Fix stale fields leaking when merging odometer and map distance expenses#94748
Draft
Julesssss wants to merge 2 commits into
Draft
Fix stale fields leaking when merging odometer and map distance expenses#94748Julesssss wants to merge 2 commits into
Julesssss wants to merge 2 commits into
Conversation
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Merging an odometer distance expense with a map distance expense produced a corrupted result — leaked odometer readings, the wrong route, and a combined receipt — because the front end accumulated both modalities' fields in the merge transaction instead of replacing them on each merchant selection.
Two distinct leaks, both fixed by making a merchant selection fully own the distance bundle:
getMergeFieldUpdatedValues,MergeTransactionUtils.ts): odometer fields were only set when the selected expense was itself an odometer request, so selecting a map merchant left the previous odometer readings untouched —Onyx.mergeignores omitted keys. They are now explicitly nulled for any non-odometer selection.receiptandcustomUnit(handleSelect,DetailsReviewPage.tsx): these are objects, andsetMergeTransactionKeyusesOnyx.merge, which deep-extends them and keeps stale sub-keys from the previously selected expense. They are now nulled first in the same synchronous batch so the new value fully replaces rather than merges.Fixed Issues
$ #91794
PROPOSAL:
Tests
Offline tests
QA Steps
Same as tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)Avatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari