Skip to content

Fix money request amount doesn't get reverted when failing to edit #32898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tylerkaraszewski merged 4 commits into from
Dec 29, 2023
Merged

Fix money request amount doesn't get reverted when failing to edit #32898

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a7d393
use merge for failure data
bernhardoj Dec 12, 2023
186812b
Merge branch 'main' into fix/31622-revert-edit-amount-on-failure
bernhardoj Dec 18, 2023
c19c5bf
fix wrong variable
bernhardoj Dec 18, 2023
d7db85e
Merge branch 'main' into fix/31622-revert-edit-amount-on-failure
bernhardoj Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2196,17 +2196,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.modifiedAmount : null,
modifiedCurrency: transaction.modifiedCurrency ? transaction.modifiedCurrency : null,
modifiedMerchant: transaction.modifiedMerchant ? transaction.modifiedMerchant : null,
modifiedWaypoints: transaction.modifiedWaypoints ? transaction.modifiedWaypoints : null,

@bernhardoj bernhardoj Dec 12, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't use null-coalescing (lint)

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,

@bernhardoj bernhardoj Dec 12, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that the policy expense chat request doesn't have cachedTotal optimistically.

lastMessageText and lastMessageHtml turns out is set optimistically in buildOnyxDataForMoneyRequest.

App/src/libs/actions/IOU.js

Lines 279 to 287 in 4239252

onyxMethod: isNewIOUReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
value: {
...iouReport,
lastMessageText: iouAction.message[0].text,
lastMessageHtml: iouAction.message[0].html,
...(isNewIOUReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
},
},

},
},
{
onyxMethod: Onyx.METHOD.SET,
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`,
value: chatReport,
},
Expand Down