fix: Merge confirm page shows converted amount when no foreign currency is involved#79499
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.
|
|
@ZhenjaHorbach 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] |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari2026-01-13.20.03.32.mov2026-01-13.20.05.49.mov |
|
LGTM! |
|
Merging since it fixed a deploy blocker |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
(cherry picked from commit 40b4e94) (cherry-picked to staging by francoisl)
|
🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.3.0-6 🚀
|
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.3.0-8 🚀
|
|
🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.3.1-0 🚀
|
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.3.1-1 🚀
|
Explanation of Change
fix: Merge confirm page shows converted amount when no foreign currency is involved
Fixed Issues
$ #79465
$ #79440
PROPOSAL:
Tests
Precondition:
Offline tests
Same
QA Steps
Same as test
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.2026-01-14.at.00.07.52.mov
Android: mWeb Chrome
Screen.Recording.2026-01-14.at.00.06.44.mov
iOS: Native
Screen.Recording.2026-01-14.at.00.08.21.mov
iOS: mWeb Safari
Screen.Recording.2026-01-14.at.00.08.58.mov
MacOS: Chrome / Safari
Screen.Recording.2026-01-14.at.00.04.39.mov
Screen.Recording.2026-01-14.at.00.17.31.mov