[Due for payment 2026-05-18] [$250] iOS - Xero - 2FA setup does not open after tapping Enable 2FA when connected to other software

[lanitochka17]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: 9.3.0-1
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack: https://test-management.browserstack.com/projects/2219752/test-runs/TR-2924/folder/13176909/41237449/1121357068
Email or phone of affected tester (no customers): jsoidnjsoijosjnoisj2d@gmail.com
Issue reported by: Applause Internal Team
Bug source: Exploratory - Significant User Experience Deterioration
Device used: iPhone 15 Pro Max / iOS 26.1
App Component: Workspace Settings

Action Performed:

Precondition:

• Workspace is connected to Sage Intacct.

1. Launch Expensify app.
2. Go to workspace settings > Accounting.
3. Tap Other.
4. Tap Connect Xero.
5. Tap Connect.
6. Tap Enable two-factor authentication.
7. Tap app back button.

Expected Result:

In Step 6, after tapping Enable two-factor authentication, 2FA setup will open.

Actual Result:

In Step 6, after tapping Enable two-factor authentication, 2FA setup does not open.
In Step 7, after tapping app back button, 2FA setup opens.

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari

Screenshots/Videos

Bug7048195_1768317525804.ScreenRecording_01-13-2026_23-08-16_1.1.mp4

View all open jobs on GitHub

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022012180916378296532
• Upwork Job ID: 2012180916378296532
• Last Price Increase: 2026-04-28
• Automatic offers:
• MobileMage | Contributor | 111295907

Issue Owner

Current Issue Owner: @mallenexpensify

[melvin-bot]

Triggered auto assignment to @bfitzexpensify (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[daledah]

Proposal

Please re-state the problem that we are trying to solve in this issue.

When connecting to Xero and the user doesn't have 2FA enabled, tapping "Enable two-factor authentication" button doesn't immediately navigate to the 2FA setup page. Instead, the 2FA setup page only opens after the user taps the app back button.

What is the root cause of that problem?

The issue is in the onSubmit handler of ConnectToXeroFlow/index.native.tsx. The handler calls setIsRequire2FAModalOpen(false) before calling close() with the navigation callback:

App/src/components/ConnectToXeroFlow/index.native.tsx

Lines 46 to 62 in 82fd38c

	onSubmit={() => {
	setIsRequire2FAModalOpen(false);
	close(() => {
	const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
	const validatedUserForwardTo = getXeroSetupLink(policyID);
	if (isUserValidated) {
	Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
	return;
	}
	Navigation.navigate(
	ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
	backTo,
	forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
	}),
	);
	});
	}}

The close() function from @libs/actions/Modal is designed to:

1. Store the callback in onModalClose
2. Call closeTop() to close the topmost modal via its onClose handler
3. When the modal finishes closing, onModalDidClose() is called which executes the stored callback

However, since setIsRequire2FAModalOpen(false) is called first, it directly changes the isVisible prop to false, starting the modal close animation independently of the modal system. This causes a race condition where:

1. The modal's onClose handler is removed from closeModals array during React's cleanup
2. The close() callback gets orphaned and is never executed until something else triggers onModalDidClose() (like pressing the back button)

What changes do you think we should make in order to solve the problem?

Remove the redundant setIsRequire2FAModalOpen(false) call. The close() function already handles closing the modal through closeTop(), which calls the modal's onCancel handler (which sets setIsRequire2FAModalOpen(false)).

File: src/components/ConnectToXeroFlow/index.native.tsx

onSubmit={() => {
    close(() => {
        const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
        const validatedUserForwardTo = getXeroSetupLink(policyID);
        if (isUserValidated) {
            Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
            return;
        }
        Navigation.navigate(
            ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
                backTo,
                forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
            }),
        );
    });
}}

The same fix should also be applied to:

• src/components/ConnectToXeroFlow/index.tsx (web version)

What alternative solutions did you explore? (Optional)

1. Using setTimeout to delay navigation - This would be a hack and not address the root cause.
2. Using InteractionManager.runAfterInteractions - While this could work, it's unnecessary since close() is designed to handle this exact scenario.

Reminder: Please use plain English, be brief and avoid jargon. Feel free to use images, charts or pseudo-code if necessary. Do not post large multi-line diffs or write walls of text. Do not create PRs unless you have been hired for this job.

[MobileMage]

🚨 Edited by proposal-police: This proposal was edited at 2026-02-23 14:31:38 UTC.

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a workspace is already connected to another accounting software (e.g., Sage Intacct) and the user tries to connect Xero, tapping "Enable two-factor authentication" does not navigate to the 2FA setup page. The navigation only happens after pressing the back button.

What is the root cause of that problem?

The onSubmit handler in ConnectToXeroFlow wraps the navigation inside Modal.close() as a callback. close() stores the callback and only executes it later when onModalDidClose() fires from BaseModal.hideModal(), which on iOS is triggered by the RN Modal's onDismiss event.

The problem is specific to the "already connected to other software" flow. In that flow, an AccountingConnectionConfirmationModal (the "disconnect existing integration?" prompt) is shown first. That modal is controlled by mount/unmount via shouldShowConfirmationModal in AccountingContext.tsx, not by isVisible. When the user confirms, it unmounts and the RequireTwoFactorAuthenticationModal mounts immediately after. On iOS, the RN Modal onDismiss from the unmounting confirmation modal gets misattributed to the newly mounted 2FA modal. This causes BaseModal.hideModal() to fire prematurely on the 2FA modal, which sets shouldCallHideModalOnUnmount.current = false and calls onModalDidClose() as a no-op (no pending callback yet).

Later when the user taps "Enable 2FA", close() stores the navigation callback and calls closeTop(). The modal starts closing, but onDismiss does not fire again (already consumed prematurely), so hideModal() is never called, onModalDidClose() is never triggered, and the navigation callback never executes.

What changes do you think we should make in order to solve the problem?

In src/components/ConnectToXeroFlow/index.native.tsx, remove the close() wrapper in the onSubmit handler and navigate directly after calling setIsRequire2FAModalOpen(false). The modal closes on its own through isVisible becoming false, and navigation does not need to wait for the close animation. Also remove the now-unused close import from @libs/actions/Modal. This is consistent with how all other accounting integrations (QBO, NetSuite, Sage Intacct) handle navigation -- they navigate directly without relying on modal close callbacks.

In index.native.tsx

-import {close} from '@libs/actions/Modal';

 onSubmit={() => {
     setIsRequire2FAModalOpen(false);
-    close(() => {
-        const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
-        const validatedUserForwardTo = getXeroSetupLink(policyID);
-        if (isUserValidated) {
-            Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
-            return;
-        }
-        Navigation.navigate(
-            ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
-                backTo,
-                forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
-            }),
-        );
-    });
+    const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
+    const validatedUserForwardTo = getXeroSetupLink(policyID);
+    if (isUserValidated) {
+        Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
+        return;
+    }
+    Navigation.navigate(
+        ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
+            backTo,
+            forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
+        }),
+    );
 }}

Recording

Simulator.Screen.Recording.-.iPhone.17.Pro.-.2026-02-23.at.15.30.07_compressed.mp4

What alternative solutions did you explore? (Optional)

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~022012180916378296532

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @truph01 (External)