Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix - iOS Xero - Navigation issue when tapping app back button three times after exiting 2FA setup #51817

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Fix - iOS Xero - Navigation issue when tapping app back button three times after exiting 2FA setup #51817

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01068ae
pass empty backTo for Xero 2Fa
FitseTLT Oct 31, 2024
48ec9d0
reversed the condition
FitseTLT Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import useLocalize from '@hooks/useLocalize';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {READ_COMMANDS} from '@libs/API/types';
import Clipboard from '@libs/Clipboard';
import localFileDownload from '@libs/localFileDownload';
import type {BackToParams, SettingsNavigatorParamList} from '@libs/Navigation/types';
Expand Down Expand Up @@ -66,7 +67,9 @@ function CodesStep({backTo}: CodesStepProps) {
text: translate('twoFactorAuth.stepCodes'),
total: 3,
}}
onBackButtonPress={() => TwoFactorAuthActions.quitAndNavigateBack(backTo)}
// When the 2FA code step is open from Xero flow, we don't need to pass backTo because we build the necessary root route
// from the backTo param in the route (in getMatchingRootRouteForRHPRoute) and goBack will not need a fallbackRoute.
onBackButtonPress={() => TwoFactorAuthActions.quitAndNavigateBack(route.params.forwardTo?.includes(READ_COMMANDS.CONNECT_POLICY_TO_XERO) ? '' : backTo)}
>
<ScrollView contentContainerStyle={styles.flexGrow1}>
{!!isUserValidated && (
Expand Down
Loading