From 65d1795264dfb19eedc2d62cc04e27e55560e64a Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 4 Dec 2025 22:52:37 +0530 Subject: [PATCH 1/6] Refactor track expenses --- src/libs/actions/IOU.ts | 11 +++++++++-- src/pages/Share/SubmitDetailsPage.tsx | 2 ++ src/pages/iou/request/step/IOURequestStepAmount.tsx | 1 + .../iou/request/step/IOURequestStepConfirmation.tsx | 2 ++ src/pages/iou/request/step/IOURequestStepDistance.tsx | 1 + .../iou/request/step/IOURequestStepDistanceManual.tsx | 1 + .../iou/request/step/IOURequestStepDistanceMap.tsx | 1 + .../request/step/IOURequestStepScan/index.native.tsx | 2 ++ .../iou/request/step/IOURequestStepScan/index.tsx | 2 ++ 9 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index f527434eedc5..94052741fc11 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -673,6 +673,7 @@ type CreateTrackExpenseParams = { shouldPlaySound?: boolean; shouldHandleNavigation?: boolean; isASAPSubmitBetaEnabled: boolean; + quickAction: OnyxEntry; }; type BuildOnyxDataForInvoiceParams = { @@ -737,6 +738,7 @@ type GetTrackExpenseInformationParams = { transactionParams: GetTrackExpenseInformationTransactionParams; retryParams?: StartSplitBilActionParams | CreateTrackExpenseParams | RequestMoneyInformation | ReplaceReceipt; isASAPSubmitBetaEnabled: boolean; + quickAction: OnyxEntry; }; let allPersonalDetails: OnyxTypes.PersonalDetailsList = {}; @@ -2616,6 +2618,7 @@ type BuildOnyxDataForTrackExpenseParams = { retryParams?: StartSplitBilActionParams | CreateTrackExpenseParams | RequestMoneyInformation | ReplaceReceipt; participant?: Participant; isASAPSubmitBetaEnabled: boolean; + quickAction: OnyxEntry; }; /** Builds the Onyx data for track expense */ @@ -2630,6 +2633,7 @@ function buildOnyxDataForTrackExpense({ retryParams, participant, isASAPSubmitBetaEnabled, + quickAction, }: BuildOnyxDataForTrackExpenseParams): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] { const {report: chatReport, previewAction: reportPreviewAction} = chat; const {report: iouReport, createdAction: iouCreatedAction, action: iouAction} = iou; @@ -2674,7 +2678,7 @@ function buildOnyxDataForTrackExpense({ value: { action: newQuickAction, chatReportID: chatReport.reportID, - isFirstQuickAction: isEmptyObject(deprecatedQuickAction), + isFirstQuickAction: isEmptyObject(quickAction), }, }, ); @@ -2903,7 +2907,7 @@ function buildOnyxDataForTrackExpense({ failureData.push({ onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, - value: deprecatedQuickAction ?? null, + value: quickAction ?? null, }); if (iouReport) { @@ -4331,6 +4335,7 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T actionableTrackExpenseWhisper, retryParams, isASAPSubmitBetaEnabled, + quickAction, }); return { @@ -6686,6 +6691,7 @@ function trackExpense(params: CreateTrackExpenseParams) { linkedTrackedExpenseReportID, customUnitRateID, }, + quickAction, }; const { @@ -6740,6 +6746,7 @@ function trackExpense(params: CreateTrackExpenseParams) { }, retryParams, isASAPSubmitBetaEnabled, + quickAction, }) ?? {}; const activeReportID = isMoneyRequestReport ? report?.reportID : chatReport?.reportID; diff --git a/src/pages/Share/SubmitDetailsPage.tsx b/src/pages/Share/SubmitDetailsPage.tsx index c0fdefff299d..d55dba1727fd 100644 --- a/src/pages/Share/SubmitDetailsPage.tsx +++ b/src/pages/Share/SubmitDetailsPage.tsx @@ -52,6 +52,7 @@ function SubmitDetailsPage({ const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getIOURequestPolicyID(transaction, report)}`, {canBeMissing: false}); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getIOURequestPolicyID(transaction, report)}`, {canBeMissing: false}); const [lastLocationPermissionPrompt] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT, {canBeMissing: false}); + const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, {canBeMissing: true}); const [reportAttributesDerived] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {canBeMissing: true, selector: reportsSelector}); const [currentDate] = useOnyx(ONYXKEYS.CURRENT_DATE, {canBeMissing: true}); const [validFilesToUpload] = useOnyx(ONYXKEYS.VALIDATED_FILE_OBJECT, {canBeMissing: true}); @@ -137,6 +138,7 @@ function SubmitDetailsPage({ isLinkedTrackedExpenseReportArchived, }, isASAPSubmitBetaEnabled, + quickAction, }); } else { requestMoney({ diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx index 60600960c0ea..b305937b9c77 100644 --- a/src/pages/iou/request/step/IOURequestStepAmount.tsx +++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx @@ -232,6 +232,7 @@ function IOURequestStepAmount({ merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, }, isASAPSubmitBetaEnabled, + quikAction, }); return; } diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 84f3e61ab78c..27fd60e300fa 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -742,6 +742,7 @@ function IOURequestStepConfirmation({ }, shouldHandleNavigation: index === transactions.length - 1, isASAPSubmitBetaEnabled, + quickAction, }); } }, @@ -762,6 +763,7 @@ function IOURequestStepConfirmation({ isManualDistanceRequest, archivedReportsIdSet, isASAPSubmitBetaEnabled, + quickAction, ], ); diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx index ab1a86fdad86..4024a9ed716c 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx @@ -351,6 +351,7 @@ function IOURequestStepDistance({ attendees: transaction?.comment?.attendees, }, isASAPSubmitBetaEnabled, + quickAction, }); return; } diff --git a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx index 734fb4dff11a..394f59746c1d 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx @@ -221,6 +221,7 @@ function IOURequestStepDistanceManual({ attendees: transaction?.comment?.attendees, }, isASAPSubmitBetaEnabled, + quickAction, }); return; } diff --git a/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx b/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx index fe08ffe11b80..02e54192f0ea 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx @@ -353,6 +353,7 @@ function IOURequestStepDistanceMap({ attendees: transaction?.comment?.attendees, }, isASAPSubmitBetaEnabled, + quickAction, }); return; } diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx index 509c39dba68d..88a86b952229 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx @@ -338,6 +338,7 @@ function IOURequestStepScan({ ...(policyParams ?? {}), shouldHandleNavigation: index === files.length - 1, isASAPSubmitBetaEnabled, + quickAction, }); } else { requestMoney({ @@ -379,6 +380,7 @@ function IOURequestStepScan({ shouldGenerateTransactionThreadReport, isASAPSubmitBetaEnabled, transactionViolations, + quickAction, ], ); diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx index a8852a90f6af..91f3b87d0ba8 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx @@ -398,6 +398,7 @@ function IOURequestStepScan({ ...(policyParams ?? {}), shouldHandleNavigation: index === files.length - 1, isASAPSubmitBetaEnabled, + quickAction, }); } else { requestMoney({ @@ -440,6 +441,7 @@ function IOURequestStepScan({ shouldGenerateTransactionThreadReport, isASAPSubmitBetaEnabled, transactionViolations, + quickAction, ], ); From 81aa52aa0e06924eee304d7a8c82ef8e83089fab Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 4 Dec 2025 22:53:21 +0530 Subject: [PATCH 2/6] fix --- src/pages/iou/request/step/IOURequestStepAmount.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx index b305937b9c77..69d0d2e5853a 100644 --- a/src/pages/iou/request/step/IOURequestStepAmount.tsx +++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx @@ -232,7 +232,7 @@ function IOURequestStepAmount({ merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, }, isASAPSubmitBetaEnabled, - quikAction, + quickAction, }); return; } From 055659387ab7ce987720e69e8dbc1ca21ae3bf0c Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Wed, 10 Dec 2025 23:07:41 +0530 Subject: [PATCH 3/6] Fix params --- src/libs/actions/IOU.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 3d2d9eb69795..d8bcd977156c 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4040,7 +4040,17 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI * it creates optimistic versions of them and uses those instead */ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): TrackExpenseInformation | null { - const {parentChatReport, moneyRequestReportID = '', existingTransactionID, participantParams, policyParams, transactionParams, retryParams, isASAPSubmitBetaEnabled} = params; + const { + parentChatReport, + moneyRequestReportID = '', + existingTransactionID, + participantParams, + policyParams, + transactionParams, + retryParams, + isASAPSubmitBetaEnabled, + quickAction, + } = params; const {payeeAccountID = userAccountID, payeeEmail = currentUserEmail, participant} = participantParams; const {policy, policyCategories, policyTagList} = policyParams; const {comment, amount, currency, created, distance, merchant, receipt, category, tag, taxCode, taxAmount, billable, reimbursable, linkedTrackedExpenseReportAction, attendees} = @@ -6579,6 +6589,7 @@ function trackExpense(params: CreateTrackExpenseParams) { shouldHandleNavigation = true, shouldPlaySound = true, isASAPSubmitBetaEnabled, + quickAction, } = params; const {participant, payeeAccountID, payeeEmail} = participantParams; const {policy, policyCategories, policyTagList} = policyData; From dc27fd7b24e46e19076869fe5ce1dd46d6e66269 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 11 Dec 2025 13:46:26 +0530 Subject: [PATCH 4/6] fix tests --- tests/actions/IOUTest.ts | 10 ++++++++++ tests/ui/UnreadIndicatorsTest.tsx | 1 + tests/unit/GoogleTagManagerTest.tsx | 1 + 3 files changed, 12 insertions(+) diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index c7f2c6072e36..9132925f1445 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -516,6 +516,7 @@ describe('actions/IOU', () => { customUnitRateID: CONST.CUSTOM_UNITS.FAKE_P2P_ID, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); await mockFetch?.resume?.(); @@ -609,6 +610,7 @@ describe('actions/IOU', () => { customUnitRateID: CONST.CUSTOM_UNITS.FAKE_P2P_ID, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); await mockFetch?.resume?.(); @@ -687,6 +689,7 @@ describe('actions/IOU', () => { billable: false, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -734,6 +737,7 @@ describe('actions/IOU', () => { accountant, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -807,6 +811,7 @@ describe('actions/IOU', () => { billable: false, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -854,6 +859,7 @@ describe('actions/IOU', () => { accountant, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -1957,6 +1963,7 @@ describe('actions/IOU', () => { billable: false, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); mockFetch?.resume?.(); @@ -2017,6 +2024,7 @@ describe('actions/IOU', () => { accountant, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -6605,6 +6613,7 @@ describe('actions/IOU', () => { }, accountantParams: action === CONST.IOU.ACTION.SHARE ? {accountant: {accountID: VIT_ACCOUNT_ID, login: VIT_EMAIL}} : undefined, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdates(); @@ -8219,6 +8228,7 @@ describe('actions/IOU', () => { reimbursable: false, }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx index bbd1fb4ba1a6..2931c138662d 100644 --- a/tests/ui/UnreadIndicatorsTest.tsx +++ b/tests/ui/UnreadIndicatorsTest.tsx @@ -711,6 +711,7 @@ describe('Unread Indicators', () => { created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING), }, isASAPSubmitBetaEnabled: true, + quickAction: undefined, }); await waitForBatchedUpdates(); diff --git a/tests/unit/GoogleTagManagerTest.tsx b/tests/unit/GoogleTagManagerTest.tsx index d7a20df62718..95c2f47d9b0e 100644 --- a/tests/unit/GoogleTagManagerTest.tsx +++ b/tests/unit/GoogleTagManagerTest.tsx @@ -192,6 +192,7 @@ describe('GoogleTagManagerTest', () => { linkedTrackedExpenseReportID: 'linkedTrackedExpenseReportID', }, isASAPSubmitBetaEnabled: false, + quickAction: undefined, }); await waitForBatchedUpdatesWithAct(); From a9e18f8bd5af12f435e633b931b60b012910cd22 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Sun, 14 Dec 2025 17:48:40 +0530 Subject: [PATCH 5/6] Pass quickAction --- src/components/MoneyReportHeader.tsx | 5 ++++- src/libs/actions/IOU.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 1b4627c2e91b..581d85c7ea2e 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -336,6 +336,8 @@ function MoneyReportHeader({ const canTriggerAutomaticPDFDownload = useRef(false); const hasFinishedPDFDownload = reportPDFFilename && reportPDFFilename !== CONST.REPORT_DETAILS_MENU_ITEM.ERROR; + const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, {canBeMissing: true}); + useEffect(() => { canTriggerAutomaticPDFDownload.current = isPDFModalVisible; }, [isPDFModalVisible]); @@ -595,13 +597,14 @@ function MoneyReportHeader({ optimisticChatReportID, optimisticIOUReportID, isASAPSubmitBetaEnabled, + quickAction, defaultExpensePolicy ?? undefined, activePolicyCategories, activePolicyExpenseChat, ); } }, - [activePolicyExpenseChat, allPolicyCategories, defaultExpensePolicy, isASAPSubmitBetaEnabled], + [activePolicyExpenseChat, allPolicyCategories, defaultExpensePolicy, isASAPSubmitBetaEnabled, quickAction], ); const getStatusIcon: (src: IconAsset) => React.ReactNode = (src) => ( diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index c354a42c2933..92f122224c5c 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -6913,6 +6913,7 @@ function duplicateExpenseTransaction( optimisticChatReportID: string, optimisticIOUReportID: string, isASAPSubmitBetaEnabled: boolean, + quickAction: OnyxEntry, targetPolicy?: OnyxEntry, targetPolicyCategories?: OnyxEntry, targetReport?: OnyxTypes.Report, @@ -6980,6 +6981,7 @@ function duplicateExpenseTransaction( }, report: selfDMReport, isDraftPolicy: false, + quickAction, }; return trackExpense(trackExpenseParams); } From 50ed1261ec3352936cea9ea24ea7e46c084f4b28 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Sun, 14 Dec 2025 17:56:02 +0530 Subject: [PATCH 6/6] Fix tests --- src/components/MoneyRequestHeader.tsx | 4 +++- tests/actions/IOUTest.ts | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index c876c363f1c1..d60e26e3e0be 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -160,6 +160,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const {wideRHPRouteKeys} = useContext(WideRHPContext); const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true}); + const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, {canBeMissing: true}); const markAsCash = useCallback(() => { markAsCashAction(transaction?.transactionID, reportID); @@ -182,13 +183,14 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre optimisticChatReportID, optimisticIOUReportID, isASAPSubmitBetaEnabled, + quickAction, defaultExpensePolicy ?? undefined, activePolicyCategories, activePolicyExpenseChat, ); } }, - [activePolicyExpenseChat, allPolicyCategories, defaultExpensePolicy, isASAPSubmitBetaEnabled], + [activePolicyExpenseChat, allPolicyCategories, defaultExpensePolicy, isASAPSubmitBetaEnabled, quickAction], ); const getStatusIcon: (src: IconAsset) => ReactNode = (src) => ( diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 6cd4fe0b6a4a..ce26dd2b4cb0 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -10825,6 +10825,7 @@ describe('actions/IOU', () => { mockOptimisticChatReportID, mockOptimisticIOUReportID, mockIsASAPSubmitBetaEnabled, + undefined, mockPolicy, fakePolicyCategories, policyExpenseChat,