fix: The Wallet Settings page is displayed instead of the settings menu page after opening "Add address" modal on the Home page on mobile web by dmkt9 · Pull Request #88949 · Expensify/App

dmkt9 · 2026-04-27T14:51:57Z

Explanation of Change

When we navigate to an RHP target route, we usually add an under–fullscreen router overlay. Currently, we only push the lastRouteInMatchingFullScreen of the matching fullscreen (e.g., Settings_Wallet) into the root state.

After the TabBar PR was merged, the sidebarScreen route is no longer automatically added to the root state, so the state becomes [Settings_Wallet].

If we're on a narrow layout and navigate to that matching fullscreen route via the navigation tab bar, the sidebarScreen gets added to the root state (becoming [Settings_Wallet, Settings_Root]). However, when navigating back again, the state gets rehydrated into [Settings_Root, Settings_Wallet] due to the logic here:

App/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts

Lines 55 to 68 in c71784d

    
           if (!isAtLeastOneInState(state, sidebarScreen) && shouldSplitHaveSidebar) { 
        
               const paramsFromRoute = getParamsFromRoute(sidebarScreen, !isNarrowLayout); 
        
               const copiedParams = pick(lastRoute?.params, paramsFromRoute); 
        
               // We don't want to get an empty object as params because it breaks some navigation logic when comparing if routes are the same. 
        
               const params = isEmptyObject(copiedParams) ? undefined : copiedParams; 
        
               routes.unshift({ 
        
                   name: sidebarScreen, 
        
                   // This handles the case where the sidebar should have params included in the central screen e.g. policyID for workspace initial. 
        
                   params, 
        
               }); 
        
               modified = true; 
        
           }

which leads to the current issue.

Therefore, this PR ensures that sidebarScreen is added immediately when adding the under–fullscreen router overlay. This prevents the current issue because Settings_Wallet already has Settings_Root in front, so no rehydration is needed. It also avoids a UI glitch where Settings_Wallet briefly appears when Settings_Root is added and the state transitions from [Settings_Wallet] to [Settings_Wallet, Settings_Root].

Fixed Issues

$ #88953
PROPOSAL:

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisite: The user is assigned a physical Expensify card and has not yet entered their personal information.

Open the application on a mobile device or in a narrow layout.
On the Home screen, tap the "Add address" button.
Tap the back button twice.
Note that you are in the Settings menu.
Tap "Home" on the tab navigation bar.
Tap "Settings" on the tab navigation bar.
Note that the Settings menu is displayed.
Tap "Home" on the tab navigation bar again.
Tap "Settings" on the tab navigation bar.
Verify that the Settings menu still displays.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.hybrid.mp4

Android: mWeb Chrome

android.chrome.mp4

iOS: Native

ios.hybrid.mp4

iOS: mWeb Safari

ios.safari.mp4

MacOS: Chrome / Safari

mac.safari.mp4

…nu page after opening "Add address" modal on the Home page on mobile web

codecov · 2026-04-27T15:01:01Z

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	`93.91% <85.71%> (-1.33%)`	⬇️
... and 39 files with indirect coverage changes

sumo-slonik · 2026-04-27T15:10:41Z

The changes looks fine to me

melvin-bot · 2026-04-27T16:17:02Z

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

ZhenjaHorbach · 2026-04-27T17:24:07Z

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 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

2026-04-27.20.32.08.mov

Android: mWeb Chrome

2026-04-27.20.30.11.mov

iOS: HybridApp

2026-04-27.20.32.08.mov

iOS: mWeb Safari

2026-04-27.20.30.11.mov

MacOS: Chrome / Safari

2026-04-27.20.29.04.mov

joekaufmanexpensify

Fixing DB

WojtekBoman · 2026-04-28T11:24:51Z

Let me review it before we merge as it's a change in one of the main functions in Navigation.ts

adamgrzybowski · 2026-04-28T11:40:44Z

@dmkt9 some explanation of changes would be great 😄

WojtekBoman · 2026-04-28T13:11:38Z

For now we can modify linkTo, but I'd suggest to clean this up as followup once we're done with deploy blockers after merging TabBar. @dmkt9 Please describe thoroughly why this change is necessary in the PR description, and maybe mention this issue in the comment above the added code

github-actions · 2026-04-28T13:32:03Z

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

luacmartins · 2026-04-28T13:32:10Z

@WojtekBoman I merged this PR since it seemed like it was ok from your previous comment. Let's clean this up as a follow up.

github-actions · 2026-04-28T13:36:54Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ddef0ba-becf156-f21d34d9a2921342d49720d8e721862d8d6b2807/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ddef0ba-becf156-597df84322d7d6143ec4294e76a0fedb7f4f72d4/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-28T13:40:22Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

fix: The Wallet Settings page is displayed instead of the settings menu page after opening "Add address" modal on the Home page on mobile web (cherry picked from commit ddef0ba) (cherry-picked to staging by luacmartins)

OSBotify · 2026-04-28T14:32:31Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.64-4 🚀

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

MelvinBot · 2026-04-28T14:34:39Z

No help site documentation changes are required for this PR.

This is a navigation bug fix in linkTo/index.ts that corrects tab switching behavior (Settings page incorrectly appearing after dismissing the "Add address" modal). The changes are purely internal navigation logic — no user-facing features, settings, terminology, or workflows were added or changed.

OSBotify · 2026-04-28T17:09:32Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.64-10 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

dmkt9 · 2026-04-29T09:35:10Z

@adamgrzybowski @WojtekBoman @luacmartins I have added an explanation of the changes for this PR

fix: The Wallet Settings page is displayed instead of the settings me…

d46e9ac

…nu page after opening "Add address" modal on the Home page on mobile web

melvin-bot Bot assigned dmkt9 Apr 27, 2026

dmkt9 marked this pull request as ready for review April 27, 2026 16:16

dmkt9 requested review from a team as code owners April 27, 2026 16:16

melvin-bot Bot requested review from ZhenjaHorbach and joekaufmanexpensify and removed request for a team April 27, 2026 16:17

melvin-bot Bot removed the request for review from a team April 27, 2026 16:17

ZhenjaHorbach approved these changes Apr 27, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny April 27, 2026 18:34

joekaufmanexpensify approved these changes Apr 27, 2026

View reviewed changes

luacmartins approved these changes Apr 28, 2026

View reviewed changes

luacmartins merged commit ddef0ba into Expensify:main Apr 28, 2026
54 of 55 checks passed

luacmartins mentioned this pull request Apr 28, 2026

Bottom Tab Navigator blockers #88978

Open

35 tasks

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 28, 2026

OSBotify mentioned this pull request Apr 28, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

arosiclair mentioned this pull request Apr 29, 2026

PR checklist #89226

Open

	if (!isAtLeastOneInState(state, sidebarScreen) && shouldSplitHaveSidebar) {
	const paramsFromRoute = getParamsFromRoute(sidebarScreen, !isNarrowLayout);
	const copiedParams = pick(lastRoute?.params, paramsFromRoute);

	// We don't want to get an empty object as params because it breaks some navigation logic when comparing if routes are the same.
	const params = isEmptyObject(copiedParams) ? undefined : copiedParams;

	routes.unshift({
	name: sidebarScreen,
	// This handles the case where the sidebar should have params included in the central screen e.g. policyID for workspace initial.
	params,
	});
	modified = true;
	}

Conversation

dmkt9 commented Apr 27, 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!

codecov Bot commented Apr 27, 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!

sumo-slonik commented Apr 27, 2026

Uh oh!

melvin-bot Bot commented Apr 27, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

WojtekBoman commented Apr 28, 2026

Uh oh!

adamgrzybowski commented Apr 28, 2026

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

luacmartins commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

dmkt9 commented Apr 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

dmkt9 commented Apr 27, 2026 •

edited

Loading

codecov Bot commented Apr 27, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Apr 27, 2026 •

edited

Loading

WojtekBoman commented Apr 28, 2026 •

edited

Loading