From f4d6c84d20448f4fa877d66f07b2d472b6842465 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 14 Apr 2026 23:18:48 +0530 Subject: [PATCH 01/42] Skip the amopunt and participants steps to match the new UI. --- .../MoneyRequestConfirmationList.tsx | 144 ++++++++++++++++-- .../MoneyRequestConfirmationListFooter.tsx | 4 +- src/pages/iou/request/IOURequestStartPage.tsx | 32 ++-- .../step/IOURequestStepConfirmation.tsx | 55 ++++--- 4 files changed, 189 insertions(+), 46 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index fe2a67ad21b7..422983cf6725 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -5,14 +5,19 @@ import type {OnyxEntry} from 'react-native-onyx'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDebouncedState from '@hooks/useDebouncedState'; +import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy'; import useLocalize from '@hooks/useLocalize'; import {MouseProvider} from '@hooks/useMouseContext'; import useOnyx from '@hooks/useOnyx'; +import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePermissions from '@hooks/usePermissions'; import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses'; import usePolicyForTransaction from '@hooks/usePolicyForTransaction'; import usePreferredPolicy from '@hooks/usePreferredPolicy'; import usePrevious from '@hooks/usePrevious'; +import usePrivateIsArchivedMap from '@hooks/usePrivateIsArchivedMap'; +import useReportAttributes from '@hooks/useReportAttributes'; +import useSelfDMReport from '@hooks/useSelfDMReport'; import useThemeStyles from '@hooks/useThemeStyles'; import blurActiveElement from '@libs/Accessibility/blurActiveElement'; import {computePerDiemExpenseAmount, isValidPerDiemExpenseAmount} from '@libs/actions/IOU/PerDiem'; @@ -25,10 +30,11 @@ import {calculateAmount, isMovingTransactionFromTrackExpense as isMovingTransact import Log from '@libs/Log'; import {validateAmount} from '@libs/MoneyRequestUtils'; import Navigation from '@libs/Navigation/Navigation'; -import {getIOUConfirmationOptionsFromPayeePersonalDetail, hasEnabledOptions} from '@libs/OptionsListUtils'; +import {getIOUConfirmationOptionsFromPayeePersonalDetail, getParticipantsOption, getReportOption, hasEnabledOptions} from '@libs/OptionsListUtils'; import {getTagLists, isAttendeeTrackingEnabled, isTaxTrackingEnabled} from '@libs/PolicyUtils'; -import {isSelectedManagerMcTest} from '@libs/ReportUtils'; +import {getPolicyExpenseChat, getReportOrDraftReport, isSelectedManagerMcTest} from '@libs/ReportUtils'; import type {OptionData} from '@libs/ReportUtils'; +import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy'; import {hasEnabledTags, hasMatchingTag} from '@libs/TagsOptionsListUtils'; import {isValidTimeExpenseAmount} from '@libs/TimeTrackingUtils'; import { @@ -61,6 +67,7 @@ import { import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils'; import {getIsViolationFixed} from '@libs/Violations/ViolationsUtils'; import {hasInvoicingDetails} from '@userActions/Policy/Policy'; +import {getMoneyRequestParticipantsFromReport} from '@userActions/IOU'; import type {IOUAction, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; @@ -81,6 +88,7 @@ import FieldAutoSelector from './MoneyRequestConfirmationList/FieldAutoSelector' import SplitBillController from './MoneyRequestConfirmationList/SplitBillController'; import TaxController from './MoneyRequestConfirmationList/TaxController'; import MoneyRequestConfirmationListFooter from './MoneyRequestConfirmationListFooter'; +import {usePersonalDetails} from './OnyxListItemProvider'; import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; @@ -284,6 +292,16 @@ function MoneyRequestConfirmationList({ const styles = useThemeStyles(); const {translate} = useLocalize(); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const defaultExpensePolicy = useDefaultExpensePolicy(); + const personalPolicy = usePersonalPolicy(); + const selfDMReport = useSelfDMReport(); + const personalDetails = usePersonalDetails(); + const reportAttributesDerived = useReportAttributes(); + const privateIsArchivedMap = usePrivateIsArchivedMap(); + const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); + const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); + const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); + const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const {isRestrictedToPreferredPolicy} = usePreferredPolicy(); const isDistanceRequest = isDistanceRequestUtil(transaction); @@ -308,6 +326,8 @@ function MoneyRequestConfirmationList({ const isTypeTrackExpense = iouType === CONST.IOU.TYPE.TRACK; const isTypeInvoice = iouType === CONST.IOU.TYPE.INVOICE; const isScanRequest = useMemo(() => isScanRequestUtil(transaction), [transaction]); + const isManualRequest = transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL; + const shouldForceTopEmptySections = isNewManualExpenseFlowEnabled && (iouType === CONST.IOU.TYPE.CREATE || isManualRequest || isScanRequest); const isFromGlobalCreateAndCanEditParticipant = !!transaction?.isFromGlobalCreate && !isPerDiemRequest && !isTimeRequest; const transactionID = transaction?.transactionID; @@ -567,6 +587,80 @@ function MoneyRequestConfirmationList({ ); const selectedParticipants = useMemo(() => selectedParticipantsProp.filter((participant) => participant.selected), [selectedParticipantsProp]); + const defaultParticipantOptions = useMemo(() => { + if (!shouldForceTopEmptySections || selectedParticipants.length > 0) { + return []; + } + + const sourceReportID = transaction?.reportID ?? reportID; + if (!sourceReportID) { + return []; + } + + const sourceReport = getReportOrDraftReport(sourceReportID); + let defaultParticipants = getMoneyRequestParticipantsFromReport(sourceReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + + const isGlobalCreateFlow = transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton ?? iouType === CONST.IOU.TYPE.CREATE; + + if (!defaultParticipants.length && isGlobalCreateFlow) { + const canUseDefaultExpensePolicy = shouldUseDefaultExpensePolicy( + iouType, + defaultExpensePolicy, + amountOwed, + userBillingGracePeriodEnds, + ownerBillingGracePeriodEnd, + ); + + if (canUseDefaultExpensePolicy) { + const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; + const defaultTargetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport; + defaultParticipants = getMoneyRequestParticipantsFromReport(defaultTargetReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + } + } + + if (!defaultParticipants.length) { + return []; + } + + return defaultParticipants + .map((participant) => { + if (participant.accountID) { + return getParticipantsOption(participant, personalDetails); + } + + const privateIsArchived = privateIsArchivedMap[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${participant.reportID}`]; + return getReportOption(participant, privateIsArchived, policy, personalDetails, conciergeReportID, reportAttributesDerived); + }) + .filter(Boolean) + .map((participant) => ({...participant, selected: true})) as Participant[]; + }, [ + shouldForceTopEmptySections, + selectedParticipants.length, + transaction?.reportID, + reportID, + currentUserPersonalDetails.accountID, + personalDetails, + privateIsArchivedMap, + policy, + conciergeReportID, + reportAttributesDerived, + transaction?.isFromGlobalCreate, + transaction?.isFromFloatingActionButton, + iouType, + defaultExpensePolicy, + personalPolicy, + selfDMReport, + amountOwed, + userBillingGracePeriodEnds, + ownerBillingGracePeriodEnd, + ]); + const selectedParticipantsWithFallback = useMemo(() => { + if (!defaultParticipantOptions.length) { + return selectedParticipants; + } + + return defaultParticipantOptions; + }, [defaultParticipantOptions, selectedParticipants]); const payeePersonalDetails = useMemo(() => payeePersonalDetailsProp ?? currentUserPersonalDetails, [payeePersonalDetailsProp, currentUserPersonalDetails]); const shouldShowReadOnlySplits = useMemo(() => isPolicyExpenseChat || isReadOnly || isScanRequest, [isPolicyExpenseChat, isReadOnly, isScanRequest]); @@ -717,24 +811,45 @@ function MoneyRequestConfirmationList({ }, ); // When adding an expense from within a report, hide the "To:" section since the destination is already the current report - } else if (!shouldHideToSection) { - const formattedSelectedParticipants = selectedParticipants.map((participant) => ({ - ...participant, - isSelected: false, - keyForList: `${participant.keyForList ?? participant.accountID ?? participant.reportID}`, - isInteractive: canEditParticipant, - shouldShowRightCaret: canEditParticipant, - })); + } else if (!shouldHideToSection || shouldForceTopEmptySections) { + const participantRows = + selectedParticipantsWithFallback.length > 0 + ? selectedParticipantsWithFallback.map((participant) => ({ + ...participant, + isSelected: false, + keyForList: `${participant.keyForList ?? participant.accountID ?? participant.reportID}`, + isInteractive: canEditParticipant, + shouldShowRightCaret: canEditParticipant, + })) + : [ + { + keyForList: 'empty-participant-option', + text: translate('iou.error.noParticipantSelected'), + isInteractive: canEditParticipant, + shouldShowRightCaret: canEditParticipant, + }, + ]; options.push({ title: translate('common.to'), - data: formattedSelectedParticipants, + data: participantRows, sectionIndex: 0, }); } return options; - }, [isTypeSplit, translate, payeePersonalDetails, getSplitSectionHeader, splitParticipants, selectedParticipants, canEditParticipant, shouldHideToSection]); + }, [ + isTypeSplit, + translate, + payeePersonalDetails, + getSplitSectionHeader, + splitParticipants, + selectedParticipants, + selectedParticipantsWithFallback, + canEditParticipant, + shouldHideToSection, + shouldForceTopEmptySections, + ]); /** * Navigate to the participant step @@ -761,7 +876,7 @@ function MoneyRequestConfirmationList({ return; } - if (selectedParticipants.length === 0) { + if (selectedParticipantsWithFallback.length === 0) { setFormError('iou.error.noParticipantSelected'); return; } @@ -874,7 +989,7 @@ function MoneyRequestConfirmationList({ return; } - onConfirm?.(selectedParticipants); + onConfirm?.(selectedParticipantsWithFallback); } else { if (!paymentMethod) { return; @@ -897,6 +1012,7 @@ function MoneyRequestConfirmationList({ policy, policyTagLists, selectedParticipants, + selectedParticipantsWithFallback, isEditingSplitBill, isMerchantRequired, isMerchantEmpty, diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx index 16d23b0946f6..7e4e7d2150ba 100644 --- a/src/components/MoneyRequestConfirmationListFooter.tsx +++ b/src/components/MoneyRequestConfirmationListFooter.tsx @@ -409,6 +409,7 @@ function MoneyRequestConfirmationListFooter({ const decodedCategoryName = useMemo(() => getDecodedCategoryName(iouCategory), [iouCategory]); const isScan = isScanRequest(transaction); + const isManualRequest = transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL; const isTrackExpense = iouType === CONST.IOU.TYPE.TRACK; const shouldShowTags = useMemo( @@ -521,7 +522,8 @@ function MoneyRequestConfirmationListFooter({ const shouldDisplayCategoryError = formError === 'violations.categoryOutOfPolicy'; const shouldDisplayAttendeesError = formError === 'violations.missingAttendees'; - const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest); + const shouldShowReceiptEmptyStateForManualOrScan = isNewManualExpenseFlowEnabled && (isManualRequest || isScan) && !isDistanceRequest && !isPerDiemRequest && !isTimeRequest; + const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest) || shouldShowReceiptEmptyStateForManualOrScan; // The per diem custom unit const perDiemCustomUnit = getPerDiemCustomUnit(policy); const { diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index fdbb92cf32e5..83fc36b3860f 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -49,6 +49,7 @@ import type {DismissedProductTraining, SelectedTabRequest} from '@src/types/onyx import {isEmptyObject} from '@src/types/utils/EmptyObject'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {IOURequestStepAmountWithTransactionOnly} from './step/IOURequestStepAmount'; +import IOURequestStepConfirmation from './step/IOURequestStepConfirmation'; import IOURequestStepDestination from './step/IOURequestStepDestination'; import IOURequestStepDistance from './step/IOURequestStepDistance'; import IOURequestStepHours from './step/IOURequestStepHours'; @@ -78,6 +79,8 @@ function IOURequestStartPage({ // This is currently only being used for testing defaultSelectedTab = CONST.TAB_REQUEST.SCAN, }: IOURequestStartPageProps) { + const confirmationScreenProps = {route, navigation} as unknown as React.ComponentProps; + const styles = useThemeStyles(); const {translate} = useLocalize(); const shouldUseTab = iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.PAY && iouType !== CONST.IOU.TYPE.INVOICE; @@ -105,7 +108,6 @@ function IOURequestStartPage({ const hasOnlyPersonalPolicies = useMemo(() => hasOnlyPersonalPoliciesUtil(allPolicies), [allPolicies]); const perDiemInputRef = useRef(null); - const tabTitles = { [CONST.IOU.TYPE.REQUEST]: translate('iou.createExpense'), [CONST.IOU.TYPE.SUBMIT]: translate('iou.createExpense'), @@ -256,11 +258,17 @@ function IOURequestStartPage({ }, [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement]); const {isBetaEnabled} = usePermissions(); + const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); + const shouldShowConfirmationOnStartPage = isNewManualExpenseFlowEnabled && shouldUseTab && (selectedTab === CONST.TAB_REQUEST.MANUAL || selectedTab === CONST.TAB_REQUEST.SCAN); const setTestReceiptAndNavigateRef = useRef<() => void>(() => {}); const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext( CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP, // The test receipt image is served via our server on web so it requires internet connection - !hasUserSubmittedExpenseOrScannedReceipt && isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedTab === CONST.TAB_REQUEST.SCAN && !(isOffline && isWeb), + !shouldShowConfirmationOnStartPage && + !hasUserSubmittedExpenseOrScannedReceipt && + isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && + selectedTab === CONST.TAB_REQUEST.SCAN && + !(isOffline && isWeb), { onShown: () => { GoogleTagManager.publishEvent(CONST.ANALYTICS.EVENT.PRODUCT_TRAINING_SCAN_TEST_TOOLTIP_SHOWN, accountID); @@ -303,7 +311,7 @@ function IOURequestStartPage({ testID="IOURequestStartPage" focusTrapSettings={{containerElements: focusTrapContainerElements}} > - + {() => ( - + {isNewManualExpenseFlowEnabled ? ( + + ) : ( + + )} )} diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index d0b7a3c10d7c..4ddccc63dd86 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -291,6 +291,7 @@ function IOURequestStepConfirmation({ const theme = useTheme(); const {translate, toLocaleDigit} = useLocalize(); const {isBetaEnabled} = usePermissions(); + const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); const {isOffline} = useNetwork(); const {showConfirmModal} = useConfirmModal(); const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false); @@ -1485,13 +1486,19 @@ function IOURequestStepConfirmation({ isMovingTransactionFromTrackExpense={isMovingTransactionFromTrackExpense} isCreatingTrackExpense={isCreatingTrackExpense} /> - + {/* + * In this rollout, NEW_MANUAL_EXPENSE_FLOW means this screen is embedded on IOURequestStartPage. + * Skip MoneyRequestInitializer here to avoid duplicate initialization and navigation side effects. + */} + {!isNewManualExpenseFlowEnabled && ( + + )} - - {hasMultipleTransactions ? ( - - ) : null} - + {/* + * Keep a single header in embedded mode: IOURequestStartPage renders the parent header, + * so this inner header must be hidden to prevent duplicate back buttons and title layout issues. + */} + {!isNewManualExpenseFlowEnabled && ( + + {hasMultipleTransactions ? ( + + ) : null} + + )} {(isLoading || (isScanRequest(transaction) && !Object.values(receiptFiles).length)) && ( Date: Fri, 17 Apr 2026 18:44:13 +0530 Subject: [PATCH 02/42] Show an error when amount field is empty --- src/components/MoneyRequestConfirmationList.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 422983cf6725..4734416c1cdf 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -881,10 +881,10 @@ function MoneyRequestConfirmationList({ return; } - const amountForValidation = iouAmount; - const isAmountMissingForManualFlow = amountForValidation === null || amountForValidation === undefined; - - if (iouType !== CONST.IOU.TYPE.PAY && isNewManualExpenseFlowEnabled && isAmountMissingForManualFlow) { + // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0). + // We block submission until the user explicitly enters an amount (tracked by isAmountSet). + // Note: a user-entered $0 is valid – this only blocks the empty field. + if (iouType !== CONST.IOU.TYPE.PAY && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { setFormError('common.error.invalidAmount'); return; } From 8560cebe6f22ed045f7fe2f5bc98f47b8ec60dcf Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 19:20:03 +0530 Subject: [PATCH 03/42] Show an error when amount field is empty --- .../MoneyRequestConfirmationList.tsx | 1 + .../MoneyRequestConfirmationListFooter.tsx | 19 ++++++++++++++++--- src/libs/actions/IOU/index.ts | 13 ++++++++++++- src/types/onyx/Transaction.ts | 8 ++++++++ 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 4734416c1cdf..67d726c8c9d3 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -1251,6 +1251,7 @@ function MoneyRequestConfirmationList({ isDescriptionRequired={isDescriptionRequired} showMoreFields={showMoreFields} setShowMoreFields={setShowMoreFields} + clearFormErrors={clearFormErrors} /> ); diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx index 7e4e7d2150ba..456a51f4c13e 100644 --- a/src/components/MoneyRequestConfirmationListFooter.tsx +++ b/src/components/MoneyRequestConfirmationListFooter.tsx @@ -20,7 +20,7 @@ import useReportAttributes from '@hooks/useReportAttributes'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; -import {setMoneyRequestAmount, setMoneyRequestDescription, setMoneyRequestMerchant} from '@libs/actions/IOU'; +import {clearMoneyRequestAmount, setMoneyRequestAmount, setMoneyRequestDescription, setMoneyRequestMerchant} from '@libs/actions/IOU'; import {getDecodedCategoryName} from '@libs/CategoryUtils'; import {convertToBackendAmount, convertToDisplayString, convertToFrontendAmountAsString, getLocalizedCurrencySymbol} from '@libs/CurrencyUtils'; import DistanceRequestUtils from '@libs/DistanceRequestUtils'; @@ -106,6 +106,9 @@ type MoneyRequestConfirmationListFooterProps = { /** The error message for the form */ formError: string; + /** Clears specific form errors by key */ + clearFormErrors: (errors: string[]) => void; + /** Flag indicating if there is a route */ hasRoute: boolean; @@ -330,6 +333,7 @@ function MoneyRequestConfirmationListFooter({ transaction, transactionID, unit, + clearFormErrors, onPDFLoadError, onPDFPassword, iouIsReimbursable, @@ -352,7 +356,10 @@ function MoneyRequestConfirmationListFooter({ const currency = isDistanceRequest ? distanceRateCurrency : (iouCurrencyCode ?? CONST.CURRENCY.USD); // TO DO: Unify currency source once we remove the old flow const decimals = getCurrencyDecimals(currency); - const transactionAmount = convertToFrontendAmountAsString(amount, decimals); + // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0 before the user + // touches it). Once the user explicitly sets an amount – including 0 – isAmountSet becomes true and we show the + // real value. This avoids showing "$0.00" as a pre-filled default. + const transactionAmount = isNewManualExpenseFlowEnabled && !transaction?.isAmountSet ? '' : convertToFrontendAmountAsString(amount, decimals); const [isCurrencyPickerVisible, setIsCurrencyPickerVisible] = useState(false); const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); @@ -708,8 +715,14 @@ function MoneyRequestConfirmationListFooter({ const parsedAmount = getBackendAmountFromInput(newAmount); if (parsedAmount === null) { + // User cleared the field — mark amount as unset so the field stays empty + // and submission is blocked until a value is re-entered. + clearMoneyRequestAmount(transactionID); return; } + + // Dismiss the "field required" error as soon as the user enters a valid amount. + clearFormErrors(['common.error.invalidAmount']); // Edits to the amount from the splits page should reset the split shares. if (transaction?.splitShares) { resetSplitShares(transaction, parsedAmount); @@ -722,7 +735,7 @@ function MoneyRequestConfirmationListFooter({ setMoneyRequestAmount(transactionID, parsedAmount, currency); }, - [transactionID, getBackendAmountFromInput, isEditingSplitBill, transaction, buildAndSaveSplitShares, currency], + [transactionID, getBackendAmountFromInput, isEditingSplitBill, transaction, buildAndSaveSplitShares, currency, clearFormErrors], ); const shouldShowAmountRequiredError = useMemo(() => { diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 8488b07248fb..970f4c0c0280 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1051,10 +1051,21 @@ function setMoneyRequestReceiptState(transactionID: string, isDraft: boolean, sh } function setMoneyRequestAmount(transactionID: string, amount: number, currency: string, shouldShowOriginalAmount = false, shouldStopSmartscan = false) { - Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {amount, currency, shouldShowOriginalAmount}); + // Mark that the user has explicitly set the amount. This is used by the new manual expense flow to distinguish + // a default amount of 0 (field empty) from a user-entered 0 (valid $0 expense). + Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {amount, currency, shouldShowOriginalAmount, isAmountSet: true}); setMoneyRequestReceiptState(transactionID, true, shouldStopSmartscan); } +/** + * Clears the amount field back to an empty/unset state in the new manual expense flow. + * Called when the user deletes all characters from the amount input so that the field + * shows as empty and submission is blocked until a value is entered again. + */ +function clearMoneyRequestAmount(transactionID: string) { + Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {isAmountSet: false}); +} + function setMoneyRequestCreated(transactionID: string, created: string, isDraft: boolean, shouldStopSmartscan = false) { Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {created}); setMoneyRequestReceiptState(transactionID, isDraft, shouldStopSmartscan); diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts index 11e420acf93b..fcedc8d2d516 100644 --- a/src/types/onyx/Transaction.ts +++ b/src/types/onyx/Transaction.ts @@ -511,6 +511,14 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback< /** Used during the creation flow before the transaction is saved to the server */ iouRequestType?: IOURequestType; + /** + * Tracks whether the user has explicitly set an amount in the new manual expense flow. + * A fresh draft transaction starts at amount=0 which is indistinguishable from an intentional $0 entry, + * so this flag is set to `true` the first time setMoneyRequestAmount is called, allowing the UI + * to show an empty field initially and the confirmation step to block submission until the field is empty. + */ + isAmountSet?: boolean; + /** The original merchant name */ merchant: string; From d6bef7e068070922399e136e3af0e17d1be3958b Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 19:21:08 +0530 Subject: [PATCH 04/42] Enable keyboard avoiding view in favour of new inline input UI. --- src/pages/iou/request/IOURequestStartPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index 83fc36b3860f..ae634e4e5ab6 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -305,7 +305,7 @@ function IOURequestStartPage({ allPolicies={allPolicies} > Date: Fri, 17 Apr 2026 19:56:10 +0530 Subject: [PATCH 05/42] Show an error when amount field is empty --- src/libs/DebugUtils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/DebugUtils.ts b/src/libs/DebugUtils.ts index 31a0a1ee5ef5..5d1f603153d2 100644 --- a/src/libs/DebugUtils.ts +++ b/src/libs/DebugUtils.ts @@ -1138,6 +1138,7 @@ function validateTransactionDraftProperty(key: keyof Transaction, value: string) currencyConversionRate: CONST.RED_BRICK_ROAD_PENDING_ACTION, splitsStartDate: CONST.RED_BRICK_ROAD_PENDING_ACTION, splitsEndDate: CONST.RED_BRICK_ROAD_PENDING_ACTION, + isAmountSet: CONST.RED_BRICK_ROAD_PENDING_ACTION, }, 'string', ); From f8e7fb64f79353a470128348984d2a363782f80d Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 19:57:38 +0530 Subject: [PATCH 06/42] Place Merchant field next to the Amount field --- .../MoneyRequestConfirmationListFooter.tsx | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx index 456a51f4c13e..f3fcbd37ed3d 100644 --- a/src/components/MoneyRequestConfirmationListFooter.tsx +++ b/src/components/MoneyRequestConfirmationListFooter.tsx @@ -803,6 +803,22 @@ function MoneyRequestConfirmationListFooter({ shouldShow: shouldShowSmartScanFields && shouldShowAmountField, shouldShowAboveShowMore: false, }, + { + item:( + + + + ), + shouldShow: shouldShowMerchant && isNewManualExpenseFlowEnabled && !isReadOnly, + shouldShowAboveShowMore: false, + }, { item: ( @@ -939,18 +955,6 @@ function MoneyRequestConfirmationListFooter({ }, { item: - isNewManualExpenseFlowEnabled && !isReadOnly ? ( - - - - ) : ( - ), - shouldShow: shouldShowMerchant, + />, + shouldShow: shouldShowMerchant && (!isNewManualExpenseFlowEnabled||isReadOnly), shouldShowAboveShowMore: false, }, { From 23b98fc05b1b3d658c89f270dd5b0a02d916b72c Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 19:58:59 +0530 Subject: [PATCH 07/42] Refine description saving logic to avoid clearing blank spoace and newline char while editing. --- src/libs/actions/IOU/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 970f4c0c0280..1f25c6ba5d42 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1081,7 +1081,9 @@ function setMoneyRequestCurrency(transactionID: string, currency: string, isEdit } function setMoneyRequestDescription(transactionID: string, comment: string, isDraft: boolean, shouldStopSmartscan = false) { - Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {comment: comment.trim()}}); + // Trim only when persisting to the real transaction (not a draft) to avoid + // stripping trailing spaces/newlines while the user is still typing. + Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {comment: isDraft ? comment : comment.trim()}}); setMoneyRequestReceiptState(transactionID, isDraft, shouldStopSmartscan); } From eb2b91df91c4a1ded883d7dad04d9782802ac65c Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 19:59:09 +0530 Subject: [PATCH 08/42] Show an error when amount field is empty --- src/libs/actions/IOU/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 1f25c6ba5d42..18e5bd72ba92 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -5876,6 +5876,7 @@ export { setGPSTransactionDraftData, setCustomUnitID, setMoneyRequestAmount, + clearMoneyRequestAmount, setMoneyRequestAttendees, setMoneyRequestAccountant, setMoneyRequestBillable, From 302b6654834e162ea7ea6bfe7018370a5bea5abf Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 17 Apr 2026 20:00:14 +0530 Subject: [PATCH 09/42] Hide suplicate header in embaded view. --- src/pages/iou/request/IOURequestStartPage.tsx | 5 ++++- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index ae634e4e5ab6..650e22f34943 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -340,7 +340,10 @@ function IOURequestStartPage({ {() => ( {isNewManualExpenseFlowEnabled ? ( - + ) : ( & - WithFullTransactionOrNotFoundProps; + WithFullTransactionOrNotFoundProps & { + shouldHideHeader?: boolean; + }; // Ends the submit expense span, starts a geolocation child span, then calls getCurrentPosition. // The expense callback receives GPS coordinates on success or undefined on error. @@ -168,6 +170,7 @@ function IOURequestStepConfirmation({ }, transaction: initialTransaction, isLoadingTransaction, + shouldHideHeader = false, }: IOURequestStepConfirmationProps) { const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const personalDetails = usePersonalDetails(); @@ -1537,7 +1540,7 @@ function IOURequestStepConfirmation({ * Keep a single header in embedded mode: IOURequestStartPage renders the parent header, * so this inner header must be hidden to prevent duplicate back buttons and title layout issues. */} - {!isNewManualExpenseFlowEnabled && ( + {!shouldHideHeader && ( Date: Fri, 17 Apr 2026 20:02:00 +0530 Subject: [PATCH 10/42] Prettier --- .../MoneyRequestConfirmationList.tsx | 14 ++-- .../MoneyRequestConfirmationListFooter.tsx | 71 ++++++++++--------- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 67d726c8c9d3..be22565f0d88 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -9,8 +9,8 @@ import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy'; import useLocalize from '@hooks/useLocalize'; import {MouseProvider} from '@hooks/useMouseContext'; import useOnyx from '@hooks/useOnyx'; -import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePermissions from '@hooks/usePermissions'; +import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses'; import usePolicyForTransaction from '@hooks/usePolicyForTransaction'; import usePreferredPolicy from '@hooks/usePreferredPolicy'; @@ -66,8 +66,8 @@ import { } from '@libs/TransactionUtils'; import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils'; import {getIsViolationFixed} from '@libs/Violations/ViolationsUtils'; -import {hasInvoicingDetails} from '@userActions/Policy/Policy'; import {getMoneyRequestParticipantsFromReport} from '@userActions/IOU'; +import {hasInvoicingDetails} from '@userActions/Policy/Policy'; import type {IOUAction, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; @@ -93,7 +93,7 @@ import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; import SelectionListWithSections from './SelectionList/SelectionListWithSections'; -import type {Section} from './SelectionList/SelectionListWithSections/types'; +import type {Section, SelectionListWithSectionsHandle} from './SelectionList/SelectionListWithSections/types'; import SettlementButton from './SettlementButton'; import type {PaymentActionParams} from './SettlementButton/types'; import Text from './Text'; @@ -603,13 +603,7 @@ function MoneyRequestConfirmationList({ const isGlobalCreateFlow = transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton ?? iouType === CONST.IOU.TYPE.CREATE; if (!defaultParticipants.length && isGlobalCreateFlow) { - const canUseDefaultExpensePolicy = shouldUseDefaultExpensePolicy( - iouType, - defaultExpensePolicy, - amountOwed, - userBillingGracePeriodEnds, - ownerBillingGracePeriodEnd, - ); + const canUseDefaultExpensePolicy = shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd); if (canUseDefaultExpensePolicy) { const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx index f3fcbd37ed3d..225ac69d2dd8 100644 --- a/src/components/MoneyRequestConfirmationListFooter.tsx +++ b/src/components/MoneyRequestConfirmationListFooter.tsx @@ -804,18 +804,18 @@ function MoneyRequestConfirmationListFooter({ shouldShowAboveShowMore: false, }, { - item:( - - - - ), + item: ( + + + + ), shouldShow: shouldShowMerchant && isNewManualExpenseFlowEnabled && !isReadOnly, shouldShowAboveShowMore: false, }, @@ -954,30 +954,31 @@ function MoneyRequestConfirmationListFooter({ shouldShowAboveShowMore: false, }, { - item: - { - if (!transactionID) { - return; - } + item: ( + { + if (!transactionID) { + return; + } - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute(), reportActionID)); - }} - disabled={didConfirm} - interactive={!isReadOnly} - brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} - errorText={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''} - rightLabel={isMerchantRequired && !shouldDisplayMerchantError ? translate('common.required') : ''} - numberOfLinesTitle={2} - sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.MERCHANT_FIELD} - />, - shouldShow: shouldShowMerchant && (!isNewManualExpenseFlowEnabled||isReadOnly), + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute(), reportActionID)); + }} + disabled={didConfirm} + interactive={!isReadOnly} + brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} + errorText={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''} + rightLabel={isMerchantRequired && !shouldDisplayMerchantError ? translate('common.required') : ''} + numberOfLinesTitle={2} + sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.MERCHANT_FIELD} + /> + ), + shouldShow: shouldShowMerchant && (!isNewManualExpenseFlowEnabled || isReadOnly), shouldShowAboveShowMore: false, }, { From b0e14bd7b1ccf15e07392f38527c63eb07a34fcd Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 24 Apr 2026 23:19:20 +0530 Subject: [PATCH 11/42] Refactor manual expense flow UI components and logic for improved clarity and functionality --- .../MoneyRequestConfirmationList.tsx | 145 ++++-------------- .../sections/AmountField.tsx | 37 ++++- .../sections/MerchantField.tsx | 27 +++- .../MoneyRequestConfirmationListFooter.tsx | 30 +++- src/libs/DebugUtils.ts | 1 + src/libs/actions/IOU/index.ts | 8 +- .../step/IOURequestStepConfirmation.tsx | 114 +++++++++++++- .../step/IOURequestStepParticipants.tsx | 10 +- src/types/onyx/Transaction.ts | 3 + tests/ui/MoneyRequestReportFooter.tsx | 2 + 10 files changed, 244 insertions(+), 133 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 8d52d4ba607a..10201803e1cf 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -5,20 +5,15 @@ import type {OnyxEntry} from 'react-native-onyx'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDebouncedState from '@hooks/useDebouncedState'; -import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy'; import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode'; import useLocalize from '@hooks/useLocalize'; import {MouseProvider} from '@hooks/useMouseContext'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; -import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses'; import usePolicyForTransaction from '@hooks/usePolicyForTransaction'; import usePreferredPolicy from '@hooks/usePreferredPolicy'; import usePrevious from '@hooks/usePrevious'; -import usePrivateIsArchivedMap from '@hooks/usePrivateIsArchivedMap'; -import useReportAttributes from '@hooks/useReportAttributes'; -import useSelfDMReport from '@hooks/useSelfDMReport'; import useThemeStyles from '@hooks/useThemeStyles'; import blurActiveElement from '@libs/Accessibility/blurActiveElement'; import {computePerDiemExpenseAmount, isValidPerDiemExpenseAmount} from '@libs/actions/IOU/PerDiem'; @@ -31,11 +26,10 @@ import {calculateAmount, isMovingTransactionFromTrackExpense as isMovingTransact import Log from '@libs/Log'; import {validateAmount} from '@libs/MoneyRequestUtils'; import Navigation from '@libs/Navigation/Navigation'; -import {getIOUConfirmationOptionsFromPayeePersonalDetail, getParticipantsOption, getReportOption, hasEnabledOptions} from '@libs/OptionsListUtils'; +import {getIOUConfirmationOptionsFromPayeePersonalDetail, hasEnabledOptions} from '@libs/OptionsListUtils'; import {getTagLists, isAttendeeTrackingEnabled, isTaxTrackingEnabled} from '@libs/PolicyUtils'; -import {getPolicyExpenseChat, getReportOrDraftReport, isSelectedManagerMcTest} from '@libs/ReportUtils'; +import {isSelectedManagerMcTest} from '@libs/ReportUtils'; import type {OptionData} from '@libs/ReportUtils'; -import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy'; import {hasEnabledTags, hasMatchingTag} from '@libs/TagsOptionsListUtils'; import {isValidTimeExpenseAmount} from '@libs/TimeTrackingUtils'; import { @@ -63,7 +57,6 @@ import { } from '@libs/TransactionUtils'; import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils'; import {getIsViolationFixed} from '@libs/Violations/ViolationsUtils'; -import {getMoneyRequestParticipantsFromReport} from '@userActions/IOU'; import {hasInvoicingDetails} from '@userActions/Policy/Policy'; import type {IOUAction, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; @@ -85,7 +78,6 @@ import FieldAutoSelector from './MoneyRequestConfirmationList/FieldAutoSelector' import SplitBillController from './MoneyRequestConfirmationList/SplitBillController'; import TaxController from './MoneyRequestConfirmationList/TaxController'; import MoneyRequestConfirmationListFooter from './MoneyRequestConfirmationListFooter'; -import {usePersonalDetails} from './OnyxListItemProvider'; import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; @@ -212,8 +204,8 @@ function MoneyRequestConfirmationList({ shouldShowSmartScanFields = true, isEditingSplitBill, isReceiptEditable, - selectedParticipants: selectedParticipantsProp, - payeePersonalDetails: payeePersonalDetailsProp, + selectedParticipants: selectedParticipantOptions = [], + payeePersonalDetails, isReadOnly = false, policyID, reportID = '', @@ -267,8 +259,8 @@ function MoneyRequestConfirmationList({ }, [transaction?.receipt?.isTestDriveReceipt]); const isManagerMcTestReceipt = useMemo(() => { - return isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedParticipantsProp.some((participant) => isSelectedManagerMcTest(participant.login)); - }, [isBetaEnabled, selectedParticipantsProp]); + return isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedParticipantOptions.some((participant) => isSelectedManagerMcTest(participant.login)); + }, [isBetaEnabled, selectedParticipantOptions]); const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext( isTestDriveReceipt ? CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_DRIVE_CONFIRMATION : CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_CONFIRMATION, @@ -290,16 +282,6 @@ function MoneyRequestConfirmationList({ const styles = useThemeStyles(); const {translate} = useLocalize(); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); - const defaultExpensePolicy = useDefaultExpensePolicy(); - const personalPolicy = usePersonalPolicy(); - const selfDMReport = useSelfDMReport(); - const personalDetails = usePersonalDetails(); - const reportAttributesDerived = useReportAttributes(); - const privateIsArchivedMap = usePrivateIsArchivedMap(); - const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); - const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); - const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); - const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const {isRestrictedToPreferredPolicy} = usePreferredPolicy(); const isDistanceRequest = isDistanceRequestUtil(transaction); @@ -311,6 +293,7 @@ function MoneyRequestConfirmationList({ const iouMerchant = getMerchant(transaction); const iouCategory = getCategory(transaction); const iouAttendees = useMemo(() => getAttendees(transaction, currentUserPersonalDetails), [transaction, currentUserPersonalDetails]); + const isP2P = !!(transaction?.participants?.[0]?.accountID && !transaction?.participants?.[0]?.isPolicyExpenseChat); const isTypeRequest = iouType === CONST.IOU.TYPE.SUBMIT; const isTypeSplit = iouType === CONST.IOU.TYPE.SPLIT; @@ -343,7 +326,6 @@ function MoneyRequestConfirmationList({ const prevCurrency = usePrevious(currency); const prevSubRates = usePrevious(subRates); - // A flag for showing the categories field const shouldShowCategories = isTrackExpense ? !policy || shouldSelectPolicy || !!iouCategory || hasEnabledOptions(Object.values(policyCategories ?? {})) : (isPolicyExpenseChat || isTypeInvoice) && (!!iouCategory || hasEnabledOptions(Object.values(policyCategories ?? {}))); @@ -421,10 +403,9 @@ function MoneyRequestConfirmationList({ return (!!hasSmartScanFailed && hasMissingSmartscanFields(transaction, transactionReport)) || (didConfirmSplit && areRequiredFieldsEmpty(transaction, transactionReport)); }, [isEditingSplitBill, hasSmartScanFailed, transaction, didConfirmSplit, transactionReport]); - const isMerchantEmpty = useMemo(() => !iouMerchant || isMerchantMissing(transaction), [transaction, iouMerchant]); + const merchantValue = iouMerchant ?? ''; const isMerchantRequired = isPolicyExpenseChat && (!isScanRequest || isEditingSplitBill) && shouldShowMerchant; const isMerchantFieldValid = useMemo(() => { - const merchantValue = iouMerchant ?? ''; const trimmedMerchant = merchantValue.trim(); const {isValid} = isValidInputLength(merchantValue, CONST.MERCHANT_NAME_MAX_BYTES); @@ -437,7 +418,7 @@ function MoneyRequestConfirmationList({ } return !isInvalidMerchantValue(trimmedMerchant); - }, [iouMerchant, isMerchantRequired]); + }, [merchantValue, isMerchantRequired]); const isCategoryRequired = !!policy?.requiresCategory && !isTypeInvoice; @@ -578,76 +559,9 @@ function MoneyRequestConfirmationList({ [transaction?.transactionID], ); - const selectedParticipants = useMemo(() => selectedParticipantsProp.filter((participant) => participant.selected), [selectedParticipantsProp]); - const defaultParticipantOptions = useMemo(() => { - if (!shouldForceTopEmptySections || selectedParticipants.length > 0) { - return []; - } - - const sourceReportID = transaction?.reportID ?? reportID; - if (!sourceReportID) { - return []; - } - - const sourceReport = getReportOrDraftReport(sourceReportID); - let defaultParticipants = getMoneyRequestParticipantsFromReport(sourceReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); - - const isGlobalCreateFlow = transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton ?? iouType === CONST.IOU.TYPE.CREATE; - - if (!defaultParticipants.length && isGlobalCreateFlow) { - const canUseDefaultExpensePolicy = shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd); - - if (canUseDefaultExpensePolicy) { - const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; - const defaultTargetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport; - defaultParticipants = getMoneyRequestParticipantsFromReport(defaultTargetReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); - } - } - - if (!defaultParticipants.length) { - return []; - } - - return defaultParticipants - .map((participant) => { - if (participant.accountID) { - return getParticipantsOption(participant, personalDetails); - } + const selectedParticipants = useMemo(() => selectedParticipantOptions.filter((participant) => participant.selected), [selectedParticipantOptions]); - const privateIsArchived = privateIsArchivedMap[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${participant.reportID}`]; - return getReportOption(participant, privateIsArchived, policy, personalDetails, conciergeReportID, reportAttributesDerived); - }) - .filter(Boolean) - .map((participant) => ({...participant, selected: true})) as Participant[]; - }, [ - shouldForceTopEmptySections, - selectedParticipants.length, - transaction?.reportID, - reportID, - currentUserPersonalDetails.accountID, - personalDetails, - privateIsArchivedMap, - policy, - conciergeReportID, - reportAttributesDerived, - transaction?.isFromGlobalCreate, - transaction?.isFromFloatingActionButton, - iouType, - defaultExpensePolicy, - personalPolicy, - selfDMReport, - amountOwed, - userBillingGracePeriodEnds, - ownerBillingGracePeriodEnd, - ]); - const selectedParticipantsWithFallback = useMemo(() => { - if (!defaultParticipantOptions.length) { - return selectedParticipants; - } - - return defaultParticipantOptions; - }, [defaultParticipantOptions, selectedParticipants]); - const payeePersonalDetails = useMemo(() => payeePersonalDetailsProp ?? currentUserPersonalDetails, [payeePersonalDetailsProp, currentUserPersonalDetails]); + const effectivePayeePersonalDetails = useMemo(() => payeePersonalDetails ?? currentUserPersonalDetails, [payeePersonalDetails, currentUserPersonalDetails]); const shouldShowReadOnlySplits = useMemo(() => isPolicyExpenseChat || isReadOnly || isScanRequest, [isPolicyExpenseChat, isReadOnly, isScanRequest]); const splitParticipants = useMemo(() => { @@ -655,7 +569,7 @@ function MoneyRequestConfirmationList({ return []; } - const payeeOption = getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails); + const payeeOption = getIOUConfirmationOptionsFromPayeePersonalDetail(effectivePayeePersonalDetails); if (shouldShowReadOnlySplits) { return [payeeOption, ...selectedParticipants].map((participantOption: Participant) => { const isPayer = participantOption.accountID === payeeOption.accountID; @@ -716,7 +630,7 @@ function MoneyRequestConfirmationList({ })); }, [ isTypeSplit, - payeePersonalDetails, + effectivePayeePersonalDetails, shouldShowReadOnlySplits, iouCurrencyCode, iouAmount, @@ -791,7 +705,7 @@ function MoneyRequestConfirmationList({ options.push( { title: translate('moneyRequestConfirmationList.paidBy'), - data: [getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails)], + data: [getIOUConfirmationOptionsFromPayeePersonalDetail(effectivePayeePersonalDetails)], sectionIndex: 0, }, { @@ -803,8 +717,8 @@ function MoneyRequestConfirmationList({ // When adding an expense from within a report, hide the "To:" section since the destination is already the current report } else if (!shouldHideToSection || shouldForceTopEmptySections) { const participantRows = - selectedParticipantsWithFallback.length > 0 - ? selectedParticipantsWithFallback.map((participant) => ({ + selectedParticipants.length > 0 + ? selectedParticipants.map((participant) => ({ ...participant, isSelected: false, keyForList: `${participant.keyForList ?? participant.accountID ?? participant.reportID}`, @@ -831,11 +745,10 @@ function MoneyRequestConfirmationList({ }, [ isTypeSplit, translate, - payeePersonalDetails, + effectivePayeePersonalDetails, getSplitSectionHeader, splitParticipants, selectedParticipants, - selectedParticipantsWithFallback, canEditParticipant, shouldHideToSection, shouldForceTopEmptySections, @@ -866,7 +779,7 @@ function MoneyRequestConfirmationList({ return; } - if (selectedParticipantsWithFallback.length === 0) { + if (selectedParticipants.length === 0) { setFormError('iou.error.noParticipantSelected'); return; } @@ -879,7 +792,12 @@ function MoneyRequestConfirmationList({ return; } - const merchantValue = iouMerchant ?? ''; + const isInvalidP2PAmount = iouAmount === 0 && (isTypeRequest ? isP2P : iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.INVOICE || iouType === CONST.IOU.TYPE.SPLIT); + if (isInvalidP2PAmount) { + setFormError('common.error.invalidAmount'); + return; + } + const {isValid: isMerchantLengthValid} = isValidInputLength(merchantValue, CONST.MERCHANT_NAME_MAX_BYTES); if (!isMerchantLengthValid) { @@ -887,7 +805,7 @@ function MoneyRequestConfirmationList({ return; } - if (!isEditingSplitBill && isMerchantRequired && (isMerchantEmpty || (shouldDisplayFieldError && isMerchantMissing(transaction)))) { + if (!isEditingSplitBill && isMerchantRequired && !isMerchantFieldValid) { setFormError('iou.error.invalidMerchant'); return; } @@ -979,7 +897,7 @@ function MoneyRequestConfirmationList({ return; } - onConfirm?.(selectedParticipantsWithFallback); + onConfirm?.(selectedParticipants); } else { if (!paymentMethod) { return; @@ -1002,11 +920,11 @@ function MoneyRequestConfirmationList({ policy, policyTagLists, selectedParticipants, - selectedParticipantsWithFallback, + selectedParticipants, isEditingSplitBill, isMerchantRequired, - isMerchantEmpty, - iouMerchant, + merchantValue, + shouldShowMerchant, shouldDisplayFieldError, shouldShowTax, transaction, @@ -1212,7 +1130,7 @@ function MoneyRequestConfirmationList({ receiptPath={receiptPath} reportActionID={reportActionID} reportID={reportID} - selectedParticipants={selectedParticipantsProp} + selectedParticipants={selectedParticipants} shouldDisplayFieldError={shouldDisplayFieldError} shouldDisplayReceipt={shouldDisplayReceipt} shouldShowCategories={shouldShowCategories} @@ -1231,6 +1149,7 @@ function MoneyRequestConfirmationList({ showMoreFields={showMoreFields} setShowMoreFields={setShowMoreFields} clearFormErrors={clearFormErrors} + setFormError={setFormError} /> ); @@ -1267,7 +1186,7 @@ function MoneyRequestConfirmationList({ isMovingTransactionFromTrackExpense={isMovingTransactionFromTrackExpense} isTypeSplit={isTypeSplit} selectedParticipants={selectedParticipants} - selectedParticipantsProp={selectedParticipantsProp} + selectedParticipantsProp={selectedParticipantOptions} defaultMileageRateCustomUnitRateID={defaultRate} hasRoute={hasRoute} isDistanceRequestWithPendingRoute={isDistanceRequestWithPendingRoute} diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index c59a392befca..65a4cc1999ac 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -4,19 +4,23 @@ import type {OnyxEntry} from 'react-native-onyx'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import NumberWithSymbolForm from '@components/NumberWithSymbolForm'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; +import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import {setMoneyRequestAmount} from '@libs/actions/IOU'; +import {clearMoneyRequestAmount, setMoneyRequestAmount} from '@libs/actions/IOU'; import {convertToBackendAmount, convertToFrontendAmountAsString, getLocalizedCurrencySymbol} from '@libs/CurrencyUtils'; import {calculateAmount} from '@libs/IOUUtils'; import Navigation from '@libs/Navigation/Navigation'; import {shouldEnableNegative} from '@libs/ReportUtils'; import {isAmountMissing} from '@libs/TransactionUtils'; +import {isParticipantP2P} from '@pages/iou/request/step/IOURequestStepAmount'; import IOURequestStepCurrencyModal from '@pages/iou/request/step/IOURequestStepCurrencyModal'; +import {getMoneyRequestParticipantsFromReport} from '@userActions/IOU'; import {resetSplitShares, setDraftSplitTransaction} from '@userActions/IOU/Split'; import CONST from '@src/CONST'; import type {IOUAction, IOUType} from '@src/CONST'; +import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type * as OnyxTypes from '@src/types/onyx'; @@ -41,6 +45,8 @@ type AmountFieldProps = { reportActionID: string | undefined; isEditingSplitBill: boolean; policy: OnyxEntry; + clearFormErrors: (errors: string[]) => void; + setFormError: (error: TranslationPaths | '') => void; }; function AmountField({ @@ -63,6 +69,8 @@ function AmountField({ reportActionID, isEditingSplitBill, policy, + clearFormErrors, + setFormError, }: AmountFieldProps) { const styles = useThemeStyles(); const {translate, preferredLocale} = useLocalize(); @@ -70,15 +78,24 @@ function AmountField({ const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID}); + const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const [isCurrencyPickerVisible, setIsCurrencyPickerVisible] = useState(false); const isAmountFieldDisabled = didConfirm || isReadOnly || shouldShowTimeRequestFields || isDistanceRequest; - const shouldShowAmountRequiredError = formError === 'common.error.invalidAmount'; + // In the new manual expense flow, participants are determined from the report, not stored in transaction.participants + const isP2P = isNewManualExpenseFlowEnabled + ? isParticipantP2P(getMoneyRequestParticipantsFromReport(report, currentUserPersonalDetails.accountID).at(0)) + : !!(transaction?.participants?.[0]?.accountID && !transaction?.participants?.[0]?.isPolicyExpenseChat); + const shouldShowAmountRequiredError = formError === 'common.error.fieldRequired'; + const shouldShowAmountInvalidError = formError === 'common.error.invalidAmount'; const effectiveCurrency = isDistanceRequest ? distanceRateCurrency : (iouCurrencyCode ?? CONST.CURRENCY.USD); const decimals = getCurrencyDecimals(effectiveCurrency); - const transactionAmount = convertToFrontendAmountAsString(amount, decimals); + // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0 before the user + // touches it). Once the user explicitly sets an amount – including 0 – isAmountSet becomes true and we show the + // real value. This avoids showing "$0.00" as a pre-filled default. + const transactionAmount = isNewManualExpenseFlowEnabled && !transaction?.isAmountSet ? '' : convertToFrontendAmountAsString(amount, decimals); const allowNegative = shouldEnableNegative(report, policy, iouType, transaction?.participants); const showCurrencyPicker = () => { @@ -165,8 +182,20 @@ function AmountField({ const parsedAmount = getBackendAmountFromInput(newAmount); if (parsedAmount === null) { + // User cleared the field — mark amount as unset so the field stays empty + // and submission is blocked until a value is re-entered. + clearMoneyRequestAmount(transactionID); return; } + + const isInlineAmountInvalid = parsedAmount === 0 && isP2P; + + if (isInlineAmountInvalid && shouldDisplayFieldError) { + setFormError('common.error.invalidAmount'); + } else if (!isInlineAmountInvalid) { + clearFormErrors(['common.error.invalidAmount']); + } + // Edits to the amount from the splits page should reset the split shares. if (transaction?.splitShares) { resetSplitShares(transaction, parsedAmount); @@ -198,7 +227,7 @@ function AmountField({ currency={effectiveCurrency} symbol={getLocalizedCurrencySymbol(preferredLocale, effectiveCurrency) ?? ''} label={translate('iou.amount')} - errorText={shouldShowAmountRequiredError ? translate('common.error.fieldRequired') : ''} + errorText={shouldShowAmountInvalidError ? translate('common.error.invalidAmount') : shouldShowAmountRequiredError ? translate('common.error.fieldRequired') : ''} onInputChange={handleAmountChange} allowNegativeInput={allowNegative} shouldShowFlipButton diff --git a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx index 633d5ef8f7fe..eb666433e64c 100644 --- a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx @@ -6,7 +6,7 @@ import TextInput from '@components/TextInput'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import {setMoneyRequestMerchant} from '@libs/actions/IOU'; +import {clearMoneyRequestMerchant, setMoneyRequestMerchant} from '@libs/actions/IOU'; import Navigation from '@libs/Navigation/Navigation'; import {getMerchant, hasReceipt, isMerchantMissing} from '@libs/TransactionUtils'; import {isValidInputLength} from '@libs/ValidationUtils'; @@ -53,19 +53,23 @@ function MerchantField({ const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); - const iouMerchant = getMerchant(transaction); - const isMerchantEmpty = !iouMerchant || isMerchantMissing(transaction); + const merchantValue = getMerchant(transaction); + const displayMerchantValue = isNewManualExpenseFlowEnabled && !transaction?.isMerchantSet ? '' : merchantValue; + const isMerchantEmpty = !displayMerchantValue; // Determine if the merchant error should be displayed const merchantErrorText = (() => { - const merchantValue = iouMerchant ?? ''; const {isValid, byteLength} = isValidInputLength(merchantValue, CONST.MERCHANT_NAME_MAX_BYTES); if (!isValid) { return translate('common.error.characterLimitExceedCounter', byteLength, CONST.MERCHANT_NAME_MAX_BYTES); } - if ((shouldDisplayFieldError || formError === 'iou.error.invalidMerchant') && isMerchantRequired && isMerchantEmpty) { + if (formError === 'iou.error.invalidMerchant') { + return translate('iou.error.invalidMerchant'); + } + + if (shouldDisplayFieldError && isMerchantRequired && isMerchantEmpty) { return translate('common.error.fieldRequired'); } @@ -82,10 +86,19 @@ function MerchantField({ // When editing a split expense, persist directly to the split draft so that // SplitBillDetailsPage and completeSplitBill read the latest value. if (isEditingSplitBill) { + if (newMerchant.trim() === '') { + setDraftSplitTransaction(transactionID, splitDraftTransaction, {merchant: '', isMerchantSet: false}); + return; + } setDraftSplitTransaction(transactionID, splitDraftTransaction, {merchant: newMerchant}); return; } + if (newMerchant.trim() === '') { + clearMoneyRequestMerchant(transactionID); + return; + } + setMoneyRequestMerchant(transactionID, newMerchant, true, hasReceipt(transaction)); }; @@ -93,7 +106,7 @@ function MerchantField({ return ( void; + /** Sets a form error message */ + setFormError: (error: TranslationPaths | '') => void; + /** Flag indicating if there is a route */ hasRoute: boolean; @@ -270,6 +274,7 @@ function MoneyRequestConfirmationListFooter({ transactionID, unit, clearFormErrors, + setFormError, onPDFLoadError, onPDFPassword, onToggleReimbursable, @@ -382,11 +387,34 @@ function MoneyRequestConfirmationListFooter({ isEditingSplitBill={isEditingSplitBill} policy={policy} clearFormErrors={clearFormErrors} + setFormError={setFormError} /> ), shouldShow: shouldShowSmartScanFields && shouldShowAmountField, shouldShowAboveShowMore: false, }, + { + item: ( + + ), + shouldShow: shouldShowMerchant && isNewManualExpenseFlowEnabled, + shouldShowAboveShowMore: false, + }, { item: ( ), - shouldShow: shouldShowMerchant, + shouldShow: shouldShowMerchant && !isNewManualExpenseFlowEnabled, shouldShowAboveShowMore: false, }, { diff --git a/src/libs/DebugUtils.ts b/src/libs/DebugUtils.ts index 5d1f603153d2..181238421d10 100644 --- a/src/libs/DebugUtils.ts +++ b/src/libs/DebugUtils.ts @@ -1090,6 +1090,7 @@ function validateTransactionDraftProperty(key: keyof Transaction, value: string) modifiedMerchant: CONST.RED_BRICK_ROAD_PENDING_ACTION, modifiedWaypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION, participantsAutoAssigned: CONST.RED_BRICK_ROAD_PENDING_ACTION, + isMerchantSet: CONST.RED_BRICK_ROAD_PENDING_ACTION, participants: CONST.RED_BRICK_ROAD_PENDING_ACTION, receipt: CONST.RED_BRICK_ROAD_PENDING_ACTION, reportID: CONST.RED_BRICK_ROAD_PENDING_ACTION, diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index ebce918f43a6..a5890df7765a 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1073,6 +1073,10 @@ function clearMoneyRequestAmount(transactionID: string) { Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {isAmountSet: false}); } +function clearMoneyRequestMerchant(transactionID: string, isDraft = true) { + Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {merchant: '', isMerchantSet: false}); +} + function setMoneyRequestCreated(transactionID: string, created: string, isDraft: boolean, shouldStopSmartscan = false) { Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {created}); setMoneyRequestReceiptState(transactionID, isDraft, shouldStopSmartscan); @@ -1095,10 +1099,9 @@ function setMoneyRequestDescription(transactionID: string, comment: string, isDr } function setMoneyRequestMerchant(transactionID: string, merchant: string, isDraft: boolean, shouldStopSmartscan = false) { - Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {merchant}); + Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {merchant, isMerchantSet: true}); setMoneyRequestReceiptState(transactionID, isDraft, shouldStopSmartscan); } - function setMoneyRequestAttendees(transactionID: string, attendees: Attendee[], isDraft: boolean) { Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {attendees}}); } @@ -3889,6 +3892,7 @@ export { setCustomUnitID, setMoneyRequestAmount, clearMoneyRequestAmount, + clearMoneyRequestMerchant, setMoneyRequestAttendees, setMoneyRequestAccountant, setMoneyRequestBillable, diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 4e53b79def10..4a0031db42a7 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -14,6 +14,7 @@ import PrevNextButtons from '@components/PrevNextButtons'; import ScreenWrapper from '@components/ScreenWrapper'; import useConfirmModal from '@hooks/useConfirmModal'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; +import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy'; import useFetchRoute from '@hooks/useFetchRoute'; import useFilesValidation from '@hooks/useFilesValidation'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; @@ -22,9 +23,11 @@ import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions'; import usePermissions from '@hooks/usePermissions'; +import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePolicyForTransaction from '@hooks/usePolicyForTransaction'; import usePrivateIsArchivedMap from '@hooks/usePrivateIsArchivedMap'; import useReportAttributes from '@hooks/useReportAttributes'; +import useSelfDMReport from '@hooks/useSelfDMReport'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {isMobileSafari} from '@libs/Browser'; @@ -41,8 +44,17 @@ import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopm import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute'; import Navigation from '@libs/Navigation/Navigation'; import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils'; -import {getReportOrDraftReport, isMoneyRequestReport, isProcessingReport, isReportOutstanding, isSelectedManagerMcTest} from '@libs/ReportUtils'; +import { + getPolicyExpenseChat, + getReportOrDraftReport, + isMoneyRequestReport, + isPolicyExpenseChat as isPolicyExpenseChatUtils, + isProcessingReport, + isReportOutstanding, + isSelectedManagerMcTest, +} from '@libs/ReportUtils'; import {buildCannedSearchQuery} from '@libs/SearchQueryUtils'; +import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy'; import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; import { getRequestType, @@ -52,7 +64,14 @@ import { isOdometerDistanceRequest as isOdometerDistanceRequestTransactionUtils, isScanRequest, } from '@libs/TransactionUtils'; -import {getIOURequestPolicyID, setMoneyRequestBillable, setMoneyRequestParticipantsFromReport, setMoneyRequestReimbursable} from '@userActions/IOU'; +import { + getIOURequestPolicyID, + getMoneyRequestParticipantsFromReport, + setMoneyRequestBillable, + setMoneyRequestParticipants, + setMoneyRequestParticipantsFromReport, + setMoneyRequestReimbursable, +} from '@userActions/IOU'; import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt'; import {removeDraftTransaction, replaceDefaultDraftTransaction} from '@userActions/TransactionEdit'; import CONST from '@src/CONST'; @@ -92,6 +111,9 @@ function IOURequestStepConfirmation({ shouldHideHeader = false, }: IOURequestStepConfirmationProps) { const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const defaultExpensePolicy = useDefaultExpensePolicy(); + const personalPolicy = usePersonalPolicy(); + const selfDMReport = useSelfDMReport(); const personalDetails = usePersonalDetails(); const allPolicyCategories = usePolicyCategories(); @@ -122,6 +144,9 @@ function IOURequestStepConfirmation({ const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${draftPolicyID}`); const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${realPolicyID}`); const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); + const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); + const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); + const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const expensifyIcons = useMemoizedLazyExpensifyIcons(['ReplaceReceipt', 'SmartScan']); @@ -246,14 +271,93 @@ function IOURequestStepConfirmation({ // connection, so we don't need to subscribe to COLLECTION.REPORT_DRAFT here. [transaction?.participants, iouType, personalDetails, reportAttributesDerived, privateIsArchivedMap, policy, conciergeReportID], ); - const isPolicyExpenseChat = useMemo(() => participants?.some((participant) => participant.isPolicyExpenseChat), [participants]); + + const defaultParticipants = useMemo(() => { + const hasSelectedParticipants = (transaction?.participants ?? []).some((participant) => participant?.selected); + if (hasSelectedParticipants) { + return []; + } + + const sourceReportID = transaction?.reportID ?? reportID; + if (!sourceReportID) { + return []; + } + + const sourceReport = getReportOrDraftReport(sourceReportID); + let defaultParticipants = getMoneyRequestParticipantsFromReport(sourceReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + + const isGlobalCreateFlow = transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton ?? iouType === CONST.IOU.TYPE.CREATE; + if (!defaultParticipants.length && isGlobalCreateFlow) { + const canUseDefaultPolicy = shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd); + + if (canUseDefaultPolicy) { + const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; + const defaultTargetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport; + defaultParticipants = getMoneyRequestParticipantsFromReport(defaultTargetReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + } + } + + return defaultParticipants; + }, [ + transaction?.participants, + transaction?.reportID, + transaction?.isFromGlobalCreate, + transaction?.isFromFloatingActionButton, + reportID, + currentUserPersonalDetails.accountID, + iouType, + defaultExpensePolicy, + personalPolicy, + selfDMReport, + amountOwed, + userBillingGracePeriodEnds, + ownerBillingGracePeriodEnd, + ]); + + useEffect(() => { + if (!transaction?.transactionID || defaultParticipants.length === 0) { + return; + } + + const transactionParticipants = transaction?.participants ?? []; + if (transactionParticipants.length > 0) { + return; + } + + setMoneyRequestParticipants(transaction.transactionID, defaultParticipants); + }, [transaction?.transactionID, transaction?.participants, defaultParticipants]); + + const isPolicyExpenseChat = useMemo(() => { + const hasPolicyExpenseChat = (participantList: typeof defaultParticipants) => + participantList.some((participant) => { + if (isPolicyExpenseChatUtils(participant)) { + return true; + } + + return !!participant?.reportID && isPolicyExpenseChatUtils(getReportOrDraftReport(participant.reportID)); + }); + + if (isPolicyExpenseChatUtils(report)) { + return true; + } + + const transactionParticipants = transaction?.participants ?? []; + if (hasPolicyExpenseChat(transactionParticipants)) { + return true; + } + + return hasPolicyExpenseChat(defaultParticipants); + }, [report, transaction?.participants, defaultParticipants]); const isFromGlobalCreate = !!(transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton); useFetchRoute(transaction, transaction?.comment?.waypoints, action, shouldUseTransactionDraft(action, iouType) ? CONST.TRANSACTION.STATE.DRAFT : CONST.TRANSACTION.STATE.CURRENT); - const policyExpenseChatPolicyID = participants?.find((participant) => participant.isPolicyExpenseChat)?.policyID; + const policyExpenseChatPolicyID = + transaction?.participants?.find((participant) => participant?.isPolicyExpenseChat)?.policyID ?? + defaultParticipants.find((participant) => participant?.isPolicyExpenseChat)?.policyID ?? + (isPolicyExpenseChatUtils(report) ? report?.policyID : undefined); - const senderPolicyID = participants?.find((participant) => !!participant && 'isSender' in participant && participant.isSender)?.policyID; + const senderPolicyID = transaction?.participants?.find((participant) => !!participant && 'isSender' in participant && participant.isSender)?.policyID; const odometerStartImage = transaction?.comment?.odometerStartImage; const odometerEndImage = transaction?.comment?.odometerEndImage; diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index c3fc23a942cc..27ce49fe9dc0 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize'; import useMappedPolicies from '@hooks/useMappedPolicies'; import useOnyx from '@hooks/useOnyx'; import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions'; +import usePermissions from '@hooks/usePermissions'; import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses'; import useThemeStyles from '@hooks/useThemeStyles'; import useTransactionsByID from '@hooks/useTransactionsByID'; @@ -119,6 +120,8 @@ function IOURequestStepParticipants({ const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); + const {isBetaEnabled} = usePermissions(); + const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); @@ -455,8 +458,13 @@ function IOURequestStepParticipants({ return false; } + // In new flow - the amount step is skipped, so we need to include the recents for all the cases. + if (isNewManualExpenseFlowEnabled) { + return false; + } + return initialTransaction?.amount !== undefined && initialTransaction?.amount !== null && initialTransaction?.amount <= 0; - }, [initialTransaction, iouRequestType]); + }, [isNewManualExpenseFlowEnabled, initialTransaction, iouRequestType]); return ( { isTimeRequest: false, showMoreFields: false, setShowMoreFields: jest.fn(), + clearFormErrors: jest.fn(), + setFormError: jest.fn(), }; return render( From 30211c78ec60c242732c8b2cc75a007f551ab653 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 03:26:21 +0530 Subject: [PATCH 12/42] Add participantPicker to new flow to make it one step process --- .../MoneyRequestConfirmationList.tsx | 82 ++++++++++++++-- src/components/ParticipantPicker.tsx | 94 +++++++++++++++++++ .../step/IOURequestStepConfirmation.tsx | 15 ++- 3 files changed, 179 insertions(+), 12 deletions(-) create mode 100644 src/components/ParticipantPicker.tsx diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 18c0abb16d5a..8b36fb08e705 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -2,6 +2,7 @@ import {useFocusEffect, useIsFocused} from '@react-navigation/native'; import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {InteractionManager, Keyboard, View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; +import ParticipantPicker from '@components/ParticipantPicker'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDebouncedState from '@hooks/useDebouncedState'; @@ -57,6 +58,7 @@ import { } from '@libs/TransactionUtils'; import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils'; import {getIsViolationFixed} from '@libs/Violations/ViolationsUtils'; +import {setMoneyRequestParticipants} from '@userActions/IOU'; import {hasInvoicingDetails} from '@userActions/Policy/Policy'; import type {IOUAction, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; @@ -104,6 +106,9 @@ type MoneyRequestConfirmationListProps = { /** Selected participants from MoneyRequestModal with login / accountID */ selectedParticipants: Participant[]; + /** Trigger opening participant picker from parent flow */ + shouldOpenParticipantPicker?: boolean; + /** Payee of the expense with login */ payeePersonalDetails?: OnyxEntry | null; @@ -204,7 +209,8 @@ function MoneyRequestConfirmationList({ shouldShowSmartScanFields = true, isEditingSplitBill, isReceiptEditable, - selectedParticipants: selectedParticipantOptions = [], + selectedParticipants = [], + shouldOpenParticipantPicker = false, payeePersonalDetails, isReadOnly = false, policyID, @@ -259,8 +265,8 @@ function MoneyRequestConfirmationList({ }, [transaction?.receipt?.isTestDriveReceipt]); const isManagerMcTestReceipt = useMemo(() => { - return isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedParticipantOptions.some((participant) => isSelectedManagerMcTest(participant.login)); - }, [isBetaEnabled, selectedParticipantOptions]); + return isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedParticipants.some((participant) => isSelectedManagerMcTest(participant.login)); + }, [isBetaEnabled, selectedParticipants]); const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext( isTestDriveReceipt ? CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_DRIVE_CONFIRMATION : CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_CONFIRMATION, @@ -382,6 +388,7 @@ function MoneyRequestConfirmationList({ const [didConfirm, setDidConfirm] = useState(isConfirmed); const [didConfirmSplit, setDidConfirmSplit] = useState(false); const [showMoreFields, setShowMoreFields] = useState(false); + const [isParticipantPickerVisible, setIsParticipantPickerVisible] = useState(false); useEffect(() => { setShowMoreFields(false); @@ -563,8 +570,6 @@ function MoneyRequestConfirmationList({ [transaction?.transactionID], ); - const selectedParticipants = useMemo(() => selectedParticipantOptions.filter((participant) => participant.selected), [selectedParticipantOptions]); - const effectivePayeePersonalDetails = useMemo(() => payeePersonalDetails ?? currentUserPersonalDetails, [payeePersonalDetails, currentUserPersonalDetails]); const shouldShowReadOnlySplits = useMemo(() => isPolicyExpenseChat || isReadOnly || isScanRequest, [isPolicyExpenseChat, isReadOnly, isScanRequest]); @@ -702,6 +707,39 @@ function MoneyRequestConfirmationList({ ); const canEditParticipant = isFromGlobalCreateAndCanEditParticipant && !isTestReceipt && (!isRestrictedToPreferredPolicy || isTypeInvoice); + const participantPickerIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; + const participantRowErrors = useMemo(() => { + if (formError !== 'iou.error.noParticipantSelected' && formError !== 'violations.missingAttendees') { + return undefined; + } + + return {participants: translate(formError)}; + }, [formError, translate]); + + const closeParticipantPicker = useCallback(() => { + setIsParticipantPickerVisible(false); + }, []); + + useEffect(() => { + if (shouldOpenParticipantPicker) { + setIsParticipantPickerVisible(true); + return; + } + setIsParticipantPickerVisible(false); + }, [shouldOpenParticipantPicker]); + + const handleParticipantsAdded = useCallback( + (participants: Participant[]) => { + if (!transactionID) { + return; + } + + setMoneyRequestParticipants(transactionID, participants); + clearFormErrors(['iou.error.noParticipantSelected']); + + }, + [transactionID, clearFormErrors, closeParticipantPicker], + ); const sections = useMemo(() => { const options: Array> = []; @@ -728,18 +766,21 @@ function MoneyRequestConfirmationList({ keyForList: `${participant.keyForList ?? participant.accountID ?? participant.reportID}`, isInteractive: canEditParticipant, shouldShowRightCaret: canEditParticipant, + errors: participantRowErrors, })) : [ { keyForList: 'empty-participant-option', - text: translate('iou.error.noParticipantSelected'), + text: translate('iou.chooseRecipient'), isInteractive: canEditParticipant, shouldShowRightCaret: canEditParticipant, + isBold: false, + errors: participantRowErrors, }, ]; options.push({ - title: translate('common.to'), + title: selectedParticipants.length > 0 ? translate('common.to') : undefined, data: participantRows, sectionIndex: 0, }); @@ -754,6 +795,7 @@ function MoneyRequestConfirmationList({ splitParticipants, selectedParticipants, canEditParticipant, + participantRowErrors, shouldHideToSection, shouldForceTopEmptySections, ]); @@ -767,9 +809,18 @@ function MoneyRequestConfirmationList({ } const newIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; + if (isNewManualExpenseFlowEnabled) { + setIsParticipantPickerVisible(true); + return; + } + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(newIOUType, transactionID, transaction.reportID, Navigation.getActiveRoute(), action)); }; + const dismissParticipantRowError = useCallback(() => { + clearFormErrors(['iou.error.noParticipantSelected', 'violations.missingAttendees']); + }, [clearFormErrors]); + /** * @param {String} paymentMethod */ @@ -791,7 +842,7 @@ function MoneyRequestConfirmationList({ // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0). // We block submission until the user explicitly enters an amount (tracked by isAmountSet). // Note: a user-entered $0 is valid – this only blocks the empty field. - if (iouType !== CONST.IOU.TYPE.PAY && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { + if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequest && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { setFormError('common.error.invalidAmount'); return; } @@ -1190,7 +1241,7 @@ function MoneyRequestConfirmationList({ isMovingTransactionFromTrackExpense={isMovingTransactionFromTrackExpense} isTypeSplit={isTypeSplit} selectedParticipants={selectedParticipants} - selectedParticipantsProp={selectedParticipantOptions} + selectedParticipantsProp={selectedParticipants} defaultMileageRateCustomUnitRateID={defaultRate} hasRoute={hasRoute} isDistanceRequestWithPendingRoute={isDistanceRequestWithPendingRoute} @@ -1225,6 +1276,7 @@ function MoneyRequestConfirmationList({ sections={sections} ListItem={UserListItem} onSelectRow={navigateToParticipantPage} + onDismissError={dismissParticipantRowError} shouldSingleExecuteRowSelect shouldPreventDefaultFocusOnSelectRow shouldShowListEmptyContent={false} @@ -1234,6 +1286,18 @@ function MoneyRequestConfirmationList({ disableKeyboardShortcuts /> + {isNewManualExpenseFlowEnabled && ( + + )} ); } diff --git a/src/components/ParticipantPicker.tsx b/src/components/ParticipantPicker.tsx new file mode 100644 index 000000000000..658880bf6459 --- /dev/null +++ b/src/components/ParticipantPicker.tsx @@ -0,0 +1,94 @@ +import React from 'react'; +import useLocalize from '@hooks/useLocalize'; +import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyRequestParticipantsSelector'; +import type {IOUAction, IOUType} from '@src/CONST'; +import CONST from '@src/CONST'; +import type {Participant} from '@src/types/onyx/IOU'; +import HeaderWithBackButton from './HeaderWithBackButton'; +import Modal from './Modal'; +import ScreenWrapper from './ScreenWrapper'; + +type ParticipantPickerProps = { + /** Selected participants */ + participants?: Participant[] | typeof CONST.EMPTY_ARRAY; + + /** The type of IOU report */ + iouType: IOUType; + + /** The IOU action */ + action: IOUAction; + + /** Whether this is a per diem expense request */ + isPerDiemRequest?: boolean; + + /** Whether this is a time expense request */ + isTimeRequest?: boolean; + + /** Callback fired when participants are updated */ + onParticipantsAdded: (value: Participant[]) => void; + + /** Callback fired when participant selection is completed */ + onFinish?: (value?: string, participants?: Participant[]) => void; + + /** Whether the picker modal is visible */ + isVisible?: boolean; + + /** Callback fired when picker should close */ + onClose?: () => void; +}; + +function ParticipantPicker({ + participants = CONST.EMPTY_ARRAY, + iouType, + action, + isPerDiemRequest = false, + isTimeRequest = false, + onParticipantsAdded, + onFinish, + isVisible = true, + onClose, +}: ParticipantPickerProps) { + const {translate} = useLocalize(); + + const pickerContent = ( + + ); + + if (!onClose) { + return pickerContent; + } + + return ( + + + + {pickerContent} + + + ); +} + +export default ParticipantPicker; diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 87368b5629e6..4c790cb0207e 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -209,6 +209,7 @@ function IOURequestStepConfirmation({ const [receiptFiles, setReceiptFiles] = useState>({}); const isDistanceRequest = isDistanceRequestTransactionUtils(transaction); const isManualDistanceRequest = isManualDistanceRequestTransactionUtils(transaction); + const isManualRequest = transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL; const isOdometerDistanceRequest = isOdometerDistanceRequestTransactionUtils(transaction); const isTimeRequest = requestType === CONST.IOU.REQUEST_TYPE.TIME; const [lastLocationPermissionPrompt] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT); @@ -225,6 +226,7 @@ function IOURequestStepConfirmation({ const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && Object.values(receiptFiles).length && !isTestTransaction && isScanRequest(transaction); const [isStitchingReceipt, setIsStitchingReceipt] = useState(false); const [stitchError, setStitchError] = useState(''); + const [shouldOpenParticipantPicker, setShouldOpenParticipantPicker] = useState(false); const headerTitle = useMemo(() => { if (isCategorizingTrackExpense) { return translate('iou.categorize'); @@ -304,17 +306,23 @@ function IOURequestStepConfirmation({ ]); useEffect(() => { - if (!transaction?.transactionID || defaultParticipants.length === 0) { + if (!transaction?.transactionID) { return; } const transactionParticipants = transaction?.participants ?? []; - if (transactionParticipants.length > 0) { + const hasTransactionParticipants = transactionParticipants.length > 0; + const hasDefaultParticipants = defaultParticipants.length > 0; + const shouldOpenPicker = !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; + + setShouldOpenParticipantPicker(shouldOpenPicker); + + if (hasTransactionParticipants || !hasDefaultParticipants) { return; } setMoneyRequestParticipants(transaction.transactionID, defaultParticipants); - }, [transaction?.transactionID, transaction?.participants, defaultParticipants]); + }, [transaction?.transactionID, transaction?.participants, defaultParticipants, isNewManualExpenseFlowEnabled]); const isPolicyExpenseChat = useMemo(() => { const hasPolicyExpenseChat = (participantList: typeof defaultParticipants) => @@ -754,6 +762,7 @@ function IOURequestStepConfirmation({ Date: Tue, 28 Apr 2026 04:49:37 +0530 Subject: [PATCH 13/42] Prettier, lint --- .../MoneyRequestConfirmationList.tsx | 12 ++++---- .../sections/AmountField.tsx | 13 ++++++-- .../sections/MerchantField.tsx | 2 +- src/libs/DebugUtils.ts | 3 ++ src/pages/iou/request/IOURequestStartPage.tsx | 8 +++-- .../step/IOURequestStepConfirmation.tsx | 30 ++++++++----------- .../step/IOURequestStepParticipants.tsx | 8 ++--- 7 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 8b36fb08e705..b5e492c4dade 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -52,7 +52,6 @@ import { isDistanceRequest as isDistanceRequestUtil, isGPSDistanceRequest as isGPSDistanceRequestUtil, isManualDistanceRequest as isManualDistanceRequestUtil, - isMerchantMissing, isScanning, isScanRequest as isScanRequestUtil, } from '@libs/TransactionUtils'; @@ -84,7 +83,7 @@ import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; import SelectionListWithSections from './SelectionList/SelectionListWithSections'; -import type {Section, SelectionListWithSectionsHandle} from './SelectionList/SelectionListWithSections/types'; +import type {Section} from './SelectionList/SelectionListWithSections/types'; import SettlementButton from './SettlementButton'; import type {PaymentActionParams} from './SettlementButton/types'; import Text from './Text'; @@ -299,7 +298,8 @@ function MoneyRequestConfirmationList({ const iouMerchant = getMerchant(transaction); const iouCategory = getCategory(transaction); const iouAttendees = useMemo(() => getAttendees(transaction, currentUserPersonalDetails), [transaction, currentUserPersonalDetails]); - const isP2P = !!(transaction?.participants?.[0]?.accountID && !transaction?.participants?.[0]?.isPolicyExpenseChat); + const firstParticipant = transaction?.participants?.at(0); + const isP2P = !!(firstParticipant?.accountID && !firstParticipant?.isPolicyExpenseChat); const isTypeRequest = iouType === CONST.IOU.TYPE.SUBMIT; const isTypeSplit = iouType === CONST.IOU.TYPE.SPLIT; @@ -736,7 +736,6 @@ function MoneyRequestConfirmationList({ setMoneyRequestParticipants(transactionID, participants); clearFormErrors(['iou.error.noParticipantSelected']); - }, [transactionID, clearFormErrors, closeParticipantPicker], ); @@ -975,10 +974,12 @@ function MoneyRequestConfirmationList({ policy, policyTagLists, selectedParticipants, - selectedParticipants, isEditingSplitBill, isMerchantRequired, merchantValue, + isMerchantFieldValid, + isP2P, + isTypeRequest, shouldShowMerchant, shouldDisplayFieldError, shouldShowTax, @@ -1004,6 +1005,7 @@ function MoneyRequestConfirmationList({ isTimeRequest, getCurrencyDecimals, isNewManualExpenseFlowEnabled, + isScanRequest, ], ); diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index 65a4cc1999ac..0e40fb778eec 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -83,13 +83,20 @@ function AmountField({ const [isCurrencyPickerVisible, setIsCurrencyPickerVisible] = useState(false); const isAmountFieldDisabled = didConfirm || isReadOnly || shouldShowTimeRequestFields || isDistanceRequest; - // In the new manual expense flow, participants are determined from the report, not stored in transaction.participants + const firstParticipant = transaction?.participants?.at(0); const isP2P = isNewManualExpenseFlowEnabled ? isParticipantP2P(getMoneyRequestParticipantsFromReport(report, currentUserPersonalDetails.accountID).at(0)) - : !!(transaction?.participants?.[0]?.accountID && !transaction?.participants?.[0]?.isPolicyExpenseChat); + : !!(firstParticipant?.accountID && !firstParticipant?.isPolicyExpenseChat); const shouldShowAmountRequiredError = formError === 'common.error.fieldRequired'; const shouldShowAmountInvalidError = formError === 'common.error.invalidAmount'; + let amountFieldErrorText = ''; + if (shouldShowAmountInvalidError) { + amountFieldErrorText = translate('common.error.invalidAmount'); + } else if (shouldShowAmountRequiredError) { + amountFieldErrorText = translate('common.error.fieldRequired'); + } + const effectiveCurrency = isDistanceRequest ? distanceRateCurrency : (iouCurrencyCode ?? CONST.CURRENCY.USD); const decimals = getCurrencyDecimals(effectiveCurrency); // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0 before the user @@ -227,7 +234,7 @@ function AmountField({ currency={effectiveCurrency} symbol={getLocalizedCurrencySymbol(preferredLocale, effectiveCurrency) ?? ''} label={translate('iou.amount')} - errorText={shouldShowAmountInvalidError ? translate('common.error.invalidAmount') : shouldShowAmountRequiredError ? translate('common.error.fieldRequired') : ''} + errorText={amountFieldErrorText} onInputChange={handleAmountChange} allowNegativeInput={allowNegative} shouldShowFlipButton diff --git a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx index eb666433e64c..5aedac3863bb 100644 --- a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx @@ -8,7 +8,7 @@ import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearMoneyRequestMerchant, setMoneyRequestMerchant} from '@libs/actions/IOU'; import Navigation from '@libs/Navigation/Navigation'; -import {getMerchant, hasReceipt, isMerchantMissing} from '@libs/TransactionUtils'; +import {getMerchant, hasReceipt} from '@libs/TransactionUtils'; import {isValidInputLength} from '@libs/ValidationUtils'; import {setDraftSplitTransaction} from '@userActions/IOU/Split'; import CONST from '@src/CONST'; diff --git a/src/libs/DebugUtils.ts b/src/libs/DebugUtils.ts index 862f936731aa..e2d533f442fa 100644 --- a/src/libs/DebugUtils.ts +++ b/src/libs/DebugUtils.ts @@ -1304,6 +1304,9 @@ function validateTransactionDraftProperty(key: keyof Transaction, value: string) originalMessage: 'object', previousMessage: 'object', }); + case 'isAmountSet': + case 'isMerchantSet': + return validateBoolean(value); } } diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index 6ce641a8a152..b6684d574408 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -43,7 +43,7 @@ import type {DismissedProductTraining, SelectedTabRequest} from '@src/types/onyx import {isEmptyObject} from '@src/types/utils/EmptyObject'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {IOURequestStepAmountWithTransactionOnly} from './step/IOURequestStepAmount'; -import IOURequestStepConfirmation from './step/IOURequestStepConfirmation'; +import IOURequestStepConfirmation, {type IOURequestStepConfirmationPublicProps} from './step/IOURequestStepConfirmation'; import IOURequestStepDestination from './step/IOURequestStepDestination'; import IOURequestStepDistance from './step/IOURequestStepDistance'; import IOURequestStepHours from './step/IOURequestStepHours'; @@ -73,7 +73,8 @@ function IOURequestStartPage({ // This is currently only being used for testing defaultSelectedTab = CONST.TAB_REQUEST.SCAN, }: IOURequestStartPageProps) { - const confirmationScreenProps = {route, navigation} as unknown as React.ComponentProps; + const confirmationRoute = route as unknown as IOURequestStepConfirmationPublicProps['route']; + const confirmationNavigation = navigation as unknown as IOURequestStepConfirmationPublicProps['navigation']; const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -292,7 +293,8 @@ function IOURequestStartPage({ {isNewManualExpenseFlowEnabled ? ( ) : ( diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 4c790cb0207e..f30d800e603e 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -1,5 +1,5 @@ import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; -import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; +import React, {type ComponentProps, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; import DragAndDropProvider from '@components/DragAndDrop/Provider'; @@ -47,15 +47,7 @@ import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopm import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute'; import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils'; -import { - getPolicyExpenseChat, - getReportOrDraftReport, - isMoneyRequestReport, - isPolicyExpenseChat as isPolicyExpenseChatUtils, - isProcessingReport, - isReportOutstanding, - isSelectedManagerMcTest, -} from '@libs/ReportUtils'; +import {getPolicyExpenseChat, getReportOrDraftReport, isMoneyRequestReport, isPolicyExpenseChat as isPolicyExpenseChatUtils, isSelectedManagerMcTest} from '@libs/ReportUtils'; import {buildCannedSearchQuery, getCurrentSearchQueryJSON} from '@libs/SearchQueryUtils'; import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy'; import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; @@ -198,7 +190,7 @@ function IOURequestStepConfirmation({ const styles = useThemeStyles(); const theme = useTheme(); - const {translate, toLocaleDigit} = useLocalize(); + const {translate} = useLocalize(); const {isBetaEnabled} = usePermissions(); const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); const {isOffline} = useNetwork(); @@ -275,20 +267,20 @@ function IOURequestStepConfirmation({ } const sourceReport = getReportOrDraftReport(sourceReportID); - let defaultParticipants = getMoneyRequestParticipantsFromReport(sourceReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + let defaultParticipantsOptions = getMoneyRequestParticipantsFromReport(sourceReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); const isGlobalCreateFlow = transaction?.isFromGlobalCreate ?? transaction?.isFromFloatingActionButton ?? iouType === CONST.IOU.TYPE.CREATE; - if (!defaultParticipants.length && isGlobalCreateFlow) { + if (!defaultParticipantsOptions.length && isGlobalCreateFlow) { const canUseDefaultPolicy = shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd); if (canUseDefaultPolicy) { const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; const defaultTargetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport; - defaultParticipants = getMoneyRequestParticipantsFromReport(defaultTargetReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); + defaultParticipantsOptions = getMoneyRequestParticipantsFromReport(defaultTargetReport, currentUserPersonalDetails.accountID).filter((participant) => participant.selected); } } - return defaultParticipants; + return defaultParticipantsOptions; }, [ transaction?.participants, transaction?.reportID, @@ -298,7 +290,7 @@ function IOURequestStepConfirmation({ currentUserPersonalDetails.accountID, iouType, defaultExpensePolicy, - personalPolicy, + personalPolicy?.autoReporting, selfDMReport, amountOwed, userBillingGracePeriodEnds, @@ -322,7 +314,7 @@ function IOURequestStepConfirmation({ } setMoneyRequestParticipants(transaction.transactionID, defaultParticipants); - }, [transaction?.transactionID, transaction?.participants, defaultParticipants, isNewManualExpenseFlowEnabled]); + }, [transaction?.transactionID, transaction?.participants, defaultParticipants, isNewManualExpenseFlowEnabled, isManualRequest]); const isPolicyExpenseChat = useMemo(() => { const hasPolicyExpenseChat = (participantList: typeof defaultParticipants) => @@ -803,4 +795,8 @@ function IOURequestStepConfirmation({ const IOURequestStepConfirmationWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepConfirmation); /* eslint-disable rulesdir/no-negated-variables */ const IOURequestStepConfirmationWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepConfirmationWithFullTransactionOrNotFound); + +/** Props for the default export (HOC-wrapped). Use for type-safe bridging from other money-request routes (e.g. CREATE). */ +export type IOURequestStepConfirmationPublicProps = ComponentProps; + export default IOURequestStepConfirmationWithWritableReportOrNotFound; diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index 82caa4e0fbff..f6845845d5fb 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -3,8 +3,8 @@ import React, {useEffect, useRef} from 'react'; import FormHelpMessage from '@components/FormHelpMessage'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; -import usePermissions from '@hooks/usePermissions'; import useParticipantSubmission from '@hooks/useParticipantSubmission'; +import usePermissions from '@hooks/usePermissions'; import useThemeStyles from '@hooks/useThemeStyles'; import {isMovingTransactionFromTrackExpense as isMovingTransactionFromTrackExpenseIOUUtils, navigateToStartMoneyRequestStep} from '@libs/IOUUtils'; import Navigation from '@libs/Navigation/Navigation'; @@ -44,8 +44,8 @@ function IOURequestStepParticipants({ const isTime = isTimeRequestUtil(initialTransaction); const isCorporateCard = isCorporateCardTransaction(initialTransaction); const {isBetaEnabled} = usePermissions(); - const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW) - + const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); + let headerTitle = translate('iou.chooseRecipient'); if (action === CONST.IOU.ACTION.CATEGORIZE) { headerTitle = translate('iou.categorize'); @@ -135,7 +135,7 @@ function IOURequestStepParticipants({ } return initialTransaction?.amount !== undefined && initialTransaction?.amount !== null && initialTransaction?.amount <= 0; - } + }; const isWorkspacesOnly = getIsWorkspacesOnly(); From bdcc8df6e852cf4a4b0d3c3e949318967d866a46 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 05:36:16 +0530 Subject: [PATCH 14/42] Remove the redundant tests --- tests/actions/IOU/IOUSettersTest.ts | 8 -------- tests/actions/IOUTest.ts | 7 ------- 2 files changed, 15 deletions(-) diff --git a/tests/actions/IOU/IOUSettersTest.ts b/tests/actions/IOU/IOUSettersTest.ts index b614fb9d0de7..532ed18b57b5 100644 --- a/tests/actions/IOU/IOUSettersTest.ts +++ b/tests/actions/IOU/IOUSettersTest.ts @@ -112,14 +112,6 @@ describe('IOU setter functions', () => { }); describe('setMoneyRequestDescription', () => { - it('should set trimmed comment on a draft transaction', async () => { - setMoneyRequestDescription(TRANSACTION_ID, ' Test description ', true); - await waitForBatchedUpdates(); - - const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${TRANSACTION_ID}`); - expect(draft?.comment?.comment).toBe('Test description'); - }); - it('should set comment on a real transaction when isDraft is false', async () => { const transaction = createRandomTransaction(1); transaction.transactionID = TRANSACTION_ID; diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index f8e587f61336..594b1d0daad4 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -6729,13 +6729,6 @@ describe('actions/IOU', () => { expect(draft?.comment?.customUnit?.attributes?.dates?.end).toBe('2024-01-31'); }); - it('setMoneyRequestDescription should set comment on transaction draft', async () => { - setMoneyRequestDescription(transactionID, ' Lunch with team ', true); - await waitForBatchedUpdates(); - const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`); - expect(draft?.comment?.comment).toBe('Lunch with team'); - }); - it('setMoneyRequestMerchant should set merchant on transaction draft', async () => { setMoneyRequestMerchant(transactionID, 'Coffee Shop', true); await waitForBatchedUpdates(); From ea0e2b1d69219f82818d4de187f3b2cb4b8d0a89 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 05:36:51 +0530 Subject: [PATCH 15/42] Update the error guard --- .../MoneyRequestConfirmationList.tsx | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index b5e492c4dade..c80dc5016fed 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -839,14 +839,27 @@ function MoneyRequestConfirmationList({ } // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0). - // We block submission until the user explicitly enters an amount (tracked by isAmountSet). - // Note: a user-entered $0 is valid – this only blocks the empty field. - if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequest && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { + // We block submission until the user explicitly enters an amount (tracked by isAmountSet), unless the + // draft already has a non-zero total (e.g. tests, restored drafts). Time expenses derive totals from + // hours × rate, not the amount field. Scan flows use SmartScan instead of a typed amount. Distance + // totals come from route × rate (see DistanceRequestController); do not apply the manual-amount guard. + if ( + iouType !== CONST.IOU.TYPE.PAY && + !isScanRequest && + !isTimeRequest && + !isDistanceRequest && + isNewManualExpenseFlowEnabled && + !transaction?.isAmountSet && + iouAmount === 0 + ) { setFormError('common.error.invalidAmount'); return; } - const isInvalidP2PAmount = iouAmount === 0 && (isTypeRequest ? isP2P : iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.INVOICE || iouType === CONST.IOU.TYPE.SPLIT); + const isInvalidP2PAmount = + !isDistanceRequest && + iouAmount === 0 && + (isTypeRequest ? isP2P : iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.INVOICE || (iouType === CONST.IOU.TYPE.SPLIT && !isScanRequest)); if (isInvalidP2PAmount) { setFormError('common.error.invalidAmount'); return; From 70aa4cd836d2c0a2e9892097b2aadaf6c357e303 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 05:37:14 +0530 Subject: [PATCH 16/42] Prettier --- src/components/MoneyRequestConfirmationList.tsx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index c80dc5016fed..096f58825edb 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -843,15 +843,7 @@ function MoneyRequestConfirmationList({ // draft already has a non-zero total (e.g. tests, restored drafts). Time expenses derive totals from // hours × rate, not the amount field. Scan flows use SmartScan instead of a typed amount. Distance // totals come from route × rate (see DistanceRequestController); do not apply the manual-amount guard. - if ( - iouType !== CONST.IOU.TYPE.PAY && - !isScanRequest && - !isTimeRequest && - !isDistanceRequest && - isNewManualExpenseFlowEnabled && - !transaction?.isAmountSet && - iouAmount === 0 - ) { + if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequest && !isTimeRequest && !isDistanceRequest && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet && iouAmount === 0) { setFormError('common.error.invalidAmount'); return; } From 5702292eb5ae8b549d6cfa855dc17417ee13b7c4 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 06:24:22 +0530 Subject: [PATCH 17/42] Refactor split changes --- .../sections/AmountField.tsx | 105 ++++++++++-------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index 0e40fb778eec..798609020641 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -17,7 +17,7 @@ import {isAmountMissing} from '@libs/TransactionUtils'; import {isParticipantP2P} from '@pages/iou/request/step/IOURequestStepAmount'; import IOURequestStepCurrencyModal from '@pages/iou/request/step/IOURequestStepCurrencyModal'; import {getMoneyRequestParticipantsFromReport} from '@userActions/IOU'; -import {resetSplitShares, setDraftSplitTransaction} from '@userActions/IOU/Split'; +import {resetSplitShares, setDraftSplitTransaction, setSplitShares} from '@userActions/IOU/Split'; import CONST from '@src/CONST'; import type {IOUAction, IOUType} from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; @@ -130,38 +130,68 @@ function AmountField({ return isNegative ? -absoluteBackendAmount : absoluteBackendAmount; }; + /** + * When the bill total or currency changes: + * - Editing an existing split bill: recompute shares on the split draft (`SPLIT_TRANSACTION_DRAFT`). + * - Creating a split (`iouType` split): `setSplitShares` on the transaction draft (or seed from `participants` if shares are missing). + * - Any other draft that already has `splitShares`: `resetSplitShares` so shares stay proportional to the new total. + */ const buildAndSaveSplitShares = (updatedAmount: number, updatedCurrency: string) => { - if (!transactionID) { + if (isEditingSplitBill) { + if (!transactionID) { + return; + } + const splitShares = splitDraftTransaction?.splitShares ?? transaction?.splitShares; + const accountID = currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID; + const newAccountIDs = Object.keys(splitShares ?? {}).map((key) => Number(key)); + const oldAccountIDs = Object.keys(transaction?.splitShares ?? {}).map((key) => Number(key)); + const accountIDs = [...new Set([accountID, ...newAccountIDs, ...oldAccountIDs])]; + + const participantsLength = newAccountIDs.includes(accountID) ? newAccountIDs.length - 1 : newAccountIDs.length; + + const updatedSplitShares = accountIDs.reduce>((acc, splitShareAccountID) => { + if (!newAccountIDs.includes(splitShareAccountID) && splitShareAccountID !== accountID) { + acc[splitShareAccountID] = null; + return acc; + } + + const isPayer = splitShareAccountID === accountID; + acc[splitShareAccountID] = { + amount: calculateAmount(participantsLength, updatedAmount, updatedCurrency, isPayer), + isModified: false, + }; + return acc; + }, {}); + + setDraftSplitTransaction(transactionID, splitDraftTransaction, { + amount: updatedAmount, + currency: updatedCurrency, + ...(accountIDs.length > 0 ? {splitShares: updatedSplitShares} : {}), + }); return; } - const splitShares = splitDraftTransaction?.splitShares ?? transaction?.splitShares; - const accountID = currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID; - const newAccountIDs = Object.keys(splitShares ?? {}).map((key) => Number(key)); - const oldAccountIDs = Object.keys(transaction?.splitShares ?? {}).map((key) => Number(key)); - const accountIDs = [...new Set([accountID, ...newAccountIDs, ...oldAccountIDs])]; - - const participantsLength = newAccountIDs.includes(accountID) ? newAccountIDs.length - 1 : newAccountIDs.length; - - const updatedSplitShares = accountIDs.reduce>((acc, splitShareAccountID) => { - if (!newAccountIDs.includes(splitShareAccountID) && splitShareAccountID !== accountID) { - acc[splitShareAccountID] = null; - return acc; + if (iouType === CONST.IOU.TYPE.SPLIT && transaction) { + const shareAccountIDs = Object.keys(transaction.splitShares ?? {}).map(Number); + const participantAccountIDs = + shareAccountIDs.length > 0 ? shareAccountIDs : (transaction.participants ?? []).map((p) => p.accountID).filter((id): id is number => id !== undefined); + if (participantAccountIDs.length > 0) { + setSplitShares(transaction, updatedAmount, updatedCurrency, participantAccountIDs); } + return; + } - const isPayer = splitShareAccountID === accountID; - acc[splitShareAccountID] = { - amount: calculateAmount(participantsLength, updatedAmount, updatedCurrency, isPayer), - isModified: false, - }; - return acc; - }, {}); - - setDraftSplitTransaction(transactionID, splitDraftTransaction, { - amount: updatedAmount, - currency: updatedCurrency, - ...(accountIDs.length > 0 ? {splitShares: updatedSplitShares} : {}), - }); + if (transaction?.splitShares) { + resetSplitShares(transaction, updatedAmount, updatedCurrency); + } + }; + + /** Writes `amount` / `currency` to the main transaction draft unless we only touched the split-bill draft above. */ + const persistMainDraftTotal = (backendAmount: number, currency: string) => { + if (isEditingSplitBill || !transactionID) { + return; + } + setMoneyRequestAmount(transactionID, backendAmount, currency); }; const updateCurrency = (value: string) => { @@ -174,12 +204,8 @@ function AmountField({ const parsedAmount = getBackendAmountFromInput(transactionAmount); const updatedAmount = parsedAmount ?? amount; - if (isEditingSplitBill) { - buildAndSaveSplitShares(updatedAmount, value); - return; - } - - setMoneyRequestAmount(transactionID, updatedAmount, value); + buildAndSaveSplitShares(updatedAmount, value); + persistMainDraftTotal(updatedAmount, value); }; const handleAmountChange = (newAmount: string) => { @@ -203,17 +229,8 @@ function AmountField({ clearFormErrors(['common.error.invalidAmount']); } - // Edits to the amount from the splits page should reset the split shares. - if (transaction?.splitShares) { - resetSplitShares(transaction, parsedAmount); - } - - if (isEditingSplitBill) { - buildAndSaveSplitShares(parsedAmount, effectiveCurrency); - return; - } - - setMoneyRequestAmount(transactionID, parsedAmount, effectiveCurrency); + buildAndSaveSplitShares(parsedAmount, effectiveCurrency); + persistMainDraftTotal(parsedAmount, effectiveCurrency); }; return ( From 5b084d8850a321c20b68fdb5d742aaa7436bc4c3 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 19:50:18 +0530 Subject: [PATCH 18/42] LInt --- src/components/MoneyRequestConfirmationList.tsx | 6 ++---- src/pages/iou/request/IOURequestStartPage.tsx | 3 ++- .../request/step/IOURequestStepConfirmation.tsx | 17 ++++++++++++----- tests/actions/IOUTest.ts | 1 - 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 096f58825edb..ff182564d2a9 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -2,7 +2,6 @@ import {useFocusEffect, useIsFocused} from '@react-navigation/native'; import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {InteractionManager, Keyboard, View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; -import ParticipantPicker from '@components/ParticipantPicker'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDebouncedState from '@hooks/useDebouncedState'; @@ -79,6 +78,7 @@ import FieldAutoSelector from './MoneyRequestConfirmationList/FieldAutoSelector' import SplitBillController from './MoneyRequestConfirmationList/SplitBillController'; import TaxController from './MoneyRequestConfirmationList/TaxController'; import MoneyRequestConfirmationListFooter from './MoneyRequestConfirmationListFooter'; +import ParticipantPicker from './ParticipantPicker'; import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; @@ -737,7 +737,7 @@ function MoneyRequestConfirmationList({ setMoneyRequestParticipants(transactionID, participants); clearFormErrors(['iou.error.noParticipantSelected']); }, - [transactionID, clearFormErrors, closeParticipantPicker], + [transactionID, clearFormErrors], ); const sections = useMemo(() => { @@ -985,8 +985,6 @@ function MoneyRequestConfirmationList({ isMerchantFieldValid, isP2P, isTypeRequest, - shouldShowMerchant, - shouldDisplayFieldError, shouldShowTax, transaction, policyTags, diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index b6684d574408..8ef284803d02 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -43,7 +43,8 @@ import type {DismissedProductTraining, SelectedTabRequest} from '@src/types/onyx import {isEmptyObject} from '@src/types/utils/EmptyObject'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {IOURequestStepAmountWithTransactionOnly} from './step/IOURequestStepAmount'; -import IOURequestStepConfirmation, {type IOURequestStepConfirmationPublicProps} from './step/IOURequestStepConfirmation'; +import type {IOURequestStepConfirmationPublicProps} from './step/IOURequestStepConfirmation'; +import IOURequestStepConfirmation from './step/IOURequestStepConfirmation'; import IOURequestStepDestination from './step/IOURequestStepDestination'; import IOURequestStepDistance from './step/IOURequestStepDistance'; import IOURequestStepHours from './step/IOURequestStepHours'; diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 8fabe22c429e..555131a07579 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -1,5 +1,6 @@ import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; -import React, {type ComponentProps, useCallback, useEffect, useMemo, useRef, useState} from 'react'; +import type {ComponentProps} from 'react'; +import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; import DragAndDropProvider from '@components/DragAndDrop/Provider'; @@ -218,7 +219,6 @@ function IOURequestStepConfirmation({ const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && Object.values(receiptFiles).length && !isTestTransaction && isScanRequest(transaction); const [isStitchingReceipt, setIsStitchingReceipt] = useState(false); const [stitchError, setStitchError] = useState(''); - const [shouldOpenParticipantPicker, setShouldOpenParticipantPicker] = useState(false); const headerTitle = useMemo(() => { if (isCategorizingTrackExpense) { return translate('iou.categorize'); @@ -297,6 +297,16 @@ function IOURequestStepConfirmation({ ownerBillingGracePeriodEnd, ]); + const shouldOpenParticipantPicker = useMemo(() => { + if (!transaction?.transactionID) { + return false; + } + const transactionParticipants = transaction?.participants ?? []; + const hasTransactionParticipants = transactionParticipants.length > 0; + const hasDefaultParticipants = defaultParticipants.length > 0; + return !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; + }, [transaction?.transactionID, transaction?.participants, defaultParticipants, isNewManualExpenseFlowEnabled]); + useEffect(() => { if (!transaction?.transactionID) { return; @@ -305,9 +315,6 @@ function IOURequestStepConfirmation({ const transactionParticipants = transaction?.participants ?? []; const hasTransactionParticipants = transactionParticipants.length > 0; const hasDefaultParticipants = defaultParticipants.length > 0; - const shouldOpenPicker = !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; - - setShouldOpenParticipantPicker(shouldOpenPicker); if (hasTransactionParticipants || !hasDefaultParticipants) { return; diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 594b1d0daad4..9fe62b1ac0ae 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -18,7 +18,6 @@ import { setMoneyRequestCategory, setMoneyRequestCreated, setMoneyRequestDateAttribute, - setMoneyRequestDescription, setMoneyRequestDistanceRate, setMoneyRequestMerchant, setMoneyRequestTag, From f40ca76a15b5058377458d46eeeb3c71afa55040 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 20:08:43 +0530 Subject: [PATCH 19/42] Prettier --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index fb3265ebbe61..e935e80b132c 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -345,7 +345,6 @@ function IOURequestStepConfirmation({ return hasPolicyExpenseChat(defaultParticipants); }, [report, transaction?.participants, defaultParticipants]); - const isFromGlobalCreate = !!transaction?.isFromGlobalCreate || !!transaction?.isFromFloatingActionButton; useFetchRoute(transaction, transaction?.comment?.waypoints, action, shouldUseTransactionDraft(action, iouType) ? CONST.TRANSACTION.STATE.DRAFT : CONST.TRANSACTION.STATE.CURRENT); From c94fb1445f81649c898b17eeb674c5138f5dbdb0 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 20:10:47 +0530 Subject: [PATCH 20/42] Auto focus the amount field --- .../MoneyRequestConfirmationList/sections/AmountField.tsx | 3 +++ src/components/MoneyRequestConfirmationListFooter.tsx | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index 798609020641..b70e8f7c1b0d 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -47,6 +47,7 @@ type AmountFieldProps = { policy: OnyxEntry; clearFormErrors: (errors: string[]) => void; setFormError: (error: TranslationPaths | '') => void; + autoFocus?: boolean; }; function AmountField({ @@ -71,6 +72,7 @@ function AmountField({ policy, clearFormErrors, setFormError, + autoFocus = false, }: AmountFieldProps) { const styles = useThemeStyles(); const {translate, preferredLocale} = useLocalize(); @@ -246,6 +248,7 @@ function AmountField({ ), shouldShow: shouldShowSmartScanFields && shouldShowAmountField, From 702dfadd81c3d32cd30f972eda291e90b8a15350 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 28 Apr 2026 20:25:26 +0530 Subject: [PATCH 21/42] lint --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index e935e80b132c..2c5c0469de5c 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -305,7 +305,7 @@ function IOURequestStepConfirmation({ const hasTransactionParticipants = transactionParticipants.length > 0; const hasDefaultParticipants = defaultParticipants.length > 0; return !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; - }, [transaction?.transactionID, transaction?.participants, defaultParticipants, isNewManualExpenseFlowEnabled]); + }, [transaction?.transactionID, transaction?.participants, defaultParticipants.length, isNewManualExpenseFlowEnabled, isManualRequest]); useEffect(() => { if (!transaction?.transactionID) { From db62613f0ffe4540d723fb66c43fe16e9baf667a Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 29 Apr 2026 21:29:03 +0530 Subject: [PATCH 22/42] Default merchant value is displayed for older flow --- .../MoneyRequestConfirmationList/sections/MerchantField.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx index 5aedac3863bb..928bf9bb3b73 100644 --- a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx @@ -54,7 +54,7 @@ function MerchantField({ const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); const merchantValue = getMerchant(transaction); - const displayMerchantValue = isNewManualExpenseFlowEnabled && !transaction?.isMerchantSet ? '' : merchantValue; + const displayMerchantValue = !transaction?.isMerchantSet ? '' : merchantValue; const isMerchantEmpty = !displayMerchantValue; // Determine if the merchant error should be displayed From ea05fa87efaf5fabdf8c454e54562d57b4aa2822 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Sat, 2 May 2026 00:08:35 +0530 Subject: [PATCH 23/42] Elivate the participants picker --- .../MoneyRequestConfirmationList.tsx | 47 +++-------------- .../step/IOURequestStepConfirmation.tsx | 51 ++++++++++++++++++- 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 43e76e7806c3..6733ab916bcb 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -56,7 +56,6 @@ import { } from '@libs/TransactionUtils'; import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils'; import {getIsViolationFixed} from '@libs/Violations/ViolationsUtils'; -import {setMoneyRequestParticipants} from '@userActions/IOU'; import {hasInvoicingDetails} from '@userActions/Policy/Policy'; import type {IOUAction, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; @@ -78,7 +77,6 @@ import FieldAutoSelector from './MoneyRequestConfirmationList/FieldAutoSelector' import SplitBillController from './MoneyRequestConfirmationList/SplitBillController'; import TaxController from './MoneyRequestConfirmationList/TaxController'; import MoneyRequestConfirmationListFooter from './MoneyRequestConfirmationListFooter'; -import ParticipantPicker from './ParticipantPicker'; import {PressableWithFeedback} from './Pressable'; import {useProductTrainingContext} from './ProductTrainingContext'; import UserListItem from './SelectionList/ListItem/UserListItem'; @@ -105,8 +103,8 @@ type MoneyRequestConfirmationListProps = { /** Selected participants from MoneyRequestModal with login / accountID */ selectedParticipants: Participant[]; - /** Trigger opening participant picker from parent flow */ - shouldOpenParticipantPicker?: boolean; + /** Callback to open participant picker from parent flow */ + onOpenParticipantPicker?: () => void; /** Payee of the expense with login */ payeePersonalDetails?: OnyxEntry | null; @@ -209,7 +207,6 @@ function MoneyRequestConfirmationList({ isEditingSplitBill, isReceiptEditable, selectedParticipants = [], - shouldOpenParticipantPicker = false, payeePersonalDetails, isReadOnly = false, policyID, @@ -230,6 +227,7 @@ function MoneyRequestConfirmationList({ showRemoveExpenseConfirmModal, isTimeRequest = false, shouldHideToSection = false, + onOpenParticipantPicker, }: MoneyRequestConfirmationListProps) { const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`); @@ -381,7 +379,6 @@ function MoneyRequestConfirmationList({ const [didConfirm, setDidConfirm] = useState(isConfirmed); const [didConfirmSplit, setDidConfirmSplit] = useState(false); const [showMoreFields, setShowMoreFields] = useState(false); - const [isParticipantPickerVisible, setIsParticipantPickerVisible] = useState(false); useEffect(() => { setShowMoreFields(false); @@ -700,7 +697,6 @@ function MoneyRequestConfirmationList({ ); const canEditParticipant = isFromGlobalCreateAndCanEditParticipant && !isTestReceipt && (!isRestrictedToPreferredPolicy || isTypeInvoice); - const participantPickerIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; const participantRowErrors = useMemo(() => { if (formError !== 'iou.error.noParticipantSelected' && formError !== 'violations.missingAttendees') { return undefined; @@ -709,29 +705,12 @@ function MoneyRequestConfirmationList({ return {participants: translate(formError)}; }, [formError, translate]); - const closeParticipantPicker = useCallback(() => { - setIsParticipantPickerVisible(false); - }, []); - useEffect(() => { - if (shouldOpenParticipantPicker) { - setIsParticipantPickerVisible(true); + if (selectedParticipants.length === 0) { return; } - setIsParticipantPickerVisible(false); - }, [shouldOpenParticipantPicker]); - - const handleParticipantsAdded = useCallback( - (participants: Participant[]) => { - if (!transactionID) { - return; - } - - setMoneyRequestParticipants(transactionID, participants); - clearFormErrors(['iou.error.noParticipantSelected']); - }, - [transactionID, clearFormErrors], - ); + clearFormErrors(['iou.error.noParticipantSelected']); + }, [selectedParticipants.length, clearFormErrors]); const sections = useMemo(() => { const options: Array> = []; @@ -802,7 +781,7 @@ function MoneyRequestConfirmationList({ const newIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; if (isNewManualExpenseFlowEnabled) { - setIsParticipantPickerVisible(true); + onOpenParticipantPicker?.(); return; } @@ -1284,18 +1263,6 @@ function MoneyRequestConfirmationList({ disableKeyboardShortcuts /> - {isNewManualExpenseFlowEnabled && ( - - )} ); } diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 2c5c0469de5c..8a85b60e95b3 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -11,6 +11,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton'; import {ModalActions} from '@components/Modal/Global/ModalContext'; import MoneyRequestConfirmationList from '@components/MoneyRequestConfirmationList'; import {usePersonalDetails, usePolicyCategories} from '@components/OnyxListItemProvider'; +import ParticipantPicker from '@components/ParticipantPicker'; import PrevNextButtons from '@components/PrevNextButtons'; import ScreenWrapper from '@components/ScreenWrapper'; import useConfirmModal from '@hooks/useConfirmModal'; @@ -75,6 +76,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import type {Participant} from '@src/types/onyx/IOU'; import type {Receipt} from '@src/types/onyx/Transaction'; import type {FileObject} from '@src/types/utils/Attachment'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; @@ -297,7 +299,7 @@ function IOURequestStepConfirmation({ ownerBillingGracePeriodEnd, ]); - const shouldOpenParticipantPicker = useMemo(() => { + const shouldAutoOpenParticipantPicker = useMemo(() => { if (!transaction?.transactionID) { return false; } @@ -306,6 +308,38 @@ function IOURequestStepConfirmation({ const hasDefaultParticipants = defaultParticipants.length > 0; return !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; }, [transaction?.transactionID, transaction?.participants, defaultParticipants.length, isNewManualExpenseFlowEnabled, isManualRequest]); + const [isParticipantPickerVisible, setIsParticipantPickerVisible] = useState(false); + const [hasAutoOpenedParticipantPicker, setHasAutoOpenedParticipantPicker] = useState(false); + const participantPickerIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; + + useEffect(() => { + setHasAutoOpenedParticipantPicker(false); + }, [transaction?.transactionID]); + + useEffect(() => { + if (!shouldAutoOpenParticipantPicker || hasAutoOpenedParticipantPicker) { + return; + } + setIsParticipantPickerVisible(true); + setHasAutoOpenedParticipantPicker(true); + }, [shouldAutoOpenParticipantPicker, hasAutoOpenedParticipantPicker]); + + const closeParticipantPicker = useCallback(() => { + setIsParticipantPickerVisible(false); + }, []); + + const handleParticipantsAdded = useCallback( + (participantsList: Participant[]) => { + if (!transaction?.transactionID) { + return; + } + setMoneyRequestParticipants(transaction.transactionID, participantsList); + if (participantsList.length > 0) { + setIsParticipantPickerVisible(false); + } + }, + [transaction?.transactionID], + ); useEffect(() => { if (!transaction?.transactionID) { @@ -759,7 +793,7 @@ function IOURequestStepConfirmation({ setIsParticipantPickerVisible(true)} onToggleBillable={setBillable} onConfirm={onConfirm} onSendMoney={sendMoney} @@ -790,6 +824,19 @@ function IOURequestStepConfirmation({ /> )} + {isNewManualExpenseFlowEnabled && ( + + )} From 4565001b504011fcd2680b3a25e28328bbbe3345 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Sat, 2 May 2026 00:09:08 +0530 Subject: [PATCH 24/42] fix: Participants picker renders selected items twice --- src/pages/iou/request/ParticipantSearchResults.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/iou/request/ParticipantSearchResults.tsx b/src/pages/iou/request/ParticipantSearchResults.tsx index ffcddc0caf25..4ad0595b8e18 100644 --- a/src/pages/iou/request/ParticipantSearchResults.tsx +++ b/src/pages/iou/request/ParticipantSearchResults.tsx @@ -111,6 +111,7 @@ function ParticipantSearchResults({ onParticipantsAdded, onFinish, }: ParticipantSearchResultsProps) { + const getParticipantOptionKey = (option: Partial) => option.reportID ?? option.accountID?.toString() ?? option.login ?? option.phoneNumber ?? ''; const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT; const isCategorizeOrShareAction = action === CONST.IOU.ACTION.CATEGORIZE || action === CONST.IOU.ACTION.SHARE; const isAllowedToSplit = @@ -266,6 +267,7 @@ function ParticipantSearchResults({ const sections: Array> = []; let header = ''; if (areOptionsInitialized && didScreenTransitionEnd) { + const selectedParticipantKeys = new Set(participants.map((participant) => getParticipantOptionKey(participant)).filter(Boolean)); const formatResults = formatSectionsFromSearchTerm( searchTerm, participants.map((participant) => ({...participant, reportID: participant.reportID})) as OptionData[], @@ -284,7 +286,7 @@ function ParticipantSearchResults({ if ((availableOptions.workspaceChats ?? []).length > 0) { sections.push({ title: translate('workspace.common.workspace'), - data: availableOptions.workspaceChats ?? [], + data: (availableOptions.workspaceChats ?? []).filter((option) => !selectedParticipantKeys.has(getParticipantOptionKey(option))), sectionIndex: 1, }); } @@ -303,7 +305,7 @@ function ParticipantSearchResults({ if (recentReports.length > 0) { sections.push({ title: translate('common.recents'), - data: recentReports, + data: recentReports.filter((option) => !selectedParticipantKeys.has(getParticipantOptionKey(option))), sectionIndex: 3, }); } @@ -311,7 +313,7 @@ function ParticipantSearchResults({ if (availableOptions.personalDetails.length > 0 && !isPerDiemRequest && !isTimeRequest) { sections.push({ title: translate('common.contacts'), - data: availableOptions.personalDetails, + data: availableOptions.personalDetails.filter((option) => !selectedParticipantKeys.has(getParticipantOptionKey(option))), sectionIndex: 4, }); } From 07b8c7a40928e664b2bc80009fd5c69b1b462907 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Sat, 2 May 2026 00:34:44 +0530 Subject: [PATCH 25/42] Refactor drag and drop provider disabling condition --- src/pages/iou/request/IOURequestStartPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index 7713840c984f..e3aada8ced52 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -200,7 +200,6 @@ function IOURequestStartPage({ const {isBetaEnabled} = usePermissions(); const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); - const shouldShowConfirmationOnStartPage = isNewManualExpenseFlowEnabled && shouldUseTab && (selectedTab === CONST.TAB_REQUEST.MANUAL || selectedTab === CONST.TAB_REQUEST.SCAN); const onBackButtonPress = () => { navigateBack(); @@ -226,7 +225,8 @@ function IOURequestStartPage({ testID="IOURequestStartPage" focusTrapSettings={{containerElements: focusTrapContainerElements}} > - + {/* If the new manual expense flow is enabled, the confirmation screen is shown on the start page, so we do not want to disable the drag and drop provider in that case */} + Date: Sat, 2 May 2026 00:57:00 +0530 Subject: [PATCH 26/42] Show error for empty amount field --- src/components/MoneyRequestConfirmationList.tsx | 16 ++++++---------- src/libs/actions/IOU/index.ts | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 6733ab916bcb..a5e8aa1718d4 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -810,20 +810,16 @@ function MoneyRequestConfirmationList({ return; } - // In the new manual expense flow the amount field starts empty (transaction.amount defaults to 0). - // We block submission until the user explicitly enters an amount (tracked by isAmountSet), unless the - // draft already has a non-zero total (e.g. tests, restored drafts). Time expenses derive totals from - // hours × rate, not the amount field. Scan flows use SmartScan instead of a typed amount. Distance - // totals come from route × rate (see DistanceRequestController); do not apply the manual-amount guard. - if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequest && !isTimeRequest && !isDistanceRequest && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet && iouAmount === 0) { + // In the new manual expense flow the amount field starts empty and submission is blocked until the user + // explicitly enters an amount (tracked by isAmountSet). Time expenses derive totals from hours × rate, + // scan flows use SmartScan, and distance totals come from route × rate (see DistanceRequestController), + // so this guard applies only to manual non-distance requests. + if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequest && !isTimeRequest && !isDistanceRequest && isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { setFormError('common.error.invalidAmount'); return; } - const isInvalidP2PAmount = - !isDistanceRequest && - iouAmount === 0 && - (isTypeRequest ? isP2P : iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.INVOICE || (iouType === CONST.IOU.TYPE.SPLIT && !isScanRequest)); + const isInvalidP2PAmount = !isScanRequest && !isTimeRequest && !isDistanceRequest && iouAmount === 0 && isP2P; if (isInvalidP2PAmount) { setFormError('common.error.invalidAmount'); return; diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 7e034160518c..98fdd7e172cd 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -852,7 +852,7 @@ function setMoneyRequestAmount(transactionID: string, amount: number, currency: * shows as empty and submission is blocked until a value is entered again. */ function clearMoneyRequestAmount(transactionID: string) { - Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {isAmountSet: false}); + Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {amount: 0, isAmountSet: false}); } function clearMoneyRequestMerchant(transactionID: string, isDraft = true) { From 288dc6b72ad9b4a2b1722be0a991f955c908a914 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Sat, 2 May 2026 01:40:08 +0530 Subject: [PATCH 27/42] Auto focus the amount field for the new flow --- .../MoneyRequestConfirmationList.tsx | 5 ++++- .../sections/AmountField.tsx | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index a5e8aa1718d4..feda8440664e 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -983,6 +983,9 @@ function MoneyRequestConfirmationList({ const focusTimeoutRef = useRef(null); useFocusEffect( useCallback(() => { + if (isNewManualExpenseFlowEnabled) { + return undefined; + } focusTimeoutRef.current = setTimeout(() => { // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { @@ -990,7 +993,7 @@ function MoneyRequestConfirmationList({ }); }, CONST.ANIMATED_TRANSITION); return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current); - }, []), + }, [isNewManualExpenseFlowEnabled]), ); const errorMessage = useMemo(() => { diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index b70e8f7c1b0d..a5a75c53e42a 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -1,12 +1,14 @@ -import React, {useState} from 'react'; +import React, {useEffect, useRef, useState} from 'react'; import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import NumberWithSymbolForm from '@components/NumberWithSymbolForm'; +import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; +import useScreenWrapperTransitionStatus from '@hooks/useScreenWrapperTransitionStatus'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearMoneyRequestAmount, setMoneyRequestAmount} from '@libs/actions/IOU'; import {convertToBackendAmount, convertToFrontendAmountAsString, getLocalizedCurrencySymbol} from '@libs/CurrencyUtils'; @@ -81,6 +83,8 @@ function AmountField({ const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID}); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const amountInputRef = useRef(null); + const {didScreenTransitionEnd} = useScreenWrapperTransitionStatus(); const [isCurrencyPickerVisible, setIsCurrencyPickerVisible] = useState(false); @@ -107,6 +111,17 @@ function AmountField({ const transactionAmount = isNewManualExpenseFlowEnabled && !transaction?.isAmountSet ? '' : convertToFrontendAmountAsString(amount, decimals); const allowNegative = shouldEnableNegative(report, policy, iouType, transaction?.participants); + // `autoFocus` on our TextInput only runs on mount. Closing and reopening the RHP often keeps the same mounted + // instance, so autofocus does not run again. After `ScreenWrapper` finishes its entry transition the field is + // reliably focusable. + useEffect(() => { + if (!didScreenTransitionEnd || !autoFocus || isAmountFieldDisabled || !isNewManualExpenseFlowEnabled) { + return; + } + + amountInputRef.current?.focus(); + }, [didScreenTransitionEnd, autoFocus, isAmountFieldDisabled, isNewManualExpenseFlowEnabled]); + const showCurrencyPicker = () => { setIsCurrencyPickerVisible(true); }; @@ -247,6 +262,7 @@ function AmountField({ {isNewManualExpenseFlowEnabled && !isAmountFieldDisabled ? ( Date: Mon, 4 May 2026 14:51:34 +0530 Subject: [PATCH 28/42] prettier --- .../hooks/useConfirmationValidation.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts index 34fc2f3d7c45..9b10b411a604 100644 --- a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts +++ b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts @@ -177,8 +177,8 @@ function useConfirmationValidation({ if (isEditingSplitBill && (isMerchantEmpty || (shouldDisplayFieldError && isMerchantMissing(transaction)))) { return {errorKey: 'iou.error.invalidMerchant'}; } - }else if(transaction?.isMerchantSet && !isMerchantFieldValid) { - return {errorKey: 'iou.error.invalidMerchant'}; + } else if (transaction?.isMerchantSet && !isMerchantFieldValid) { + return {errorKey: 'iou.error.invalidMerchant'}; } if (iouCategory.length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) { From 89ab9ed285c551654cb7a6330b8564d993d72967 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Mon, 4 May 2026 15:05:01 +0530 Subject: [PATCH 29/42] Lint --- src/components/MoneyRequestConfirmationList.tsx | 1 - .../hooks/useConfirmationValidation.ts | 6 +----- src/pages/iou/request/IOURequestStartPage.tsx | 2 +- tests/unit/hooks/useConfirmationValidation.test.ts | 11 +++++------ 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index eaf39daea118..904ff2875d45 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -453,7 +453,6 @@ function MoneyRequestConfirmationList({ isDistanceRequestWithPendingRoute, isPerDiemRequest, isTimeRequest, - isNewManualExpenseFlowEnabled, routeError, }); diff --git a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts index 9b10b411a604..6a101caef602 100644 --- a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts +++ b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts @@ -19,7 +19,7 @@ import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; type ValidationResult = {errorKey: TranslationPaths; shouldSetDidConfirmSplit?: boolean} | {errorKey: null}; -type UseConfirmationValidationParams = { +export type UseConfirmationValidationParams = { /** Transaction being validated */ transaction: OnyxEntry; @@ -95,9 +95,6 @@ type UseConfirmationValidationParams = { /** Whether the transaction is a time-tracking request */ isTimeRequest: boolean; - /** Whether the new manual expense flow beta is enabled */ - isNewManualExpenseFlowEnabled: boolean; - /** Truthy when the route to the confirmation page has a known error */ routeError: string | null | undefined; }; @@ -142,7 +139,6 @@ function useConfirmationValidation({ isDistanceRequestWithPendingRoute, isPerDiemRequest, isTimeRequest, - isNewManualExpenseFlowEnabled, routeError, }: UseConfirmationValidationParams): {validate: (paymentType?: PaymentMethodType) => ValidationResult | null} { const {getCurrencyDecimals} = useCurrencyListActions(); diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index e3aada8ced52..d099e37a8655 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -44,7 +44,7 @@ import IOURequestStepHours from './step/IOURequestStepHours'; import IOURequestStepPerDiemWorkspace from './step/IOURequestStepPerDiemWorkspace'; import IOURequestStepScan from './step/IOURequestStepScan'; import IOURequestStepTimeWorkspace from './step/IOURequestStepTimeWorkspace'; -import {WithWritableReportOrNotFoundProps} from './step/withWritableReportOrNotFound'; +import type {WithWritableReportOrNotFoundProps} from './step/withWritableReportOrNotFound'; type IOURequestStartPageProps = WithWritableReportOrNotFoundProps & { defaultSelectedTab: SelectedTabRequest; diff --git a/tests/unit/hooks/useConfirmationValidation.test.ts b/tests/unit/hooks/useConfirmationValidation.test.ts index a41fadf288ff..edd6f844d3d9 100644 --- a/tests/unit/hooks/useConfirmationValidation.test.ts +++ b/tests/unit/hooks/useConfirmationValidation.test.ts @@ -1,4 +1,5 @@ import {renderHook} from '@testing-library/react-native'; +import type {UseConfirmationValidationParams} from '@components/MoneyRequestConfirmationList/hooks/useConfirmationValidation'; import useConfirmationValidation from '@components/MoneyRequestConfirmationList/hooks/useConfirmationValidation'; import CONST from '@src/CONST'; import type * as OnyxTypes from '@src/types/onyx'; @@ -11,9 +12,7 @@ jest.mock('@hooks/useCurrencyList', () => ({ }), })); -type Params = Parameters[0]; - -const baseParams: Params = { +const baseParams = { transaction: {transactionID: 'txn1', comment: {}, amount: 100} as unknown as OnyxTypes.Transaction, transactionReport: undefined, transactionID: 'txn1', @@ -31,6 +30,7 @@ const baseParams: Params = { currentUserPersonalDetails: {accountID: 1} as CurrentUserPersonalDetails, isEditingSplitBill: false, isMerchantRequired: false, + isMerchantFieldValid: true, isMerchantEmpty: false, shouldDisplayFieldError: false, shouldShowTax: false, @@ -38,9 +38,8 @@ const baseParams: Params = { isDistanceRequestWithPendingRoute: false, isPerDiemRequest: false, isTimeRequest: false, - isNewManualExpenseFlowEnabled: false, routeError: undefined, -}; +} satisfies UseConfirmationValidationParams; describe('useConfirmationValidation', () => { it('returns null when routeError is set', () => { @@ -65,7 +64,7 @@ describe('useConfirmationValidation', () => { }); it('returns invalidMerchant when merchant is required but empty', () => { - const {result} = renderHook(() => useConfirmationValidation({...baseParams, isMerchantRequired: true, isMerchantEmpty: true})); + const {result} = renderHook(() => useConfirmationValidation({...baseParams, isMerchantRequired: true, isMerchantEmpty: true, isMerchantFieldValid: false})); expect(result.current.validate()).toEqual({errorKey: 'iou.error.invalidMerchant'}); }); From a6aa951dbea70194155d19f1deab57254a12690a Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Mon, 4 May 2026 15:51:22 +0530 Subject: [PATCH 30/42] Lint --- .../hooks/useConfirmationValidation.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts index 6a101caef602..49c7cff958ca 100644 --- a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts +++ b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts @@ -19,7 +19,7 @@ import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; type ValidationResult = {errorKey: TranslationPaths; shouldSetDidConfirmSplit?: boolean} | {errorKey: null}; -export type UseConfirmationValidationParams = { +type UseConfirmationValidationParams = { /** Transaction being validated */ transaction: OnyxEntry; @@ -257,4 +257,4 @@ function useConfirmationValidation({ } export default useConfirmationValidation; -export type {ValidationResult}; +export type {ValidationResult, UseConfirmationValidationParams}; From e6c0c5df73777c195637711f41595691f3aa8f91 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Mon, 4 May 2026 16:06:14 +0530 Subject: [PATCH 31/42] lint --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 608d5f505df0..dd3385403039 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -847,7 +847,7 @@ const IOURequestStepConfirmationWithFullTransactionOrNotFound = withFullTransact const IOURequestStepConfirmationWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepConfirmationWithFullTransactionOrNotFound); -/** Props for the default export (HOC-wrapped). Use for type-safe bridging from other money-request routes (e.g. CREATE). */ -export type IOURequestStepConfirmationPublicProps = ComponentProps; +type IOURequestStepConfirmationPublicProps = ComponentProps; export default IOURequestStepConfirmationWithWritableReportOrNotFound; +export type {IOURequestStepConfirmationPublicProps}; From 7c67b6f41a4b091a90d30e3f98b8d86922cfae34 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 6 May 2026 17:54:37 +0530 Subject: [PATCH 32/42] Show field required error when user clears the amount field and tries to preceed further --- src/components/MoneyRequestConfirmationList.tsx | 1 + .../hooks/useConfirmationValidation.ts | 8 +++++++- .../MoneyRequestConfirmationList/sections/AmountField.tsx | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 904ff2875d45..b9721b73b3ed 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -454,6 +454,7 @@ function MoneyRequestConfirmationList({ isPerDiemRequest, isTimeRequest, routeError, + isNewManualExpenseFlowEnabled, }); const confirm = buildConfirmAction({ diff --git a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts index 49c7cff958ca..794f6a1a01a6 100644 --- a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts +++ b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationValidation.ts @@ -97,6 +97,9 @@ type UseConfirmationValidationParams = { /** Truthy when the route to the confirmation page has a known error */ routeError: string | null | undefined; + + /** Whether the new manual expense flow is enabled */ + isNewManualExpenseFlowEnabled: boolean; }; /** @@ -140,6 +143,7 @@ function useConfirmationValidation({ isPerDiemRequest, isTimeRequest, routeError, + isNewManualExpenseFlowEnabled, }: UseConfirmationValidationParams): {validate: (paymentType?: PaymentMethodType) => ValidationResult | null} { const {getCurrencyDecimals} = useCurrencyListActions(); const selectedParticipantsCount = selectedParticipants.length; @@ -159,7 +163,9 @@ function useConfirmationValidation({ if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequestUtil(transaction) && !isTimeRequest && !isDistanceRequest && iouAmount === 0 && isP2P) { return {errorKey: 'common.error.invalidAmount'}; } - + if (isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) { + return {errorKey: 'common.error.fieldRequired'}; + } const merchantValue = iouMerchant ?? ''; const {isValid: isMerchantLengthValid} = isValidInputLength(merchantValue, CONST.MERCHANT_NAME_MAX_BYTES); diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx index a5a75c53e42a..edda76523b93 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx @@ -243,7 +243,7 @@ function AmountField({ if (isInlineAmountInvalid && shouldDisplayFieldError) { setFormError('common.error.invalidAmount'); } else if (!isInlineAmountInvalid) { - clearFormErrors(['common.error.invalidAmount']); + clearFormErrors(['common.error.invalidAmount', 'common.error.fieldRequired']); } buildAndSaveSplitShares(parsedAmount, effectiveCurrency); From f661c16a0f75557ec60c7e2969450a9208e5bb88 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 6 May 2026 18:30:31 +0530 Subject: [PATCH 33/42] Adjust the field to add new line on 'shift + Enter' and submit on 'Enter' --- src/components/MoneyRequestConfirmationList.tsx | 1 + src/components/MoneyRequestConfirmationList/confirmAction.ts | 2 +- .../sections/DescriptionField.tsx | 4 ++++ src/components/MoneyRequestConfirmationListFooter.tsx | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index b9721b73b3ed..99ce2a8dc55b 100644 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -573,6 +573,7 @@ function MoneyRequestConfirmationList({ isDescriptionRequired={isDescriptionRequired} showMoreFields={showMoreFields} setShowMoreFields={setShowMoreFields} + onSubmitForm={confirm} /> ); diff --git a/src/components/MoneyRequestConfirmationList/confirmAction.ts b/src/components/MoneyRequestConfirmationList/confirmAction.ts index 7a7f9919b313..92813d16508b 100644 --- a/src/components/MoneyRequestConfirmationList/confirmAction.ts +++ b/src/components/MoneyRequestConfirmationList/confirmAction.ts @@ -79,7 +79,7 @@ function buildConfirmAction({ onConfirm, onSendMoney, }: BuildConfirmActionParams) { - return ({paymentType: paymentMethod}: PaymentActionParams) => { + return ({paymentType: paymentMethod}: PaymentActionParams = {}) => { // Routing short-circuit: invoices without company info go to the company info step before we validate anything. if (iouType === CONST.IOU.TYPE.INVOICE && !hasInvoicingDetails(policy) && transactionID && !routeError) { Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_COMPANY_INFO.getRoute(iouType, transactionID, reportID, Navigation.getActiveRoute())); diff --git a/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx b/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx index 4466e6a04f74..d4c12eaf2653 100644 --- a/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx @@ -33,6 +33,7 @@ type DescriptionFieldProps = { policy: OnyxEntry; transaction: OnyxEntry; isEditingSplitBill: boolean; + onSubmitForm?: () => void; }; function DescriptionField({ @@ -48,6 +49,7 @@ function DescriptionField({ policy, transaction, isEditingSplitBill, + onSubmitForm, }: DescriptionFieldProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -102,6 +104,8 @@ function DescriptionField({ value={iouComment ?? ''} readOnly={didConfirm} onChangeText={handleDescriptionInputChange} + submitBehavior="blurAndSubmit" + onSubmitEditing={onSubmitForm} label={translate('common.description')} accessibilityLabel={translate('common.description')} autoGrowHeight diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx index b5bd83fb9bd7..9631627785c1 100644 --- a/src/components/MoneyRequestConfirmationListFooter.tsx +++ b/src/components/MoneyRequestConfirmationListFooter.tsx @@ -220,6 +220,9 @@ type MoneyRequestConfirmationListFooterProps = { /** Toggles compact mode by showing all fields */ setShowMoreFields?: (showMoreFields: boolean) => void; + + /** Trigger form submission from inline inputs */ + onSubmitForm?: () => void; }; type ConfirmationField = { @@ -283,6 +286,7 @@ function MoneyRequestConfirmationListFooter({ isDescriptionRequired = false, showMoreFields = false, setShowMoreFields = () => {}, + onSubmitForm, }: MoneyRequestConfirmationListFooterProps) { const icons = useMemoizedLazyExpensifyIcons(['Sparkles', 'DownArrow']); const styles = useThemeStyles(); @@ -434,6 +438,7 @@ function MoneyRequestConfirmationListFooter({ policy={policy} transaction={transaction} isEditingSplitBill={isEditingSplitBill} + onSubmitForm={onSubmitForm} /> ), shouldShow: true, From e8621dc2ca2f220cfa117864264c9ea1bfe1e8cb Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 6 May 2026 18:59:34 +0530 Subject: [PATCH 34/42] Move the merchant field above the description field --- .../fieldGroups/TransactionDetailsFields.tsx | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/components/MoneyRequestConfirmationListFooter/fieldGroups/TransactionDetailsFields.tsx b/src/components/MoneyRequestConfirmationListFooter/fieldGroups/TransactionDetailsFields.tsx index ba941de88543..f11c6b7315dd 100644 --- a/src/components/MoneyRequestConfirmationListFooter/fieldGroups/TransactionDetailsFields.tsx +++ b/src/components/MoneyRequestConfirmationListFooter/fieldGroups/TransactionDetailsFields.tsx @@ -189,6 +189,24 @@ function TransactionDetailsFields({ /> )} + {!isCompactMode && fieldVisibility.merchant && ( + + )} + )} - {!isCompactMode && fieldVisibility.merchant && ( - - )} - {!isCompactMode && fieldVisibility.time && ( Date: Wed, 6 May 2026 19:00:07 +0530 Subject: [PATCH 35/42] Show receipt empty state for new flow --- src/libs/IOUUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 6eeb71e21d61..97b23f6392f4 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -315,7 +315,7 @@ function shouldShowReceiptEmptyState(iouType: IOUType, action: IOUAction, policy // - Hide for per diem requests // - Hide when submitting a track expense to a non-paid group policy (personal users) return ( - (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK || iouType === CONST.IOU.TYPE.PAY) && + (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK || iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.CREATE) && !isPerDiemRequest && (!isMovingTransactionFromTrackExpense(action) || isPaidGroupPolicy(policy)) ); From b4aacebe9849bb1f6a368e6fc61313c7fca8def8 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 8 May 2026 00:03:11 +0530 Subject: [PATCH 36/42] lint --- .../step/IOURequestStepConfirmation.tsx | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index d84e709d24e4..563961e7f67d 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -309,37 +309,33 @@ function IOURequestStepConfirmation({ const hasDefaultParticipants = defaultParticipants.length > 0; return !hasTransactionParticipants && !hasDefaultParticipants && isNewManualExpenseFlowEnabled && isManualRequest; }, [transaction?.transactionID, transaction?.participants, defaultParticipants.length, isNewManualExpenseFlowEnabled, isManualRequest]); - const [isParticipantPickerVisible, setIsParticipantPickerVisible] = useState(false); - const [hasAutoOpenedParticipantPicker, setHasAutoOpenedParticipantPicker] = useState(false); + const activeTransactionID = transaction?.transactionID; + const [manuallyOpenedParticipantPickerForTransactionID, setManuallyOpenedParticipantPickerForTransactionID] = useState(); + const [dismissedAutoOpenParticipantPickerForTransactionID, setDismissedAutoOpenParticipantPickerForTransactionID] = useState(); const participantPickerIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; + const isParticipantPickerVisible = + manuallyOpenedParticipantPickerForTransactionID === activeTransactionID || + (shouldAutoOpenParticipantPicker && dismissedAutoOpenParticipantPickerForTransactionID !== activeTransactionID); - useEffect(() => { - setHasAutoOpenedParticipantPicker(false); - }, [transaction?.transactionID]); - - useEffect(() => { - if (!shouldAutoOpenParticipantPicker || hasAutoOpenedParticipantPicker) { + const closeParticipantPicker = useCallback(() => { + setManuallyOpenedParticipantPickerForTransactionID(undefined); + if (!activeTransactionID) { return; } - setIsParticipantPickerVisible(true); - setHasAutoOpenedParticipantPicker(true); - }, [shouldAutoOpenParticipantPicker, hasAutoOpenedParticipantPicker]); - - const closeParticipantPicker = useCallback(() => { - setIsParticipantPickerVisible(false); - }, []); + setDismissedAutoOpenParticipantPickerForTransactionID(activeTransactionID); + }, [activeTransactionID]); const handleParticipantsAdded = useCallback( (participantsList: Participant[]) => { - if (!transaction?.transactionID) { + if (!activeTransactionID) { return; } - setMoneyRequestParticipants(transaction.transactionID, participantsList); + setMoneyRequestParticipants(activeTransactionID, participantsList); if (participantsList.length > 0) { - setIsParticipantPickerVisible(false); + closeParticipantPicker(); } }, - [transaction?.transactionID], + [activeTransactionID, closeParticipantPicker], ); useEffect(() => { @@ -794,7 +790,12 @@ function IOURequestStepConfirmation({ setIsParticipantPickerVisible(true)} + onOpenParticipantPicker={() => { + if (!activeTransactionID) { + return; + } + setManuallyOpenedParticipantPickerForTransactionID(activeTransactionID); + }} onToggleBillable={setBillable} onConfirm={onConfirm} onSendMoney={sendMoney} From 454305f97ebd0afcb1c319432e01b7fb64d636ad Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Fri, 8 May 2026 00:03:22 +0530 Subject: [PATCH 37/42] fix tests --- tests/ui/TimeExpenseConfirmationTest.tsx | 2 ++ tests/ui/components/IOURequestStepConfirmationPageTest.tsx | 6 ++++++ tests/unit/hooks/useConfirmationValidation.test.ts | 1 + 3 files changed, 9 insertions(+) diff --git a/tests/ui/TimeExpenseConfirmationTest.tsx b/tests/ui/TimeExpenseConfirmationTest.tsx index 5a60d18b69c5..e3bc37f1a9ff 100644 --- a/tests/ui/TimeExpenseConfirmationTest.tsx +++ b/tests/ui/TimeExpenseConfirmationTest.tsx @@ -89,6 +89,7 @@ jest.mock('@libs/Navigation/Navigation', () => { getPreInsertedFullscreenRouteName: jest.fn(() => undefined), clearFullscreenPreInsertedFlag: jest.fn(), revealRouteBeforeDismissingModal: jest.fn(), + isTopmostRouteModalScreen: jest.fn(() => false), navigationRef: mockRef, }; }); @@ -150,6 +151,7 @@ function createPolicyWithTimeTracking(): Policy { const DEFAULT_TIME_TRANSACTION: Transaction = { amount: 40000, // $400.00 (8 hours * $50/hr) + isAmountSet: true, billable: false, comment: { units: { diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx index 6b1698ddae2d..5933bd7e88c0 100644 --- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx +++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx @@ -125,6 +125,7 @@ jest.mock('@libs/Navigation/Navigation', () => { getTopmostReportId: jest.fn(() => undefined), preInsertFullscreenUnderRHP: jest.fn(), removePreInsertedFullscreenIfNeeded: jest.fn(), + isTopmostRouteModalScreen: jest.fn(() => false), navigationRef: mockRef, }; }); @@ -238,6 +239,7 @@ function createWaypoints(startAddress: string, endAddress: string): WaypointColl const DEFAULT_SPLIT_TRANSACTION: Transaction = { amount: 0, + isAmountSet: true, billable: false, comment: { attendees: [ @@ -983,6 +985,7 @@ describe('IOURequestStepConfirmationPageTest', () => { transactionID, reportID: transactionReportID, amount: 1000, + isAmountSet: true, currency: 'USD', merchant: 'Test', created: '2025-01-15', @@ -1049,6 +1052,7 @@ describe('IOURequestStepConfirmationPageTest', () => { transactionID, reportID: routeReportID, amount: 1000, + isAmountSet: true, currency: 'USD', merchant: 'Test', created: '2025-01-15', @@ -1124,6 +1128,7 @@ describe('IOURequestStepConfirmationPageTest', () => { transactionID, reportID: transactionReportID, amount: 1000, + isAmountSet: true, currency: 'USD', merchant: 'Test', created: '2025-01-15', @@ -1183,6 +1188,7 @@ describe('IOURequestStepConfirmationPageTest', () => { transactionID, reportID: CONST.REPORT.UNREPORTED_REPORT_ID, amount: 1000, + isAmountSet: true, currency: 'USD', merchant: 'Test Merchant', created: '2025-01-15', diff --git a/tests/unit/hooks/useConfirmationValidation.test.ts b/tests/unit/hooks/useConfirmationValidation.test.ts index edd6f844d3d9..66bcb590ce82 100644 --- a/tests/unit/hooks/useConfirmationValidation.test.ts +++ b/tests/unit/hooks/useConfirmationValidation.test.ts @@ -39,6 +39,7 @@ const baseParams = { isPerDiemRequest: false, isTimeRequest: false, routeError: undefined, + isNewManualExpenseFlowEnabled: false, } satisfies UseConfirmationValidationParams; describe('useConfirmationValidation', () => { From e1593fd14986b30e143ebe813a7866174fdaa576 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Tue, 12 May 2026 23:44:09 +0530 Subject: [PATCH 38/42] fix participantsPicker flicker --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 563961e7f67d..b45a8a65c192 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -314,8 +314,9 @@ function IOURequestStepConfirmation({ const [dismissedAutoOpenParticipantPickerForTransactionID, setDismissedAutoOpenParticipantPickerForTransactionID] = useState(); const participantPickerIOUType = iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.CREATE : iouType; const isParticipantPickerVisible = - manuallyOpenedParticipantPickerForTransactionID === activeTransactionID || - (shouldAutoOpenParticipantPicker && dismissedAutoOpenParticipantPickerForTransactionID !== activeTransactionID); + !!activeTransactionID && + (manuallyOpenedParticipantPickerForTransactionID === activeTransactionID || + (shouldAutoOpenParticipantPicker && dismissedAutoOpenParticipantPickerForTransactionID !== activeTransactionID)); const closeParticipantPicker = useCallback(() => { setManuallyOpenedParticipantPickerForTransactionID(undefined); From 5f4e503197236b8af6b580bd683b0c4495cd7937 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 13 May 2026 00:57:47 +0530 Subject: [PATCH 39/42] improve TS structure --- src/pages/iou/request/IOURequestStartPage.tsx | 8 ++----- .../step/IOURequestStepConfirmation.tsx | 23 ++++++++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index d099e37a8655..3fa23516fd86 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -36,7 +36,6 @@ import type {SelectedTabRequest} from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import {IOURequestStepAmountWithTransactionOnly} from './step/IOURequestStepAmount'; -import type {IOURequestStepConfirmationPublicProps} from './step/IOURequestStepConfirmation'; import IOURequestStepConfirmation from './step/IOURequestStepConfirmation'; import IOURequestStepDestination from './step/IOURequestStepDestination'; import IOURequestStepDistance from './step/IOURequestStepDistance'; @@ -62,9 +61,6 @@ function IOURequestStartPage({ // This is currently only being used for testing defaultSelectedTab = CONST.TAB_REQUEST.SCAN, }: IOURequestStartPageProps) { - const confirmationRoute = route as unknown as IOURequestStepConfirmationPublicProps['route']; - const confirmationNavigation = navigation as unknown as IOURequestStepConfirmationPublicProps['navigation']; - const styles = useThemeStyles(); const {translate} = useLocalize(); const shouldUseTab = iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.PAY && iouType !== CONST.IOU.TYPE.INVOICE; @@ -254,8 +250,8 @@ function IOURequestStartPage({ {isNewManualExpenseFlowEnabled ? ( ) : ( diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index b45a8a65c192..3e4500900e97 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -49,6 +49,7 @@ import isReportOpenInRHP from '@libs/Navigation/helpers/isReportOpenInRHP'; import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator'; import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute'; import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; +import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types'; import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils'; import {getPolicyExpenseChat, getReportOrDraftReport, isMoneyRequestReport, isPolicyExpenseChat as isPolicyExpenseChatUtils, isSelectedManagerMcTest} from '@libs/ReportUtils'; import {buildCannedSearchQuery, getCurrentSearchQueryJSON} from '@libs/SearchQueryUtils'; @@ -72,11 +73,11 @@ import { } from '@userActions/IOU'; import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt'; import {removeDraftTransaction, replaceDefaultDraftTransaction} from '@userActions/TransactionEdit'; -import CONST from '@src/CONST'; +import CONST, {type IOUType} from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; -import type SCREENS from '@src/SCREENS'; +import SCREENS from '@src/SCREENS'; import type {Participant} from '@src/types/onyx/IOU'; import type {Receipt} from '@src/types/onyx/Transaction'; import type {FileObject} from '@src/types/utils/Attachment'; @@ -95,21 +96,27 @@ import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound'; import withWritableReportOrNotFound from './withWritableReportOrNotFound'; -type IOURequestStepConfirmationProps = WithWritableReportOrNotFoundProps & - WithFullTransactionOrNotFoundProps & { +type IOURequestStepConfirmationIncomingRouteName = typeof SCREENS.MONEY_REQUEST.STEP_CONFIRMATION | typeof SCREENS.MONEY_REQUEST.CREATE; + +type StepConfirmationParams = MoneyRequestNavigatorParamList[typeof SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]; + +type IOURequestStepConfirmationProps = WithWritableReportOrNotFoundProps & + WithFullTransactionOrNotFoundProps & { shouldHideHeader?: boolean; }; function IOURequestStepConfirmation({ report: reportReal, reportDraft, - route: { - params: {iouType, reportID, transactionID: initialTransactionID, action, participantsAutoAssigned: participantsAutoAssignedFromRoute, backToReport, backTo}, - }, + route, transaction: initialTransaction, isLoadingTransaction, shouldHideHeader = false, }: IOURequestStepConfirmationProps) { + const params = route.params; + const {iouType, reportID, transactionID: initialTransactionID, action, backToReport, backTo} = params; + const participantsAutoAssignedFromRoute = route.name === SCREENS.MONEY_REQUEST.STEP_CONFIRMATION ? (params as StepConfirmationParams).participantsAutoAssigned : undefined; + const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const defaultExpensePolicy = useDefaultExpensePolicy(); const personalPolicy = usePersonalPolicy(); @@ -805,7 +812,7 @@ function IOURequestStepConfirmation({ }} receiptPath={receiptPath} receiptFilename={receiptFilename} - iouType={iouType} + iouType={iouType as Exclude} reportID={reportID} shouldDisplayReceipt={ !isMovingTransactionFromTrackExpense && (!isDistanceRequest || isManualDistanceRequest || isOdometerDistanceRequest) && !isPerDiemRequest From c66718ed0eee82b60b27a5347bf1c1bd9928f859 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 13 May 2026 02:01:17 +0530 Subject: [PATCH 40/42] lint --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index dac55ce973db..ef78aa10cbc4 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -73,7 +73,8 @@ import { } from '@userActions/IOU'; import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt'; import {removeDraftTransaction, replaceDefaultDraftTransaction} from '@userActions/TransactionEdit'; -import CONST, {type IOUType} from '@src/CONST'; +import CONST from '@src/CONST'; +import type {IOUType} from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; From b1961af7a0bbd2abfa79ee56599389128b3906d5 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 13 May 2026 02:01:27 +0530 Subject: [PATCH 41/42] fix tests --- tests/ui/TimeExpenseConfirmationTest.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ui/TimeExpenseConfirmationTest.tsx b/tests/ui/TimeExpenseConfirmationTest.tsx index e3bc37f1a9ff..872840f59108 100644 --- a/tests/ui/TimeExpenseConfirmationTest.tsx +++ b/tests/ui/TimeExpenseConfirmationTest.tsx @@ -85,6 +85,7 @@ jest.mock('@libs/Navigation/Navigation', () => { goBack: jest.fn(), dismissModal: jest.fn(), dismissModalWithReport: jest.fn(), + getActiveRoute: jest.fn(() => ''), getIsFullscreenPreInsertedUnderRHP: jest.fn(() => false), getPreInsertedFullscreenRouteName: jest.fn(() => undefined), clearFullscreenPreInsertedFlag: jest.fn(), From 734a1a4b9ac9f65490b7da8bf9adf975d6fc3cb2 Mon Sep 17 00:00:00 2001 From: Chavda Sachin Date: Wed, 13 May 2026 02:18:53 +0530 Subject: [PATCH 42/42] lint --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index ef78aa10cbc4..85bf2a940419 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -486,10 +486,12 @@ function IOURequestStepConfirmation({ hasPreInsertFired.current = true; - const route: Route = shouldPreInsertSearch ? ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery({type: searchType})}) : ROUTES.REPORT_WITH_ID.getRoute(destinationReportID); + const preInsertFullscreenRoute: Route = shouldPreInsertSearch + ? ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery({type: searchType})}) + : ROUTES.REPORT_WITH_ID.getRoute(destinationReportID); const timer = setTimeout(() => { - Navigation.preInsertFullscreenUnderRHP(route); + Navigation.preInsertFullscreenUnderRHP(preInsertFullscreenRoute); }, CONST.PRE_INSERT_FULLSCREEN_DELAY); return () => {