Fix flakiness in mandatory 2FA enforcement

[chuckdries]

Explanation of Change

I observed a number of situations where we should've shown the RequireTwoFactorAuthenticationPage, all the data was correct in onyx, but we didn't. The core of this PR is that I removed /2fa-required as a routable url. There's no reason a user would ever need to navigate to it on purpose or share a link to it, and we explicitly prevented the user from navigating away from it. Treating it as a route effectively meant that the current URL was a second source of truth for "should the user be locked out of the app" that needed to be kept in sync with the account data in onyx via imperative routing in an effect. When we failed to do so, the app would become soft locked, where the user was stuck on whatever page they were on and we prevented them from navigating away, but never showed the lockout screen. video demonstration

This PR makes it so that if the user's account data says they should be forced to enable 2FA, we simply render the lockout page on top of the rest of the app.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/577605
PROPOSAL:

Tests

Prerequisites:

• have a domain configured to require 2FA
• have a user on that domain who has not yet enabled two-factor auth

Base case: User is prompted to enable 2FA immediately after signing in

1. Navigate directly to NewDot
2. Sign in as the user who has not yet enabled 2fa
3. Observe that the user sees the 2FA prompt immediately when they log in

2fa.prompt.immediately.on.login.mp4

Case: User is able to set up 2FA after being shown prompt

1. When looking at the "Two factor authentication required" screen, press "Enable two-factor authentication" button
2. Observe the screen disappears, allowing you to access the 2FA setup flow
3. Complete the 2FA setup flow
4. Observe the 2FA prompt does not re-appear
5. Observe user is navigated back to wherever they were initially after dismissing success screen (usually Inbox)

2fa.prompt.allows.2fa.setup.mp4

Case: User is re-prompted for 2FA setup immediately after disabling it

1. Go to account > security > 2fa > Disable two factor authentication
2. complete the flow
3. Press "Got it" on success screen
4. Observe you are immediately shown 2fa prompt

2fa.prompt.device.reset.mp4

Case: 2FA prompt always comes back if user bails out of 2FA setup flow

1. When looking at the 2fa prompt screen, press "enable two-factor authentication" button
2. press Back on the recovery codes screen
3. Observe 2fa prompt immediately re-appears
4. press "enable two-factor authentication" again
5. copy or download the codes, then press next
6. click away from the verify screen
7. Observe 2fa prompt immediately re-appears

2fa.prompt.always.reappears.mp4

• Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as manual tests

• Verify that no errors appear in the JS console

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
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • 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

[melvin-bot]

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

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

[chuckdries]

Hi @bernhardoj, I'm hoping you could review this PR since you authored the original RequireTwoFactorAuthenticationPage component

[codecov]

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/ROUTES.ts	12.54% <ø> (-0.30%)	⬇️
src/hooks/useOnboardingFlow.ts	87.09% <ø> (+2.24%)	⬆️
src/hooks/useSidePanelDisplayStatus.tsx	100.00% <100.00%> (ø)
src/libs/Navigation/NavigationRoot.tsx	84.78% <ø> (+0.57%)	⬆️
src/libs/Navigation/linkingConfig/config.ts	75.00% <ø> (ø)
...es/settings/Security/TwoFactorAuth/SuccessPage.tsx	0.00% <ø> (ø)
src/styles/index.ts	46.85% <ø> (ø)
src/libs/Navigation/AppNavigator/AuthScreens.tsx	52.27% <57.14%> (+0.89%)	⬆️
.../settings/Security/TwoFactorAuth/CopyCodesPage.tsx	0.00% <0.00%> (ø)
src/libs/Navigation/Navigation.ts	53.71% <80.00%> (+0.57%)	⬆️
... and 1 more
... and 5 files with indirect coverage changes

[bernhardoj]

@chuckdries yeah, I can review it

[trjExpensify]

No qualms from me with fixing the flakiness here 👍

[bernhardoj]

@chuckdries I think we need to prevent the debug modal page shortcut, too.

App/src/hooks/useDebugShortcut.tsx

Lines 6 to 15 in 6d7eaa6

	function useDebugShortcut() {
	useEffect(() => {
	const debugShortcutConfig = CONST.KEYBOARD_SHORTCUTS.DEBUG;
	const unsubscribeDebugShortcut = KeyboardShortcut.subscribe(
	debugShortcutConfig.shortcutKey,
	() => toggleTestToolsModal(),
	debugShortcutConfig.descriptionKey,
	debugShortcutConfig.modifiers,
	true,
	);

w.mp4

[bernhardoj]

Case: User is re-prompted for 2FA setup immediately after disabling it

@chuckdries I can't seem to test this case because it prevents me from disabling the 2FA if a workspace is connected to Xero.

Maybe we can also show the same modal if a domain is configured to require 2FA (I'm not sure what this means, actually, that's why I connect my workspace to Xero instead to show the 2FA require modal)

[chuckdries]

it prevents me from disabling the 2FA if a workspace is connected to Xero

Ooh good catch. I am pretty sure we need to allow Xero users to reset their 2FA devices, just like users on 2FA enforced domains, but I'm going to confirm that and report back

[bernhardoj]

@chuckdries have you got any confirmation?

[chuckdries]

Not yet, we're still talking it over. I'll circle back here on Monday.

[ZhenjaHorbach]

I suppose when we add 2FA and press Got it we need to navigate directly to the desired screen
Because now we have a delay before navigation and it looks a bit weird

2026-01-15.14.51.20.mov

[ZhenjaHorbach]

When I enable 2FA in OD domains
I need to sign out and log in to show 2FA full screen
I'm not sure this is the correct behavior

[ZhenjaHorbach]

Minor issue on mobile
But we have visual glitches when the modal opens
We immediately close 2FA fullscreen

2026-01-15.15.25.40.mov

[ZhenjaHorbach]

On native apps we have an issue with the floating button

2026-01-15.15.33.42.mov

[chuckdries]

I suppose when we add 2FA and press Got it we need to navigate directly to the desired screen Because now we have a delay before navigation and it looks a bit weird

This is acceptable

When I enable 2FA in OD domains
I need to sign out and log in to show 2FA full screen
I'm not sure this is the correct behavior

This is expected behavior. The OD page specifies that "Domain members will be prompted to set up Two-Factor Authentication on their account when they sign in."

Minor issue on mobile
But we have visual glitches when the modal opens
We immediately close 2FA fullscreen

This is acceptable

On native apps we have an issue with the floating button

Good catch! This is now fixed.

[chuckdries]

@ZhenjaHorbach gentle bump 🙏

[ZhenjaHorbach]

@ZhenjaHorbach gentle bump 🙏

Sorry for the delay
I will complete the checklist tomorrow morning!

[ZhenjaHorbach]

LGTM!

[melvin-bot]

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

🎯 @ZhenjaHorbach, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #80092.

[Julesssss]

Nice improvement, lets keep an eye out for regressions in next checklist

[OSBotify]

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

[OSBotify]

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.6-0 🚀

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

[jponikarchuk]

This PR failing because of an issue
This issue is reproducible in: Android and iOS app

[OSBotify]

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.6-4 🚀

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