From 5f94c05b01da1e07d87e167054b3cdc3603e0dfb Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 20 Jan 2026 17:13:14 +0700 Subject: [PATCH 01/15] refactor startDistanceRequest --- src/components/MoneyReportHeader.tsx | 5 +- .../MoneyRequestReportTransactionList.tsx | 5 +- .../SearchMoneyRequestReportEmptyState.tsx | 3 +- .../MoneyRequestReportPreviewContent.tsx | 5 +- .../Share/ShareTabParticipantsSelector.tsx | 5 +- src/libs/ReportUtils.ts | 3 +- src/libs/actions/IOU/index.ts | 11 ++- src/libs/actions/QuickActionNavigation.ts | 9 ++- .../AttachmentPickerWithMenuItems.tsx | 29 ++++++- .../FloatingActionButtonAndPopover.tsx | 3 +- tests/unit/QuickActionNavigationTest.ts | 75 ++++++++++++++++++- 11 files changed, 133 insertions(+), 20 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 45362c5568d7..9bdfb072bd9a 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -251,6 +251,7 @@ function MoneyReportHeader({ 'ReceiptPlus', ] as const); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${moneyRequestReport?.reportID}`, {canBeMissing: true}); const {translate, localeCompare} = useLocalize(); @@ -832,8 +833,8 @@ function MoneyReportHeader({ }); const addExpenseDropdownOptions = useMemo( - () => getAddExpenseDropdownOptions(expensifyIcons, moneyRequestReport?.reportID, policy, undefined, undefined, lastDistanceExpenseType), - [moneyRequestReport?.reportID, policy, lastDistanceExpenseType, expensifyIcons], + () => getAddExpenseDropdownOptions(expensifyIcons, moneyRequestReport?.reportID, policy, undefined, undefined, lastDistanceExpenseType, allTransactionDrafts), + [moneyRequestReport?.reportID, policy, lastDistanceExpenseType, expensifyIcons, allTransactionDrafts], ); const exportSubmenuOptions: Record> = useMemo(() => { diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 4a9598349e7c..3487f3d1e01a 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -186,12 +186,13 @@ function MoneyRequestReportTransactionList({ const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report); const addExpenseDropdownOptions = useMemo( - () => getAddExpenseDropdownOptions(expensifyIcons, report?.reportID, policy, undefined, undefined, lastDistanceExpenseType), - [report?.reportID, policy, lastDistanceExpenseType, expensifyIcons.Location], + () => getAddExpenseDropdownOptions(expensifyIcons, report?.reportID, policy, undefined, undefined, lastDistanceExpenseType, allTransactionDrafts), + [report?.reportID, policy, lastDistanceExpenseType, expensifyIcons.Location, allTransactionDrafts], ); const hasPendingAction = useMemo(() => { diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx index 639066bbf326..4292cd3bbb61 100644 --- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx +++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx @@ -27,6 +27,7 @@ function SearchMoneyRequestReportEmptyState({report, policy}: {report: OnyxTypes const styles = useThemeStyles(); const expensifyIcons = useMemoizedLazyExpensifyIcons(['Location']); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); const reportId = report.reportID; const isReportArchived = isArchivedReport(reportNameValuePairs); const icons = useMemoizedLazyExpensifyIcons(['ReceiptPlus']); @@ -59,7 +60,7 @@ function SearchMoneyRequestReportEmptyState({report, policy}: {report: OnyxTypes Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportId, lastDistanceExpenseType); + startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportId, lastDistanceExpenseType, false, undefined, allTransactionDrafts); }, }, { diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 504981d3488f..770690bd4b7f 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -129,6 +129,7 @@ function MoneyRequestReportPreviewContent({ const [iouReportNextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReportID}`, {canBeMissing: true}); const activePolicy = usePolicy(activePolicyID); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); const shouldShowLoading = !chatReportMetadata?.hasOnceLoadedReportActions && transactions.length === 0 && !chatReportMetadata?.isOptimisticReport; // `hasOnceLoadedReportActions` becomes true before transactions populate fully, // so we defer the loading state update to ensure transactions are loaded @@ -563,8 +564,8 @@ function MoneyRequestReportPreviewContent({ ]); const addExpenseDropdownOptions = useMemo( - () => getAddExpenseDropdownOptions(expensifyIcons, iouReport?.reportID, policy, chatReportID, iouReport?.parentReportID, lastDistanceExpenseType), - [chatReportID, iouReport?.parentReportID, iouReport?.reportID, policy, lastDistanceExpenseType, expensifyIcons], + () => getAddExpenseDropdownOptions(expensifyIcons, iouReport?.reportID, policy, chatReportID, iouReport?.parentReportID, lastDistanceExpenseType, allTransactionDrafts), + [chatReportID, iouReport?.parentReportID, iouReport?.reportID, policy, lastDistanceExpenseType, expensifyIcons, allTransactionDrafts], ); const isReportDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE; diff --git a/src/components/Share/ShareTabParticipantsSelector.tsx b/src/components/Share/ShareTabParticipantsSelector.tsx index c1727f0f269a..d29059a8eafd 100644 --- a/src/components/Share/ShareTabParticipantsSelector.tsx +++ b/src/components/Share/ShareTabParticipantsSelector.tsx @@ -1,12 +1,14 @@ import type {Ref} from 'react'; import React from 'react'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; +import useOnyx from '@hooks/useOnyx'; import {clearMoneyRequest} from '@libs/actions/IOU'; import {saveUnknownUserDetails} from '@libs/actions/Share'; import Navigation from '@libs/Navigation/Navigation'; import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyRequestParticipantsSelector'; import {getOptimisticChatReport, saveReportDraft} from '@userActions/Report'; import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; import type ROUTES from '@src/ROUTES'; type ShareTabParticipantsSelectorProps = { @@ -20,13 +22,14 @@ type InputFocusRef = { function ShareTabParticipantsSelectorComponent({detailsPageRouteObject, ref}: ShareTabParticipantsSelectorProps) { const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); return ( { // clear the existing draft transaction from the previous flow to prevent the old data from being displayed - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, false, allTransactionDrafts); const participant = value.at(0); let reportID = participant?.reportID ?? CONST.DEFAULT_NUMBER_ID; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 2485d529ffae..390c477a5bb3 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2932,6 +2932,7 @@ function getAddExpenseDropdownOptions( iouRequestBackToReport?: string, unreportedExpenseBackToReport?: string, lastDistanceExpenseType?: IOURequestType, + draftTransactions?: OnyxCollection, ): Array>> { return [ { @@ -2965,7 +2966,7 @@ function getAddExpenseDropdownOptions( Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startDistanceRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, lastDistanceExpenseType, false, iouRequestBackToReport); + startDistanceRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, lastDistanceExpenseType, false, iouRequestBackToReport, draftTransactions); }, }, { diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 76be6b209886..aaa42a683e56 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1246,8 +1246,15 @@ function startMoneyRequest( } } -function startDistanceRequest(iouType: ValueOf, reportID: string, requestType?: IOURequestType, skipConfirmation = false, backToReport?: string) { - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, skipConfirmation); +function startDistanceRequest( + iouType: ValueOf, + reportID: string, + requestType: IOURequestType | undefined, + skipConfirmation: boolean, + backToReport: string | undefined, + draftTransactions: OnyxCollection, +) { + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, skipConfirmation, draftTransactions); switch (requestType) { case CONST.IOU.REQUEST_TYPE.DISTANCE_MAP: Navigation.navigate(ROUTES.DISTANCE_REQUEST_CREATE_TAB_MAP.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, reportID, backToReport)); diff --git a/src/libs/actions/QuickActionNavigation.ts b/src/libs/actions/QuickActionNavigation.ts index 3d6b94a8823f..b6d5bec33e20 100644 --- a/src/libs/actions/QuickActionNavigation.ts +++ b/src/libs/actions/QuickActionNavigation.ts @@ -1,9 +1,11 @@ +import type {OnyxCollection} from 'react-native-onyx'; import {generateReportID} from '@libs/ReportUtils'; import CONST from '@src/CONST'; import type {PersonalDetails} from '@src/types/onyx'; import type {DistanceExpenseType} from '@src/types/onyx/IOU'; import type {QuickActionName} from '@src/types/onyx/QuickAction'; import type QuickAction from '@src/types/onyx/QuickAction'; +import type Transaction from '@src/types/onyx/Transaction'; import type {IOURequestType} from './IOU'; import {startDistanceRequest, startMoneyRequest} from './IOU'; import {startOutCreateTaskQuickAction} from './Task'; @@ -15,6 +17,7 @@ type NavigateToQuickActionParams = { lastDistanceExpenseType?: DistanceExpenseType; targetAccountPersonalDetails: PersonalDetails; currentUserAccountID: number; + draftTransactions: OnyxCollection; }; function getQuickActionRequestType(action: QuickActionName | undefined, lastDistanceExpenseType?: DistanceExpenseType): IOURequestType | undefined { @@ -37,7 +40,7 @@ function getQuickActionRequestType(action: QuickActionName | undefined, lastDist } function navigateToQuickAction(params: NavigateToQuickActionParams) { - const {isValidReport, quickAction, selectOption, lastDistanceExpenseType, targetAccountPersonalDetails, currentUserAccountID} = params; + const {isValidReport, quickAction, selectOption, lastDistanceExpenseType, targetAccountPersonalDetails, currentUserAccountID, draftTransactions} = params; const reportID = isValidReport && quickAction?.chatReportID ? quickAction?.chatReportID : generateReportID(); const requestType = getQuickActionRequestType(quickAction?.action, lastDistanceExpenseType); @@ -63,10 +66,10 @@ function navigateToQuickAction(params: NavigateToQuickActionParams) { selectOption(() => startMoneyRequest(CONST.IOU.TYPE.TRACK, reportID, requestType, true), false); break; case CONST.QUICK_ACTIONS.REQUEST_DISTANCE: - selectOption(() => startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportID, requestType, true), false); + selectOption(() => startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportID, requestType, true, undefined, draftTransactions), false); break; case CONST.QUICK_ACTIONS.TRACK_DISTANCE: - selectOption(() => startDistanceRequest(CONST.IOU.TYPE.TRACK, reportID, requestType, true), false); + selectOption(() => startDistanceRequest(CONST.IOU.TYPE.TRACK, reportID, requestType, true, undefined, draftTransactions), false); break; default: } diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx index 7bdade046f45..feb1be6cc9cf 100644 --- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx +++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx @@ -163,6 +163,7 @@ function AttachmentPickerWithMenuItems({ const {isDelegateAccessRestricted, showDelegateNoAccessModal} = useContext(DelegateNoAccessContext); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {canBeMissing: true}); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); + const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); const {isProduction} = useEnvironment(); const {isRestrictedToPreferredPolicy} = usePreferredPolicy(); const {setIsLoaderVisible} = useFullScreenLoader(); @@ -242,7 +243,19 @@ function AttachmentPickerWithMenuItems({ text: translate('quickAction.recordDistance'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_TRACK_DISTANCE, - onSelected: () => selectOption(() => startDistanceRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), lastDistanceExpenseType), true), + onSelected: () => + selectOption( + () => + startDistanceRequest( + CONST.IOU.TYPE.SUBMIT, + report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), + lastDistanceExpenseType, + false, + undefined, + allTransactionDrafts, + ), + true, + ), }, ], [CONST.IOU.TYPE.PAY]: [ @@ -275,7 +288,19 @@ function AttachmentPickerWithMenuItems({ text: translate('iou.trackDistance'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_TRACK_DISTANCE, - onSelected: () => selectOption(() => startDistanceRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), lastDistanceExpenseType), true), + onSelected: () => + selectOption( + () => + startDistanceRequest( + CONST.IOU.TYPE.TRACK, + report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), + lastDistanceExpenseType, + false, + undefined, + allTransactionDrafts, + ), + true, + ), }, ], [CONST.IOU.TYPE.INVOICE]: [ diff --git a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx index a761fe442e55..4fede5e0b39d 100644 --- a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx @@ -464,6 +464,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, ref lastDistanceExpenseType, targetAccountPersonalDetails, currentUserAccountID: currentUserPersonalDetails.accountID, + draftTransactions: allTransactionDrafts, }); }); }; @@ -567,7 +568,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, ref return; } // Start the flow to start tracking a distance request - startDistanceRequest(CONST.IOU.TYPE.CREATE, reportID, lastDistanceExpenseType); + startDistanceRequest(CONST.IOU.TYPE.CREATE, reportID, lastDistanceExpenseType, false, undefined, allTransactionDrafts); }); }, sentryLabel: CONST.SENTRY_LABEL.FAB_MENU.TRACK_DISTANCE, diff --git a/tests/unit/QuickActionNavigationTest.ts b/tests/unit/QuickActionNavigationTest.ts index af64b1146740..e31818a09356 100644 --- a/tests/unit/QuickActionNavigationTest.ts +++ b/tests/unit/QuickActionNavigationTest.ts @@ -31,6 +31,7 @@ describe('IOU Utils', () => { }, targetAccountPersonalDetails: createPersonalDetails(1), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: {}, }); // Then we should start manual submit request flow @@ -47,6 +48,7 @@ describe('IOU Utils', () => { }, targetAccountPersonalDetails: createPersonalDetails(1), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: {}, }); // Then we should start scan split request flow @@ -54,6 +56,7 @@ describe('IOU Utils', () => { }); it('should be navigated to Track distance Expense', () => { + const draftTransactions = {}; // When the quick action is TRACK_DISTANCE navigateToQuickAction({ isValidReport: true, @@ -63,13 +66,15 @@ describe('IOU Utils', () => { }, targetAccountPersonalDetails: createPersonalDetails(1), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions, }); // Then we should start distance track request flow - expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.TRACK, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true); + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.TRACK, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true, undefined, draftTransactions); }); it('should be navigated to Map distance Expense by default', () => { + const draftTransactions = {}; // When the quick action is REQUEST_DISTANCE navigateToQuickAction({ isValidReport: true, @@ -79,13 +84,15 @@ describe('IOU Utils', () => { }, targetAccountPersonalDetails: createPersonalDetails(1), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions, }); // Then we should start map distance request flow - expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true); + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true, undefined, draftTransactions); }); it('should be navigated to request distance Expense depending on lastDistanceExpenseType', () => { + const draftTransactions = {}; // When the quick action is REQUEST_DISTANCE navigateToQuickAction({ isValidReport: true, @@ -96,10 +103,70 @@ describe('IOU Utils', () => { targetAccountPersonalDetails: createPersonalDetails(1), lastDistanceExpenseType: CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL, currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions, }); // Then we should start manual distance request flow - expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL, true); + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL, true, undefined, draftTransactions); + }); + + it('should pass draftTransactions with existing drafts to startDistanceRequest for TRACK_DISTANCE', () => { + // Given draftTransactions with some existing draft data + const draftTransactions = { + transaction_123: {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], + }; + // When the quick action is TRACK_DISTANCE + navigateToQuickAction({ + isValidReport: true, + quickAction: {action: CONST.QUICK_ACTIONS.TRACK_DISTANCE, chatReportID: reportID}, + selectOption: (onSelected: () => void) => { + onSelected(); + }, + targetAccountPersonalDetails: createPersonalDetails(1), + currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: draftTransactions as Parameters[0]['draftTransactions'], + }); + + // Then startDistanceRequest should be called with the draftTransactions + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.TRACK, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true, undefined, draftTransactions); + }); + + it('should pass draftTransactions with existing drafts to startDistanceRequest for REQUEST_DISTANCE', () => { + // Given draftTransactions with some existing draft data + const draftTransactions = { + transaction_456: {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], + }; + // When the quick action is REQUEST_DISTANCE + navigateToQuickAction({ + isValidReport: true, + quickAction: {action: CONST.QUICK_ACTIONS.REQUEST_DISTANCE, chatReportID: reportID}, + selectOption: (onSelected: () => void) => { + onSelected(); + }, + targetAccountPersonalDetails: createPersonalDetails(1), + currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: draftTransactions as Parameters[0]['draftTransactions'], + }); + + // Then startDistanceRequest should be called with the draftTransactions + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true, undefined, draftTransactions); + }); + + it('should pass undefined draftTransactions to startDistanceRequest when draftTransactions is undefined', () => { + // When the quick action is TRACK_DISTANCE with undefined draftTransactions + navigateToQuickAction({ + isValidReport: true, + quickAction: {action: CONST.QUICK_ACTIONS.TRACK_DISTANCE, chatReportID: reportID}, + selectOption: (onSelected: () => void) => { + onSelected(); + }, + targetAccountPersonalDetails: createPersonalDetails(1), + currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: undefined as unknown as Parameters[0]['draftTransactions'], + }); + + // Then startDistanceRequest should be called with undefined draftTransactions + expect(startDistanceRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.TRACK, reportID, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, true, undefined, undefined); }); it('should be navigated to Per Diem Expense', () => { @@ -112,6 +179,7 @@ describe('IOU Utils', () => { }, targetAccountPersonalDetails: createPersonalDetails(1), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: {}, }); // Then we should start per diem request flow @@ -131,6 +199,7 @@ describe('Non IOU quickActions test:', () => { }, targetAccountPersonalDetails: createPersonalDetails(123), currentUserAccountID: CONST.DEFAULT_NUMBER_ID, + draftTransactions: {}, }); expect(startOutCreateTaskQuickAction).toHaveBeenCalled(); }); From 01cbb5354db40f2e8718b0920da144a897d586dd Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 20 Jan 2026 18:07:38 +0700 Subject: [PATCH 02/15] update id --- tests/unit/QuickActionNavigationTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/QuickActionNavigationTest.ts b/tests/unit/QuickActionNavigationTest.ts index e31818a09356..2998eedc2ff6 100644 --- a/tests/unit/QuickActionNavigationTest.ts +++ b/tests/unit/QuickActionNavigationTest.ts @@ -113,7 +113,7 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for TRACK_DISTANCE', () => { // Given draftTransactions with some existing draft data const draftTransactions = { - transaction_123: {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], + "transaction_123": {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is TRACK_DISTANCE navigateToQuickAction({ @@ -134,7 +134,7 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for REQUEST_DISTANCE', () => { // Given draftTransactions with some existing draft data const draftTransactions = { - transaction_456: {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], + "transaction_456": {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is REQUEST_DISTANCE navigateToQuickAction({ From 5cc7535b1cb0e5ec05a12aeffe4e9b3e6f05f499 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 22 Jan 2026 11:07:16 +0700 Subject: [PATCH 03/15] prettier fix --- tests/unit/QuickActionNavigationTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/QuickActionNavigationTest.ts b/tests/unit/QuickActionNavigationTest.ts index 2998eedc2ff6..e31818a09356 100644 --- a/tests/unit/QuickActionNavigationTest.ts +++ b/tests/unit/QuickActionNavigationTest.ts @@ -113,7 +113,7 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for TRACK_DISTANCE', () => { // Given draftTransactions with some existing draft data const draftTransactions = { - "transaction_123": {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], + transaction_123: {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is TRACK_DISTANCE navigateToQuickAction({ @@ -134,7 +134,7 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for REQUEST_DISTANCE', () => { // Given draftTransactions with some existing draft data const draftTransactions = { - "transaction_456": {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], + transaction_456: {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is REQUEST_DISTANCE navigateToQuickAction({ From 854616dd55912fcbfcd29149fe9a943deb12695b Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 23 Jan 2026 18:00:30 +0700 Subject: [PATCH 04/15] lint fix --- tests/unit/QuickActionNavigationTest.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/QuickActionNavigationTest.ts b/tests/unit/QuickActionNavigationTest.ts index e31818a09356..804e36f6b19b 100644 --- a/tests/unit/QuickActionNavigationTest.ts +++ b/tests/unit/QuickActionNavigationTest.ts @@ -112,8 +112,9 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for TRACK_DISTANCE', () => { // Given draftTransactions with some existing draft data + const transactionKey = 'transaction_123'; const draftTransactions = { - transaction_123: {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], + [transactionKey]: {transactionID: '123', amount: 100, currency: 'USD'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is TRACK_DISTANCE navigateToQuickAction({ @@ -133,8 +134,9 @@ describe('IOU Utils', () => { it('should pass draftTransactions with existing drafts to startDistanceRequest for REQUEST_DISTANCE', () => { // Given draftTransactions with some existing draft data + const transactionKey = 'transaction_456'; const draftTransactions = { - transaction_456: {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], + [transactionKey]: {transactionID: '456', amount: 200, currency: 'EUR'} as unknown as Parameters[0]['draftTransactions'], }; // When the quick action is REQUEST_DISTANCE navigateToQuickAction({ From 831d0e7e021c4f2b8c5747ed0055f35fed755293 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 10:28:21 +0700 Subject: [PATCH 05/15] refactor --- .../FloatingCameraButton/BaseFloatingCameraButton.tsx | 5 +++-- src/components/MoneyRequestHeader.tsx | 5 ++--- src/components/Share/ShareTabParticipantsSelector.tsx | 5 +++-- src/libs/ReportUtils.ts | 6 +++--- src/pages/iou/request/step/IOURequestStepAmount.tsx | 2 +- src/selectors/TransactionDraft.ts | 11 +++++++++-- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx b/src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx index 5af7528e1545..ad6289c0228b 100644 --- a/src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx +++ b/src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx @@ -18,6 +18,7 @@ import Tab from '@userActions/Tab'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'; import type * as OnyxTypes from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import type IconAsset from '@src/types/utils/IconAsset'; @@ -36,7 +37,7 @@ function BaseFloatingCameraButton({icon}: BaseFloatingCameraButtonProps) { const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID); const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`); const [session] = useOnyx(ONYXKEYS.SESSION, {selector: sessionSelector}); - const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const reportID = useMemo(() => generateReportID(), []); const policyChatForActivePolicySelector = useCallback( @@ -60,7 +61,7 @@ function BaseFloatingCameraButton({icon}: BaseFloatingCameraButtonProps) { const quickActionReportID = policyChatForActivePolicy?.reportID ?? reportID; Tab.setSelectedTab(CONST.TAB.IOU_REQUEST_TYPE, CONST.IOU.REQUEST_TYPE.SCAN); - startMoneyRequest(CONST.IOU.TYPE.CREATE, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, !!policyChatForActivePolicy?.reportID, undefined, allTransactionDrafts, true); + startMoneyRequest(CONST.IOU.TYPE.CREATE, quickActionReportID, draftTransactionIDs, CONST.IOU.REQUEST_TYPE.SCAN, !!policyChatForActivePolicy?.reportID, undefined, true); }); }; diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index ceb24605022c..73ebc0676c8c 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -1,6 +1,6 @@ import {useRoute} from '@react-navigation/native'; import {hasSeenTourSelector} from '@selectors/Onboarding'; -import {validTransactionDraftsSelector} from '@selectors/TransactionDraft'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import type {ReactNode} from 'react'; import React, {useCallback, useMemo, useState} from 'react'; import {View} from 'react-native'; @@ -165,8 +165,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const {removeTransaction} = useSearchActionsContext(); const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction); const [cardList] = useOnyx(ONYXKEYS.CARD_LIST); - const [transactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector}); - const draftTransactionIDs = Object.keys(transactionDrafts ?? {}); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const {deleteTransactions} = useDeleteTransactions({report: parentReport, reportActions: parentReportAction ? [parentReportAction] : [], policy}); const {isBetaEnabled} = usePermissions(); diff --git a/src/components/Share/ShareTabParticipantsSelector.tsx b/src/components/Share/ShareTabParticipantsSelector.tsx index d29059a8eafd..8bf3786d1f84 100644 --- a/src/components/Share/ShareTabParticipantsSelector.tsx +++ b/src/components/Share/ShareTabParticipantsSelector.tsx @@ -10,6 +10,7 @@ import {getOptimisticChatReport, saveReportDraft} from '@userActions/Report'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type ROUTES from '@src/ROUTES'; +import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'; type ShareTabParticipantsSelectorProps = { detailsPageRouteObject: typeof ROUTES.SHARE_SUBMIT_DETAILS | typeof ROUTES.SHARE_DETAILS; @@ -22,14 +23,14 @@ type InputFocusRef = { function ShareTabParticipantsSelectorComponent({detailsPageRouteObject, ref}: ShareTabParticipantsSelectorProps) { const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); - const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {canBeMissing: true}); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); return ( { // clear the existing draft transaction from the previous flow to prevent the old data from being displayed - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, false, allTransactionDrafts); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, false, draftTransactionIDs); const participant = value.at(0); let reportID = participant?.reportID ?? CONST.DEFAULT_NUMBER_ID; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 7a3a17628fa8..ec0aec4ed090 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2976,10 +2976,10 @@ function getAddExpenseDropdownOptions( iouReportID: string | undefined, policy: OnyxEntry, userBillingGraceEndPeriodCollection: OnyxCollection, + draftTransactionIDs: string[] = [], iouRequestBackToReport?: string, unreportedExpenseBackToReport?: string, lastDistanceExpenseType?: IOURequestType, - draftTransactions?: OnyxCollection, ): Array>> { return [ { @@ -2995,7 +2995,7 @@ function getAddExpenseDropdownOptions( Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startMoneyRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, undefined, false, iouRequestBackToReport); + startMoneyRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, draftTransactionIDs, undefined, false, iouRequestBackToReport); }, }, { @@ -3011,7 +3011,7 @@ function getAddExpenseDropdownOptions( Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startDistanceRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, lastDistanceExpenseType, false, iouRequestBackToReport, draftTransactions); + startDistanceRequest(CONST.IOU.TYPE.SUBMIT, iouReportID, draftTransactionIDs, lastDistanceExpenseType, false, iouRequestBackToReport); }, }, { diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx index 3d1bf34fb753..cdabef0233a7 100644 --- a/src/pages/iou/request/step/IOURequestStepAmount.tsx +++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx @@ -131,7 +131,7 @@ function IOURequestStepAmount({ const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [transactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector}); - const draftTransactionIDs = Object.keys(transactionDrafts ?? {}); + const draftTransactionIDs = useMemo(() => Object.keys(transactionDrafts ?? {}), [transactionDrafts]); const currentUserAccountIDParam = currentUserPersonalDetails.accountID; const currentUserEmailParam = currentUserPersonalDetails.login ?? ''; diff --git a/src/selectors/TransactionDraft.ts b/src/selectors/TransactionDraft.ts index 92a274165eb0..f3b4d44cbbdc 100644 --- a/src/selectors/TransactionDraft.ts +++ b/src/selectors/TransactionDraft.ts @@ -9,5 +9,12 @@ const validTransactionDraftsSelector = (drafts: OnyxCollection): Re return acc; }, {}); -// eslint-disable-next-line import/prefer-default-export -export {validTransactionDraftsSelector}; +const validTransactionDraftIDsSelector = (drafts: OnyxCollection): string[] => + Object.values(drafts ?? {}).reduce((acc, draft) => { + if (draft) { + acc.push(draft.transactionID); + } + return acc; + }, []); + +export {validTransactionDraftsSelector, validTransactionDraftIDsSelector}; From 4b724c291ee0594efcc22379721ef08d59a23154 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 10:47:41 +0700 Subject: [PATCH 06/15] lint fix --- src/components/MoneyRequestHeader.tsx | 5 +++-- src/hooks/useSearchTypeMenuSections.ts | 4 ++++ src/libs/SearchUIUtils.ts | 3 ++- src/pages/AddUnreportedExpense.tsx | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 73ebc0676c8c..ff653da5cecd 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -1,6 +1,6 @@ import {useRoute} from '@react-navigation/native'; import {hasSeenTourSelector} from '@selectors/Onboarding'; -import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; +import {validTransactionDraftsSelector} from '@selectors/TransactionDraft'; import type {ReactNode} from 'react'; import React, {useCallback, useMemo, useState} from 'react'; import {View} from 'react-native'; @@ -165,7 +165,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const {removeTransaction} = useSearchActionsContext(); const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction); const [cardList] = useOnyx(ONYXKEYS.CARD_LIST); - const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); + const [transactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector}); + const draftTransactionIDs = useMemo(() => Object.keys(transactionDrafts ?? {}), [transactionDrafts]); const {deleteTransactions} = useDeleteTransactions({report: parentReport, reportActions: parentReportAction ? [parentReportAction] : [], policy}); const {isBetaEnabled} = usePermissions(); diff --git a/src/hooks/useSearchTypeMenuSections.ts b/src/hooks/useSearchTypeMenuSections.ts index 86d3a5d05eb0..ad8cacc8535d 100644 --- a/src/hooks/useSearchTypeMenuSections.ts +++ b/src/hooks/useSearchTypeMenuSections.ts @@ -1,4 +1,5 @@ import {defaultExpensifyCardSelector} from '@selectors/Card'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import {useCallback, useEffect, useMemo, useState} from 'react'; import type {OnyxEntry} from 'react-native-onyx'; import {areAllGroupPoliciesExpenseChatDisabled} from '@libs/PolicyUtils'; @@ -60,6 +61,7 @@ const useSearchTypeMenuSections = () => { const [currentUserLoginAndAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: currentUserLoginAndAccountIDSelector}); const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES); const shouldRedirectToExpensifyClassic = useMemo(() => areAllGroupPoliciesExpenseChatDisabled(allPolicies ?? {}), [allPolicies]); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const [pendingReportCreation, setPendingReportCreation] = useState<{policyID: string; policyName?: string; onConfirm: (shouldDismissEmptyReportsConfirmation: boolean) => void} | null>( null, ); @@ -107,6 +109,7 @@ const useSearchTypeMenuSections = () => { isOffline, defaultExpensifyCard, shouldRedirectToExpensifyClassic, + draftTransactionIDs, ), [ currentUserLoginAndAccountID?.email, @@ -119,6 +122,7 @@ const useSearchTypeMenuSections = () => { isOffline, shouldRedirectToExpensifyClassic, icons, + draftTransactionIDs, ], ); diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 279afb5fb651..b72af928f872 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -3540,6 +3540,7 @@ function createTypeMenuSections( isOffline: boolean, defaultExpensifyCard: CardFeedForDisplay | undefined, shouldRedirectToExpensifyClassic: boolean, + draftTransactionIDs: string[] | undefined, ): SearchTypeMenuSection[] { const typeMenuSections: SearchTypeMenuSection[] = []; @@ -3593,7 +3594,7 @@ function createTypeMenuSections( return; } - startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID(), CONST.IOU.REQUEST_TYPE.SCAN); + startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID(), draftTransactionIDs, CONST.IOU.REQUEST_TYPE.SCAN); }); }, }, diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx index a70c3d2b8afc..fa4e5bd14ce6 100644 --- a/src/pages/AddUnreportedExpense.tsx +++ b/src/pages/AddUnreportedExpense.tsx @@ -32,6 +32,7 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'; import type Transaction from '@src/types/onyx/Transaction'; import getEmptyArray from '@src/types/utils/getEmptyArray'; import UnreportedExpenseListItem from './UnreportedExpenseListItem'; @@ -56,6 +57,7 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) { const [cardList] = useOnyx(ONYXKEYS.CARD_LIST); const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); const shouldShowUnreportedTransactionsSkeletons = isLoadingUnreportedTransactions && hasMoreUnreportedTransactionsResults && !isOffline; + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const getUnreportedTransactions = useCallback( (transactions: OnyxCollection) => { @@ -272,7 +274,7 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) { return; } interceptAnonymousUser(() => { - startMoneyRequest(CONST.IOU.TYPE.SUBMIT, reportID, undefined, false, backToReport); + startMoneyRequest(CONST.IOU.TYPE.SUBMIT, reportID, draftTransactionIDs, undefined, false, backToReport); }); }, success: true, From 927c8ec51b372844bfa205c84d3d72565a7c9f73 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 11:27:32 +0700 Subject: [PATCH 07/15] lint fix --- src/hooks/useSearchTypeMenuSections.ts | 12 +- src/libs/SearchUIUtils.ts | 41 +++-- tests/unit/Search/SearchUIUtilsTest.ts | 237 ++++++++++++++++++------- 3 files changed, 203 insertions(+), 87 deletions(-) diff --git a/src/hooks/useSearchTypeMenuSections.ts b/src/hooks/useSearchTypeMenuSections.ts index ad8cacc8535d..9c467fe736d2 100644 --- a/src/hooks/useSearchTypeMenuSections.ts +++ b/src/hooks/useSearchTypeMenuSections.ts @@ -98,19 +98,19 @@ const useSearchTypeMenuSections = () => { const typeMenuSections = useMemo( () => - createTypeMenuSections( + createTypeMenuSections({ icons, - currentUserLoginAndAccountID?.email, - currentUserLoginAndAccountID?.accountID, + currentUserEmail: currentUserLoginAndAccountID?.email, + currentUserAccountID: currentUserLoginAndAccountID?.accountID, cardFeedsByPolicy, - defaultCardFeed ?? defaultExpensifyCard, - allPolicies, + defaultCardFeed: defaultCardFeed ?? defaultExpensifyCard, + policies: allPolicies, savedSearches, isOffline, defaultExpensifyCard, shouldRedirectToExpensifyClassic, draftTransactionIDs, - ), + }), [ currentUserLoginAndAccountID?.email, currentUserLoginAndAccountID?.accountID, diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index b72af928f872..abf904ecabb6 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -3529,19 +3529,34 @@ function isTodoSearch(recentSearchHash: number, suggestedSearches: Record, - currentUserEmail: string | undefined, - currentUserAccountID: number | undefined, - cardFeedsByPolicy: Record, - defaultCardFeed: CardFeedForDisplay | undefined, - policies: OnyxCollection, - savedSearches: OnyxEntry, - isOffline: boolean, - defaultExpensifyCard: CardFeedForDisplay | undefined, - shouldRedirectToExpensifyClassic: boolean, - draftTransactionIDs: string[] | undefined, -): SearchTypeMenuSection[] { +type TypeMenuSectionsParams = { + icons: Record<'Document' | 'Send' | 'ThumbsUp', IconAsset>; + currentUserEmail: string | undefined; + currentUserAccountID: number | undefined; + cardFeedsByPolicy: Record; + defaultCardFeed: CardFeedForDisplay | undefined; + policies: OnyxCollection; + savedSearches: OnyxEntry; + isOffline: boolean; + defaultExpensifyCard: CardFeedForDisplay | undefined; + shouldRedirectToExpensifyClassic: boolean; + draftTransactionIDs: string[] | undefined; +}; + +function createTypeMenuSections(params: TypeMenuSectionsParams): SearchTypeMenuSection[] { + const { + icons, + currentUserEmail, + currentUserAccountID, + cardFeedsByPolicy, + defaultCardFeed, + policies, + savedSearches, + isOffline, + defaultExpensifyCard, + shouldRedirectToExpensifyClassic, + draftTransactionIDs, + } = params; const typeMenuSections: SearchTypeMenuSection[] = []; const suggestedSearches = getSuggestedSearches(currentUserAccountID, defaultCardFeed?.id, icons); diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts index 8ec18485233c..52c8acb833c2 100644 --- a/tests/unit/Search/SearchUIUtilsTest.ts +++ b/tests/unit/Search/SearchUIUtilsTest.ts @@ -4734,7 +4734,19 @@ describe('SearchUIUtils', () => { describe('Test createTypeMenuItems', () => { it('should return the default menu items', () => { const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const menuItems = SearchUIUtils.createTypeMenuSections(icons.current, undefined, undefined, {}, undefined, {}, {}, false, undefined, false) + const menuItems = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: undefined, + currentUserAccountID: undefined, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }) .map((section) => section.menuItems) .flat(); @@ -4813,18 +4825,19 @@ describe('SearchUIUtils', () => { const mockSavedSearches = {}; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections( - icons.current, - adminEmail, - adminAccountID, - mockCardFeedsByPolicy, - undefined, - mockPolicies, - mockSavedSearches, - false, - undefined, - false, - ); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: mockCardFeedsByPolicy, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: mockSavedSearches, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const todoSection = sections.find((section) => section.translationPath === 'common.todo'); expect(todoSection).toBeDefined(); @@ -4875,18 +4888,19 @@ describe('SearchUIUtils', () => { const mockSavedSearches = {}; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections( - icons.current, - adminEmail, - adminAccountID, - mockCardFeedsByPolicy, - undefined, - mockPolicies, - mockSavedSearches, - false, - undefined, - false, - ); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: mockCardFeedsByPolicy, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: mockSavedSearches, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const monthlyAccrualSection = sections.find((section) => section.translationPath === 'search.monthlyAccrual'); expect(monthlyAccrualSection).toBeDefined(); @@ -4923,7 +4937,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, {}, undefined, {}, mockSavedSearches, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: mockSavedSearches, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const savedSection = sections.find((section) => section.translationPath === 'search.savedSearchesMenuItemTitle'); expect(savedSection).toBeDefined(); @@ -4933,7 +4959,19 @@ describe('SearchUIUtils', () => { const mockSavedSearches = {}; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, {}, undefined, {}, mockSavedSearches, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: mockSavedSearches, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const savedSection = sections.find((section) => section.translationPath === 'search.savedSearchesMenuItemTitle'); expect(savedSection).toBeUndefined(); @@ -4950,18 +4988,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections( - icons.current, - adminEmail, - adminAccountID, - {}, - undefined, - {}, - mockSavedSearches, - false, // not offline - undefined, - false, - ); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: mockSavedSearches, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const savedSection = sections.find((section) => section.translationPath === 'search.savedSearchesMenuItemTitle'); expect(savedSection).toBeUndefined(); @@ -4978,18 +5017,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections( - icons.current, - adminEmail, - adminAccountID, - {}, - undefined, - {}, - mockSavedSearches, - true, // offline - undefined, - false, - ); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: mockSavedSearches, + isOffline: true, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const savedSection = sections.find((section) => section.translationPath === 'search.savedSearchesMenuItemTitle'); expect(savedSection).toBeDefined(); @@ -5010,7 +5050,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, {}, undefined, mockPolicies, {}, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const todoSection = sections.find((section) => section.translationPath === 'common.todo'); expect(todoSection).toBeUndefined(); @@ -5031,18 +5083,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections( - icons.current, - adminEmail, - adminAccountID, - {}, // no card feeds - undefined, - mockPolicies, - {}, - false, - undefined, - false, - ); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const monthlyAccrualSection = sections.find((section) => section.translationPath === 'search.monthlyAccrual'); const reconciliationSection = sections.find((section) => section.translationPath === 'search.reconciliation'); @@ -5075,7 +5128,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, {}, undefined, mockPolicies, {}, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const reconciliationSection = sections.find((section) => section.translationPath === 'search.reconciliation'); expect(reconciliationSection).toBeDefined(); @@ -5102,7 +5167,19 @@ describe('SearchUIUtils', () => { const mockCardFeedsByPolicy: Record = {}; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, mockCardFeedsByPolicy, undefined, mockPolicies, {}, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: mockCardFeedsByPolicy, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const reconciliationSection = sections.find((section) => section.translationPath === 'search.reconciliation'); expect(reconciliationSection).toBeDefined(); @@ -5114,7 +5191,19 @@ describe('SearchUIUtils', () => { it('should generate correct routes', () => { const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const menuItems = SearchUIUtils.createTypeMenuSections(icons.current, undefined, undefined, {}, undefined, {}, {}, false, undefined, false) + const menuItems = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: undefined, + currentUserAccountID: undefined, + cardFeedsByPolicy: {}, + defaultCardFeed: undefined, + policies: {}, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }) .map((section) => section.menuItems) .flat(); @@ -5177,7 +5266,19 @@ describe('SearchUIUtils', () => { }; const {result: icons} = renderHook(() => useMemoizedLazyExpensifyIcons(['Document', 'Send', 'ThumbsUp'])); - const sections = SearchUIUtils.createTypeMenuSections(icons.current, adminEmail, adminAccountID, mockCardFeedsByPolicy, undefined, mockPolicies, {}, false, undefined, false); + const sections = SearchUIUtils.createTypeMenuSections({ + icons: icons.current, + currentUserEmail: adminEmail, + currentUserAccountID: adminAccountID, + cardFeedsByPolicy: mockCardFeedsByPolicy, + defaultCardFeed: undefined, + policies: mockPolicies, + savedSearches: {}, + isOffline: false, + defaultExpensifyCard: undefined, + shouldRedirectToExpensifyClassic: false, + draftTransactionIDs: [], + }); const todoSection = sections.find((section) => section.translationPath === 'common.todo'); expect(todoSection).toBeDefined(); From a4b7cb4fcea415077f76600cdfbc77b210828682 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 16:00:30 +0700 Subject: [PATCH 08/15] update test --- src/components/MoneyReportHeader.tsx | 2 +- .../MoneyRequestReportTransactionList.tsx | 2 +- .../MoneyRequestReportPreviewContent.tsx | 2 +- tests/unit/QuickActionNavigationTest.ts | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index d34eb3e5c46a..6c68bc736bef 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -951,7 +951,7 @@ function MoneyReportHeader({ undefined, lastDistanceExpenseType, ), - [moneyRequestReport?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType, expensifyIcons, translate, transactionDrafts], + [moneyRequestReport?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType, expensifyIcons, translate, transactionDrafts, draftTransactionIDs], ); const exportSubmenuOptions: Record> = useMemo(() => { diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index dae2c649ad1e..bc42d7db054a 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -199,7 +199,7 @@ function MoneyRequestReportTransactionList({ undefined, lastDistanceExpenseType, ), - [translate, expensifyIcons, report?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType], + [translate, expensifyIcons, report?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType, draftTransactionIDs], ); const hasPendingAction = useMemo(() => { diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index f1347774735b..d9ed05406214 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -648,7 +648,7 @@ function MoneyRequestReportPreviewContent({ iouReport?.parentReportID, lastDistanceExpenseType, ), - [translate, expensifyIcons, iouReport?.reportID, iouReport?.parentReportID, policy, userBillingGraceEndPeriodCollection, chatReportID, lastDistanceExpenseType], + [translate, expensifyIcons, iouReport?.reportID, iouReport?.parentReportID, policy, userBillingGraceEndPeriodCollection, chatReportID, lastDistanceExpenseType, draftTransactionIDs], ); const isReportDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE; diff --git a/tests/unit/QuickActionNavigationTest.ts b/tests/unit/QuickActionNavigationTest.ts index 683bc8818625..e26b384b06b9 100644 --- a/tests/unit/QuickActionNavigationTest.ts +++ b/tests/unit/QuickActionNavigationTest.ts @@ -35,7 +35,7 @@ describe('IOU Utils', () => { }); // Then we should start manual submit request flow - expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.MANUAL, true, undefined, undefined, undefined); + expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, [], CONST.IOU.REQUEST_TYPE.MANUAL, true, undefined, undefined); }); it('should be navigated to Scan receipt Split Expense', () => { @@ -52,7 +52,7 @@ describe('IOU Utils', () => { }); // Then we should start scan split request flow - expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SPLIT, reportID, CONST.IOU.REQUEST_TYPE.SCAN, true, undefined, undefined, undefined); + expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SPLIT, reportID, [], CONST.IOU.REQUEST_TYPE.SCAN, true, undefined, undefined); }); it('should be navigated to Track distance Expense', () => { @@ -162,7 +162,7 @@ describe('IOU Utils', () => { }); // Then we should start per diem request flow - expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.PER_DIEM, true, undefined, undefined, undefined); + expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, [], CONST.IOU.REQUEST_TYPE.PER_DIEM, true, undefined, undefined); }); it('should be navigated to Time Expense', () => { @@ -179,7 +179,7 @@ describe('IOU Utils', () => { }); // Then we should start time request flow - expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, CONST.IOU.REQUEST_TYPE.TIME, false, undefined, undefined, undefined); + expect(startMoneyRequest).toHaveBeenCalledWith(CONST.IOU.TYPE.SUBMIT, reportID, [], CONST.IOU.REQUEST_TYPE.TIME, false, undefined, undefined); }); }); }); From f8290a55128a65882e05d81531c6969da7d23f1c Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 17:05:07 +0700 Subject: [PATCH 09/15] lint fix --- src/components/MoneyReportHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 6c68bc736bef..105cfa01c97f 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -951,7 +951,7 @@ function MoneyReportHeader({ undefined, lastDistanceExpenseType, ), - [moneyRequestReport?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType, expensifyIcons, translate, transactionDrafts, draftTransactionIDs], + [moneyRequestReport?.reportID, policy, userBillingGraceEndPeriodCollection, lastDistanceExpenseType, expensifyIcons, translate, draftTransactionIDs], ); const exportSubmenuOptions: Record> = useMemo(() => { From b272db582eef5a223aa9ef7ac52b1c31118dfd6c Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 27 Feb 2026 17:52:09 +0700 Subject: [PATCH 10/15] lint fix --- src/components/MoneyReportHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 105cfa01c97f..6874d703ceb3 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -1787,7 +1787,7 @@ function MoneyReportHeader({ } return option; }); - }, [originalSelectedTransactionsOptions, showDeleteModal, dismissedRejectUseExplanation]); + }, [originalSelectedTransactionsOptions, showDeleteModal, dismissedRejectUseExplanation, isDelegateAccessRestricted, showDelegateNoAccessModal]); const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length && !transactionThreadReportID; From 4d13ada3096dbd8b91ad99829a50965bd6420e2e Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 9 Mar 2026 10:17:54 +0700 Subject: [PATCH 11/15] remove default ids --- .../SearchMoneyRequestReportEmptyState.tsx | 4 ++-- src/libs/ReportUtils.ts | 2 +- src/libs/actions/IOU/index.ts | 6 +++--- src/libs/actions/TransactionEdit.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx index 293607fe46ea..8b7baf1ed27b 100644 --- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx +++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx @@ -45,7 +45,7 @@ function SearchMoneyRequestReportEmptyState({report, policy}: {report: OnyxTypes Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startMoneyRequest(CONST.IOU.TYPE.SUBMIT, reportId); + startMoneyRequest(CONST.IOU.TYPE.SUBMIT, reportId, draftTransactionIDs); }, }, { @@ -60,7 +60,7 @@ function SearchMoneyRequestReportEmptyState({report, policy}: {report: OnyxTypes Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id)); return; } - startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportId, draftTransactionIDs, lastDistanceExpenseType, false, undefined); + startDistanceRequest(CONST.IOU.TYPE.SUBMIT, reportId, draftTransactionIDs, lastDistanceExpenseType); }, }, { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ec0aec4ed090..d44d049be13e 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2976,7 +2976,7 @@ function getAddExpenseDropdownOptions( iouReportID: string | undefined, policy: OnyxEntry, userBillingGraceEndPeriodCollection: OnyxCollection, - draftTransactionIDs: string[] = [], + draftTransactionIDs: string[] | undefined, iouRequestBackToReport?: string, unreportedExpenseBackToReport?: string, lastDistanceExpenseType?: IOURequestType, diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index cdcfb40e7ce3..0325a797b6f0 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1342,7 +1342,7 @@ function createDraftTransaction(transaction: OnyxTypes.Transaction) { Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, newTransaction); } -function clearMoneyRequest(transactionID: string, skipConfirmation = false, draftTransactionIDs: string[] = []) { +function clearMoneyRequest(transactionID: string, skipConfirmation = false, draftTransactionIDs: string[] | undefined) { removeDraftTransactionsByIDs(draftTransactionIDs); Onyx.set(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`, skipConfirmation); } @@ -1350,7 +1350,7 @@ function clearMoneyRequest(transactionID: string, skipConfirmation = false, draf function startMoneyRequest( iouType: ValueOf, reportID: string, - draftTransactionIDs: string[] = [], + draftTransactionIDs: string[] | undefined, requestType?: IOURequestType, skipConfirmation = false, backToReport?: string, @@ -1392,7 +1392,7 @@ function startMoneyRequest( function startDistanceRequest( iouType: ValueOf, reportID: string, - draftTransactionIDs: string[] = [], + draftTransactionIDs: string[] | undefined, requestType?: IOURequestType, skipConfirmation = false, backToReport?: string, diff --git a/src/libs/actions/TransactionEdit.ts b/src/libs/actions/TransactionEdit.ts index 57d3ccd8ca79..3450b33c9ead 100644 --- a/src/libs/actions/TransactionEdit.ts +++ b/src/libs/actions/TransactionEdit.ts @@ -114,8 +114,8 @@ function removeDraftTransactions(shouldExcludeInitialTransaction = false, allTra Onyx.multiSet(draftTransactionsSet); } -function removeDraftTransactionsByIDs(transactionIDs: string[]) { - if (!transactionIDs.length) { +function removeDraftTransactionsByIDs(transactionIDs: string[] | undefined) { + if (!transactionIDs?.length) { return; } From 68853e4543e8abbfaa11f8581f308112e914b62a Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 9 Mar 2026 10:18:15 +0700 Subject: [PATCH 12/15] resolve comments --- src/libs/actions/QuickActionNavigation.ts | 2 +- .../AttachmentPickerWithMenuItems.tsx | 31 +++++-------------- .../FloatingActionButtonAndPopover.tsx | 2 +- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/libs/actions/QuickActionNavigation.ts b/src/libs/actions/QuickActionNavigation.ts index aa13452258aa..a1ce391e38be 100644 --- a/src/libs/actions/QuickActionNavigation.ts +++ b/src/libs/actions/QuickActionNavigation.ts @@ -15,7 +15,7 @@ type NavigateToQuickActionParams = { lastDistanceExpenseType?: DistanceExpenseType; targetAccountPersonalDetails: PersonalDetails; currentUserAccountID: number; - draftTransactionIDs: string[]; + draftTransactionIDs: string[] | undefined; isFromFloatingActionButton?: boolean; }; diff --git a/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx index cbe607ad98c9..04ad90faa691 100644 --- a/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx +++ b/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx @@ -220,7 +220,7 @@ function AttachmentPickerWithMenuItems({ text: translate('iou.splitExpense'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_SPLIT_EXPENSE, - onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true), + onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs), true), }, ], [CONST.IOU.TYPE.SUBMIT]: [ @@ -229,7 +229,7 @@ function AttachmentPickerWithMenuItems({ text: translate('iou.createExpense'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_CREATE_EXPENSE, - onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true), + onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs), true), }, { icon: icons.Location, @@ -238,15 +238,7 @@ function AttachmentPickerWithMenuItems({ sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_TRACK_DISTANCE, onSelected: () => selectOption( - () => - startDistanceRequest( - CONST.IOU.TYPE.SUBMIT, - report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), - draftTransactionIDs, - lastDistanceExpenseType, - false, - undefined, - ), + () => startDistanceRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs, lastDistanceExpenseType), true, ), }, @@ -264,7 +256,7 @@ function AttachmentPickerWithMenuItems({ }); return; } - selectOption(() => startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false); + selectOption(() => startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs), false); }, }, ], @@ -274,7 +266,7 @@ function AttachmentPickerWithMenuItems({ text: translate('iou.createExpense'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_CREATE_EXPENSE, - onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true), + onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs), true), }, { icon: icons.Location, @@ -283,15 +275,7 @@ function AttachmentPickerWithMenuItems({ sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_TRACK_DISTANCE, onSelected: () => selectOption( - () => - startDistanceRequest( - CONST.IOU.TYPE.TRACK, - report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), - draftTransactionIDs, - lastDistanceExpenseType, - false, - undefined, - ), + () => startDistanceRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs, lastDistanceExpenseType), true, ), }, @@ -302,7 +286,7 @@ function AttachmentPickerWithMenuItems({ text: translate('workspace.invoices.sendInvoice'), shouldCallAfterModalHide: shouldUseNarrowLayout, sentryLabel: CONST.SENTRY_LABEL.REPORT.ATTACHMENT_PICKER_MENU_SEND_INVOICE, - onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false), + onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), draftTransactionIDs), false), }, ], }; @@ -326,6 +310,7 @@ function AttachmentPickerWithMenuItems({ translate, icons, betas, + draftTransactionIDs, ]); const createReportOption: PopoverMenuItem[] = useMemo(() => { diff --git a/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx b/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx index 6d54118d5e9d..58904d382be9 100644 --- a/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx +++ b/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx @@ -493,7 +493,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, ref lastDistanceExpenseType, targetAccountPersonalDetails, currentUserAccountID: currentUserPersonalDetails.accountID, - draftTransactionIDs: draftTransactionIDs ?? [], + draftTransactionIDs, isFromFloatingActionButton: true, }); }); From 0e8e776ef8a44f38fac7a99ef486c92130a3c2d0 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 9 Mar 2026 11:07:47 +0700 Subject: [PATCH 13/15] lint fix --- src/components/MoneyReportHeader.tsx | 12 +- .../MoneyRequestReportTransactionList.tsx | 10 +- .../MoneyRequestReportPreviewContent.tsx | 14 +- .../SearchFiltersBarCreateButton.tsx | 7 +- src/libs/ReportUtils.ts | 40 +++-- src/libs/actions/IOU/index.ts | 6 +- src/pages/Search/EmptySearchView.tsx | 4 +- src/pages/SubmitExpensePage.tsx | 6 +- src/pages/TrackExpensePage.tsx | 3 + .../step/IOURequestStepConfirmation.tsx | 3 + tests/unit/ReportUtilsTest.ts | 165 ++++++++++++++++-- 11 files changed, 215 insertions(+), 55 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 43dc47317bfe..8cb9b7fd651f 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -995,19 +995,17 @@ function MoneyReportHeader({ const addExpenseDropdownOptions = useMemo( () => - getAddExpenseDropdownOptions( + getAddExpenseDropdownOptions({ translate, - expensifyIcons, - moneyRequestReport?.reportID, + icons: expensifyIcons, + iouReportID: moneyRequestReport?.reportID, policy, - userBillingGraceEndPeriods, + userBillingGraceEndPeriodCollection: userBillingGraceEndPeriods, draftTransactionIDs, amountOwed, ownerBillingGraceEndPeriod, - undefined, - undefined, lastDistanceExpenseType, - ), + }), [moneyRequestReport?.reportID, policy, userBillingGraceEndPeriods, amountOwed, lastDistanceExpenseType, expensifyIcons, translate, ownerBillingGraceEndPeriod, draftTransactionIDs], ); diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 5d5abb448efb..4beca2866463 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -198,19 +198,17 @@ function MoneyRequestReportTransactionList({ const addExpenseDropdownOptions = useMemo( () => - getAddExpenseDropdownOptions( + getAddExpenseDropdownOptions({ translate, - expensifyIcons, - report?.reportID, + icons: expensifyIcons, + iouReportID: report?.reportID, policy, userBillingGraceEndPeriodCollection, draftTransactionIDs, amountOwed, ownerBillingGraceEndPeriod, - undefined, - undefined, lastDistanceExpenseType, - ), + }), [translate, expensifyIcons, report?.reportID, policy, userBillingGraceEndPeriodCollection, amountOwed, lastDistanceExpenseType, ownerBillingGraceEndPeriod, draftTransactionIDs], ); diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 39a66854a665..db62d8bf4395 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -683,19 +683,19 @@ function MoneyRequestReportPreviewContent({ const addExpenseDropdownOptions = useMemo( () => - getAddExpenseDropdownOptions( + getAddExpenseDropdownOptions({ translate, - expensifyIcons, - iouReport?.reportID, + icons: expensifyIcons, + iouReportID: iouReport?.reportID, policy, - userBillingGraceEndPeriods, + userBillingGraceEndPeriodCollection: userBillingGraceEndPeriods, draftTransactionIDs, amountOwed, ownerBillingGraceEndPeriod, - chatReportID, - iouReport?.parentReportID, + iouRequestBackToReport: chatReportID, + unreportedExpenseBackToReport: iouReport?.parentReportID, lastDistanceExpenseType, - ), + }), [ translate, expensifyIcons, diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx index e908cdd70fae..af8a566b6954 100644 --- a/src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx +++ b/src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx @@ -1,4 +1,5 @@ import {emailSelector} from '@selectors/Session'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import React, {useCallback, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; @@ -48,6 +49,7 @@ function SearchFiltersBarCreateButton() { const [allBetas] = useOnyx(ONYXKEYS.BETAS); const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const groupPaidPoliciesWithChatEnabledSelector = useCallback((policies: OnyxCollection) => groupPaidPoliciesWithExpenseChatEnabledSelector(policies, email), [email]); const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledSelector}, [email]); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); @@ -139,7 +141,7 @@ function SearchFiltersBarCreateButton() { text: translate('iou.createExpense'), onSelected: () => interceptAnonymousUser(() => { - startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID()); + startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID(), draftTransactionIDs); }), }, { @@ -147,7 +149,7 @@ function SearchFiltersBarCreateButton() { text: translate('iou.trackDistance'), onSelected: () => interceptAnonymousUser(() => { - startDistanceRequest(CONST.IOU.TYPE.CREATE, generateReportID()); + startDistanceRequest(CONST.IOU.TYPE.CREATE, generateReportID(), draftTransactionIDs); }), }, { @@ -202,6 +204,7 @@ function SearchFiltersBarCreateButton() { [ translate, expensifyIcons, + draftTransactionIDs, shouldRedirectToExpensifyClassic, showRedirectToExpensifyClassicModal, shouldNavigateToUpgradePath, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 1ca83621284a..05ee0339a252 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2996,19 +2996,33 @@ function shouldCurrentUserSubmitReport(iouReport: OnyxEntry, chatReport: * @param backToReport - The report to return to after adding an expense * @returns The dropdown options for the add expense button */ -function getAddExpenseDropdownOptions( - translate: LocalizedTranslate, - icons: Record<'Location' | 'ReceiptPlus', IconAsset>, - iouReportID: string | undefined, - policy: OnyxEntry, - userBillingGraceEndPeriodCollection: OnyxCollection, - draftTransactionIDs: string[] | undefined, - amountOwed: OnyxEntry, - ownerBillingGraceEndPeriod: OnyxEntry, - iouRequestBackToReport?: string, - unreportedExpenseBackToReport?: string, - lastDistanceExpenseType?: IOURequestType, -): Array>> { +type GetAddExpenseDropdownOptionsParams = { + translate: LocalizedTranslate; + icons: Record<'Location' | 'ReceiptPlus', IconAsset>; + iouReportID: string | undefined; + policy: OnyxEntry; + userBillingGraceEndPeriodCollection: OnyxCollection; + draftTransactionIDs: string[] | undefined; + amountOwed: OnyxEntry; + ownerBillingGraceEndPeriod: OnyxEntry; + iouRequestBackToReport?: string; + unreportedExpenseBackToReport?: string; + lastDistanceExpenseType?: IOURequestType; +}; + +function getAddExpenseDropdownOptions({ + translate, + icons, + iouReportID, + policy, + userBillingGraceEndPeriodCollection, + draftTransactionIDs, + amountOwed, + ownerBillingGraceEndPeriod, + iouRequestBackToReport, + unreportedExpenseBackToReport, + lastDistanceExpenseType, +}: GetAddExpenseDropdownOptionsParams): Array>> { return [ { value: CONST.REPORT.ADD_EXPENSE_OPTIONS.CREATE_NEW_EXPENSE, diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 5fc5994628d2..f7ecc876b6b1 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1351,7 +1351,7 @@ function createDraftTransaction(transaction: OnyxTypes.Transaction) { Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, newTransaction); } -function clearMoneyRequest(transactionID: string, skipConfirmation = false, draftTransactionIDs: string[] | undefined) { +function clearMoneyRequest(transactionID: string, draftTransactionIDs: string[] | undefined, skipConfirmation = false) { removeDraftTransactionsByIDs(draftTransactionIDs); Onyx.set(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`, skipConfirmation); } @@ -1376,7 +1376,7 @@ function startMoneyRequest( [CONST.TELEMETRY.ATTRIBUTE_ROUTE_FROM]: sourceRoute || 'unknown', }, }); - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, skipConfirmation, draftTransactionIDs); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransactionIDs, skipConfirmation); if (isFromFloatingActionButton) { Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {isFromFloatingActionButton}); } @@ -1407,7 +1407,7 @@ function startDistanceRequest( backToReport?: string, isFromFloatingActionButton?: boolean, ) { - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, skipConfirmation, draftTransactionIDs); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransactionIDs, skipConfirmation); if (isFromFloatingActionButton) { Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {isFromFloatingActionButton}); } diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx index 428d44265cf3..591d26abf985 100644 --- a/src/pages/Search/EmptySearchView.tsx +++ b/src/pages/Search/EmptySearchView.tsx @@ -1,5 +1,6 @@ import {hasSeenTourSelector, tryNewDotOnyxSelector} from '@selectors/Onboarding'; import {accountIDSelector} from '@selectors/Session'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import React from 'react'; import type {ReactNode} from 'react'; // eslint-disable-next-line no-restricted-imports @@ -147,6 +148,7 @@ function EmptySearchViewContent({ selector: accountIDSelector, }); const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, accountID ?? CONST.DEFAULT_NUMBER_ID, ''); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const [hasTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, { selector: hasTransactionsSelector, @@ -235,7 +237,7 @@ function EmptySearchViewContent({ handleRedirectToExpensifyClassic(); return; } - startMoneyRequest(iouType, generateReportID()); + startMoneyRequest(iouType, generateReportID(), draftTransactionIDs); }); }; diff --git a/src/pages/SubmitExpensePage.tsx b/src/pages/SubmitExpensePage.tsx index a14351c9ed20..9432503e0b53 100644 --- a/src/pages/SubmitExpensePage.tsx +++ b/src/pages/SubmitExpensePage.tsx @@ -1,9 +1,11 @@ import {useFocusEffect} from '@react-navigation/native'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import React, {useEffect, useRef} from 'react'; import {View} from 'react-native'; import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView'; import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView'; import ScreenWrapper from '@components/ScreenWrapper'; +import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import interceptAnonymousUser from '@libs/interceptAnonymousUser'; import Navigation from '@libs/Navigation/Navigation'; @@ -11,6 +13,7 @@ import * as ReportUtils from '@libs/ReportUtils'; import * as App from '@userActions/App'; import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; /* * This is a "utility page", that does this: @@ -20,6 +23,7 @@ import CONST from '@src/CONST'; function SubmitExpensePage() { const styles = useThemeStyles(); const isUnmounted = useRef(false); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); useFocusEffect(() => { interceptAnonymousUser(() => { @@ -29,7 +33,7 @@ function SubmitExpensePage() { return; } Navigation.goBack(); - IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, ReportUtils.generateReportID()); + IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, ReportUtils.generateReportID(), draftTransactionIDs); }); }); }); diff --git a/src/pages/TrackExpensePage.tsx b/src/pages/TrackExpensePage.tsx index d9834b32c7cb..d900b5431820 100644 --- a/src/pages/TrackExpensePage.tsx +++ b/src/pages/TrackExpensePage.tsx @@ -1,4 +1,5 @@ import {useFocusEffect} from '@react-navigation/native'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import React, {useEffect, useRef} from 'react'; import {View} from 'react-native'; import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView'; @@ -28,6 +29,7 @@ function TrackExpensePage() { const {isOffline} = useNetwork(); const [hasSeenTrackTraining, hasSeenTrackTrainingResult] = useOnyx(ONYXKEYS.NVP_HAS_SEEN_TRACK_TRAINING); const isLoadingHasSeenTrackTraining = isLoadingOnyxValue(hasSeenTrackTrainingResult); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); useFocusEffect(() => { interceptAnonymousUser(() => { @@ -41,6 +43,7 @@ function TrackExpensePage() { CONST.IOU.TYPE.TRACK, // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing findSelfDMReportID() || generateReportID(), + draftTransactionIDs, ); if (!hasSeenTrackTraining && !isOffline) { diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 5b3fa81274ff..ad8171cd6eaa 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -1,4 +1,5 @@ import {hasSeenTourSelector} from '@selectors/Onboarding'; +import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; @@ -147,6 +148,7 @@ function IOURequestStepConfirmation({ const isLoadingCurrentTransaction = isLoadingOnyxValue(existingTransactionResult, optimisticTransactionResult); const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED); const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID); + const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector}); const transaction = useMemo( () => (!isLoadingCurrentTransaction ? (optimisticTransaction ?? existingTransaction) : undefined), [existingTransaction, optimisticTransaction, isLoadingCurrentTransaction], @@ -411,6 +413,7 @@ function IOURequestStepConfirmation({ // When starting to create an expense from the global FAB, If there is not an existing report yet, a random optimistic reportID is generated and used // for all of the routes in the creation flow. reportID ?? generateReportID(), + draftTransactionIDs, ); // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again }, [isLoadingTransaction]); diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index 081c6df5e3b4..e2df6848d212 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -13477,26 +13477,62 @@ describe('ReportUtils', () => { const mockIouReportID = '12345'; it('should return exactly 3 dropdown options', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result).toHaveLength(3); }); it('should return options with correct values', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, undefined, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: undefined, + }); expect(result.at(0)?.value).toBe(CONST.REPORT.ADD_EXPENSE_OPTIONS.CREATE_NEW_EXPENSE); expect(result.at(1)?.value).toBe(CONST.REPORT.ADD_EXPENSE_OPTIONS.TRACK_DISTANCE_EXPENSE); expect(result.at(2)?.value).toBe(CONST.REPORT.ADD_EXPENSE_OPTIONS.ADD_UNREPORTED_EXPENSE); }); it('should return options with correct translated text', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result.at(0)?.text).toBe(translate(CONST.LOCALES.EN, 'iou.createExpense')); expect(result.at(1)?.text).toBe(translate(CONST.LOCALES.EN, 'iou.trackDistance')); expect(result.at(2)?.text).toBe(translate(CONST.LOCALES.EN, 'iou.addUnreportedExpense')); }); it('should return options with correct sentry labels', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result.at(0)?.sentryLabel).toBe(CONST.SENTRY_LABEL.MORE_MENU.ADD_EXPENSE_CREATE); expect(result.at(1)?.sentryLabel).toBe(CONST.SENTRY_LABEL.MORE_MENU.ADD_EXPENSE_TRACK_DISTANCE); expect(result.at(2)?.sentryLabel).toBe(CONST.SENTRY_LABEL.MORE_MENU.ADD_EXPENSE_UNREPORTED); @@ -13506,7 +13542,16 @@ describe('ReportUtils', () => { const mockPolicy = createRandomPolicy(0); mockPolicy.type = CONST.POLICY.TYPE.CORPORATE; const amountOwed = 100; - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, mockPolicy, undefined, amountOwed, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: mockPolicy, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed, + ownerBillingGraceEndPeriod: undefined, + }); // Trigger each onSelected - the function should not throw for (const option of result) { @@ -13517,7 +13562,16 @@ describe('ReportUtils', () => { it('should return options with zero amountOwed without triggering billing restrictions', () => { const mockPolicy = createRandomPolicy(0); mockPolicy.type = CONST.POLICY.TYPE.CORPORATE; - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, mockPolicy, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: mockPolicy, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result).toHaveLength(3); // Each onSelected should work without issues when amountOwed is 0 @@ -13527,7 +13581,16 @@ describe('ReportUtils', () => { }); it('should handle undefined iouReportID in CREATE_NEW_EXPENSE and TRACK_DISTANCE_EXPENSE onSelected', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, undefined, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: undefined, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); // CREATE_NEW_EXPENSE and TRACK_DISTANCE_EXPENSE should early-return when iouReportID is undefined expect(() => result.at(0)?.onSelected?.()).not.toThrow(); @@ -13537,7 +13600,16 @@ describe('ReportUtils', () => { }); it('should handle undefined policy gracefully', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result).toHaveLength(3); for (const option of result) { @@ -13547,13 +13619,31 @@ describe('ReportUtils', () => { it('should accept amountOwed as a number parameter', () => { const amountOwed = 500; - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, amountOwed, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed, + ownerBillingGraceEndPeriod: undefined, + }); expect(result).toHaveLength(3); }); it('should use the provided icons for Location and ReceiptPlus', () => { - const result = getAddExpenseDropdownOptions(mockTranslate, mockIcons, mockIouReportID, undefined, undefined, 0, undefined); + const result = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: mockIouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: 0, + ownerBillingGraceEndPeriod: undefined, + }); expect(result.at(1)?.icon).toBe(mockIcons.Location); expect(result.at(2)?.icon).toBe(mockIcons.ReceiptPlus); }); @@ -13709,7 +13799,16 @@ describe('ReportUtils', () => { }); it('should return 3 dropdown options with correct values', () => { - const options = getAddExpenseDropdownOptions(mockTranslate, mockIcons, iouReportID, undefined, undefined, undefined, undefined); + const options = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: undefined, + }); expect(options).toHaveLength(3); expect(options.at(0)?.value).toBe(CONST.REPORT.ADD_EXPENSE_OPTIONS.CREATE_NEW_EXPENSE); @@ -13719,7 +13818,16 @@ describe('ReportUtils', () => { describe('CREATE_NEW_EXPENSE', () => { it('should return early when iouReportID is undefined', () => { - const options = getAddExpenseDropdownOptions(mockTranslate, mockIcons, undefined, undefined, undefined, undefined, undefined); + const options = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID: undefined, + policy: undefined, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: undefined, + }); options.at(0)?.onSelected?.(); expect(Navigation.navigate).not.toHaveBeenCalled(); @@ -13741,7 +13849,16 @@ describe('ReportUtils', () => { }, }; - const options = getAddExpenseDropdownOptions(mockTranslate, mockIcons, iouReportID, testPolicy, pastDueCollection, undefined, undefined); + const options = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID, + policy: testPolicy, + userBillingGraceEndPeriodCollection: pastDueCollection, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: undefined, + }); options.at(0)?.onSelected?.(); expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.RESTRICTED_ACTION.getRoute(policyID)); @@ -13764,7 +13881,16 @@ describe('ReportUtils', () => { }, }; - const options = getAddExpenseDropdownOptions(mockTranslate, mockIcons, iouReportID, testPolicy, pastDueCollection, undefined, undefined); + const options = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID, + policy: testPolicy, + userBillingGraceEndPeriodCollection: pastDueCollection, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: undefined, + }); options.at(2)?.onSelected?.(); expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.RESTRICTED_ACTION.getRoute(policyID)); @@ -13781,7 +13907,16 @@ describe('ReportUtils', () => { await Onyx.merge(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED, 100); await waitForBatchedUpdates(); - const options = getAddExpenseDropdownOptions(mockTranslate, mockIcons, iouReportID, testPolicy, undefined, undefined, gracePeriodEnd); + const options = getAddExpenseDropdownOptions({ + translate: mockTranslate, + icons: mockIcons, + iouReportID, + policy: testPolicy, + userBillingGraceEndPeriodCollection: undefined, + draftTransactionIDs: undefined, + amountOwed: undefined, + ownerBillingGraceEndPeriod: gracePeriodEnd, + }); options.at(2)?.onSelected?.(); expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.RESTRICTED_ACTION.getRoute(policyID)); From ff37136c6485ca7096fdecf39f9291e0fa797503 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 9 Mar 2026 11:13:33 +0700 Subject: [PATCH 14/15] lint fix --- src/components/Share/ShareTabParticipantsSelector.tsx | 2 +- src/pages/SubmitExpensePage.tsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Share/ShareTabParticipantsSelector.tsx b/src/components/Share/ShareTabParticipantsSelector.tsx index 8bf3786d1f84..28282445de72 100644 --- a/src/components/Share/ShareTabParticipantsSelector.tsx +++ b/src/components/Share/ShareTabParticipantsSelector.tsx @@ -30,7 +30,7 @@ function ShareTabParticipantsSelectorComponent({detailsPageRouteObject, ref}: Sh iouType={CONST.IOU.TYPE.SUBMIT} onParticipantsAdded={(value) => { // clear the existing draft transaction from the previous flow to prevent the old data from being displayed - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, false, draftTransactionIDs); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransactionIDs, false); const participant = value.at(0); let reportID = participant?.reportID ?? CONST.DEFAULT_NUMBER_ID; diff --git a/src/pages/SubmitExpensePage.tsx b/src/pages/SubmitExpensePage.tsx index 9432503e0b53..8f43326fc007 100644 --- a/src/pages/SubmitExpensePage.tsx +++ b/src/pages/SubmitExpensePage.tsx @@ -9,9 +9,9 @@ import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import interceptAnonymousUser from '@libs/interceptAnonymousUser'; import Navigation from '@libs/Navigation/Navigation'; -import * as ReportUtils from '@libs/ReportUtils'; -import * as App from '@userActions/App'; -import * as IOU from '@userActions/IOU'; +import {generateReportID} from '@libs/ReportUtils'; +import {confirmReadyToOpenApp} from '@userActions/App'; +import {startMoneyRequest} from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -27,13 +27,13 @@ function SubmitExpensePage() { useFocusEffect(() => { interceptAnonymousUser(() => { - App.confirmReadyToOpenApp(); + confirmReadyToOpenApp(); Navigation.isNavigationReady().then(() => { if (isUnmounted.current) { return; } Navigation.goBack(); - IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, ReportUtils.generateReportID(), draftTransactionIDs); + startMoneyRequest(CONST.IOU.TYPE.SUBMIT, generateReportID(), draftTransactionIDs); }); }); }); From 2f6afcacef8039ac6961631ea887cd4fcfede73f Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 11 Mar 2026 14:34:18 +0700 Subject: [PATCH 15/15] lint fix --- src/components/Share/ShareTabParticipantsSelector.tsx | 2 +- src/pages/iou/request/step/IOURequestStepAmount.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Share/ShareTabParticipantsSelector.tsx b/src/components/Share/ShareTabParticipantsSelector.tsx index 28282445de72..74c9d0d05b28 100644 --- a/src/components/Share/ShareTabParticipantsSelector.tsx +++ b/src/components/Share/ShareTabParticipantsSelector.tsx @@ -30,7 +30,7 @@ function ShareTabParticipantsSelectorComponent({detailsPageRouteObject, ref}: Sh iouType={CONST.IOU.TYPE.SUBMIT} onParticipantsAdded={(value) => { // clear the existing draft transaction from the previous flow to prevent the old data from being displayed - clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransactionIDs, false); + clearMoneyRequest(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransactionIDs); const participant = value.at(0); let reportID = participant?.reportID ?? CONST.DEFAULT_NUMBER_ID; diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx index d034efae6e9c..e5030f82db29 100644 --- a/src/pages/iou/request/step/IOURequestStepAmount.tsx +++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx @@ -132,7 +132,7 @@ function IOURequestStepAmount({ const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [transactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector}); - const draftTransactionIDs = useMemo(() => Object.keys(transactionDrafts ?? {}), [transactionDrafts]); + const draftTransactionIDs = Object.keys(transactionDrafts ?? {}); const currentUserAccountIDParam = currentUserPersonalDetails.accountID; const currentUserEmailParam = currentUserPersonalDetails.login ?? '';