Merge pull request #47864 from Expensify/neil-track-custom-rate

Track expense with custom distance rate
Expensify · Sep 5, 2024 · 9d9acde · 9d9acde
2 parents 82b6db1 + 0a2c8ed
commit 9d9acde
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/src/libs/API/parameters/TrackExpenseParams.ts b/src/libs/API/parameters/TrackExpenseParams.ts
@@ -27,6 +27,7 @@ type TrackExpenseParams = {
     createdReportActionIDForThread: string;
     waypoints?: string;
     actionableWhisperReportActionID?: string;
+    customUnitRateID?: string;
 };
 
 export default TrackExpenseParams;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -3666,6 +3666,7 @@ function trackExpense(
     actionableWhisperReportActionID?: string,
     linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID?: string,
+    customUnitRateID?: string,
 ) {
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReportOrDraftReport(report.chatReportID) : report;
@@ -3805,6 +3806,7 @@ function trackExpense(
                 transactionThreadReportID: transactionThreadReportID ?? '-1',
                 createdReportActionIDForThread: createdReportActionIDForThread ?? '-1',
                 waypoints: validWaypoints ? JSON.stringify(validWaypoints) : undefined,
+                customUnitRateID,
             };
             if (actionableWhisperReportActionIDParam) {
                 parameters.actionableWhisperReportActionID = actionableWhisperReportActionIDParam;

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -303,9 +303,22 @@ function IOURequestStepConfirmation({
                 transaction.actionableWhisperReportActionID,
                 transaction.linkedTrackedExpenseReportAction,
                 transaction.linkedTrackedExpenseReportID,
+                customUnitRateID,
             );
         },
-        [report, transaction, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, transactionTaxCode, transactionTaxAmount, policy, policyTags, policyCategories, action],
+        [
+            report,
+            transaction,
+            currentUserPersonalDetails.login,
+            currentUserPersonalDetails.accountID,
+            transactionTaxCode,
+            transactionTaxAmount,
+            policy,
+            policyTags,
+            policyCategories,
+            action,
+            customUnitRateID,
+        ],
     );
 
     const createDistanceRequest = useCallback(

diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx
@@ -118,6 +118,7 @@ function IOURequestStepDistance({
     const isCreatingNewRequest = !(backTo || isEditing);
     const [recentWaypoints, {status: recentWaypointsStatus}] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
     const iouRequestType = TransactionUtils.getRequestType(transaction);
+    const customUnitRateID = TransactionUtils.getRateID(transaction);
 
     // For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace
     // request and the workspace requires a category or a tag
@@ -293,6 +294,11 @@ function IOURequestStepDistance({
                         undefined,
                         undefined,
                         TransactionUtils.getValidWaypoints(waypoints, true),
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        customUnitRateID,
                     );
                     return;
                 }
@@ -346,6 +352,7 @@ function IOURequestStepDistance({
         policy,
         iouRequestType,
         reportNameValuePairs,
+        customUnitRateID,
     ]);
 
     const getError = () => {