From 0a7d393635884428b0f75d66715f3d25a3daf707 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 12 Dec 2023 12:54:22 +0800 Subject: [PATCH 1/2] use merge for failure data --- src/libs/actions/IOU.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 9040d4c1607b..0265fda9aace 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2079,17 +2079,28 @@ function editRegularMoneyRequest(transactionID, transactionThreadReportID, trans }, }, { - onyxMethod: Onyx.METHOD.SET, + onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, - value: transaction, + value: { + ...transaction, + modifiedCreated: transaction.modifiedCreated ? transaction.modifiedCreated : null, + modifiedAmount: transaction.modifiedAmount ? transaction.modifiedCreated : null, + modifiedCurrency: transaction.modifiedCurrency ? transaction.modifiedCurrency : null, + modifiedMerchant: transaction.modifiedMerchant ? transaction.modifiedMerchant : null, + modifiedWaypoints: transaction.modifiedWaypoints ? transaction.modifiedWaypoints : null, + pendingFields: null, + }, }, { - onyxMethod: Onyx.METHOD.SET, + onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, - value: iouReport, + value: { + ...iouReport, + cachedTotal: iouReport.cachedTotal ? iouReport.cachedTotal : null, + }, }, { - onyxMethod: Onyx.METHOD.SET, + onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`, value: chatReport, }, From c19c5bf0d98f3fdcf7aa1df4d00eb4e371afdc60 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Mon, 18 Dec 2023 18:43:11 +0800 Subject: [PATCH 2/2] fix wrong variable --- src/libs/actions/IOU.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index b38846df0c2f..27e6b0bd7883 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2201,7 +2201,7 @@ function editRegularMoneyRequest(transactionID, transactionThreadReportID, trans value: { ...transaction, modifiedCreated: transaction.modifiedCreated ? transaction.modifiedCreated : null, - modifiedAmount: transaction.modifiedAmount ? transaction.modifiedCreated : null, + modifiedAmount: transaction.modifiedAmount ? transaction.modifiedAmount : null, modifiedCurrency: transaction.modifiedCurrency ? transaction.modifiedCurrency : null, modifiedMerchant: transaction.modifiedMerchant ? transaction.modifiedMerchant : null, modifiedWaypoints: transaction.modifiedWaypoints ? transaction.modifiedWaypoints : null,