Fix: smooth post-submit navigation and rendering on Spend tab by JakubKorytko · Pull Request #88728 · Expensify/App

JakubKorytko · 2026-04-24T15:01:17Z

Explanation of Change

Fix post-expense-submit navigation and visual flickering on the Spend (Search) page.
Four issues addressed:

swap SEARCH_DISMISS / REPORT_IN_RHP_DISMISS evaluation order so QAB expenses from Search stay on the Spend tab instead of navigating to WS chat (linked issue),
suppress AnimatedEmptyStateBackground flash when a DISMISS_MODAL deferred write is pending (raised here),
eliminate the blink between SearchStaticList and the real SearchList by hoisting the static overlay to SearchPage (common ancestor for narrow/wide) so it persists until the real list signals readiness. (raised by @ShridharGoel in slack)
show a loading skeleton instead of the "no expenses" empty state when creating the first expense on an empty report - reserve a DISMISS_MODAL deferred-write channel during the RHP dismiss so MoneyRequestReportActionsList renders a skeleton while the transaction is being created.

Fixed Issues

$ #88664
PROPOSAL: N/A

Tests

Open the Spend tab (Search page) on web or mobile
Tap the Quick Action Button (QAB) and create a new expense (e.g. manual expense to a workspace)
Submit the expense
Verify that you are navigated back to the Spend tab (not to the workspace chat or inbox)
Verify there is no white flash / blink between the static list and the real search results appearing

Open a money request report that has no expenses yet (shows the "no expenses" empty state with "Add expense" button)
Create an expense from within that report (mobile or web super-wide RHP)
Submit the expense
Verify that a loading skeleton is shown briefly instead of the "no expenses" empty state, and the expense appears smoothly

Open a report that has no expenses yet (empty report with the "created" header)
Create a track distance expense within that report
Submit the expense
Verify that the "add a report" empty state background does not flash briefly before the expense page appears

On web (wide layout), open the Spend tab with existing expenses
Create a new expense via the FAB (global create)
During the brief overlay period, verify the static list shows table headers, checkboxes, and column content identical to the real list (not empty rows)

Offline tests

N/A

QA Steps

Same as tests, performed on the staging environment.

PR Author Checklist

Screenshots/Videos

Android: Native

Android.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

codecov · 2026-04-24T15:10:48Z

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 Δ
...equestReportView/MoneyRequestReportActionsList.tsx	`65.69% <100.00%> (+0.63%)`	⬆️
...ts/Search/SearchPageHeader/useSearchFiltersBar.tsx	`31.11% <100.00%> (-1.50%)`	⬇️
src/libs/MoneyRequestReportUtils.ts	`78.26% <100.00%> (+0.31%)`	⬆️
src/pages/Search/SearchPage.tsx	`56.16% <100.00%> (+1.87%)`	⬆️
src/pages/inbox/report/ReportActionItemCreated.tsx	`100.00% <100.00%> (ø)`
src/pages/inbox/report/ReportActionsView.tsx	`81.56% <100.00%> (+0.26%)`	⬆️
...es/iou/request/step/IOURequestStepConfirmation.tsx	`67.78% <100.00%> (ø)`
.../iou/request/step/confirmation/getSubmitHandler.ts	`100.00% <100.00%> (ø)`
src/selectors/AdvancedSearchFiltersForm.ts	`100.00% <100.00%> (ø)`
src/pages/Search/SearchPageNarrow/index.tsx	`76.66% <80.00%> (-1.46%)`	⬇️
... and 5 more
... and 64 files with indirect coverage changes

JakubKorytko · 2026-04-24T17:44:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9415615739

ℹ️ 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 · 2026-04-24T19:05:09Z

@ShridharGoel 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: 8b025f5a20

ℹ️ 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-04-24T19:24:42Z

+    // Show skeleton while waiting for the transaction thread report to load after
+    // an optimistic expense creation. This prevents the partial "amount with nothing else"
+    // flash between the orchestrator skeleton and the fully rendered single-expense view.
+    const shouldShowSkeletonForTransactionThread = isWaitingForTransactionThread && !isOffline;


Limit transaction-thread skeleton to initial loading window

The new shouldShowSkeletonForTransactionThread branch is active whenever transactionThreadReportID exists but transactionThreadReport is still missing, regardless of whether the initial load phase has ended. If that child report never arrives (for example after a partial/failed data load), shouldShowSkeleton remains true indefinitely and the report stays stuck on a loading skeleton instead of falling back to renderable content. This gate should be bounded to initial-load conditions (or have a timeout/fallback) so one missing subscription does not permanently block the view.

Useful? React with 👍 / 👎.

ShridharGoel · 2026-04-24T19:44:16Z

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

Screen.Recording.2026-04-25.at.2.58.54.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-04-25.at.2.51.13.AM.mov

iOS: HybridApp

Screen.Recording.2026-04-25.at.2.22.40.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-04-25.at.2.30.35.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-25.at.2.12.27.AM.mov

ShridharGoel · 2026-04-24T20:49:12Z

Looks like the new expense highlight doesn't work if we stay on the confirmation page for at least CONST.PRE_INSERT_FULLSCREEN_DELAY

Open home page so global expense creation will return to Search after submit.
Tap the global create and create an expense.
Stay on the confirmation page for at least CONST.PRE_INSERT_FULLSCREEN_DELAY so Navigation.preInsertFullscreenUnderRHP() can insert Search behind the RHP.
Submit the expense.
When the RHP dismisses, observe the Search page.

Screen.Recording.2026-04-25.at.2.13.09.AM.mov

ShridharGoel · 2026-04-24T21:23:39Z

Is the loader at timestamp 0:16 expected?

Screen.Recording.2026-04-25.at.2.51.13.AM.mov

ShridharGoel · 2026-04-24T21:30:48Z

Seems like we still have a flicker on the search page.

Go to home page.
Use global create to start a multi-scan.
Capture multiple images.
Confirm the expense creation.

Screen.Recording.2026-04-25.at.2.58.54.AM.mov

JakubKorytko added 3 commits April 24, 2026 13:43

fix: search dismiss

5a8fa53

fix: empty report in between

72f5346

fix: search flickering

12ceaea

melvin-bot Bot assigned JakubKorytko Apr 24, 2026

JakubKorytko added 2 commits April 24, 2026 17:12

refactor: cleanup the code

e7fe0da

fix: empty report state

9415615

chatgpt-codex-connector Bot reviewed Apr 24, 2026

View reviewed changes

Comment thread src/hooks/useSearchOverlay.tsx

Comment thread src/pages/Search/SearchPageNarrow/index.tsx Outdated

address codex comments

8b025f5

JakubKorytko marked this pull request as ready for review April 24, 2026 19:05

JakubKorytko requested review from a team as code owners April 24, 2026 19:05

melvin-bot Bot requested review from JmillsExpensify and ShridharGoel and removed request for a team April 24, 2026 19:05

melvin-bot Bot removed the request for review from a team April 24, 2026 19:05

chatgpt-codex-connector Bot reviewed Apr 24, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: smooth post-submit navigation and rendering on Spend tab#88728

Fix: smooth post-submit navigation and rendering on Spend tab#88728
JakubKorytko wants to merge 6 commits intoExpensify:mainfrom
software-mansion-labs:korytko/perf/fix-search-dismiss

JakubKorytko commented Apr 24, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 24, 2026 •

edited by github-actions Bot

Loading

Uh oh!

JakubKorytko commented Apr 24, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

Uh oh!

melvin-bot Bot commented Apr 24, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Apr 24, 2026

Uh oh!

ShridharGoel commented Apr 24, 2026 •

edited

Loading

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

JakubKorytko commented Apr 24, 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 24, 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!

JakubKorytko commented Apr 24, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

melvin-bot Bot commented Apr 24, 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 Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

ShridharGoel commented Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

JakubKorytko commented Apr 24, 2026 •

edited

Loading

codecov Bot commented Apr 24, 2026 •

edited by github-actions Bot

Loading

ShridharGoel commented Apr 24, 2026 •

edited

Loading