Skip to content

Fix test drive modal appearing twice on Android#81465

Closed
Julesssss wants to merge 2 commits intomainfrom
jules-fixTestDriveModalDouble
Closed

Fix test drive modal appearing twice on Android#81465
Julesssss wants to merge 2 commits intomainfrom
jules-fixTestDriveModalDouble

Conversation

@Julesssss
Copy link
Contributor

@Julesssss Julesssss commented Feb 5, 2026 •
edited
Loading

Explanation of Change

Fixes the test drive modal appearing twice during onboarding on Android, which was causing tabs to become unresponsive. The issue was caused by two independent navigation triggers racing to show the modal when onboarding completes.

I think it's okay to implement this as the fix, we should be refactoring this logic away as a follow-up to the original PR, as indicated here:

// Should be removed once Test Drive modal route has its own navigation guard
 // Details: https://github.com/Expensify/App/pull/79898

Two fixes:

  1. Added navigation guard in useOnboardingFlow.ts to prevent duplicate navigation if the modal is already shown (similar to the migrated user modal pattern)
  2. Added modalScreenListeners to TestDriveModalNavigator in AuthScreens.tsx to properly manage modal visibility state on Android

Fixed Issues

$ #81453

Tests

  1. Fresh install the app
  2. Create a new account
  3. Tap Skip on work email step
  4. Select Track and budget expenses
  5. Complete the onboarding
  6. Tap Skip on test drive modal
  7. Verify the modal appears only once (not twice)
  8. Go to Workspaces > Account > Workspaces > Inbox
  9. Switch between different tabs
  10. Verify tabs are responsive

QA Steps

Same as tests

PR Author Checklist

  • I linked the correct issue in the `### Fixed Issues` section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the `Tests` section
    • I added steps for the expected offline behavior in the `Offline steps` section
    • I added steps for Staging and/or Production testing in the `QA steps` section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the `canBeMissing` param for `useOnyx`
  • I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run `npm run compress-svg`)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@Julesssss Julesssss requested review from a team as code owners February 5, 2026 00:54
@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and mananjadhav and removed request for a team February 5, 2026 00:54
@melvin-bot
Copy link

melvin-bot bot commented Feb 5, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team February 5, 2026 00:54
Julesssss
Julesssss commented Feb 5, 2026
View reviewed changes
src/hooks/useOnboardingFlow.ts Outdated
onboardingValues,
const navigationState = navigationRef.getRootState();
const lastRoute = navigationState.routes.at(-1);
// Prevent duplicate navigation if the test drive modal is already shown
Copy link
Contributor Author

@Julesssss Julesssss Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MelvinBot remove unnecessary comment

Copy link
Contributor Author

@Julesssss Julesssss Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MelvinBot NO you removed the wrong comment. Leave that one. Remove the one that was included in the NEW diff: '// Prevent duplicate navigation if the test drive modal is already shown'

@MelvinBot
Copy link
Contributor

MelvinBot commented Feb 5, 2026

Done! Removed the outdated TODO comment since the navigation guard for the Test Drive modal has been implemented in this PR.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

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

@MelvinBot @Julesssss
Remove unnecessary comment
cbcdf15 
Co-authored-by: Jules <Julesssss@users.noreply.github.com>
@MelvinBot MelvinBot force-pushed the jules-fixTestDriveModalDouble branch from ade589f to cbcdf15 Compare February 5, 2026 01:11
@MelvinBot
Copy link
Contributor

MelvinBot commented Feb 5, 2026

Sorry about that! I've now removed the correct comment (// Prevent duplicate navigation if the test drive modal is already shown) and force-pushed to fix the branch.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-4d4f242-07eae58459d80222fb82381ede7401e562e5d951/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-4d4f242-54e89147d28f8e8638773d8a678888d5d25e206b/index.html
Android iOS
Web 🕸️
https://81465.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@codecov
Copy link

codecov bot commented Feb 5, 2026 •
edited by github-actions bot
Loading

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/libs/Navigation/AppNavigator/AuthScreens.tsx 53.12% <ø> (ø)
src/hooks/useOnboardingFlow.ts 84.61% <0.00%> (-3.39%) ⬇️
... and 18 files with indirect coverage changes

@mountiny
Copy link
Contributor

mountiny commented Feb 5, 2026

I have merged the revert

@LukasMod LukasMod mentioned this pull request Feb 5, 2026
Open
@Julesssss Julesssss closed this Feb 5, 2026
@Julesssss Julesssss deleted the jules-fixTestDriveModalDouble branch February 5, 2026 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mananjadhav mananjadhav Awaiting requested review from mananjadhav

@joekaufmanexpensify joekaufmanexpensify Awaiting requested review from joekaufmanexpensify

Assignees

@Julesssss Julesssss

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Julesssss @MelvinBot @mountiny