Show a fullscreen 2fa required instead of modal by bernhardoj · Pull Request #58071 · Expensify/App

bernhardoj · 2025-03-10T05:23:12Z

Explanation of Change

Fixed Issues

$ #57684
PROPOSAL:

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisite: User A has a workspace connected to Xero accounting

As User A Invite User B to a workspace as Admin
As User B:

Sign in to the app
Verify a 2FA required page is shown
Press the enable button
Complete the 2FA flow
Press the Got it/back button
Verify a home screen (LHN) is shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2025-03-10T05:23:17Z

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

bernhardoj · 2025-03-10T05:29:37Z

Asked for translation verification here: https://expensify.slack.com/archives/C01GTK53T8Q/p1741584360196839

dukenv0307 · 2025-03-10T08:15:54Z

Bug:

Screen.Recording.2025-03-10.at.14.47.33.mov

dukenv0307 · 2025-03-10T08:16:23Z

I think this PR should be merged first

dubielzyk-expensify · 2025-03-10T22:30:45Z

I think the visuals look good. Part of me wonders now if we should just tweak the copy to be less about Xero's accounting package and that "This workspaces requires two-factor authentication.." or something.

Keen to hear from @Expensify/design and @trjExpensify

trjExpensify · 2025-03-10T22:38:55Z

Mhm yeah, the only reason for this is because of Xero though. They enforce it for admins in partner apps that connect to Xero.

dubielzyk-expensify · 2025-03-11T01:04:44Z

I get that, I guess just for a new user being invited, it isn't really relevant info. I don't care too much so happy to move along 😄

shawnborton · 2025-03-11T07:34:13Z

No strong feelings, though I totally see Jon's point.

bernhardoj · 2025-03-11T08:29:28Z

Bug:

Screen.Recording.2025-03-10.at.14.47.33.mov

Checking

bernhardoj · 2025-03-11T11:27:00Z

My account (WS owner) that has Xero connection is somehow suspended. I have asked for help on slack to unsuspend it.

trjExpensify · 2025-03-11T23:39:26Z

My account (WS owner) that has Xero connection is somehow suspended. I have asked for help on slack to unsuspend it.

I took you off the email suppression list. 👍

bernhardoj · 2025-03-13T06:01:32Z

@dukenv0307 I tried fixing the bug by using the reset action, but the browser history still contains the /2fa-require path. The react-navigation doc itself also mention that

the browser's history will still reflect the old navigation state

https://reactnavigation.org/docs/navigation-actions/#rewriting-the-history-with-reset

What if we change the behavior so that after the user enables the 2FA, both the 2FA required page and 2FA RHP are closed?

web2.mp4

cc: @trjExpensify

dukenv0307 · 2025-03-13T08:50:38Z

but the browser history still contains the /2fa-require path. The react-navigation doc itself also mention that

Can you check the behavior of onboarding feature?

bernhardoj · 2025-03-13T08:53:05Z

We close the onboarding navigator after completing it, so we can't go back to it.

App/src/libs/navigateAfterOnboarding.ts

Lines 6 to 34 in 2496dfa

    
           const navigateAfterOnboarding = ( 
        
               isSmallScreenWidth: boolean, 
        
               canUseDefaultRooms: boolean | undefined, 
        
               onboardingPolicyID?: string, 
        
               activeWorkspaceID?: string, 
        
               onboardingAdminsChatReportID?: string, 
        
           ) => { 
        
               Navigation.dismissModal(); 
        
               // When hasCompletedGuidedSetupFlow is true, OnboardingModalNavigator in AuthScreen is removed from the navigation stack. 
        
               // On small screens, this removal redirects navigation to HOME. Dismissing the modal doesn't work properly, 
        
               // so we need to specifically navigate to the last accessed report. 
        
               if (!isSmallScreenWidth) { 
        
                   if (onboardingAdminsChatReportID) { 
        
                       Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(onboardingAdminsChatReportID)); 
        
                   } 
        
                   return; 
        
               } 
        
               const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom(), activeWorkspaceID); 
        
               const lastAccessedReportID = lastAccessedReport?.reportID; 
        
               // we don't want to navigate to newly created workspaces after onboarding is completed. 
        
               if (!lastAccessedReportID || lastAccessedReport.policyID === onboardingPolicyID || isConciergeChatReport(lastAccessedReport)) { 
        
                   return; 
        
               } 
        
               const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID); 
        
               Navigation.navigate(lastAccessedReportRoute); 
        
           };

trjExpensify · 2025-03-13T14:13:33Z

What if we change the behavior so that after the user enables the 2FA, both the 2FA required page and 2FA RHP are closed?

Hm, I don't love losing the confirmation screen tbh. I think it's fine to close both after confirming. Your vid also looks like it takes quite a long time for the account to load, so the "added delay" in showing the confirmation screen with the blocking modal in the background still could prove to be beneficial. CC: @Expensify/design for thoughts, vid here.

dannymcclain · 2025-03-13T14:29:54Z

Hm, I don't love losing the confirmation screen tbh. I think it's fine to close both after confirming.

Agree with this. It feels a little jarring to hit Next and then have the whole entire UI completely change. I would definitely down with closing both after clicking Got it on the confirmation screen though.

shawnborton · 2025-03-13T16:11:29Z

Yeah, I agree with you both.

bernhardoj · 2025-03-13T16:35:45Z

I think it's fine to close both after confirming.

Got it, I'll try and record this tomorrow.

bernhardoj · 2025-03-14T04:45:00Z

Does this looks good?

web.mp4

(I pressed the browser back button to show the navigation bug is fixed, cc: @dukenv0307)

dukenv0307 · 2025-03-14T07:53:00Z

@bernhardoj Looks good

shawnborton · 2025-03-14T07:57:05Z

Nice, that seems better to me.

bernhardoj · 2025-03-14T08:28:54Z

Updated

dukenv0307 · 2025-03-14T08:49:29Z

@bernhardoj Lint are failing...

dukenv0307 · 2025-03-14T09:06:20Z

@bernhardoj Bug

User B enables 2FA
User A remove user B from WS
User B disables 2FA

Actual result: 2fa-required page is shown

Expected result: 2fa-required page isn't shown

bernhardoj · 2025-03-14T10:33:02Z

I believe it's the same bug as #58217.

Lint fixed.

dukenv0307 · 2025-03-14T16:20:46Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Screen.Recording.2025-03-14.at.23.13.13.mov

Android: mWeb Chrome

Screen.Recording.2025-03-14.at.23.03.36.mov

iOS: Native

Screen.Recording.2025-03-14.at.23.07.25.mov

iOS: mWeb Safari

Screen.Recording.2025-03-14.at.22.57.24.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-14.at.22.50.37.mov

MacOS: Desktop

Screen.Recording.2025-03-14.at.23.17.15.mov

dukenv0307

LGTM

trjExpensify · 2025-03-14T16:32:30Z

Nice, that seems better to me.

+1, looks good!

dannymcclain · 2025-03-14T16:41:13Z

Feels much better, nice!

Beamanator

Overall looking great! Just a few lil comments!

src/libs/Navigation/NavigationRoot.tsx

Beamanator · 2025-03-15T11:37:38Z

src/libs/Navigation/NavigationRoot.tsx

        selector: wasInvitedToNewDotSelector,
    });
    const [hasNonPersonalPolicy] = useOnyx(ONYXKEYS.HAS_NON_PERSONAL_POLICY);
+    const shouldShowRequire2FAPage = account?.needsTwoFactorAuthSetup && !account.requiresTwoFactorAuth;


Mind adding a comment here explaining exactly why this is the logic we want? I think this will confuse people in the future who read this

Beamanator · 2025-03-15T11:39:26Z

src/languages/en.ts

+        twoFactorAuthIsRequiredForAdminsHeader: 'Two-factor authentication required',
+        twoFactorAuthIsRequiredForAdminsTitle: 'You need to enable two-factor authentication',
+        twoFactorAuthIsRequiredForAdminsDescription: 'The Xero accounting connection requires the use of two-factor authentication. To continue using Expensify, please enable it.',


Could be nice to remove the ForAdmins part of these keys since the text doesn't say anything about admins, what do y'all think?

Yes, it doesn't mention about admin, but the page will only show in a case where a workspace (connected to Xero) admin without 2FA enabled login.

Beamanator · 2025-03-15T11:41:56Z

src/libs/Navigation/AppNavigator/AuthScreens.tsx

        };
    }, [theme]);

+    useEffect(() => {


I think we should also add a comment here for these 2 new useEffects

src/pages/RequireTwoFactorAuthenticationPage.tsx

bernhardoj · 2025-03-16T05:45:35Z

For the comment, I don't think it's necessary. needsTwoFactorAuthSetup and requiresTwoFactorAuth already have a clear comment explaining what it is and the variable name (shouldShowRequire2FAPage) is already self-explanatory. (the logic is also been there for a long time)

Beamanator

Thanks for the updates & looks good 🚀

OSBotify · 2025-03-17T11:43:33Z

✋ 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 · 2025-03-18T22:19:22Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.15-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

m-natarajan · 2025-03-19T14:01:46Z

This PR is failing with original issue #57684 on iOS and Android
https://platform.applause.com/services/links/v1/external/9ec80a84dcf7888bfd8103d61330d9e87b71c9d39e9db0f9de5e827750bfe2d3
https://platform.applause.com/services/links/v1/external/c20bf07f023f5ebce748167d43614017993fdedd34abd95c152e6e9d1b5b4164

mountiny · 2025-03-20T11:14:00Z

@bernhardoj can you please check the failing cases?

bernhardoj · 2025-03-20T14:11:47Z

I don't have access to hybrid app. From the video, the user stays on the OD, so the new page we add here isn't shown. It's the same issue as #58232 (comment)

github-actions · 2025-03-20T15:17:11Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.15-9 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

show a fullscreen 2fa required instead of modal

1865b8a

bernhardoj requested review from a team as code owners March 10, 2025 05:23

melvin-bot bot requested a review from dukenv0307 March 10, 2025 05:23

melvin-bot bot removed the request for review from a team March 10, 2025 05:23

lint

16b43a3

Merge branch 'main' into feat/57684-improve-2fa-enablement-fllow

6f685a1

Merge branch 'main' into feat/57684-improve-2fa-enablement-fllow

144a965

Merge branch 'main' into feat/57684-improve-2fa-enablement-fllow

ad3dbb1

close both 2fa rhp and required page when closing the rhp

7eec01d

lint

57bdd3e

dukenv0307 approved these changes Mar 14, 2025

View reviewed changes

melvin-bot bot requested a review from Beamanator March 14, 2025 16:21

Merge branch 'main' into feat/57684-improve-2fa-enablement-fllow

c15a8b2

Beamanator requested changes Mar 15, 2025

View reviewed changes

bernhardoj added 3 commits March 16, 2025 13:34

remove unnecessary check

a8e8e89

replace inline styles

d9c54c0

move the var definition inside useEffect

67d06b5

Beamanator approved these changes Mar 17, 2025

View reviewed changes

Beamanator merged commit 61a1941 into Expensify:main Mar 17, 2025
16 checks passed

trjExpensify mentioned this pull request Mar 18, 2025

[Due for payment 2025-04-14] Android - 2FA - After enabling 2FA Inbox becomes empty #58232

Closed

8 tasks

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

Deploy Checklist: New Expensify 2025-03-18 #58665

Closed

54 tasks

luacmartins mentioned this pull request Mar 19, 2025

[Due for payment 2025-03-27] [$250] 2FA - Hybrid - User asked to again validate account after disabling 2FA #58682

Closed

8 tasks

melvin-bot bot mentioned this pull request Mar 20, 2025

[Due for payment 2025-03-27] Improve the Xero 2FA enablement flow #57684

Closed

8 tasks

truph01 mentioned this pull request Feb 7, 2026

Xero - Admin is navigated to Home page instead of workspace chat after enabling 2FA #81694

Open

7 tasks

Conversation

bernhardoj commented Mar 10, 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 Mar 10, 2025

Uh oh!

bernhardoj commented Mar 10, 2025

Uh oh!

dukenv0307 commented Mar 10, 2025

Uh oh!

dukenv0307 commented Mar 10, 2025

Uh oh!

dubielzyk-expensify commented Mar 10, 2025

Uh oh!

trjExpensify commented Mar 10, 2025

Uh oh!

dubielzyk-expensify commented Mar 11, 2025

Uh oh!

shawnborton commented Mar 11, 2025

Uh oh!

bernhardoj commented Mar 11, 2025

Uh oh!

bernhardoj commented Mar 11, 2025

Uh oh!

trjExpensify commented Mar 11, 2025

Uh oh!

bernhardoj commented Mar 13, 2025

Uh oh!

dukenv0307 commented Mar 13, 2025

Uh oh!

bernhardoj commented Mar 13, 2025

Uh oh!

trjExpensify commented Mar 13, 2025

Uh oh!

dannymcclain commented Mar 13, 2025

Uh oh!

shawnborton commented Mar 13, 2025

Uh oh!

bernhardoj commented Mar 13, 2025

Uh oh!

bernhardoj commented Mar 14, 2025

Uh oh!

dukenv0307 commented Mar 14, 2025

Uh oh!

shawnborton commented Mar 14, 2025

Uh oh!

bernhardoj commented Mar 14, 2025

Uh oh!

dukenv0307 commented Mar 14, 2025

Uh oh!

dukenv0307 commented Mar 14, 2025

Uh oh!

bernhardoj commented Mar 14, 2025

Uh oh!

dukenv0307 commented Mar 14, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Mar 14, 2025

Uh oh!

dannymcclain commented Mar 14, 2025

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Beamanator Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

Beamanator Mar 15, 2025

bernhardoj commented Mar 10, 2025 •

edited

Loading