Implement logic to prevent onboarding flow when 2FA setup is required. by blazejkustra · Pull Request #72218 · Expensify/App

blazejkustra · 2025-10-09T13:52:05Z

Explanation of Change

Initially the idea from @mountiny was:

Fix the Google sign in flow in NewDot to correct set the 2fa flag <- this should be handled on the backend
Update the navigation/modal logic in App to always show the 2FA modal over anything else

However, onboarding has once again become complicated, its logic is fragmented and difficult to follow. Ideally, we should look for opportunities to refactor and simplify this flow 😢

Showing the 2FA modal above everything else would make the implementation even more complex and is not the ideal solution. With input from @WojtekBoman, we discussed an alternative approach: preventing onboarding from being displayed until the user has properly configured their 2FA (and after it is configured then redirect users to onboarding).

Fixed Issues

$ #70803
PROPOSAL: N/A

Tests

Sign in as a new user
Use this command in the console:

Onyx.merge('account' , {
  hasAccessibleDomainPolicies: true, 
  isFromPublicDomain: false,
  needsTwoFactorAuthSetup: true
});

Refresh the page
Verify that 2fa is required page is displayed

Other than that, we need to test:

Onboarding flow holistically
Verify that deeplinking works as before
2FA flow

Offline tests

N/A

QA Steps

Prerequisites + domain setup:

Domain Is fully verified (do it as adim of a domain in OldDot)
Require 2FA for domain members
No group restrictions in the default domain group.

Steps:

Go to expensify.com
Click the Sign in button in the top left
Sign up with Google on an account that is domain controlled
Get redirect to NewDot as you’re a new user
Verify that 2fa is required modal is displayed to the user

Other than that, we need to test:

Onboarding flow holistically
Verify that deeplinking works as before

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…equired-2fa

melvin-bot · 2025-10-09T15:23:44Z

@parasharrajat 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 · 2025-10-09T15:24:13Z

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

codecov · 2025-10-09T15:46:37Z

Codecov Report

❌ Patch coverage is 54.54545% with 10 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/actions/TwoFactorAuthActions.ts	0.00%	6 Missing ⚠️
src/libs/actions/Welcome/index.ts	62.50%	3 Missing ⚠️
src/hooks/useOnboardingFlow.ts	85.71%	0 Missing and 1 partial ⚠️

Files with missing lines	Coverage Δ
src/libs/Navigation/AppNavigator/AuthScreens.tsx	`55.00% <100.00%> (+0.37%)`	⬆️
...on/AppNavigator/Navigators/RightModalNavigator.tsx	`3.77% <ø> (ø)`
src/hooks/useOnboardingFlow.ts	`88.00% <85.71%> (-3.31%)`	⬇️
src/libs/actions/Welcome/index.ts	`48.93% <62.50%> (+0.66%)`	⬆️
src/libs/actions/TwoFactorAuthActions.ts	`0.00% <0.00%> (ø)`

... and 11 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

github-actions · 2025-10-09T15:59:36Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/72218/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/72218/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/72218/NewExpensify.dmg	https://72218.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

fedirjh · 2025-10-09T16:44:59Z

@blazejkustra I have tested in dev and got this result, the 2FA is working as expected only after we refresh the page.

CleanShot.2025-10-09.at.17.41.02.mp4

blazejkustra · 2025-10-10T09:45:43Z

@fedirjh Could you try again? I pushed some new changes

blazejkustra · 2025-10-10T12:08:47Z

This is how it works with current changes:

QuickTime.movie.mov

mountiny · 2025-10-10T12:55:13Z

@fedirjh can you please test again? thanks!

jmusial · 2025-10-10T14:28:00Z

lint failing :(

github-actions · 2025-10-10T14:32:19Z

LGTM . Thank you for your hard work!

fedirjh

Looks great overall! it works well on my end. I’ve shared some feedback and possible improvements in the review.

fedirjh · 2025-10-11T09:38:06Z

-                    listeners={{
-                        ...modalScreenListenersWithCancelSearch,
-                        beforeRemove: () => {
-                            modalScreenListenersWithCancelSearch.beforeRemove();
-
-                            // When a 2FA RHP page is closed, if the 2FA require page is visible and the user has now enabled the 2FA, then remove the 2FA require page from the navigator.
-                            const routeParams = navigation.getState()?.routes?.at(-1)?.params;
-                            const screen = routeParams && 'screen' in routeParams ? routeParams.screen : '';
-                            if (!shouldShowRequire2FAPage || !account?.requiresTwoFactorAuth || screen !== SCREENS.RIGHT_MODAL.TWO_FACTOR_AUTH) {
-                                return;
-                            }
-                            setShouldShowRequire2FAPage(false);
-                        },
-                    }}


@blazejkustra The 2FA setup modal is displayed under the onboarding modal: I think we should consider either removing it when the onboarding modal is open or displaying the onboarding only when the 2FA modal is closed.

This change could add quite a bit of complexity to the code 🤔 The onboarding logic currently depends on:
!!account?.needsTwoFactorAuthSetup && !account?.requiresTwoFactorAuth.

Right after 2FA is configured, the user is redirected to the “Two-factor authentication enabled” page. At that point, the above logic returns false, which triggers the onboarding screen.

It’s not ideal as is, but automatically closing the “Two-factor authentication enabled” page wouldn’t be great either, the user wouldn’t get clear feedback that 2FA setup was completed successfully.

Keeping the user on the “Two-factor authentication enabled” page could work, but we’d need to introduce an additional frontend-controlled state like twoFactorAuthSetupAcknowledged. That could easily become messy and prone to edge cases (e.g., page refreshes or similar scenarios).

Meanwhile I'm trying other approaches to improve the logic!

@fedirjh What do you think? update logic to show 2FA setup page based on progress

QuickTime.movie.2.mov

@blazejkustra Looks good to me and works as expected :

CleanShot.2025-10-13.at.11.55.15.mp4

cc @blazejkustra

CleanShot.2025-10-13.at.14.09.35.mp4

Seems like we need to resolve this one still

@fedirjh It looks like it worked for you this time, right? The 2FA-required page was hidden after 2FA was configured

Okay I pushed a logic change, could you check again? 👀

Perfect, this is working as expected 🚀.

CleanShot.2025-10-15.at.13.47.26.mp4

parasharrajat · 2025-10-12T19:50:58Z

Please remove me from reviewer list.

…equired-2fa

blazejkustra · 2025-10-15T11:14:12Z

Working on it now 👀

…equired-2fa

fedirjh

Looks good to me.

mountiny · 2025-10-15T13:17:51Z

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

MacOS: Desktop

mountiny

Changes look good to me, I think @fedirjh has tested this one well so we can move forwards

mountiny · 2025-10-15T13:22:18Z

-    const [onboardingInitialPath, onboardingInitialPathResult] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, {canBeMissing: true});
-    const isOnboardingInitialPathLoading = isLoadingOnyxValue(onboardingInitialPathResult);
+    const [onboardingInitialPath, onboardingInitialPathMetadata] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, {canBeMissing: true});
+    const [account, accountMetadata] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});


Maybe room for improvement would be to only pick the properties with selector if we need only some of them

OSBotify · 2025-10-15T13:39:09Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

m-natarajan · 2025-10-15T22:58:29Z

@blazejkustra @mountiny We can't use verified domain controlled account. Could this be verified internally?

OSBotify · 2025-10-15T23:14:23Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.2.32-0 🚀

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

blazejkustra · 2025-10-16T10:54:21Z

@blazejkustra @mountiny We can't use verified domain controlled account. Could this be verified internally?

I think @fedirjh has already verified that, so for QA I suggest testing the overall onboarding process and the 2FA flow.

IuliiaHerets · 2025-10-16T10:57:40Z

@blazejkustra can you please share QA steps that you want us to check?

mountiny · 2025-10-16T11:31:24Z

@IuliiaHerets I think the existing sign in process and 2FA setup should be fine

mountiny · 2025-10-16T11:31:58Z

I have asked @fedirjh to do internalQA on these steps here in staging

IuliiaHerets · 2025-10-16T11:38:40Z

@mountiny thank you

fedirjh · 2025-10-16T12:02:03Z

This works as expected in staging 🚀

cc @IuliiaHerets

CleanShot.2025-10-16.at.12.56.34.mp4

IuliiaHerets · 2025-10-16T12:52:55Z

@fedirjh @mountiny So we can check off it in the checklist, right?

fedirjh · 2025-10-16T13:48:21Z

So we can check off it in the checklist, right?

@IuliiaHerets Yes, let's do it.

m-natarajan · 2025-10-16T13:58:41Z

Yes, let's do it.

@fedirjh Done, Thanks

OSBotify · 2025-10-16T23:20:50Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.32-6 🚀

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

blazejkustra added 2 commits October 9, 2025 15:38

Implement logic to prevent onboarding flow when 2FA setup is required.

496e113

Merge branch 'main' of github.com:Expensify/App into fix/onboarding-r…

185e2db

…equired-2fa

melvin-bot Bot assigned blazejkustra Oct 9, 2025

Merge branch 'main' of github.com:Expensify/App into fix/onboarding-r…

0ebf09b

…equired-2fa

mountiny requested a review from fedirjh October 9, 2025 15:16

blazejkustra marked this pull request as ready for review October 9, 2025 15:20

blazejkustra requested a review from a team as a code owner October 9, 2025 15:20

melvin-bot Bot requested a review from parasharrajat October 9, 2025 15:23

melvin-bot Bot removed the request for review from a team October 9, 2025 15:23

staszekscp reviewed Oct 10, 2025

View reviewed changes

Comment thread src/hooks/useOnboardingFlow.ts Outdated

Refactor onboarding & 2fa

1081c0e

blazejkustra added 2 commits October 10, 2025 11:46

Remove unrelated change

8274359

Fix that user was unable to proceed with 2fa

6224172

blazejkustra requested a review from staszekscp October 10, 2025 12:14

jmusial reviewed Oct 10, 2025

View reviewed changes

Comment thread src/hooks/useOnboardingFlow.ts Outdated

Memoize shouldShowRequire2FAPage and remove unused import

0e39117

fedirjh reviewed Oct 11, 2025

View reviewed changes

blazejkustra added 2 commits October 13, 2025 11:16

Merge branch 'main' of github.com:Expensify/App into fix/onboarding-r…

4e7d46f

…equired-2fa

Add isOnboardingLoading state to useOnboardingFlowRouter

5f78412

update logic to show 2FA setup page based on progress

a3267da

mountiny mentioned this pull request Oct 13, 2025

[$250] Investigate optimization to the AuthScreens from extra rerenders due to useSearchTypeMenuSections #72096

Closed

mountiny removed the request for review from parasharrajat October 13, 2025 21:37

blazejkustra added 2 commits October 15, 2025 13:20

Merge branch 'main' of github.com:Expensify/App into fix/onboarding-r…

31b025f

…equired-2fa

Fix the logic for showing required 2fa page

85014e5

fedirjh approved these changes Oct 15, 2025

View reviewed changes

blazejkustra requested a review from mountiny October 15, 2025 13:03

mountiny approved these changes Oct 15, 2025

View reviewed changes

mountiny merged commit fc41e57 into Expensify:main Oct 15, 2025
24 of 27 checks passed

OSBotify mentioned this pull request Oct 15, 2025

Deploy Checklist: New Expensify 2025-10-15 #72723

Closed

52 tasks

melvin-bot Bot mentioned this pull request Oct 16, 2025

[Due for payment 2025-11-07] Investigate users that can’t dismiss onboarding when 2FA is required to continue onboarding. #70803

Closed

16 tasks

Uh oh!

Conversation

blazejkustra commented Oct 9, 2025 • 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 Oct 9, 2025

Uh oh!

github-actions Bot commented Oct 9, 2025

Uh oh!

codecov Bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions Bot commented Oct 9, 2025

Uh oh!

fedirjh commented Oct 9, 2025

Uh oh!

Uh oh!

blazejkustra commented Oct 10, 2025

Uh oh!

blazejkustra commented Oct 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mountiny commented Oct 10, 2025

Uh oh!

Uh oh!

jmusial commented Oct 10, 2025

Uh oh!

github-actions Bot commented Oct 10, 2025

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Oct 12, 2025

Uh oh!

blazejkustra commented Oct 15, 2025

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Oct 15, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 15, 2025

blazejkustra commented Oct 9, 2025 •

edited

Loading

codecov Bot commented Oct 9, 2025 •

edited

Loading

blazejkustra commented Oct 10, 2025 •

edited

Loading