From bc076b5e6a38acf273ea46721ecad6c18dc39aa9 Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Sun, 18 Feb 2024 23:02:11 +0530 Subject: [PATCH 1/6] Increase editing space for recovery code --- src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js index 4afba77b77b5..7cbf05dba783 100755 --- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js +++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js @@ -324,7 +324,7 @@ function BaseValidateCodeForm(props) { accessibilityLabel={props.translate('recoveryCodeForm.recoveryCode')} value={recoveryCode} onChangeText={(text) => onTextInput(text, 'recoveryCode')} - maxLength={CONST.RECOVERY_CODE_LENGTH} + maxLength={CONST.FORM_CHARACTER_LIMIT} label={props.translate('recoveryCodeForm.recoveryCode')} errorText={formError.recoveryCode || ''} hasError={hasError} From 04fb21000447ec284980392bd55ff7fade561a9a Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Sun, 18 Feb 2024 23:16:23 +0530 Subject: [PATCH 2/6] Add logic to trim text on input --- src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js index 7cbf05dba783..2bc90efaceb5 100755 --- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js +++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js @@ -179,7 +179,7 @@ function BaseValidateCodeForm(props) { setInput = setRecoveryCode; } - setInput(text); + setInput(text.trim()); setFormError((prevError) => ({...prevError, [key]: ''})); if (props.account.errors) { From 6465479de01d8d88e890ce6d24828380ab5be40d Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Tue, 20 Feb 2024 16:12:33 +0530 Subject: [PATCH 3/6] Update recovery code trim logic --- src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js index 2bc90efaceb5..db14010f5f37 100755 --- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js +++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js @@ -179,7 +179,7 @@ function BaseValidateCodeForm(props) { setInput = setRecoveryCode; } - setInput(text.trim()); + setInput(text); setFormError((prevError) => ({...prevError, [key]: ''})); if (props.account.errors) { @@ -283,7 +283,7 @@ function BaseValidateCodeForm(props) { setFormError({recoveryCode: 'recoveryCodeForm.error.pleaseFillRecoveryCode'}); return; } - if (!ValidationUtils.isValidRecoveryCode(recoveryCode)) { + if (!ValidationUtils.isValidRecoveryCode(recoveryCode.trim())) { setFormError({recoveryCode: 'recoveryCodeForm.error.incorrectRecoveryCode'}); return; } @@ -303,7 +303,7 @@ function BaseValidateCodeForm(props) { } setFormError({}); - const recoveryCodeOr2faCode = props.isUsingRecoveryCode ? recoveryCode : twoFactorAuthCode; + const recoveryCodeOr2faCode = props.isUsingRecoveryCode ? recoveryCode.trim() : twoFactorAuthCode; const accountID = lodashGet(props.credentials, 'accountID'); if (accountID) { From 1dce287e76577a87c92e3cf555a17fbc735046b4 Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Thu, 29 Feb 2024 20:24:31 +0530 Subject: [PATCH 4/6] Trim recovery code on text input --- src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx index 428df32bf032..f7e08c128df5 100755 --- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx +++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx @@ -143,7 +143,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs setTwoFactorAuthCode(text); } if (key === 'recoveryCode') { - setRecoveryCode(text); + setRecoveryCode(text.trim()); } setFormError((prevError) => ({...prevError, [key]: undefined})); From 3630b1b0c4c7729889d3a3ad585cf88394c4b7f0 Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Fri, 1 Mar 2024 09:11:00 +0530 Subject: [PATCH 5/6] Increase editing space for recovery code input --- src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx index f7e08c128df5..7d1caebb2e47 100755 --- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx +++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx @@ -290,7 +290,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs accessibilityLabel={translate('recoveryCodeForm.recoveryCode')} value={recoveryCode} onChangeText={(text) => onTextInput(text, 'recoveryCode')} - maxLength={CONST.RECOVERY_CODE_LENGTH} + maxLength={CONST.FORM_CHARACTER_LIMIT} label={translate('recoveryCodeForm.recoveryCode')} errorText={formError?.recoveryCode ?? ''} hasError={hasError} From bba08641839e706662f290342890a336b0aa4cef Mon Sep 17 00:00:00 2001 From: Someshwar Tripathi Date: Fri, 8 Mar 2024 08:33:08 +0530 Subject: [PATCH 6/6] Remove unused const --- src/CONST.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 70fecab70c39..39414cbad3a7 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -991,8 +991,6 @@ const CONST = { MAGIC_CODE_LENGTH: 6, MAGIC_CODE_EMPTY_CHAR: ' ', - RECOVERY_CODE_LENGTH: 8, - KEYBOARD_TYPE: { VISIBLE_PASSWORD: 'visible-password', ASCII_CAPABLE: 'ascii-capable',