Fix merge expense transaction thread navigation - #96633
Open
marufsharifi wants to merge 2 commits into
Open
Conversation
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
marufsharifi
marked this pull request as ready for review
July 21, 2026 16:01
melvin-bot
Bot
requested review from
joekaufmanexpensify and
rojiphil
and removed request for
a team
July 21, 2026 16:01
Contributor
Author
|
@rojiphil, could you please take a look at this. thanks. |
Contributor
Author
|
@rojiphil, Gentle bump. thanks. |
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
Merge expense now follows the same destination behavior across individual and bulk merge flows.
Before this update, merging expenses from
search/spendcould open the wrong place or leave the RHP loading, especially when the target workspace expense did not already have a transaction thread and the destination was anunreported/self-DMexpense.Now, the app creates the missing optimistic transaction thread when needed, carries that thread through confirmation, and attaches offline optimistic merge data to the correct destination report. This makes post-merge navigation consistent and predictable for
workspace,self-DM,split, and offline merge cases.Fixed Issues
$ #83257
PROPOSAL:
Tests
Flow 1: Workspace expense with self-DM expense
Flow 2: Workspace manual expense with split expense
Flow 3: Offline workspace expense with self-DM expense
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, 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
Flow:1
flow01.mov
Flow:2
flow02.mov
Flow:3
flow03.mov
Android: mWeb Chrome
Flow:1
flow1.mp4
Flow:2
flow2.mp4
Flow:3
flow3.mp4
iOS: Native
Flow:1
flow001.mov
Flow:2
flow002.mov
Flow:3
flow003.mov
iOS: mWeb Safari
Flow:1
flow0001.mov
Flow:2
flow0002.mov
Flow:3
Screen.Recording.2026-07-21.at.8.17.39.PM.mov
MacOS: Chrome / Safari
Flow:1
flow1.mov
Flow:2
flow2.mov
Flow:3
flow3.mov