Show Submit/Approve/Pay actions for selected transactions when all expenses are selected #78426
+136
−92
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,7 +123,6 @@ | |
| import AnimatedSubmitButton from './AnimatedSubmitButton'; | ||
| import BrokenConnectionDescription from './BrokenConnectionDescription'; | ||
| import Button from './Button'; | ||
| import type {DropdownOption} from './ButtonWithDropdownMenu/types'; | ||
| import DecisionModal from './DecisionModal'; | ||
| import {DelegateNoAccessContext} from './DelegateNoAccessModalProvider'; | ||
|
|
@@ -133,7 +132,6 @@ | |
| import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; | ||
| import Icon from './Icon'; | ||
| import {KYCWallContext} from './KYCWall/KYCWallContext'; | ||
| import LoadingBar from './LoadingBar'; | ||
| import Modal from './Modal'; | ||
| import {ModalActions} from './Modal/Global/ModalContext'; | ||
|
|
@@ -149,6 +147,7 @@ | |
| import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu'; | ||
| import {useSearchContext} from './Search/SearchContext'; | ||
| import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton'; | ||
| import type {PaymentActionParams} from './SettlementButton/types'; | ||
| import Text from './Text'; | ||
| import {WideRHPContext} from './WideRHPContextProvider'; | ||
|
|
||
|
|
@@ -431,18 +430,6 @@ | |
| ); | ||
|
|
||
| const [offlineModalVisible, setOfflineModalVisible] = useState(false); | ||
|
|
||
| const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]); | ||
| const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]); | ||
|
|
@@ -491,11 +478,11 @@ | |
|
|
||
| const existingB2BInvoiceReport = useParticipantsInvoiceReport(activePolicyID, CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS, chatReport?.policyID); | ||
| const confirmPayment = useCallback( | ||
| ({paymentType: selectedPaymentType, payAsBusiness, methodID, paymentMethod, skipAnimation}: PaymentActionParams) => { | ||
| if (!selectedPaymentType || !chatReport) { | ||
| return; | ||
| } | ||
| setPaymentType(selectedPaymentType); | ||
| setRequestType(CONST.IOU.REPORT_ACTION_TYPE.PAY); | ||
| if (isDelegateAccessRestricted) { | ||
| showDelegateNoAccessModal(); | ||
|
|
@@ -507,9 +494,12 @@ | |
| setIsHoldMenuVisible(true); | ||
| } | ||
| } else if (isInvoiceReport) { | ||
| // Only start animation when skipAnimation is not set (default behavior for header button) | ||
| if (!skipAnimation) { | ||
| startAnimation(); | ||
| } | ||
| payInvoice({ | ||
| paymentMethodType: selectedPaymentType, | ||
| chatReport, | ||
| invoiceReport: moneyRequestReport, | ||
| introSelected, | ||
|
|
@@ -522,8 +512,11 @@ | |
| activePolicy, | ||
| }); | ||
| } else { | ||
| // Only start animation when skipAnimation is not set (default behavior for header button) | ||
| if (!skipAnimation) { | ||
| startAnimation(); | ||
| } | ||
| payMoneyRequest(selectedPaymentType, chatReport, moneyRequestReport, introSelected, undefined, true, activePolicy); | ||
| if (currentSearchQueryJSON && !isOffline) { | ||
| search({ | ||
| searchKey: currentSearchKey, | ||
|
|
@@ -570,7 +563,7 @@ | |
| } | ||
| }; | ||
|
|
||
| const confirmApproval = (skipAnimation?: boolean) => { | ||
| if (hasDynamicExternalWorkflow(policy)) { | ||
| showDWEModal(); | ||
| return; | ||
|
|
@@ -581,7 +574,9 @@ | |
| } else if (isAnyTransactionOnHold) { | ||
| setIsHoldMenuVisible(true); | ||
| } else { | ||
| if (!skipAnimation) { | ||
| startApprovedAnimation(); | ||
| } | ||
| approveMoneyRequest(moneyRequestReport, policy, accountID, email ?? '', hasViolations, isASAPSubmitBetaEnabled, nextStep, true); | ||
| } | ||
| }; | ||
|
|
@@ -911,7 +906,7 @@ | |
| [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: ( | ||
| <Button | ||
| success | ||
| onPress={() => confirmApproval()} | ||
| text={translate('iou.approve')} | ||
| isDisabled={isBlockSubmitDueToPreventSelfApproval} | ||
| /> | ||
|
|
@@ -1090,7 +1085,7 @@ | |
| </Text> | ||
| ); | ||
|
|
||
| const secondaryActionsImplementation: Record< | ||
|
Check warning on line 1088 in src/components/MoneyReportHeader.tsx
|
||
| ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, | ||
| DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> & Pick<PopoverMenuItem, 'backButtonText' | 'rightIcon'> | ||
| > = { | ||
|
|
@@ -1145,7 +1140,7 @@ | |
| icon: expensifyIcons.ThumbsUp, | ||
| value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE, | ||
| sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.APPROVE, | ||
| onSelected: () => confirmApproval(true), | ||
|
Contributor
There was a problem hiding this comment. ❌ PERF-4 (docs)Creating inline arrow functions in object literals that are recreated on every render causes unnecessary recomputations of dependent values. The To fix this, wrap const handleApproveWithSkipAnimation = useCallback(() => confirmApproval(true), [confirmApproval]);
// Then use in the object:
[CONST.REPORT.SECONDARY_ACTIONS.APPROVE]: {
text: translate(iou.approve),
icon: expensifyIcons.ThumbsUp,
value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE,
sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.APPROVE,
onSelected: handleApproveWithSkipAnimation,
}Alternatively, wrap the entire |
||
| }, | ||
| [CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE]: { | ||
| text: translate('iou.unapprove'), | ||
|
|
@@ -1474,6 +1469,28 @@ | |
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [transactionThreadReportID]); | ||
|
|
||
| const applicableTransactionActions = useMemo(() => { | ||
| const allowedActions = [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT, CONST.REPORT.PRIMARY_ACTIONS.APPROVE, CONST.REPORT.PRIMARY_ACTIONS.PAY]; | ||
| return allowedActions | ||
| .filter((actionType) => { | ||
| return actionType === primaryAction || secondaryActions.includes(actionType); | ||
| }) | ||
| .map((actionType) => secondaryActionsImplementation[actionType]); | ||
| }, [primaryAction, secondaryActions, secondaryActionsImplementation]); | ||
|
|
||
| const isOnSearch = route.name.toLowerCase().startsWith('search'); | ||
| const {options: originalSelectedTransactionsOptions, handleDeleteTransactions} = useSelectedTransactionsActions({ | ||
| report: moneyRequestReport, | ||
| reportActions, | ||
| allTransactionsLength: transactions.length, | ||
| session, | ||
| onExportFailed: () => setIsDownloadErrorModalVisible(true), | ||
| onExportOffline: () => setOfflineModalVisible(true), | ||
| policy, | ||
| beginExportWithTemplate: (templateName, templateType, transactionIDList, policyID) => beginExportWithTemplate(templateName, templateType, transactionIDList, policyID), | ||
| reportLevelActions: applicableTransactionActions, | ||
| isOnSearch, | ||
| }); | ||
| useEffect(() => { | ||
| if (!hasFinishedPDFDownload || !canTriggerAutomaticPDFDownload.current) { | ||
| return; | ||
|
|
@@ -1625,36 +1642,37 @@ | |
| chatReportID={chatReport?.reportID} | ||
| iouReport={moneyRequestReport} | ||
| onPaymentSelect={onPaymentSelect} | ||
| onSuccessfulKYC={(kycPaymentType) => confirmPayment({paymentType: kycPaymentType})} | ||
| primaryAction={primaryAction} | ||
| applicableSecondaryActions={applicableSecondaryActions} | ||
| ref={kycWallRef} | ||
| /> | ||
| )} | ||
| {shouldShowSelectedTransactionsButton && ( | ||
| <MoneyReportHeaderKYCDropdown | ||
| chatReportID={chatReport?.reportID} | ||
| iouReport={moneyRequestReport} | ||
| onPaymentSelect={onPaymentSelect} | ||
| onSuccessfulKYC={(kycPaymentType) => confirmPayment({paymentType: kycPaymentType, skipAnimation: true})} | ||
| options={selectedTransactionsOptions} | ||
| customText={translate('workspace.common.selected', {count: selectedTransactionIDs.length})} | ||
| ref={kycWallRef} | ||
| /> | ||
| )} | ||
| </View> | ||
| )} | ||
| </HeaderWithBackButton> | ||
| {!shouldDisplayNarrowMoreButton && | ||
| (shouldShowSelectedTransactionsButton ? ( | ||
| <View style={[styles.dFlex, styles.w100, styles.ph5, styles.pb3]}> | ||
| <MoneyReportHeaderKYCDropdown | ||
| chatReportID={chatReport?.reportID} | ||
| iouReport={moneyRequestReport} | ||
| onPaymentSelect={onPaymentSelect} | ||
| onSuccessfulKYC={(kycPaymentType) => confirmPayment({paymentType: kycPaymentType, skipAnimation: true})} | ||
| options={selectedTransactionsOptions} | ||
| customText={translate('workspace.common.selected', {count: selectedTransactionIDs.length})} | ||
| ref={kycWallRef} | ||
| /> | ||
| </View> | ||
| ) : ( | ||
|
|
@@ -1665,7 +1683,7 @@ | |
| chatReportID={chatReport?.reportID} | ||
| iouReport={moneyRequestReport} | ||
| onPaymentSelect={onPaymentSelect} | ||
| onSuccessfulKYC={(kycPaymentType) => confirmPayment({paymentType: kycPaymentType})} | ||
| primaryAction={primaryAction} | ||
| applicableSecondaryActions={applicableSecondaryActions} | ||
| ref={kycWallRef} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❌ PERF-4 (docs)
Creating inline arrow functions as props causes unnecessary re-renders because a new function reference is created on every render. React uses referential equality to determine if props changed, so even if the logic is identical, the new function instance triggers re-renders of child components.
Wrap this function in
useCallbackto preserve referential stability:Note: For this to be fully effective,
confirmApprovalitself should also be wrapped inuseCallback.