From 1b20dffbf24126c84ac8efb7175144a2083bd4eb Mon Sep 17 00:00:00 2001 From: daledah Date: Thu, 24 Apr 2025 15:41:59 +0700 Subject: [PATCH 1/4] fix: correct order of applying Onyx data for convert tracked expense --- src/libs/actions/IOU.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 86d302440567..69d61b99de91 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4705,14 +4705,13 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac attendees, transactionThreadReportID, } = transactionParams; - const {optimisticData, successData, failureData} = onyxData; - const { - optimisticData: moveTransactionOptimisticData, - successData: moveTransactionSuccessData, - failureData: moveTransactionFailureData, - modifiedExpenseReportActionID, - } = getConvertTrackedExpenseInformation( + optimisticData: convertTransactionOptimisticData = [], + successData: conveconvertTransactionOptimisticData = [], + failureData: convertTransactionFailureData = [], + } = onyxData; + + const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation( transactionID, actionableWhisperReportActionID, iouParams.reportID, @@ -4722,9 +4721,9 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac CONST.IOU.ACTION.SUBMIT, ); - optimisticData?.push(...moveTransactionOptimisticData); - successData?.push(...moveTransactionSuccessData); - failureData?.push(...moveTransactionFailureData); + optimisticData?.push(...convertTransactionOptimisticData); + successData?.push(...conveconvertTransactionOptimisticData); + failureData?.push(...convertTransactionFailureData); if (workspaceParams) { const params = { From e1fa22ef40a067bf7c75dc40a4353328d6083aa4 Mon Sep 17 00:00:00 2001 From: daledah Date: Thu, 24 Apr 2025 15:53:56 +0700 Subject: [PATCH 2/4] fix: apply fix for share tracked expense --- src/libs/actions/IOU.ts | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 69d61b99de91..4a99735251e8 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4705,11 +4705,7 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac attendees, transactionThreadReportID, } = transactionParams; - const { - optimisticData: convertTransactionOptimisticData = [], - successData: conveconvertTransactionOptimisticData = [], - failureData: convertTransactionFailureData = [], - } = onyxData; + const {optimisticData: convertTransactionOptimisticData = [], successData: conveconvertTransactionOptimisticData = [], failureData: convertTransactionFailureData = []} = onyxData; const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation( transactionID, @@ -4823,7 +4819,7 @@ function categorizeTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { const {onyxData, reportInformation, transactionParams, policyParams, createdWorkspaceParams} = trackedExpenseParams; - const {optimisticData, successData, failureData} = onyxData ?? {}; + const {optimisticData: shareTrackedExpenseOptimisticData = [], successData: shareTrackedExpenseSuccessData = [], failureData: shareTrackedExpenseFailureData = []} = onyxData ?? {}; const {transactionID} = transactionParams; const { actionableWhisperReportActionID, @@ -4836,12 +4832,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { transactionThreadReportID, } = reportInformation; - const { - optimisticData: moveTransactionOptimisticData, - successData: moveTransactionSuccessData, - failureData: moveTransactionFailureData, - modifiedExpenseReportActionID, - } = getConvertTrackedExpenseInformation( + const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation( transactionID, actionableWhisperReportActionID, moneyRequestReportID, @@ -4851,9 +4842,9 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { CONST.IOU.ACTION.SHARE, ); - optimisticData?.push(...moveTransactionOptimisticData); - successData?.push(...moveTransactionSuccessData); - failureData?.push(...moveTransactionFailureData); + optimisticData?.push(...shareTrackedExpenseOptimisticData); + successData?.push(...shareTrackedExpenseSuccessData); + failureData?.push(...shareTrackedExpenseFailureData); const parameters: ShareTrackedExpenseParams = { ...transactionParams, From 7262c12c746d7f8b0f1a07bd53b2cb94354a8e16 Mon Sep 17 00:00:00 2001 From: daledah Date: Thu, 24 Apr 2025 18:07:30 +0700 Subject: [PATCH 3/4] Update src/libs/actions/IOU.ts Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com> --- src/libs/actions/IOU.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 4a99735251e8..a537fa0f3239 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4705,7 +4705,7 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac attendees, transactionThreadReportID, } = transactionParams; - const {optimisticData: convertTransactionOptimisticData = [], successData: conveconvertTransactionOptimisticData = [], failureData: convertTransactionFailureData = []} = onyxData; + const {optimisticData: convertTransactionOptimisticData = [], successData: convertTransactionSuccessData = [], failureData: convertTransactionFailureData = []} = onyxData; const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation( transactionID, From 542db3355cbcc6aa58e505733de7243bb3c92643 Mon Sep 17 00:00:00 2001 From: daledah Date: Thu, 24 Apr 2025 18:07:41 +0700 Subject: [PATCH 4/4] Update src/libs/actions/IOU.ts Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com> --- src/libs/actions/IOU.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index a537fa0f3239..5f0ef6b2ed92 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4718,7 +4718,7 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac ); optimisticData?.push(...convertTransactionOptimisticData); - successData?.push(...conveconvertTransactionOptimisticData); + successData?.push(...convertTransactionSuccessData); failureData?.push(...convertTransactionFailureData); if (workspaceParams) {