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 - modified magic code link redirects to welcome screen with first place of magic code green #21724

Merged
merged 12 commits into from
Jul 3, 2023
Merged

Fix - modified magic code link redirects to welcome screen with first place of magic code green #21724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a95b3e2
make sure inputs get blurred when validating magic code using link
HezekielT Jun 27, 2023
c1edca5
Added PropTypes
HezekielT Jun 27, 2023
ec85657
consistency issue fixed
HezekielT Jun 27, 2023
d4a9dae
fix
HezekielT Jun 27, 2023
1dd4349
added Boolean
HezekielT Jun 27, 2023
c2c229c
typo fixed
HezekielT Jun 27, 2023
bb33473
single quote
HezekielT Jun 27, 2023
0fa37e1
fix lint error
HezekielT Jun 27, 2023
a2a780f
fix lint error
HezekielT Jun 27, 2023
8426a5e
fix lint error
HezekielT Jun 27, 2023
2f1d2fe
removed boolean
HezekielT Jun 27, 2023
06c7156
fixed prettier issue
HezekielT Jun 27, 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
1 change: 1 addition & 0 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ export default {
enterAuthenticatorCode: 'Please enter your authenticator code',
requiredWhen2FAEnabled: 'Required when 2FA is enabled',
requestNewCode: 'Request a new code in ',
requestNewCodeAfterErrorOccurred: 'Request a new code',
error: {
pleaseFillMagicCode: 'Please enter your magic code',
incorrectMagicCode: 'Incorrect magic code.',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@ export default {
enterAuthenticatorCode: 'Por favor, introduce el código de autenticador',
requiredWhen2FAEnabled: 'Obligatorio cuando A2F está habilitado',
requestNewCode: 'Pedir un código nuevo en ',
requestNewCodeAfterErrorOccurred: 'Solicitar un nuevo código',
error: {
pleaseFillMagicCode: 'Por favor, introduce el código mágico',
incorrectMagicCode: 'Código mágico incorrecto.',
Expand Down
25 changes: 22 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 @@ -46,6 +46,12 @@ const propTypes = {
login: PropTypes.string,
}),

/** Session of currently logged in user */
session: PropTypes.shape({
/** Currently logged in user authToken */
authToken: PropTypes.string,
}),

/** Indicates which locale the user currently has selected */
preferredLocale: PropTypes.string,

Expand All @@ -62,6 +68,9 @@ const propTypes = {
const defaultProps = {
account: {},
credentials: {},
session: {
authToken: null,
},
preferredLocale: CONST.LOCALES.DEFAULT,
};

Expand All @@ -79,6 +88,15 @@ function BaseValidateCodeForm(props) {
const input2FARef = useRef();
const timerRef = useRef();

const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);

useEffect(() => {
if (!(inputValidateCodeRef.current && ((hasError && props.session.autoAuthState === CONST.AUTO_AUTH_STATE.FAILED) || props.account.isLoading))) {
return;
}
inputValidateCodeRef.current.blur();
}, [props.account.isLoading, props.session.autoAuthState, hasError]);

useEffect(() => {
if (!inputValidateCodeRef.current || prevIsVisible || !props.isVisible || !canFocusInputOnScreenFocus()) {
return;
Expand Down Expand Up @@ -219,8 +237,6 @@ function BaseValidateCodeForm(props) {
}
}, [props.account.requiresTwoFactorAuth, props.credentials, props.preferredLocale, twoFactorAuthCode, validateCode]);

const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);

return (
<>
{/* At this point, if we know the account requires 2FA we already successfully authenticated */}
Expand Down Expand Up @@ -273,7 +289,9 @@ function BaseValidateCodeForm(props) {
accessibilityRole="button"
accessibilityLabel={props.translate('validateCodeForm.magicCodeNotReceived')}
>
<Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>{props.translate('validateCodeForm.magicCodeNotReceived')}</Text>
<Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>
{hasError ? props.translate('validateCodeForm.requestNewCodeAfterErrorOccurred') : props.translate('validateCodeForm.magicCodeNotReceived')}
</Text>
</PressableWithFeedback>
)}
</View>
Expand Down Expand Up @@ -309,6 +327,7 @@ export default compose(
account: {key: ONYXKEYS.ACCOUNT},
credentials: {key: ONYXKEYS.CREDENTIALS},
preferredLocale: {key: ONYXKEYS.NVP_PREFERRED_LOCALE},
session: {key: ONYXKEYS.SESSION},
}),
withToggleVisibilityView,
withNetwork(),
Expand Down