Fix navigation arrows disappearing during report browsing by leshniak · Pull Request #88118 · Expensify/App

leshniak · 2026-04-16T13:56:25Z

Explanation of Change

Flip shouldUpdateLastSearchParams default to false in the search() action so background searches no longer overwrite the global last-search-params key. Only 2 out of ~10 callers actually need to persist search params — all others are background refreshes, chart data, or bulk action follow-ups.

Persist params explicitly at the two points that establish or extend the navigation context:

In Search/index.tsx onSelectRow: save params when the user clicks an expense report row to open the RHP
In MoneyRequestReportNavigation.tsx goToNextReport: pass shouldUpdateLastSearchParams: true when prefetching more results via arrows (75% threshold)

Fixed Issues

$ #87784
PROPOSAL:

Tests

Navigate to Search → Reports (expense reports)
Click on any expense report row to open it in the RHP
Verify the navigation arrows are visible and show "X of Y" counter
Use the prev/next arrows to navigate between reports
Verify the arrows remain visible and functional after each navigation
Verify the counter updates correctly
Navigate past 75% of results and verify more results are prefetched (arrows continue working)
Close the RHP and return to search results

Verify that no errors appear in the JS console

Offline tests

Open an expense report via search while online
Go offline
Verify arrows still show for cached reports
Navigate between cached reports using arrows
Verify no crash occurs

QA Steps

Same as Tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

bez.nazwy.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

test.mp4

Background search calls (useSearchHighlightAndScroll, useSearchPageSetup) overwrote REPORT_NAVIGATION_LAST_SEARCH_QUERY with a different search type, causing prev/next arrows to hide. Flip shouldUpdateLastSearchParams default to false in search() so background calls no longer overwrite the navigation context. Persist params explicitly when user selects an expense report row (onSelectRow) and when arrows prefetch more results (goToNextReport). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

melvin-bot · 2026-04-22T13:16:24Z

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

joekaufmanexpensify

Good for product 👍

aimane-chnaif · 2026-04-23T17:01:56Z

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: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

aimane-chnaif · 2026-04-23T17:02:23Z

Please fix conflict

aimane-chnaif · 2026-04-23T17:26:18Z

@@ -523,7 +516,7 @@ function search({
    prevReportsLength,
    isOffline = false,
    isLoading,
-    shouldUpdateLastSearchParams = true,
+    shouldUpdateLastSearchParams = false,


This affects too many places where this function is called. Please confirm this change doesn't cause any regressions in all affected files.
Payment actions are fine but what about the calls in

TransactionGroupListItem

useSearchHighlightAndScroll

useSearchPageSetup

SearchPage, SearchPageNarrow

useSpendOverTimeData?

Let me ensure.

This is the main fix - in my opinion this default was wrong by design, the "search" action should not implicitly change the state.

Confirmed — the default flip is safe for all affected callers. Here is the breakdown:

Caller Regression risk Reasoning

TransactionGroupListItem None Refreshes/re-fetches within existing search context. Prev/next state already set at navigation time.

useSearchHighlightAndScroll None Re-triggers search on new transactions for highlight refresh — not a navigation context change.

useSearchPageSetup None Initial page search setup. Navigation context is now saved explicitly in Search/index.tsx when user clicks a result, not when search fires.

SearchPage / SearchPageNarrow None Same as above — handleSearchAction triggers data fetch, but prev/next context is persisted at navigation time.

useSpendOverTimeData None Already passes false explicitly. No change in behavior.

The core reasoning: lastSearchParams only matters for prev/next navigation arrows in the report RHP. Those arrows activate when user navigates from search results to a report. This PR moves saveLastSearchParams() to that exact navigation point (Search/index.tsx, the openMoneyRequestReport handler), which is more correct — it captures the state at click time, including hasMoreResults from the already-resolved response, rather than saving it speculatively when the search request fires.

The search() function becomes a pure data-fetch with no implicit navigation state mutation. The one caller that still needs the old behavior (MoneyRequestReportNavigation — pagination for next/prev) now passes shouldUpdateLastSearchParams: true explicitly.

MelvinBot · 2026-04-23T17:48:58Z

The approach is sound — flipping the default to false prevents background refreshes from clobbering the richer params saved when the user opens a report, while the two explicit opt-ins (onSelectRow and goToNextReport) cover the paths that actually need it.

One question on scope:

saveLastSearchParams is only called in the isTransactionGroupListItemType branch (navigating to SEARCH_MONEY_REQUEST_REPORT). The other onSelectRow paths — ReportAction items, Task items, and plain transaction items that navigate to SEARCH_REPORT — don't get this call. Is that intentional? If navigation arrows are expected for those report types too, they'd have the same bug.

Everything else looks correct:

The new useMemo deps (queryJSON, offset, searchResults?.search?.hasMoreResults) match exactly what's referenced in the new code
The shouldUpdateLastSearchParams: true in goToNextReport is correct for the prefetch-more-results path
All other search() callers are background refreshes that don't need to persist params

Next Steps: Reply with @MelvinBot <your feedback> if you'd like me to look at anything else.

aimane-chnaif · 2026-04-27T09:30:11Z

And there's conflict

…verwrite # Conflicts: # src/components/Search/index.tsx

leshniak · 2026-04-27T14:53:42Z

@aimane-chnaif resolved

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

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 Δ
...RequestReportView/MoneyRequestReportNavigation.tsx	`8.51% <ø> (ø)`
src/libs/actions/Search.ts	`25.70% <100.00%> (-1.22%)`	⬇️
src/components/Search/index.tsx	`0.91% <0.00%> (-0.01%)`	⬇️
... and 17 files with indirect coverage changes

Julesssss

New conflicts unfortunately

…verwrite # Conflicts: # src/components/Search/index.tsx

leshniak · 2026-04-28T13:15:28Z

resolved again

leshniak · 2026-04-29T11:53:29Z

@aimane-chnaif do you still have concerns? can I convince you more?

aimane-chnaif · 2026-04-29T14:16:47Z

Thanks. No more concerns

aimane-chnaif · 2026-04-29T14:19:38Z


            if (isTransactionGroupListItemType(item)) {
                const firstTransaction = item.transactions.at(0);
+


Remove line break as unrelated

MelvinBot · 2026-04-29T14:22:17Z

Approach is correct. Flipping the default to false and saving params explicitly at the two user-intent points is the right fix. All 13 callers that relied on the old true default are background refreshes, action follow-ups, or pagination — none should persist search params.

All CI checks pass. The three new useMemo deps (queryJSON, offset, searchResults?.search?.hasMoreResults) match exactly what the new code references.

One note (reiterated from my earlier comment): saveLastSearchParams is only called in the isTransactionGroupListItemType branch of onSelectRow. The other row types (ReportAction, Task, plain transaction navigating to SEARCH_REPORT) don't save params either. If navigation arrows are expected for those report types, they'd still have the original bug. If arrows are only shown for money request reports, this is fine as-is.

MelvinBot · 2026-04-29T14:29:04Z

Regression Analysis

Two potential regressions found — one likely real, one low-risk.

1. `useSearchPageSetup` no longer seeds navigation params (medium risk)

useSearchPageSetup.ts:55 fires the initial search() call when a user navigates to the Search page. With the default flipped to false, this call no longer populates REPORT_NAVIGATION_LAST_SEARCH_QUERY.

The PR compensates by calling saveLastSearchParams in onSelectRow (branch 5), so when the user clicks a transaction group row the params are saved just before navigation. This should work — but the timing is tighter: the params are now saved synchronously right before requestAnimationFrame(() => Navigation.navigate(...)) at index.tsx:1174. If Onyx.set hasn't flushed by the time MoneyRequestReportNavigation mounts and reads the key, the arrows could flicker or not appear on first render.

Recommendation: Verify this timing works reliably on slow devices. If it doesn't, adding shouldUpdateLastSearchParams: true to useSearchPageSetup.ts:55 is a safe fix — it's the initial search and would only run once per search page visit.

2. `SearchTabButton` fallback behavior change (low risk)

SearchTabButton.tsx:65-68 reads lastSearchParams to restore the user's last search query when tapping the Search tab. Previously, every search() call saved params, so this reliably remembered the last query. Now it only gets updated when the user clicks a transaction group row or when goToNextReport paginates.

Impact: If a user runs a search but never clicks into a report, taps away, then taps the Search tab again — they'll see the default canned expense query instead of their previous search. This is a minor UX regression, not a crash.

No regressions found in:

All other search() callers (submit/pay actions, selection mode, group expansion, highlight/scroll) — these are background refreshes that don't need to save params
Non-transaction-group onSelectRow branches (report actions, tasks, individual transactions) — the arrows guard at MoneyRequestReportNavigation.tsx:165 requires queryJSON.type === 'expense-report', so arrows never mount for these paths anyway
All consumers of REPORT_NAVIGATION_LAST_SEARCH_QUERY handle the empty/undefined case safely with optional chaining and fallback defaults — no crash risk

Edge case: stale lastSearchQuery across navigations

Since lastSearchQuery persists in Onyx, if a user clicks a transaction group (saving params), goes back, then clicks a report action item from the same search, the stale params could cause arrows to appear on the SEARCH_REPORT screen with incorrect context. This is pre-existing behavior (not introduced by this PR) since clearLastSearchParams is only called when creating a new report.

Next Steps: Reply with @MelvinBot <your feedback> if you'd like me to dig deeper into any of these.

aimane-chnaif · 2026-04-29T14:41:18Z

Please check potential regressions above

chatgpt-codex-connector · 2026-04-29T14:45:13Z

Codex Review: Didn't find any major issues. What shall we delve into next?

ℹ️ 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".

melvin-bot Bot assigned leshniak Apr 16, 2026

adhorodyski approved these changes Apr 17, 2026

View reviewed changes

leshniak mentioned this pull request Apr 17, 2026

[$250] RHP closes unexpectedly when navigating between expense reports using prev/next arrows #87784

Open

leshniak marked this pull request as ready for review April 22, 2026 13:16

leshniak requested review from a team as code owners April 22, 2026 13:16

melvin-bot Bot requested review from aimane-chnaif and joekaufmanexpensify and removed request for a team April 22, 2026 13:16

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

joekaufmanexpensify previously approved these changes Apr 22, 2026

View reviewed changes

Julesssss mentioned this pull request Apr 23, 2026

Eliminate redundant getSections() computations in Report Navigation #86542

Open

aimane-chnaif reviewed Apr 23, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/main' into fix/search-params-o…

53fdc0a

…verwrite # Conflicts: # src/components/Search/index.tsx

leshniak dismissed joekaufmanexpensify’s stale review via 53fdc0a April 27, 2026 14:53

Julesssss reviewed Apr 27, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/main' into fix/search-params-o…

f108d97

…verwrite # Conflicts: # src/components/Search/index.tsx

aimane-chnaif approved these changes Apr 29, 2026

View reviewed changes

melvin-bot Bot requested a review from Julesssss April 29, 2026 14:17

aimane-chnaif reviewed Apr 29, 2026

View reviewed changes

Caller	Regression risk	Reasoning
TransactionGroupListItem	None	Refreshes/re-fetches within existing search context. Prev/next state already set at navigation time.
useSearchHighlightAndScroll	None	Re-triggers search on new transactions for highlight refresh — not a navigation context change.
useSearchPageSetup	None	Initial page search setup. Navigation context is now saved explicitly in `Search/index.tsx` when user clicks a result, not when search fires.
SearchPage / SearchPageNarrow	None	Same as above — `handleSearchAction` triggers data fetch, but prev/next context is persisted at navigation time.
useSpendOverTimeData	None	Already passes `false` explicitly. No change in behavior.


		if (isTransactionGroupListItemType(item)) {
		const firstTransaction = item.transactions.at(0);

Conversation

leshniak commented Apr 16, 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 22, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Apr 23, 2026

Uh oh!

aimane-chnaif Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leshniak Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

leshniak Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 23, 2026

Uh oh!

aimane-chnaif commented Apr 27, 2026

Uh oh!

leshniak commented Apr 27, 2026

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!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

leshniak commented Apr 28, 2026

Uh oh!

leshniak commented Apr 29, 2026

Uh oh!

aimane-chnaif commented Apr 29, 2026

Uh oh!

aimane-chnaif Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Regression Analysis

1. useSearchPageSetup no longer seeds navigation params (medium risk)

2. SearchTabButton fallback behavior change (low risk)

No regressions found in:

Uh oh!

aimane-chnaif commented Apr 29, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

leshniak commented Apr 16, 2026 •

edited

Loading

aimane-chnaif commented Apr 23, 2026 •

edited

Loading

aimane-chnaif Apr 23, 2026 •

edited

Loading

codecov Bot commented Apr 27, 2026 •

edited by github-actions Bot

Loading

1. `useSearchPageSetup` no longer seeds navigation params (medium risk)

2. `SearchTabButton` fallback behavior change (low risk)