Fix Xero 2FA modal not navigating after disconnecting other accountin… by MobileMage · Pull Request #89470 · Expensify/App

MobileMage · 2026-05-04T08:02:51Z

Explanation of Change

On iOS, when a workspace was already connected to another accounting integration (e.g., Sage Intacct) and the user tried to connect Xero, tapping Enable two-factor authentication did not navigate to the 2FA setup page — the navigation only happened after the user pressed the back button.

The RequireTwoFactorAuthenticationModal's onSubmit handler wrapped the navigation inside Modal.close(callback). close() stores its callback and only runs it later when onModalDidClose() fires from BaseModal.hideModal(), which on iOS is triggered by RN Modal's onDismiss event.

This flow is unique because an AccountingConnectionConfirmationModal (the "disconnect existing integration?" prompt) is shown first and unmounts right before the 2FA modal mounts. On iOS, the unmounting confirmation modal's onDismiss event is misattributed to the freshly mounted 2FA modal, causing hideModal() to fire prematurely as a no-op (no callback queued yet). Later, when the user taps Enable 2FA, close() stores the navigation callback and calls closeTop(), but onDismiss never fires again, so the navigation callback never runs.

The fix removes the close() wrapper in src/components/ConnectToXeroFlow/index.native.tsx and navigates directly after setIsRequire2FAModalOpen(false). The modal still closes on its own via isVisible becoming false, and navigation does not need to wait for the close animation. This matches how the other accounting integrations (QBO, NetSuite, Sage Intacct) handle this navigation.

Fixed Issues

$ #79494
PROPOSAL: #79494 (comment)

Tests

Precondition: the workspace is already connected to another accounting integration (e.g., Sage Intacct).

Launch the Expensify app on iOS.
Go to workspace Settings > Accounting.
Tap Other.
Tap Connect next to Xero.
Proceed past the prompt to disconnect the existing integration.
Tap Enable two-factor authentication.
Verify the 2FA setup page opens immediately, without needing to press the back button.
Disconnect Xero and repeat from a workspace with no other integration connected — the Xero connection flow should still work normally (WebView opens for Xero login).

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Precondition: the workspace is already connected to another accounting integration (e.g., Sage Intacct).

Launch the Expensify app on iOS.
Go to workspace Settings > Accounting.
Tap Other.
Tap Connect next to Xero.
Proceed past the prompt to disconnect the existing integration.
Tap Enable two-factor authentication.
Verify the 2FA setup page opens immediately (no back-button workaround required).

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Kapture.2026-05-04.at.08.55.04.mp4

Android: mWeb Chrome

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2026-05-04.at.08.36.52.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

…g integration on iOS

melvin-bot · 2026-05-04T08:02:58Z

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

codecov · 2026-05-04T08:13:14Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/components/ConnectToXeroFlow/index.native.tsx	`0.00% <0.00%> (ø)`
... and 43 files with indirect coverage changes

truph01 · 2026-05-07T10:40:56Z

@codex review

chatgpt-codex-connector · 2026-05-07T10:44:27Z

Codex Review: Didn't find any major issues. Nice work!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

truph01 · 2026-05-07T11:03:05Z

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
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 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

Screen.Recording.2026-05-07.at.18.02.27.mov

Android: mWeb Chrome

Screen.Recording.2026-05-07.at.17.59.42.mov

iOS: HybridApp

Screen.Recording.2026-05-07.at.17.53.13.mov

iOS: mWeb Safari

Screen.Recording.2026-05-07.at.17.57.53.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-07.at.17.56.16.mov

lakchote

LGTM

github-actions · 2026-05-08T08:16:52Z

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

github-actions · 2026-05-08T08:21:13Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5ee59ef-16ca8cb-195bdd271bef3ce496cb177cdd8ac7acd58b0097/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5ee59ef-16ca8cb-647d791d7739c4c85a0fa6d86cbf5c8a1387f43f/index.html

Web 🕸️
https://89470.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-08T08:39:39Z

✋ 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 · 2026-05-08T15:42:34Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.3.69-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-08T15:43:49Z

I reviewed the changes in this PR. It fixes an iOS-specific bug where the 2FA modal navigation callback wasn't firing due to a timing issue with Modal.close(). The only change is in src/components/ConnectToXeroFlow/index.native.tsx — removing the close() wrapper so navigation happens directly.

No help site changes are required. This PR doesn't add or modify any user-facing features, workflows, settings, or UI labels — it only corrects existing navigation behavior on iOS.

OSBotify · 2026-05-11T23:43:03Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

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

truph01 · 2026-05-18T03:08:20Z

                <RequireTwoFactorAuthenticationModal
                    onSubmit={() => {
                        setIsRequire2FAModalOpen(false);
-                        close(() => {


@MelvinBot Find the PR which caused this bug.

MelvinBot · 2026-05-18T03:13:45Z

The bug was introduced by PR #59773 — "Fix validate code modal shows blank" by bernhardoj, merged 2025-04-09.

Specifically, commit 2f35f90 changed the onSubmit handler in ConnectToXeroFlow/index.native.tsx from a direct Navigation.navigate(...) call to wrapping it in close(() => Navigation.navigate(...)). The intent was to wait for the modal to close before navigating, but this broke the iOS flow when an AccountingConnectionConfirmationModal had been shown beforehand — iOS's onDismiss event from the unmounting confirmation modal was misattributed to the freshly mounted 2FA modal, preventing the navigation callback from ever firing.

Fix Xero 2FA modal not navigating after disconnecting other accountin…

698dbf1

…g integration on iOS

MobileMage requested review from a team as code owners May 4, 2026 08:02

melvin-bot Bot assigned MobileMage May 4, 2026

melvin-bot Bot requested review from JmillsExpensify and truph01 and removed request for a team May 4, 2026 08:02

truph01 approved these changes May 7, 2026

View reviewed changes

melvin-bot Bot requested a review from lakchote May 7, 2026 11:03

lakchote approved these changes May 8, 2026

View reviewed changes

lakchote merged commit 5ee59ef into Expensify:main May 8, 2026
43 checks passed

OSBotify mentioned this pull request May 8, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

melvin-bot Bot mentioned this pull request May 11, 2026

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

Closed

7 tasks

truph01 reviewed May 18, 2026

View reviewed changes

Uh oh!

Conversation

MobileMage commented May 4, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 4, 2026

Uh oh!

codecov Bot commented May 4, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

truph01 commented May 7, 2026

Uh oh!

chatgpt-codex-connector Bot commented May 7, 2026

Uh oh!

truph01 commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 8, 2026

Uh oh!

github-actions Bot commented May 8, 2026

Uh oh!

OSBotify commented May 8, 2026

Uh oh!

OSBotify commented May 8, 2026

Uh oh!

MelvinBot commented May 8, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

truph01 May 18, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented May 4, 2026 •

edited by github-actions Bot

Loading

truph01 commented May 7, 2026 •

edited

Loading