[#92558] Close Test Tools modal when launching biometrics MFA flow by oqildev · Pull Request #93557 · Expensify/App

oqildev · 2026-06-15T07:26:26Z

The biometrics Test button only called executeScenario(), which opens the MFA "Let's verify it's you" overlay as a sibling of the root navigator driven by isModalOpen state. On iOS the Test Tools transparent modal stayed presented on top, so the menu never closed (the verify page was hidden behind it).

Register TEST_TOOLS_MODAL_NAVIGATOR in MODAL_ROUTES_TO_DISMISS and call Navigation.dismissModal() from the biometrics Test button before executeScenario. The call is guarded by the active-route check so it is a no-op when TestToolMenu is rendered inline on the Troubleshoot page.

Explanation of Change

On iOS, tapping Test on the Biometrics row of the hidden Test Tool menu did not close the menu, so the "Let's verify it's you" verification page stayed hidden behind it.

BiometricsTestToolRow only called executeScenario(BIOMETRICS_TEST), which opens the MFA flow as a state-driven (isModalOpen) overlay rendered as a sibling of the root navigator — it never dismissed the Test Tools modal. On iOS the Test Tools transparentModal is a native view controller that stays on top, so the menu never closed.

Fix:

Register NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR in MODAL_ROUTES_TO_DISMISS so the existing DISMISS_MODAL handler treats it as a dismissable modal.
In the Biometrics Test button, call Navigation.dismissModal() before executeScenario(...), guarded by the active-route check so it is a no-op when TestToolMenu is rendered inline on the Troubleshoot page.

Fixed Issues

$ #92558
PROPOSAL: #92558 (comment)

Tests

Sign in.
Open the hidden Test Tool menu (iOS/Android App & mWeb: tap the screen with 4 fingers; Web: open /test-tools or press Cmd/Ctrl+D).
Tap Test on the Biometrics row.
Verify the Test Tool menu closes and the "Let's verify it's you" page appears on top.
Regression (inline): Settings → Troubleshoot → tap Test on the Biometrics row → verify the verification page appears and no Test Tool modal is opened or left behind.

Verify that no errors appear in the JS console

Offline tests

N/A — pure local navigation (no API/Onyx writes); behavior is identical offline.

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

2026-06-14.18.27.57.mov

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

2026-06-15.11.56.21.video-converter.com.mp4

2026-06-15.11.56.21.mp4

iOS: mWeb Safari

ios.mweb.MOV

MacOS: Chrome / Safari

2026-06-14.18.49.06.mp4

…A flow The biometrics Test button only called executeScenario(), which opens the MFA "Let's verify it's you" overlay as a sibling of the root navigator driven by isModalOpen state. On iOS the Test Tools transparent modal stayed presented on top, so the menu never closed (the verify page was hidden behind it). Register TEST_TOOLS_MODAL_NAVIGATOR in MODAL_ROUTES_TO_DISMISS and call Navigation.dismissModal() from the biometrics Test button before executeScenario. The call is guarded by the active-route check so it is a no-op when TestToolMenu is rendered inline on the Troubleshoot page.

melvin-bot · 2026-06-15T07:26:33Z

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

github-actions · 2026-06-15T07:27:06Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

oqildev · 2026-06-15T07:34:43Z

I have read the CLA Document and I hereby sign the CLA

JmillsExpensify

No product review required.

suneox · 2026-06-15T08:38:16Z

@oqildev could your please provide the record for ios native platform?

Sign in to view

+                        // overlay isn't hidden behind it on iOS. When rendered inline on the Troubleshoot page there is no
+                        // modal on top, so this is a no-op and we don't accidentally open one.
+                        if (Navigation.getActiveRoute().includes(ROUTES.TEST_TOOLS_MODAL.route)) {
+                            Navigation.dismissModal();


oqildev · 2026-06-15T08:47:56Z

@oqildev could your please provide the record for ios native platform?

I added one more video next to it. The format doesn't seem to be compatible. Could you please check

suneox · 2026-06-15T15:12:04Z

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

CleanShot.2026-06-15.at.22.07.05.4.mp4

Android: mWeb Chrome

CleanShot.2026-06-15.at.22.08.56.5.mp4

iOS: HybridApp

CleanShot.2026-06-15.at.21.58.10.3.mp4

iOS: mWeb Safari

CleanShot.2026-06-15.at.21.57.27.2.mp4

MacOS: Chrome / Safari

CleanShot.2026-06-15.at.21.56.25.1.mp4

codecov · 2026-06-15T16:20:17Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/BiometricsTestToolRow.tsx	`100.00% <100.00%> (ø)`
...ateRootStackNavigator/GetStateForActionHandlers.ts	`26.54% <ø> (ø)`
... and 32 files with indirect coverage changes

chuckdries

Works like a charm

github-actions · 2026-06-15T18:38:39Z

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

OSBotify · 2026-06-15T18:42:37Z

✋ 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-15T18:50:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-aebab394edf-d12cd93-5bfdf2fbd6b61d26df62a0e4ecc329053b8b6cf9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-aebab39-d12cd93-473c8c4f32d26c826536223299d5fff474c25fa7/index.html

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

👀 View the workflow run that generated this build 👀

oqildev requested review from a team as code owners June 15, 2026 07:26

melvin-bot Bot assigned oqildev Jun 15, 2026

melvin-bot Bot requested review from JmillsExpensify and suneox June 15, 2026 07:26

melvin-bot Bot removed request for a team June 15, 2026 07:26

exfy-clabot Bot added a commit to Expensify/CLA that referenced this pull request Jun 15, 2026

@oqildev has signed the CLA in Expensify/App#93557

c501f6d

JmillsExpensify reviewed Jun 15, 2026

View reviewed changes

oqildev mentioned this pull request Jun 15, 2026

[$250] iOS - Biometrics - The Test Tool menu does not close after tapping Test #92558

Open

7 tasks

suneox reviewed Jun 15, 2026

View reviewed changes

suneox approved these changes Jun 15, 2026

View reviewed changes

melvin-bot Bot requested a review from chuckdries June 15, 2026 15:19

chuckdries approved these changes Jun 15, 2026

View reviewed changes

chuckdries merged commit aebab39 into Expensify:main Jun 15, 2026
38 of 39 checks passed

Conversation

oqildev commented Jun 15, 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 Jun 15, 2026

Uh oh!

github-actions Bot commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oqildev commented Jun 15, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

suneox commented Jun 15, 2026

Uh oh!

This comment was marked as resolved.

Uh oh!

oqildev commented Jun 15, 2026

Uh oh!

suneox commented Jun 15, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

chuckdries left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

oqildev commented Jun 15, 2026 •

edited

Loading

github-actions Bot commented Jun 15, 2026 •

edited

Loading

codecov Bot commented Jun 15, 2026 •

edited by github-actions Bot

Loading