Skip to content

[CP Staging] Add currentStep to navigation hook to prevent lock in 2fa setup step #27938

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

Merged
thienlnam merged 2 commits into from
Sep 22, 2023
Merged

[CP Staging] Add currentStep to navigation hook to prevent lock in 2fa setup step #27938

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53723b5
Add currentStep to navigation hook to prevent lock in certain state
ospfranco Sep 21, 2023
56aeedb
Remove comment because without the 2fa step it doesn't work
ospfranco Sep 21, 2023
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: 2 additions & 3 deletions src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ function TwoFactorAuthSteps({account = defaultAccount}) {
setCurrentStep(account.twoFactorAuthStep);
return;
}

if (account.requiresTwoFactorAuth) {
setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.ENABLED);
} else {
setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.CODES);
}
// we don't want to trigger the hook every time the step changes, only when the requiresTwoFactorAuth changes
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [account.requiresTwoFactorAuth]);
}, [account.requiresTwoFactorAuth, account.twoFactorAuthStep]);

const handleSetStep = useCallback(
(step, animationDirection = CONST.ANIMATION_DIRECTION.IN) => {
Expand Down