Skip to content

Commit 5ee59ef

Browse files
authored
Merge pull request Expensify#89470 from MobileMage/fix/79494-xero-2fa-modal-navigation
Fix Xero 2FA modal not navigating after disconnecting other accountin…
2 parents be6595c + 698dbf1 commit 5ee59ef

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

src/components/ConnectToXeroFlow/index.native.tsx

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import useLocalize from '@hooks/useLocalize';
1010
import useOnyx from '@hooks/useOnyx';
1111
import useThemeStyles from '@hooks/useThemeStyles';
1212
import {getXeroSetupLink} from '@libs/actions/connections/Xero';
13-
import {close} from '@libs/actions/Modal';
1413
import getUAForWebView from '@libs/getUAForWebView';
1514
import Navigation from '@libs/Navigation/Navigation';
1615
import CONST from '@src/CONST';
@@ -55,20 +54,18 @@ function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
5554
<RequireTwoFactorAuthenticationModal
5655
onSubmit={() => {
5756
setIsRequire2FAModalOpen(false);
58-
close(() => {
59-
const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
60-
const validatedUserForwardTo = getXeroSetupLink(policyID);
61-
if (isUserValidated) {
62-
Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
63-
return;
64-
}
65-
Navigation.navigate(
66-
ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
67-
backTo,
68-
forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
69-
}),
70-
);
71-
});
57+
const backTo = ROUTES.POLICY_ACCOUNTING.getRoute(policyID);
58+
const validatedUserForwardTo = getXeroSetupLink(policyID);
59+
if (isUserValidated) {
60+
Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo));
61+
return;
62+
}
63+
Navigation.navigate(
64+
ROUTES.SETTINGS_2FA_VERIFY_ACCOUNT.getRoute({
65+
backTo,
66+
forwardTo: ROUTES.SETTINGS_2FA_ROOT.getRoute(backTo, validatedUserForwardTo),
67+
}),
68+
);
7269
}}
7370
onCancel={() => setIsRequire2FAModalOpen(false)}
7471
isVisible={isRequire2FAModalOpen}

0 commit comments

Comments
 (0)