Fix Spend tab flash when backing out of manual expense from Workspaces tab by MelvinBot · Pull Request #94515 · Expensify/App

MelvinBot · 2026-06-24T21:51:40Z

Explanation of Change

On the Workspaces bottom tab, opening FAB → Create expense → Manual and then pressing back briefly flashed the Spend tab before landing back on Workspaces.

When the embedded IOURequestStepConfirmation mounts from global-create, it pre-inserts the Search/Spend fullscreen route under the RHP so the right tab is revealed after submit. On back-press, navigateBack called Navigation.closeRHPFlow() which pops the RHP first. By the time the confirmation's unmount cleanup ran removePreInsertedFullscreenIfNeeded(), the RHP was already gone, so it took the "already-dismissed" branch and restored the original tab on the next frame via requestAnimationFrame. For that one frame the pre-inserted Spend tab was the visible top route → the flash.

This change restores the original tab while the RHP is still on top by calling Navigation.removePreInsertedFullscreenIfNeeded() before closeRHPFlow() in navigateBack. That routes the dismiss through the clean REMOVE_FULLSCREEN_UNDER_RHP branch, which swaps the tab back under the RHP before it pops — so Workspaces (not Spend) is revealed and there is no flash. The call is a guarded no-op when nothing was pre-inserted, and the existing unmount-cleanup check (getIsFullscreenPreInsertedUnderRHP()) prevents any double handling.

Note: The original deploy blocker was already mitigated by reverting #94134 (re-gating the NEW_MANUAL_EXPENSE_FLOW beta) in #94312. This PR is the forward fix for the underlying navigation flash so the new manual expense flow can be re-landed without it. The fix lives entirely in the shared pre-insert machinery and benefits any global-create pre-insert dismiss path.

Code reference

src/pages/iou/request/IOURequestStartPage.tsx navigateBack
Clean branch: Navigation.ts REMOVE_FULLSCREEN_UNDER_RHP
"Already-dismissed" rAF restore (the flashy path now avoided on back-press): Navigation.ts

Fixed Issues

$ #94271
PROPOSAL: #94271 (comment)

Tests

Launch Expensify app.
Go to Spend.
Go to Workspaces.
Open FAB > Create expense > Manual.
Tap app back button.
Verify that App will directly return to Workspaces tab

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Launch Expensify app.
Go to Spend.
Go to Workspaces.
Open FAB > Create expense > Manual.
Tap app back button.
Verify that App will directly return to Workspaces tab

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

🤖 Drafted by MelvinBot. AI tests run locally before opening this PR: prettier (clean), lint-changed (pass), typecheck-tsgo (pass), tests/ui/IOURequestStartPageTest.tsx (pass), tests/ui/components/IOURequestStepConfirmationPageTest.tsx (13 pass). The React Compiler compliance check could not run locally due to an environment ref-resolution issue (CI=true with an empty GITHUB_BASE_REF); the change adds only an imperative statement to an existing event handler, so it introduces no new memoizable construct — CI runs the authoritative check.

…se back Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>

MelvinBot · 2026-06-24T21:52:08Z

🤖 I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixWorkspacesTabFlashOnExpenseBack
git checkout -b claude-fixWorkspacesTabFlashOnExpenseBack upstream/claude-fixWorkspacesTabFlashOnExpenseBack
git push -u origin claude-fixWorkspacesTabFlashOnExpenseBack

Then you can close this PR and open a new one from your fork if you prefer.

thelullabyy · 2026-06-25T04:57:52Z

@MelvinBot Please replace all [ ] in PR description to [x] and add this test to Tests and QA section

Enabled `newManualExpenseFlow` beta

1. Launch Expensify app.
2. Go to Spend.
3. Go to Workspaces.
4. Open FAB > Create expense > Manual.
5. Tap app back button.
6. Verify that App will directly return to Workspaces tab

Finally, open PR for review

melvin-bot · 2026-06-25T05:00:22Z

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

MelvinBot · 2026-06-25T05:00:24Z

🤖 Done, thelullabyy:

Checked all [ ] boxes ([x]) in the PR description.
Added your test steps to both the Tests and QA Steps sections.
Marked the PR as Ready for review.

thelullabyy · 2026-06-25T05:01:29Z

@MelvinBot The Test and QA part should be

Enabled `newManualExpenseFlow` beta

1. Launch Expensify app.
2. Go to Spend.
3. Go to Workspaces.
4. Open FAB > Create expense > Manual.
5. Tap app back button.
6. Verify that App will directly return to Workspaces tab

thelullabyy · 2026-06-25T05:01:35Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-25.at.00.54.51.mov

MelvinBot · 2026-06-25T05:03:36Z

🤖 Updated the Tests and QA Steps sections to add the Enabled newManualExpenseFlow beta prerequisite line above the steps, thelullabyy.

thelullabyy · 2026-06-25T05:04:11Z

@MelvinBot You are using the wrong PR description template. Please use this one

https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md

thelullabyy

LGTM

MelvinBot · 2026-06-25T05:06:18Z

🤖 Done, thelullabyy. I rebuilt the description from the canonical PULL_REQUEST_TEMPLATE.md, preserving the Explanation of Change, Fixed Issues, your Tests/QA steps, and the checked checklist boxes.

OSBotify · 2026-06-25T20:20:42Z

✋ 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-25T20:37:16Z

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

github-actions · 2026-06-25T20:44:07Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f4a57dbba75-f7f8a31-41efedb1e138ca2fde2a7463b4b0360519e67014/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f4a57db-f7f8a31-af0cb6a741276b4c9c606ad8ee6cef64a8029fed/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-25T21:52:30Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.4.20-0 🚀

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

MelvinBot · 2026-06-25T21:55:17Z

🤖 I reviewed the changes in this PR and no help site changes are required.

Why: This is a purely internal navigation fix. It adds a single Navigation.removePreInsertedFullscreenIfNeeded() call in navigateBack so the pre-inserted fullscreen tab is restored while the RHP is still on top, avoiding a one-frame flash of the Spend tab when backing out of FAB → Create expense → Manual from the Workspaces tab.

There is no change to any user-facing feature, workflow, label, button, tab name, or setting — the steps a user takes to create a manual expense are unchanged; only an internal animation glitch is removed. The help articles under App/docs/articles document how to use features, not internal navigation/rendering behavior, so nothing there needs updating.

No draft PR was created since there are no docs updates to make.

@thelullabyy, if you believe a specific help article should still be updated, let me know which behavior it should describe and I'll draft the changes.

OSBotify · 2026-06-26T19:24:24Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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

Bundle Size Analysis (Sentry):

Android

Fix: restore tab before closing RHP to avoid Spend tab flash on expen…

d31c22f

…se back Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>

MelvinBot assigned thelullabyy Jun 24, 2026

MelvinBot requested a review from a team June 24, 2026 21:51

MelvinBot mentioned this pull request Jun 24, 2026

[Due for payment 2026-07-03] [$250] [Due for payment 2026-07-01] [Due for payment 2026-06-30] iOS - Expense - App returns to Spend briefly after closing confirm page on Workspaces tab #94271

Open

7 tasks

MelvinBot marked this pull request as ready for review June 25, 2026 05:00

MelvinBot requested a review from a team as a code owner June 25, 2026 05:00

melvin-bot Bot requested review from thelullabyy and removed request for a team June 25, 2026 05:00

melvin-bot Bot requested review from flaviadefaria and removed request for a team June 25, 2026 05:00

thelullabyy approved these changes Jun 25, 2026

View reviewed changes

melvin-bot Bot requested a review from puneetlath June 25, 2026 05:04

thelullabyy mentioned this pull request Jun 25, 2026

[Due for payment 2026-07-02] [Due for payment 2026-06-30] [CFI] Show Merchant, Date, Amount Fields in the Scan flow #93854

Open

7 tasks

puneetlath approved these changes Jun 25, 2026

View reviewed changes

puneetlath merged commit f4a57db into main Jun 25, 2026
42 of 45 checks passed

puneetlath deleted the claude-fixWorkspacesTabFlashOnExpenseBack branch June 25, 2026 20:14

OSBotify mentioned this pull request Jun 25, 2026

Deploy Checklist: New Expensify 2026-06-25 #94631

Closed

60 tasks

Uh oh!

Conversation

MelvinBot commented Jun 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!

MelvinBot commented Jun 24, 2026

Uh oh!

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

Uh oh!

Uh oh!

melvin-bot Bot commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

thelullabyy commented Jun 25, 2026

Uh oh!

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

MelvinBot commented Jun 25, 2026

Uh oh!

thelullabyy commented Jun 25, 2026

Uh oh!

thelullabyy left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MelvinBot commented Jun 24, 2026 •

edited

Loading

thelullabyy commented Jun 25, 2026 •

edited

Loading

thelullabyy commented Jun 25, 2026 •

edited

Loading