Skip to content

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

Open
yuvrajangadsingh wants to merge 1 commit intoExpensify:mainfrom
yuvrajangadsingh:fix/87655-home-to-settings-replace
Open

fix: replace HOME instead of pushing when navigating to Settings RHP#88117
yuvrajangadsingh wants to merge 1 commit intoExpensify:mainfrom
yuvrajangadsingh:fix/87655-home-to-settings-replace

Conversation

@yuvrajangadsingh
Copy link
Copy Markdown
Contributor

@yuvrajangadsingh yuvrajangadsingh commented Apr 16, 2026 •
edited
Loading

Explanation of Change

Regression fix from #87128.

PR #87128 (merged Apr 8) added a guard in shouldChangeToMatchingFullScreen that returned false when lastFullScreenRoute.name === SCREENS.HOME. This fixed the back animation issue (#85122) but broke navigation from Home to Settings RHP routes (#87655).

The guard was too broad: it blocked ALL fullscreen changes when on HOME, including legitimate ones like "Add address" which needs to navigate to Settings/Wallet.

This PR replaces HOME with the matching fullscreen via StackActions.replace instead of blocking the fullscreen change entirely. The stack shape now matches a page reload ([SETTINGS_SPLIT_NAVIGATOR, RHP]), which fixes both:

One boolean: shouldReplace = lastFullScreenRoute.name === SCREENS.HOME. Uses replace instead of push only for HOME. All other routes use push as before.

Fixed Issues

$ #87655
PROPOSAL: #88117

Tests

  1. Sign in, land on Home
  2. Open a Time Sensitive card that has an "Add address" action
  3. Tap the action, verify it navigates to Settings Wallet card page
  4. Tap back, verify it lands on Settings Wallet (matches reload behavior)
  5. On Android, verify the back animation direction is correct (not reversed)
  6. Verify non-HOME RHP navigations (e.g. from any Settings page to another RHP) still use push and behave as before
  • Verify that no errors appear in the JS console

Offline tests

Same as tests. Navigation logic is client-side and not affected by network state.

QA Steps

  1. Sign in, land on Home
  2. Open a Time Sensitive card that has an "Add address" action
  3. Tap the action, verify it navigates to Settings Wallet card page
  4. Tap back, verify it lands on Settings Wallet
  5. On Android, verify the back animation direction is correct
  6. Verify non-HOME RHP navigations still use push and behave as before
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

N/A

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

N/A

@yuvrajangadsingh yuvrajangadsingh mentioned this pull request Apr 16, 2026
Open
7 tasks
@yuvrajangadsingh yuvrajangadsingh marked this pull request as ready for review April 16, 2026 13:58
@yuvrajangadsingh yuvrajangadsingh requested review from a team as code owners April 16, 2026 13:58
@melvin-bot melvin-bot bot requested review from cristipaval and flaviadefaria and removed request for a team April 16, 2026 13:59
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 16, 2026

@cristipaval 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]

@yuvrajangadsingh yuvrajangadsingh mentioned this pull request Apr 16, 2026
Open
7 tasks
@roryabraham roryabraham requested review from ShridharGoel and roryabraham and removed request for cristipaval and flaviadefaria April 16, 2026 16:31
@roryabraham
Copy link
Copy Markdown
Contributor

roryabraham commented Apr 16, 2026

@yuvrajangadsingh CI is failing

@yuvrajangadsingh yuvrajangadsingh force-pushed the fix/87655-home-to-settings-replace branch from 1d677d6 to 9ed2431 Compare April 16, 2026 17:56
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 16, 2026 •
edited by github-actions bot
Loading

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/Navigation/helpers/linkTo/index.ts 86.41% <75.00%> (+1.05%) ⬆️
... and 13 files with indirect coverage changes

@yuvrajangadsingh
fix: replace HOME instead of pushing when navigating to Settings RHP
0ddfa64 
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 (Expensify#85122). the original fix in Expensify#87128 added a blanket guard
in shouldChangeToMatchingFullScreen that returned false for HOME,
which broke Add address navigation (Expensify#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.
@yuvrajangadsingh yuvrajangadsingh force-pushed the fix/87655-home-to-settings-replace branch from 18552e9 to 0ddfa64 Compare April 16, 2026 18:37
@yuvrajangadsingh
Copy link
Copy Markdown
Contributor Author

yuvrajangadsingh commented Apr 16, 2026

@roryabraham CI is green now. the earlier fails were a stale checklist template, missing signing config, and a prettier nit. also rebased on latest main so the diff now cleanly removes the #87128 guard in shouldChangeToMatchingFullScreen and replaces it with a replace-instead-of-push when navigating from HOME. matches the reload stack shape [SETTINGS, RHP] so Android doesn't trim HOME and Add address navigation works. ready for review.

@roryabraham
Copy link
Copy Markdown
Contributor

roryabraham commented Apr 16, 2026

awaiting C+ review from @ShridharGoel

@ShridharGoel
Copy link
Copy Markdown
Contributor

ShridharGoel commented Apr 16, 2026

@roryabraham Just waiting on this

@ShridharGoel
Copy link
Copy Markdown
Contributor

ShridharGoel commented Apr 17, 2026

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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-04-17.at.1.08.45.PM.mov

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roryabraham roryabraham Awaiting requested review from roryabraham

1 more reviewer

@ShridharGoel ShridharGoel ShridharGoel approved these changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@yuvrajangadsingh yuvrajangadsingh

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yuvrajangadsingh @roryabraham @ShridharGoel