[CP Staging] Fix FAB deploy blockers from popover decomposition (#83299) by adhorodyski · Pull Request #85666 · Expensify/App

adhorodyski · 2026-03-18T15:04:55Z

Explanation of Change

PR #83299 (FAB popover decomposition) introduced three regressions, all fixed here:

1. Report RHP closes immediately on second FAB create

The decomposition moved the empty-report confirmation from an inline <ConfirmModal> to the global modal system via useConfirmModal, which hardcodes shouldHandleNavigationBack: true. Both the FAB popover and the confirm modal then push {shouldGoBack: true} browser history entries. When the FAB popover closes, its deferred history.back() fires after the confirm modal has already pushed its own entry — popping the confirm modal's entry instead of the FAB's, which instantly dismisses the confirmation.

Fix: pass shouldHandleNavigationBack: false to showConfirmModal() so the confirm modal skips history management. The FAB popover already handles back navigation, making this safe.

2. FAB keyboard highlight persists across open/close

After closing the FAB menu and reopening it, the previously focused item was still highlighted — because focusedIndex was never reset on close. Arrow-key navigation would then start from the stale position.

Fix: reset focusedIndex to -1 when the FAB menu closes so keyboard navigation always starts fresh on next open.

3. FAB "Test Drive" does nothing on click

Clicking "Take a 2-minute test drive" in the FAB menu closes the popover but never navigates to the test drive screen. startTestDrive wrapped navigation in InteractionManager.runAfterInteractions(), which was blocked by the FAB popover's fadeOut animation creating an interaction handle. Meanwhile, shouldHandleNavigationBack fires window.history.back() via setTimeout(0), racing with the deferred navigation — result: navigation never happens. Additionally, both branches of the conditional inside startTestDrive navigated to the same route (dead code after commit 2a843f5e2a1).

Fix: remove InteractionManager wrapper, collapse the dead conditional, and clean up unused params/imports. startTestDrive() now directly calls Navigation.navigate(ROUTES.TEST_DRIVE_DEMO_ROOT).

Fixed Issues

$ #85661
$ #85656
$ #85654
$ #85685
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

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

The confirm modal pushed a competing browser history entry via shouldHandleNavigationBack: true (hardcoded in useConfirmModal). When the FAB popover's deferred history.back() fired, it popped the confirm modal's entry instead of its own, instantly closing it. Pass shouldHandleNavigationBack: false so the confirm modal skips history management — the FAB popover already handles back navigation. Fixes Expensify#85661 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

aimane-chnaif · 2026-03-18T15:26:54Z

@MelvinBot review

MelvinBot · 2026-03-18T15:31:01Z

Code Review

Change: Single line — adds shouldHandleNavigationBack: false to showConfirmModal() in useCreateEmptyReportConfirmation.tsx.

Analysis

Root Cause is correctly identified. The FAB popover (FABPopoverMenu.tsx:116) pushes a {shouldGoBack: true} browser history entry via its shouldHandleNavigationBack prop. When the confirm modal opens, useConfirmModal defaults shouldHandleNavigationBack: true (useConfirmModal.ts:14), pushing a second entry. When the FAB hides, its deferred setTimeout(() => history.back(), 0) in Modal/index.tsx:54-58 fires and pops the confirm modal's entry instead of the FAB's own — instantly closing the confirmation.

Fix is correct. Passing shouldHandleNavigationBack: false prevents the confirm modal from pushing its own history entry, so the FAB's deferred history.back() correctly pops the FAB's own entry.

Checklist

Valid API usage: shouldHandleNavigationBack is a supported prop on ConfirmModal, flowing through ConfirmModalWrapper → ConfirmModal → Modal. The spread in useConfirmModal.ts:13-15 ({shouldHandleNavigationBack: true, ...options}) allows callers to override the default.
Established pattern: Three other callers already set shouldHandleNavigationBack: false:
- ReportDetailsPage.tsx:346 (leave chat confirmation)
- CardSection.tsx:95 (request refund confirmation)
- TravelTerms.tsx:97 (verify company — includes an explicit comment about disabling browser history)
Side effect: Browser Back button won't close this specific confirm modal. Acceptable because: (1) it's always launched from a popover that manages its own history entry, (2) the modal is still dismissible via Cancel button, Escape key, or backdrop click, and (3) same trade-off exists for the three callers above.
CI checks: All substantive checks pass (lint, typecheck, tests, perf-tests). Only checklist fails (PR Author Checklist — not a code issue).

Verdict: This is a clean, minimal, well-targeted fix. Looks good to me. 👍

Reset focusedIndex on close so arrow-key highlight doesn't carry over when reopening the FAB menu. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Remove InteractionManager.runAfterInteractions() wrapper from startTestDrive that blocked navigation when the FAB popover's fadeOut animation created an interaction handle. Also collapse dead conditional where both branches navigated to the same route, and clean up unused params/imports. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

adhorodyski · 2026-03-18T16:03:10Z

src/libs/actions/Tour.ts

 import ROUTES from '@src/ROUTES';
-import type {IntroSelected} from './Report';

-function startTestDrive(introSelected: IntroSelected | undefined, hasUserBeenAddedToNudgeMigration: boolean, isUserPaidPolicyMember: boolean) {


all this was just deadcode called from 2 places (FAB is one)

melvin-bot · 2026-03-18T16:04:12Z

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

aimane-chnaif · 2026-03-18T16:25:31Z

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

MacOS: Chrome / Safari

demo.mov

aimane-chnaif · 2026-03-18T16:27:08Z

Can you please generate adhoc build and ask QA to test linked issues?

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 872f0349a1

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

src/hooks/useCreateEmptyReportConfirmation.tsx

The previous fix hardcoded shouldHandleNavigationBack: false in the shared useCreateEmptyReportConfirmation hook, which broke browser-back dismissal for all callers (search, workspace selection, compose bar). Make it an opt-in parameter (default: true) and only disable it from the FAB's CreateReportMenuItem. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

codecov · 2026-03-18T17:27:43Z

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 Δ
src/hooks/useCreateEmptyReportConfirmation.tsx	`42.85% <100.00%> (+4.39%)`	⬆️
src/libs/actions/Tour.ts	`100.00% <100.00%> (ø)`
src/pages/Search/EmptySearchView.tsx	`65.09% <ø> (-0.05%)`	⬇️
...inbox/sidebar/FABPopoverContent/FABPopoverMenu.tsx	`84.21% <100.00%> (+0.87%)`	⬆️
...BPopoverContent/menuItems/CreateReportMenuItem.tsx	`5.40% <ø> (ø)`
.../FABPopoverContent/menuItems/TestDriveMenuItem.tsx	`20.00% <ø> (+5.71%)`	⬆️
... and 13 files with indirect coverage changes

github-actions · 2026-03-18T18:18:12Z

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

Julesssss · 2026-03-18T18:21:52Z

Oh thanks for handling this @adhorodyski

adhorodyski · 2026-03-18T18:29:27Z

@Julesssss you're welcome!

adhorodyski · 2026-03-18T18:29:51Z

fixes #85685 as well

Julesssss · 2026-03-18T19:41:13Z

Requested AdHoc testing for the linked issues

mountiny

Thanks! I guess we can wait until QA is done with this

github-actions · 2026-03-18T21:11:30Z

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

Julesssss · 2026-03-18T21:13:38Z

[Due for payment 2026-03-30] Reports - New report RHP opens and closes when creating second report #85661 fixed
[Due for payment 2026-03-30] Web - FAB - Keyboard selected menu item is still highlighted after closing and reopening FAB #85656 fixed
[Due for payment 2026-03-30] Onboarding - Test drive does not open from FAB #85654 fixed
[Due for payment 2026-03-30] Android - FAB - Menu item icons become green when reopening FAB #85685 not fixed

github-actions · 2026-03-18T21:21:39Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-89ba952-7c10bda-a51c12ff697dd4f9752a99506f8c1931b9d3415d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-89ba952-7c10bda-02ea2e7aab87b147feff990ea5fa2eae72ba146d/index.html

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

👀 View the workflow run that generated this build 👀

[CP Staging] Fix FAB deploy blockers from popover decomposition (#83299) (cherry picked from commit 89ba952) (cherry-picked to staging by Julesssss)

OSBotify · 2026-03-18T22:37:56Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.3.40-2 🚀

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

Julesssss · 2026-03-18T23:23:18Z

QA passed on AdHoc build. Now it's on staging I requested a retest for the 3 issues that were fixed with this revert:

[Due for payment 2026-03-30] Web - FAB - Keyboard selected menu item is still highlighted after closing and reopening FAB #85656
[Due for payment 2026-03-30] Onboarding - Test drive does not open from FAB #85654
[Due for payment 2026-03-30] Android - FAB - Menu item icons become green when reopening FAB #85685

OSBotify · 2026-03-19T20:26:55Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-23T09:30:48Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

melvin-bot bot assigned adhorodyski Mar 18, 2026

Fix FAB keyboard highlight persisting across open/close

d0397cb

Reset focusedIndex on close so arrow-key highlight doesn't carry over when reopening the FAB menu. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

adhorodyski mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Web - FAB - Keyboard selected menu item is still highlighted after closing and reopening FAB #85656

Closed

7 tasks

adhorodyski changed the title ~~Fix report confirmation modal closing immediately on second FAB create~~ Fix two FAB regressions from popover decomposition (#83299) Mar 18, 2026

adhorodyski mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Onboarding - Test drive does not open from FAB #85654

Closed

7 tasks

adhorodyski changed the title ~~Fix two FAB regressions from popover decomposition (#83299)~~ Fix FAB deploy blockers from popover decomposition (#83299) Mar 18, 2026

adhorodyski commented Mar 18, 2026

View reviewed changes

adhorodyski marked this pull request as ready for review March 18, 2026 16:04

adhorodyski requested review from a team as code owners March 18, 2026 16:04

melvin-bot bot requested review from aimane-chnaif and heyjennahay March 18, 2026 16:04

melvin-bot bot removed request for a team March 18, 2026 16:04

aimane-chnaif approved these changes Mar 18, 2026

View reviewed changes

melvin-bot bot requested a review from mountiny March 18, 2026 16:26

chatgpt-codex-connector bot reviewed Mar 18, 2026

View reviewed changes

src/hooks/useCreateEmptyReportConfirmation.tsx Outdated Show resolved Hide resolved

adhorodyski and others added 2 commits March 18, 2026 18:09

Merge branch 'Expensify:main' into hotfix-fab-1

4dfad75

adhorodyski mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Android - FAB - Menu item icons become green when reopening FAB #85685

Closed

7 tasks

This comment has been minimized.

Sign in to view

Merge branch 'Expensify:main' into hotfix-fab-1

6599483

mountiny changed the title ~~Fix FAB deploy blockers from popover decomposition (#83299)~~ [CP Staging] Fix FAB deploy blockers from popover decomposition (#83299) Mar 18, 2026

mountiny approved these changes Mar 18, 2026

View reviewed changes

Julesssss merged commit 89ba952 into Expensify:main Mar 18, 2026
33 checks passed

github-actions bot mentioned this pull request Mar 18, 2026

Investigate workflow job failing on main: chooseDeployActions #85712

Closed

OSBotify pushed a commit that referenced this pull request Mar 18, 2026

Merge pull request #85666 from callstack-internal/hotfix-fab-1

7e188a2

[CP Staging] Fix FAB deploy blockers from popover decomposition (#83299) (cherry picked from commit 89ba952) (cherry-picked to staging by Julesssss)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 18, 2026

OSBotify mentioned this pull request Mar 18, 2026

Deploy Checklist: New Expensify 2026-03-18 #85646

Closed

100 tasks

melvin-bot bot mentioned this pull request Mar 23, 2026

[Due for payment 2026-03-30] Reports - New report RHP opens and closes when creating second report #85661

Closed

7 tasks

Conversation

adhorodyski commented Mar 18, 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!

aimane-chnaif commented Mar 18, 2026

Uh oh!

MelvinBot commented Mar 18, 2026

Code Review

Analysis

Checklist

Uh oh!

adhorodyski Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 18, 2026

Uh oh!

aimane-chnaif commented Mar 18, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Mar 18, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov bot commented Mar 18, 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!

github-actions bot commented Mar 18, 2026

Uh oh!

Julesssss commented Mar 18, 2026

Uh oh!

This comment has been minimized.

adhorodyski commented Mar 18, 2026

Uh oh!

adhorodyski commented Mar 18, 2026

Uh oh!

Julesssss commented Mar 18, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

Julesssss commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

Julesssss commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

adhorodyski commented Mar 18, 2026 •

edited

Loading

codecov bot commented Mar 18, 2026 •

edited by github-actions bot

Loading