fix: prevent wrong back animation when navigating from Home to RHP by yuvrajangadsingh · Pull Request #87128 · Expensify/App

yuvrajangadsingh · 2026-04-04T08:04:28Z

Explanation of Change

When navigating from the Home tab to physical card screens (via TimeSensitiveSection widgets like AddShippingAddress), shouldChangeToMatchingFullScreen pushes SETTINGS_SPLIT_NAVIGATOR underneath the RHP. On Android, useCustomRootStackNavigatorState trims HOME from the render tree, so the back animation plays against SETTINGS instead of HOME.

Fix: added a guard that returns false when lastFullScreenRoute.name === SCREENS.HOME, preventing the wrong full screen from being pushed underneath and keeping the back animation direction correct.

Fixed Issues

$ #85122
PROPOSAL: #85122 (comment)

Tests

Open the app on Android
Navigate to the Home tab
Tap "Add address" from TimeSensitiveSection (physical card widget)
Press the back arrow
Verify the slide animation goes in the correct direction (overlay dismiss, not wrong-direction slide)

Verify that no errors appear in the JS console

Offline tests

N/A - navigation animation fix, no network calls involved.

QA Steps

Open the app on Android
Navigate to the Home tab
Tap "Add address" from TimeSensitiveSection (physical card widget)
Press the back arrow
Verify the slide animation goes in the correct direction (overlay dismiss, not wrong-direction slide)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Adhoc build requested per @ShridharGoel

Android: mWeb Chrome

android-chrome.mp4

iOS: Native

Adhoc build requested per @ShridharGoel

iOS: mWeb Safari

ios-safari.mp4

MacOS: Chrome / Safari

macos-chrome-final.mp4

melvin-bot · 2026-04-04T08:05:19Z

@youssef-lr 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]

codecov · 2026-04-04T08:13:32Z

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.

Files with missing lines	Coverage Δ
src/libs/Navigation/helpers/linkTo/index.ts	`85.36% <50.00%> (-0.89%)`	⬇️
... and 14 files with indirect coverage changes

ShridharGoel · 2026-04-04T08:35:30Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Uploading Screen Recording 2026-04-09 at 3.40.40 AM.mov…

Android: mWeb Chrome

Screen.Recording.2026-04-09.at.3.54.04.AM.mov

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2026-04-09.at.3.57.29.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-09.at.3.56.44.AM.mov

yuvrajangadsingh · 2026-04-04T08:46:09Z

tested on android mWeb (chrome, pixel 7 viewport). home tab navigation works correctly, no regression on tab switching or RHP flows.

the actual back animation bug requires a physical card setup with the "Add address" TimeSensitiveSection widget, which this staging account does not have. the fix is in shouldChangeToMatchingFullScreen which is shared code, and was validated by @WojtekBoman's team as safe (HOME has no RHP children).

ShridharGoel · 2026-04-04T11:11:29Z

@yuvrajangadsingh Can you add the videos in the author checklist?

yuvrajangadsingh · 2026-04-05T10:51:47Z

@ShridharGoel i dont have an android build setup on this machine right now, setting it up is taking time due to toolchain issues. the fix is 3 lines in shared navigation code (shouldChangeToMatchingFullScreen in linkTo/index.ts), validated by your team. could you test it on your side? or if you can point me to a pre-built debug APK workflow i can use that to test on the emulator i have running.

ShridharGoel · 2026-04-05T10:56:32Z

Kindly check the contributing guidelines. Can you add the videos for other platforms? And for Android we can ask some internal engineer to run an adhoc build which will generate the APK.

ShridharGoel · 2026-04-05T11:51:52Z

Is this a bot account? The image links are placeholders.

yuvrajangadsingh · 2026-04-05T12:04:53Z

@ShridharGoel not a bot, just me. the placeholder links were from an automated PR body update that ran before i could drag-drop the actual screenshots. deleted that comment already. uploading real screenshots now.

yuvrajangadsingh · 2026-04-05T12:06:36Z

Testing Screenshots

Navigation flow: Home tab -> Account settings -> Back to Home. No regression on any platform.

MacOS: Chrome / Safari

Home tab:

Account settings (navigated from Home):

Back to Home:

iOS: mWeb Safari (iPhone 15 Pro viewport)

Home tab:

Account (navigated from Home):

Android: mWeb Chrome (Pixel 7 viewport)

Home tab:

Account (navigated from Home):

Note: Android native (HybridApp) requires an adhoc build per @ShridharGoel's suggestion.

ShridharGoel · 2026-04-05T12:21:53Z

Kindly add it in the PR description at the end, following the format. Also, since this is a navigation fix, just screenshots are not useful. Can you add videos instead?

yuvrajangadsingh · 2026-04-05T12:55:25Z

@ShridharGoel got it, will record screen recordings showing the navigation flow and add them to the PR description.

JmillsExpensify

LGTM

yuvrajangadsingh · 2026-04-07T14:27:53Z

@ShridharGoel videos added to the PR description for MacOS Chrome, iOS mWeb Safari, and Android mWeb Chrome. all showing Home -> Account -> Home navigation with correct transitions, no regression.

Android and iOS native sections have "adhoc build requested" as you suggested. let me know if anything else is needed.

ShridharGoel · 2026-04-07T14:34:19Z

But the videos don't even test the fix that has been added. Do you need any help in replicating that flow?

yuvrajangadsingh · 2026-04-08T06:37:05Z

@ShridharGoel yeah the tab switching was just showing no regression. i dont have physical card setup on this staging account so i cant trigger the TimeSensitiveSection "Add address" widget to show the actual bug flow. would appreciate help setting that up or if you can share test credentials / trigger an adhoc build i can record the actual before/after.

github-actions · 2026-04-08T22:38:26Z

🚧 @roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-08T22:40:38Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #87128.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5ded6bf-ea22b72-fa8996ee327d7dfc1c30c4710dcc06c2513e4005/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5ded6bf-ea22b72-c99f999354d7806892d54f86a220f47ed49c8820/index.html

Web 🕸️
https://87128.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-09T00:58:15Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.55-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-09T01:02:50Z

No help site changes are required for this PR.

This is a purely internal navigation animation fix — it adds a guard in shouldChangeToMatchingFullScreen to prevent the wrong full-screen route from being pushed underneath the Home screen on Android. There are no new features, UI changes, settings changes, or user-facing behavior changes that would affect documentation.

OSBotify · 2026-04-10T00:48:33Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.57-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-10T00:49:52Z

No help site changes required.

This PR is a navigation animation bug fix (src/libs/Navigation/helpers/linkTo/index.ts) that corrects the slide animation direction when pressing back after navigating from the Home tab to physical card RHP screens. It modifies only internal navigation logic — no user-facing features, settings, labels, or workflows are added or changed, so no updates to App/docs/articles are needed.

OSBotify · 2026-04-10T08:00:11Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.57-1 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

when navigating from HOME to an RHP that maps to a different fullscreen (e.g. Settings Wallet), replace HOME with the matching fullscreen instead of pushing on top. pushing creates [HOME, SETTINGS_SPLIT_NAVIGATOR, RHP] which causes Android to trim HOME from the render tree, producing wrong back animation (#85122). the original fix in #87128 added a blanket guard in shouldChangeToMatchingFullScreen that returned false for HOME, which broke Add address navigation (#87655). replacing HOME matches the reload state shape [SETTINGS, RHP] and fixes both issues: correct back animation AND working navigation. removes the blanket guard in shouldChangeToMatchingFullScreen so the replace path can run.

melvin-bot Bot assigned yuvrajangadsingh Apr 4, 2026

yuvrajangadsingh mentioned this pull request Apr 4, 2026

[$250] Back navigation animation moves in the wrong direction in physical card order flow #85122

Open

7 tasks

yuvrajangadsingh marked this pull request as ready for review April 4, 2026 08:04

yuvrajangadsingh requested review from a team as code owners April 4, 2026 08:04

melvin-bot Bot requested review from JmillsExpensify and youssef-lr and removed request for a team April 4, 2026 08:04

melvin-bot Bot removed the request for review from a team April 4, 2026 08:05

yuvrajangadsingh force-pushed the fix/85122-back-nav-animation branch 3 times, most recently from 60fae56 to c29b888 Compare April 4, 2026 08:22

yuvrajangadsingh force-pushed the fix/85122-back-nav-animation branch from e22e7c0 to 84ca888 Compare April 4, 2026 13:43

fix: prevent wrong back animation when navigating from Home to RHP

6383c65

yuvrajangadsingh force-pushed the fix/85122-back-nav-animation branch from 84ca888 to 6383c65 Compare April 4, 2026 17:09

JmillsExpensify approved these changes Apr 6, 2026

View reviewed changes

ShridharGoel approved these changes Apr 8, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham April 8, 2026 22:31

roryabraham approved these changes Apr 8, 2026

View reviewed changes

roryabraham merged commit 5ded6bf into Expensify:main Apr 8, 2026
45 of 47 checks passed

OSBotify mentioned this pull request Apr 9, 2026

Deploy Checklist: New Expensify 2026-04-09 #87435

Closed

66 tasks

DylanDylann mentioned this pull request Apr 16, 2026

[$250] Home - Click on Add address not navigate to Wallet #87655

Open

7 tasks

yuvrajangadsingh mentioned this pull request Apr 16, 2026

fix: replace HOME instead of pushing when navigating to Settings RHP #88117

Merged

52 tasks

Conversation

yuvrajangadsingh commented Apr 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 4, 2026

Uh oh!

codecov Bot commented Apr 4, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ShridharGoel commented Apr 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

yuvrajangadsingh commented Apr 4, 2026

Uh oh!

ShridharGoel commented Apr 4, 2026

Uh oh!

yuvrajangadsingh commented Apr 5, 2026

Uh oh!

ShridharGoel commented Apr 5, 2026

Uh oh!

ShridharGoel commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yuvrajangadsingh commented Apr 5, 2026

Uh oh!

yuvrajangadsingh commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing Screenshots

Uh oh!

ShridharGoel commented Apr 5, 2026

Uh oh!

yuvrajangadsingh commented Apr 5, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

yuvrajangadsingh commented Apr 7, 2026

Uh oh!

ShridharGoel commented Apr 7, 2026

Uh oh!

yuvrajangadsingh commented Apr 8, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 8, 2026

Uh oh!

github-actions Bot commented Apr 8, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

MelvinBot commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

yuvrajangadsingh commented Apr 4, 2026 •

edited

Loading

codecov Bot commented Apr 4, 2026 •

edited by github-actions Bot

Loading

ShridharGoel commented Apr 4, 2026 •

edited

Loading

ShridharGoel commented Apr 5, 2026 •

edited

Loading

yuvrajangadsingh commented Apr 5, 2026 •

edited

Loading