Merged
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.
|
- Add isDistanceRequest import from TransactionUtils - Add validation to prevent merging distance requests with non-distance requests - Use XOR logic to check if transactions have different distance request types
- Extract merge field update logic into reusable getMergeFieldUpdatedValues function - Add customUnit and waypoints fields to MergeTransaction Onyx type - Update DetailsReviewPage to use the new utility function - Add comprehensive test coverage for getMergeFieldUpdatedValues function - Handle special cases for amount field (currency) and merchant field (distance requests) - Ensure proper TypeScript typing with Partial<MergeTransaction> return type
- Update mergeTransactionRequest to include customUnit and waypoints in comment field - Add createRandomDistanceRequestTransaction test utility function - Ensure distance request data is properly serialized in merge transaction API call
8 tasks
… has routes value
- Export areTransactionsEligibleForMerge from MergeTransaction actions - Add 6 test cases for areTransactionsEligibleForMerge covering: * Card transaction rules (both card = false, one card = true) * Zero amount rules (both zero = false, one zero = true) * Distance request rules (mixed = false, both distance = true) * Valid merge cases (both cash with non-zero amounts = true) - Add test for shouldNavigateToReceiptReview with distance requests - Update test data with waypoints, customUnit, and routes fields for distance requests - Reorder imports and clean up test structure - All tests passing with proper mocking and test utilities
…oints/customUnit during merge
- Add fallbackToDefault parameter to DistanceRequestUtils.getRate() - Disable fallback for merge transactions to show 'Rate out of policy' when selected rate is not in policy - Ensures proper rate validation display in merge transaction scenarios
melvin-bot
bot
requested review from
dominictb
and removed request for
a team
|
@dominictb Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Contributor
Author
|
@dominictb this PR is ready for review |
Contributor
|
🚧 @garrettmknight has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
|
melvin-bot
bot
requested review from
heyjennahay
and removed request for
a team
Contributor
Author
|
@dominictb I resolved conflicts |
youssef-lr
previously approved these changes
Nov 11, 2025
Contributor
|
@hoangzinh looks like there is an unsigned commit 
|
Contributor
Author
|
Oops, should I rebase and push force to fix that commit? I had an issue with git config last week, it didn't commit with |
Contributor
|
Yes, can you try a rebase method instead to update only that commit? also we have conflicts |
hoangzinh
force-pushed
the
ft/68183-merge-distance-expenses
branch
from
baaad0b to
cae4383
Compare
Contributor
Author
|
@dominictb @youssef-lr I resolved conflict and also fixed unverified commit |
youssef-lr
approved these changes
Nov 13, 2025
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
69 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.2.59-0 🚀
|
This was referenced Nov 14, 2025
This was referenced Nov 18, 2025
Contributor
|
🚀 Deployed to production by https://github.com/grgia in version: 9.2.59-5 🚀
|
This was referenced Mar 4, 2026
Closed
Beamanator
pushed a commit
that referenced
this pull request
Mar 5, 2026
…istance expenses When merging workspace distance expenses, the merge confirmation page was unconditionally overriding the rate display with the rate value parsed from the merchant string. This happened because a pre-existing workaround (from PR #71675) assumed that policy rate data was not available in the merge flow. Since the merge flow now properly preserves customUnit data (including customUnitRateID), getRate() can resolve the rate name from the policy. The override is now conditional, only falling back to getRateFromMerchant() when rateName is unavailable (P2P expenses). Co-authored-by: Mohammad Luthfi Fathur Rahman <mollfpr@users.noreply.github.com>
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
6 participants
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
Fixed Issues
$ #68183
PROPOSAL:
Tests
Same as QA
Offline tests
Same as QA
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Case 1: Merge an unreported distance expense and a workspace distance expense
Case 2: Merge two workspace distance expenses
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, 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.ScrollViewcomponent to make it scrollable when more elements are added to the page.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
Screen.Recording.2025-10-14.at.19.57.14.android.mov
Android: mWeb Chrome
Screen.Recording.2025-10-14.at.21.42.30.android.chrome.mov
iOS: Native
Screen.Recording.2025-10-14.at.21.45.40.ios.mov
iOS: mWeb Safari
Screen.Recording.2025-10-14.at.21.38.03.ios.safari.mov
MacOS: Chrome / Safari
Screen.Recording.2025-10-10.at.21.29.15.web.mov
MacOS: Desktop
Screen.Recording.2025-10-14.at.08.06.17.desktop.mov