fix: The LHN within the Spend tab is not remembered when navigating to Inbox by nkdengineer · Pull Request #93396 · Expensify/App

nkdengineer · 2026-06-12T08:32:29Z

Explanation of Change

fix: The LHN within the Spend tab is not remembered when navigating to Inbox

Fixed Issues

$ #92460
PROPOSAL: #92460 (comment)

Tests

Open the "Spend" tab
Navigate to any item within the Reports LHN, for example, the "Drafts" section
Navigate to the Inbox tab
Navigate back to the "Spend" tab
Verify that the Spend tab displays the previously selected section.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-06-12.at.15.28.16.mov

Android: mWeb Chrome

Screen.Recording.2026-06-12.at.15.24.25.mov

iOS: Native

Screen.Recording.2026-06-12.at.15.25.00.mov

iOS: mWeb Safari

Screen.Recording.2026-06-12.at.15.26.02.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-12.at.15.21.32.mov

…o Inbox

melvin-bot · 2026-06-12T08:50:56Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ddfbf2ceaf

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-06-12T08:56:38Z

+        let rootTabRoute = rootState.routes.findLast((route) => {
+            if (route.name !== NAVIGATORS.TAB_NAVIGATOR) {
+                return false;
+            }
+            const tabState = getTabState(route);
+            return tabState?.routes?.[tabState.index ?? 0]?.name === navigator;


Don't restore reports from an older tab stack

When an older TAB_NAVIGATOR with Inbox/Reports active exists below the current tab stack, this findLast selects that older stack before considering the topmost stack's inactive Reports state. For example on wide layout, if a user opens report A, goes to Spend, opens report B from Spend (pushing a newer Reports tab stack), then switches to Home and presses Inbox, this predicate matches the older report-A stack and navigateToChats restores A instead of the report B state the user just left in the topmost tab navigator. The active-tab preference needs to avoid overriding a newer tab navigator that already has the target navigator state.

Useful? React with 👍 / 👎.

@nkdengineer thoughts?

I think it's not a valid case. If the Reports tab here means the report split navigator, it will be the focused route in tabState then we can find them as the last. If Reports tab means the full-screen search navigator, navigateToChats restores the report A is correct.

mkhutornyi · 2026-06-12T11:36:22Z

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
- MacOS: Desktop
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.mov

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MelvinBot · 2026-06-12T11:42:03Z

Review

The change correctly implements the approved proposal and fixes the reported Spend-LHN bug: it prefers the TAB_NAVIGATOR whose active tab is the requested navigator, so SearchTabButton reads preserved state from the tab stack that actually had Spend focused instead of the freshly-pushed (empty) one. The single-TAB_NAVIGATOR common case is unchanged — the fallback at getLastRoute.ts:20-22 reproduces the old behavior exactly.

The Codex P2 concern is legitimate, though — mkhutornyi it's worth a response before merge.

getLastRoute has 4 callers, and the riskiest is navigateToChats (index.tsx:113, wide layout) which restores the last report. Multiple TAB_NAVIGATOR instances can coexist — ensureTabNavigatorRoutes.ts:18-19 keeps the last two mounted, each carrying its own preserved per-navigator state. Because the new predicate uses findLast keyed on active tab, it can select an older tab stack whose active tab matched the requested navigator over a newer stack that has more recent preserved state for that navigator (but a different active tab) — restoring stale state.

Suggested alternative: select by what we actually want — preserved state — rather than using active-tab as a proxy. getPreservedNavigatorState is just a keyed lookup (usePreserveNavigatorState.ts:38), so iterate TAB_NAVIGATOR instances newest-first and pick the first whose child navigator key has a preserved state entry. That fixes the original bug and avoids preferring an older stack over a newer one.

Why the active-tab heuristic can pick the wrong stack

The bot's scenario: open report A → Spend → open report B from Spend (newer tab stack) → Home → press Inbox. The newest TAB_NAVIGATOR now has HOME active, so the new predicate rejects it and findLast walks back to an older stack whose active tab was REPORTS_SPLIT_NAVIGATOR — restoring report A instead of the newer report B.

getTabState(route).index is the active-tab index (tabNavigatorUtils.ts:14), and each tab instance contains all five tab routes, so tabState.routes[index].name === navigator correctly identifies the active tab — the issue is only which instance wins when several are stacked.

One open question: it's not fully confirmed that this exact sequence actually produces two stacked TAB_NAVIGATORs with HOME active above REPORTS active (plain tab presses and the RHP in-place tab-switch path behave differently). A quick wide-layout repro of the bot's steps would confirm whether this is a real regression or only theoretical — worth doing before merge given navigateToChats is on the hot path.

This review is advisory — I didn't open this PR and I'm not an assignee, so I haven't pushed any changes. Reply with @MelvinBot <feedback> to refine.

mkhutornyi

Please check potential regressions above.

MelvinBot · 2026-06-12T12:00:23Z

Regression scan

The fix works — I verified Flow 1 in a wide-layout browser: select "Reports" in the Spend LHN → switch to Inbox → switch back, and the Spend tab correctly restores "Reports" (would previously reset to the default "Expenses"). The simple Inbox round-trip is not polluted by Spend state.

But because this change alters which TAB_NAVIGATOR instance getLastRoute selects when more than one is stacked (ensureTabNavigatorRoutes.ts:18-19 keeps the last two mounted), it affects all 4 callers, not just Search. Two concrete regression risks:

1. Stale report restored by navigateToChats (the P2 chatgpt-codex-connector already raised). index.tsx:113 and the two selectors at index.tsx:60/:68 request REPORTS_SPLIT_NAVIGATOR. When a newer tab stack exists but its active tab isn't Reports, the new predicate skips it and picks an older stack — restoring a staler report on wide-layout Inbox than before. I couldn't reproduce this empirically (test account had no reports, so Spend never pushed a /r/<id> route), so it stays a code-level risk pending a repro with real report data.

2. tabState.index ?? 0 can produce a false "Reports-active" match. At getLastRoute.ts:18, when index is undefined (a tab navigator pushed but not yet focused, e.g. mid-transition), ?? 0 treats routes[0] as active — and routes[0] is REPORTS_SPLIT_NAVIGATOR (TabNavigator.tsx:118). So a half-initialized instance is wrongly counted as Reports-active (and never Search-active), skewing the selection during transient states. Safer to bail out of the predicate when index is undefined rather than defaulting to 0.

No unit tests were added for getLastRoute, and none exist today — the multi-tab-stack selection logic is exactly the kind of thing a small state-shape unit test would lock down.

Lower-severity / notes

navigateToSearch reading an older stack (the fixed path): symmetric to Some initial fixes and code style updates #1 — if the newest tab nav's active tab isn't Search, the new code reads Search state from an older instance. In practice both instances usually share the same preserved-state key so the query is identical; only diverges after a fresh remount gives them distinct keys. Low severity.
A Cannot update a component (SearchPage) while rendering a different component (Search) console warning appeared during testing, but it originates in the Search components and is not obviously introduced by this PR (the diff only touches getLastRoute.ts).
Recommendation from Some initial fixes and code style updates #1/Fix spaces #2: select by preserved-state presence (iterate tab navigators newest-first, pick the first whose target navigator child key has a preserved-state entry) rather than using active-tab as a proxy — this fixes the original bug without ever preferring an older stack over a newer one.

Advisory only — I didn't open this PR and I'm not an assignee, so I haven't pushed changes. Reply with @MelvinBot <feedback> to refine.

trjExpensify

You sure this is the right RCA? It's not all the tabs, just the Todos.

2026-06-12_18-55-50.mp4

mkhutornyi · 2026-06-12T17:57:52Z

@trjExpensify also Card accruals

nkdengineer · 2026-06-15T09:31:50Z

@trjExpensify For the tab that doesn't use live data, we save the param to Onyx here

App/src/hooks/useSearchPageSetup.ts

Lines 56 to 70 in 1765e75

    
           useEffect(() => { 
        
               if (!queryJSON || hash === undefined || shouldUseLiveData || isOffline) { 
        
                   return; 
        
               } 
        
               // Must run even on cached snapshots, else SearchTabButton's Onyx fallback restores 
        
               // a stale query after a tab switch (e.g. filter reappears after Reset). 
        
               if (lastSavedSearchHash !== hash) { 
        
                   saveLastSearchParams({queryJSON, offset: 0, searchKey: currentSearchKey, hasMoreResults: false, allowPostSearchRecount: false}); 
        
                   lastSavedSearchHash = hash; 
        
               } 
        
               if (isSnapshotDataLoaded || isSnapshotSearchLoading) { 
        
                   return; 
        
               }

Then, after that for other tabs, we can't find lastSearchRoute as my RCA, then we read from lastSearchParams so it doesn't happen for other tabs except live data tab.

App/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx

Lines 40 to 75 in 1765e75

    
               } 
        
               clearSelectedText(); 
        
               interceptAnonymousUser(() => { 
        
                   startSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, { 
        
                       name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, 
        
                       op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, 
        
                       forceTransaction: true, 
        
                   }); 
        
                   startNavigateToReportsSpans(); 
        
                   const lastSearchRoute = getLastRoute(navigationRef.getRootState(), NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SCREENS.SEARCH.ROOT); 
        
                   if (lastSearchRoute) { 
        
                       const {q, ...rest} = lastSearchRoute.params as SearchFullscreenNavigatorParamList[typeof SCREENS.SEARCH.ROOT]; 
        
                       const queryJSON = buildSearchQueryJSON(q); 
        
                       if (queryJSON) { 
        
                           const query = buildSearchQueryString(queryJSON); 
        
                           Navigation.navigate( 
        
                               ROUTES.SEARCH_ROOT.getRoute({ 
        
                                   query, 
        
                                   ...rest, 
        
                               }), 
        
                           ); 
        
                           return; 
        
                       } 
        
                   } 
        
                   const lastQueryJSON = lastSearchParams?.queryJSON; 
        
                   const lastQueryFromOnyx = lastQueryJSON ? buildSearchQueryString(lastQueryJSON) : undefined; 
        
                   const defaultSearchQuery = buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE}); 
        
                   Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: lastQueryFromOnyx ?? defaultSearchQuery})); 
        
               }); 
        
           }; 
        
           if (isWideLayout) { 
        
               return (

trjExpensify · 2026-06-16T01:05:37Z

CC'ing @JS00001 for vis on this.

fix: The LHN within the Spend tab is not remembered when navigating t…

ddfbf2c

…o Inbox

melvin-bot Bot assigned nkdengineer Jun 12, 2026

nkdengineer marked this pull request as ready for review June 12, 2026 08:50

nkdengineer requested review from a team as code owners June 12, 2026 08:50

melvin-bot Bot requested a review from mkhutornyi June 12, 2026 08:50

melvin-bot Bot requested review from trjExpensify and removed request for a team June 12, 2026 08:50

chatgpt-codex-connector Bot reviewed Jun 12, 2026

View reviewed changes

mkhutornyi reviewed Jun 12, 2026

View reviewed changes

trjExpensify reviewed Jun 12, 2026

View reviewed changes

Conversation

nkdengineer commented Jun 12, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 12, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 12, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jun 12, 2026

Choose a reason for hiding this comment

Uh oh!

nkdengineer Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Jun 12, 2026

Review

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Jun 12, 2026

Regression scan

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Jun 12, 2026

Uh oh!

nkdengineer commented Jun 15, 2026

Uh oh!

trjExpensify commented Jun 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mkhutornyi commented Jun 12, 2026 •

edited

Loading