fix: prevent "Something went wrong" screen flash on failed spend query by nabi-ebrahimi · Pull Request #93752 · Expensify/App

nabi-ebrahimi · 2026-06-16T21:57:49Z

Explanation of Change

This PR prevents Search from re-running an already resolved initial search request.

useSearchPageSetup() already owns the initial offset: 0 request for the current search query. The Search component was also issuing a mount/focus search for the same query. When that query failed, the duplicate request optimistically cleared errors, causing the error page to unmount and the loading skeleton to appear again.

This change removes that redundant initial fetch path from Search, so failed search snapshots remain stable and the Something went wrong page stays visible.

Fixed Issues

$ #92462
PROPOSAL:#92462(comment)

Tests

Create a workspace.
Go to Spend > Expenses.
In the search field, type type:chat category:abcd.
Apply the search.
Verify the "Something went wrong" page appears.
Verify the "Something went wrong" page does not flash.

Verify that no errors appear in the JS console

Offline tests

N/A. This issue is about duplicate Search requests after a failed online search response.

QA Steps

Same as tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-06-17.at.2.11.29.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-06-17.at.2.17.33.AM.mov

iOS: Native

Screen.Recording.2026-06-17.at.1.44.17.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-06-17.at.1.52.47.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-17.at.2.24.39.AM.mov

…end query

codecov · 2026-06-17T07:20:30Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/Search/index.tsx	`0.76% <0.00%> (+<0.01%)`	⬆️
... and 9 files with indirect coverage changes

melvin-bot · 2026-06-17T07:31:26Z

@QichenZhu 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: 574f2f24b6

ℹ️ 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-17T07:38:39Z

-            if (validGroupBy || (shouldCalculateTotals && searchResults?.search?.count === undefined)) {
-                shouldRetrySearchWithTotalsOrGroupedRef.current = true;
-            }
+        if (offset === 0 || offset === searchResults?.search?.offset || !isFocused || isOffline || searchResults?.search?.isLoading) {


Re-run empty searches after reconnecting

When a user has a cached empty search open while offline and then reconnects, this new guard always returns for offset === 0, so the removed comingBackOnlineWithNoResults path no longer refreshes the snapshot. useSearchPageSetup() does not compensate because isSearchDataLoaded() treats existing empty data as loaded, so users can remain stuck on a stale empty state until they change the query or navigate away.

Useful? React with 👍 / 👎.

@nabi-ebrahimi thanks for the prompt update. However, I doubt the above comment is valid. Could you clarify:

What was the bug before your recent changes?

How do I verify it's working now?

Asking because I didn't notice any behaviour difference before/after, so I'm not sure whether I was testing it wrong or the bug didn't exist at all.

@QichenZhu thanks for checking.

That change is only to keep the old reconnect behavior for empty results.

Before, if a search was already loaded but empty, then the app went offline and came back online, Search still refreshed once via comingBackOnlineWithNoResults.

After removing the broad Search effect, that refresh was lost because useSearchPageSetup() sees empty data as already loaded and skips the request.

I tested it with two sessions:

Session A has an empty expense search open.

Session A goes offline.

Session B creates an expense matching that search.

Session A goes back online.

With the current change, Session A sends one Search request on reconnect and the new expense appears. I also guarded it with hasErrors, so it does not retry the failed-query error case.

Video:

required-search-req.mov

Thanks for answering the second question.

How do I verify it's working now?

How about the first one?

What was the bug before your recent changes?

I tried it without the last 2 commits and got the same expected result.

So I don't think the bot comment is valid, and I don't see what benefit the recent changes provide. Am I missing something?

@QichenZhu thanks for pointing this out, that's why we have C+s here.
Addressed this.

chatgpt-codex-connector · 2026-06-17T07:38:39Z

+            const shouldRefreshBehindRHP = isChat || hasManualHighlightTransactionIDs;
+            const isSearchStillActive = isFocused || (isSearchTopmostFullScreenRoute() && shouldRefreshBehindRHP);
            if (!isSearchStillActive || isOffline) {
-                hasPendingSearchRef.current = true;
+                hasPendingSearchRef.current = isOffline || shouldRefreshBehindRHP;


Keep pending refreshes for expense changes behind RHP

When a non-chat Search page is covered by an RHP and a matching transaction is added or removed while the RHP is open, isFocused is false and shouldRefreshBehindRHP is also false unless a manual highlight was registered, so this drops the pending refresh instead of preserving it. After the RHP closes, previousTransactions has already advanced and the hook no longer sees an ID change, leaving the expense search snapshot stale until another search is triggered.

Useful? React with 👍 / 👎.

This comment is genuine. Let's not touch the highlight logic then, since it doesn't contribute to the original issue.

Before

before.mov

After

after.mov

Addressed, thanks.

joekaufmanexpensify

Good for product

nabi-ebrahimi · 2026-06-18T07:12:08Z

@QichenZhu thanks for the videos. I agree the useSearchHighlightAndScroll concern is valid, so I reverted that part and left the highlight/RHP refresh behavior unchanged from main.

The PR now only keeps the issue-scoped Search fix: remove the redundant initial fetch from Search, keep pagination offset-only, skip already-loaded offsets, and preserve empty-results reconnect recovery without retrying errored snapshots.

nabi-ebrahimi · 2026-06-22T04:31:10Z

@QichenZhu kindly bump, thanks

QichenZhu · 2026-06-22T04:40:10Z

@nabi-ebrahimi, it may have escaped your notice, but the question above is still outstanding.

nabi-ebrahimi · 2026-06-22T07:24:11Z

@nabi-ebrahimi, it may have escaped your notice, but the question above is still outstanding.

@QichenZhu sorry, I missed that one. I replied here: #93752 (comment)

QichenZhu · 2026-06-23T12:04:12Z

@nabi-ebrahimi I replied. Could you take another look?

…ry-error-screen-flash

QichenZhu · 2026-06-25T02:43: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
https://expensify.slack.com/archives/C049HHMV9SM/p1782212176212669
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 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)
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)
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.
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

Screen_recording_20260625_143920.webm

Android: mWeb Chrome

Screen_recording_20260625_144041.webm

iOS: HybridApp

Simulator.Screen.Recording.-.iPhone.17.-.2026-06-25.at.21.39.35.mov

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.17.-.2026-06-25.at.14.40.30.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-25.at.2.06.19.PM.mov

QichenZhu

@nabi-ebrahimi thanks! One last thing (hopefully) is to fix the lint error.

nabi-ebrahimi · 2026-06-25T06:56:03Z

@nabi-ebrahimi thanks! One last thing (hopefully) is to fix the lint error.

Done, thanks! for the review.

github-actions · 2026-06-25T22:44:01Z

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

OSBotify · 2026-06-25T22:49:17Z

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

github-actions · 2026-06-25T22:49:42Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e109e842382-8dfb018-06048e2c665b2703fba72549cab52a8fe26622c0/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e109e84-8dfb018-ee4d785f142bddcbfd4fe470126bb5db5e50b773/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-26T20:00:09Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.21-2 🚀

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

mitarachim · 2026-06-27T00:36:05Z

Deploy Blocker #94742 was identified to be related to this PR.

fix: prevent "Something went wrong" screen from flashing on failed sp…

de6db01

…end query

melvin-bot Bot assigned nabi-ebrahimi Jun 16, 2026

Merge branch 'main' into fix/spend-failing-query-error-screen-flash

574f2f2

nabi-ebrahimi marked this pull request as ready for review June 17, 2026 07:31

nabi-ebrahimi requested review from a team as code owners June 17, 2026 07:31

melvin-bot Bot requested review from QichenZhu and joekaufmanexpensify and removed request for a team June 17, 2026 07:31

melvin-bot Bot removed the request for review from a team June 17, 2026 07:31

chatgpt-codex-connector Bot reviewed Jun 17, 2026

View reviewed changes

joekaufmanexpensify previously approved these changes Jun 17, 2026

View reviewed changes

Merge branch 'main' into fix/spend-failing-query-error-screen-flash

44c7421

nabi-ebrahimi dismissed joekaufmanexpensify’s stale review via 44c7421 June 18, 2026 06:37

Fix duplicate search requests on failed search

8ab6781

prettier fixed

ddae330

nabi-ebrahimi added 2 commits June 24, 2026 17:03

Merge remote-tracking branch 'origin/main' into fix/spend-failing-que…

3af327d

…ry-error-screen-flash

removed the extra empty-results reconnect effect

ef4e095

QichenZhu approved these changes Jun 25, 2026

View reviewed changes

melvin-bot Bot requested a review from blimpich June 25, 2026 02:53

nabi-ebrahimi added 2 commits June 25, 2026 09:56

Merge branch 'main' into fix/spend-failing-query-error-screen-flash

36cbc7d

fixed lint of screen flash

58f1152

blimpich approved these changes Jun 25, 2026

View reviewed changes

blimpich merged commit e109e84 into Expensify:main Jun 25, 2026
33 checks passed

OSBotify mentioned this pull request Jun 26, 2026

Deploy Checklist: New Expensify 2026-06-26 #94730

Open

45 tasks

applause-bot Bot mentioned this pull request Jun 27, 2026

Spend - Newly created report does not appear on Spend > Reports #94742

Open

7 tasks

mitarachim mentioned this pull request Jun 27, 2026

[$250] Spend-"Something went wrong" screen for a failing query flashes #92462

Open

7 tasks

blimpich mentioned this pull request Jun 27, 2026

Revert "fix: prevent "Something went wrong" screen flash on failed spend query" #94743

Draft

Uh oh!

Conversation

nabi-ebrahimi commented Jun 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!

codecov Bot commented Jun 17, 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!

melvin-bot Bot commented Jun 17, 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 17, 2026

Choose a reason for hiding this comment

Uh oh!

QichenZhu Jun 19, 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!

nabi-ebrahimi Jun 22, 2026

Choose a reason for hiding this comment

Uh oh!

QichenZhu Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

QichenZhu Jun 17, 2026

Choose a reason for hiding this comment

Before

After

Uh oh!

nabi-ebrahimi Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi commented Jun 18, 2026

Uh oh!

nabi-ebrahimi commented Jun 22, 2026

Uh oh!

QichenZhu commented Jun 22, 2026

Uh oh!

nabi-ebrahimi commented Jun 22, 2026

Uh oh!

QichenZhu commented Jun 23, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

QichenZhu left a comment • 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!

nabi-ebrahimi commented Jun 25, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

nabi-ebrahimi commented Jun 16, 2026 •

edited

Loading

codecov Bot commented Jun 17, 2026 •

edited by github-actions Bot

Loading

QichenZhu Jun 19, 2026 •

edited

Loading

QichenZhu commented Jun 25, 2026 •

edited

Loading

QichenZhu left a comment •

edited

Loading