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

Fix App allows changing to use the 2FA code option when signning in with recovery code #29195

Merged
merged 5 commits into from
Oct 11, 2023
Merged

Fix App allows changing to use the 2FA code option when signning in with recovery code #29195

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a18142f
Disable switching between 2FA and recover code button when form submi…
hoangzinh Oct 10, 2023
f106ffa
Fix linter
hoangzinh Oct 10, 2023
85a7a91
Trigger checklist
hoangzinh Oct 10, 2023
f9f2f00
Trigger perf-test
hoangzinh Oct 11, 2023
888c6f6
Merge branch 'main' into fix/28254
hoangzinh Oct 11, 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
7 changes: 4 additions & 3 deletions src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ function BaseValidateCodeForm(props) {
const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);
const isLoadingResendValidationForm = props.account.loadingForm === CONST.FORMS.RESEND_VALIDATE_CODE_FORM;
const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
const isValidateCodeFormSubmitting =
props.account.isLoading && props.account.loadingForm === (props.account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

useEffect(() => {
if (!(inputValidateCodeRef.current && hasError && (props.session.autoAuthState === CONST.AUTO_AUTH_STATE.FAILED || props.account.isLoading))) {
Expand Down Expand Up @@ -327,6 +329,7 @@ function BaseValidateCodeForm(props) {
underlayColor={themeColors.componentBG}
hoverDimmingValue={1}
pressDimmingValue={0.2}
disabled={isValidateCodeFormSubmitting}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
accessibilityLabel={props.isUsingRecoveryCode ? props.translate('recoveryCodeForm.use2fa') : props.translate('recoveryCodeForm.useRecoveryCode')}
>
Expand Down Expand Up @@ -379,9 +382,7 @@ function BaseValidateCodeForm(props) {
success
style={[styles.mv3]}
text={props.translate('common.signIn')}
isLoading={
props.account.isLoading && props.account.loadingForm === (props.account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM)
}
isLoading={isValidateCodeFormSubmitting}
onPress={validateAndSubmitForm}
/>
<ChangeExpensifyLoginLink onPress={clearSignInData} />
Expand Down
Loading