diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 823e6a08861b0..6178820aa7c41 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -5563,7 +5563,7 @@ function updateMoneyRequestTaxRate({ } type UpdateMoneyRequestDistanceParams = { - transactionID: string | undefined; + transaction: OnyxEntry; transactionThreadReport: OnyxEntry; parentReport: OnyxEntry; waypoints?: WaypointCollection; @@ -5584,7 +5584,7 @@ type UpdateMoneyRequestDistanceParams = { /** Updates the waypoints of a distance expense */ function updateMoneyRequestDistance({ - transactionID, + transaction, transactionThreadReport, parentReport, waypoints, @@ -5612,10 +5612,10 @@ function updateMoneyRequestDistance({ let data: UpdateMoneyRequestData; // eslint-disable-next-line @typescript-eslint/no-deprecated if (isTrackExpenseReport(transactionThreadReport) && isSelfDM(parentReport)) { - data = getUpdateTrackExpenseParams(transactionID, transactionThreadReport?.reportID, transactionChanges, policy); + data = getUpdateTrackExpenseParams(transaction?.transactionID, transactionThreadReport?.reportID, transactionChanges, policy); } else { data = getUpdateMoneyRequestParams({ - transactionID, + transactionID: transaction?.transactionID, transactionThreadReport, iouReport: parentReport, transactionChanges, @@ -5647,8 +5647,6 @@ function updateMoneyRequestDistance({ } if (transactionBackup) { - const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; - // We need to include all keys of the optimisticData's waypoints in the failureData for onyx merge to properly reset // waypoint keys that do not exist in the failureData's waypoints. For instance, if the optimisticData waypoints had // three keys and the failureData waypoint had only 2 keys then the third key that doesn't exist in the failureData @@ -5665,7 +5663,7 @@ function updateMoneyRequestDistance({ }, {}); onyxData?.failureData?.push({ onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, + key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`, value: { comment: { waypoints: onyxWaypoints, diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx index c1d594b05c0c4..6019ec0e71481 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx @@ -434,7 +434,7 @@ function IOURequestStepDistance({ } if (transaction?.transactionID && report?.reportID) { updateMoneyRequestDistance({ - transactionID: transaction?.transactionID, + transaction, transactionThreadReport: report, parentReport, waypoints, @@ -467,8 +467,7 @@ function IOURequestStepDistance({ navigateToNextStep, transactionBackup, waypoints, - transaction?.routes, - transaction?.transactionID, + transaction, report, navigateBack, parentReport, diff --git a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx index 33886d82aaad8..3ddf4d9cc6675 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx @@ -158,7 +158,7 @@ function IOURequestStepDistanceManual({ if (action === CONST.IOU.ACTION.EDIT) { if (distance !== distanceAsFloat) { updateMoneyRequestDistance({ - transactionID: transaction?.transactionID, + transaction, transactionThreadReport: report, parentReport, distance: distanceAsFloat, diff --git a/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx b/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx index bdf18091fa1a1..14047b9c07a28 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceMap.tsx @@ -431,7 +431,7 @@ function IOURequestStepDistanceMap({ } if (transaction?.transactionID && report?.reportID) { updateMoneyRequestDistance({ - transactionID: transaction?.transactionID, + transaction, transactionThreadReport: report, parentReport, waypoints, @@ -471,8 +471,7 @@ function IOURequestStepDistanceMap({ policyTags, policyCategories, report, - transaction?.routes, - transaction?.transactionID, + transaction, transactionBackup, waypoints, parentReportNextStep, diff --git a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx index a350b7f7ff0b6..47c781f3989bd 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx @@ -369,7 +369,7 @@ function IOURequestStepDistanceOdometer({ if (hasChanges) { // Update distance (which will also update amount and merchant) updateMoneyRequestDistance({ - transactionID: transaction?.transactionID, + transaction, transactionThreadReport: report, parentReport, distance: calculatedDistance,