Merge pull request #15294 from tienifr/fix/14972-The-Terms-of-Service…

…-checkbox-does-not-respond-properly-while-navigating-the-connect-bank-account-flow Fix/14972 the terms of service checkbox does not respond properly while navigating the connect bank account flow
Expensify · Feb 22, 2023 · dad522f · dad522f
2 parents 1b0b16f + fe2b320
commit dad522f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -85,7 +85,7 @@ export default {
         genericErrorMessage: 'Oops... something went wrong and your request could not be completed. Please try again later.',
         error: {
             invalidAmount: 'Invalid amount',
-            acceptedTerms: 'You must accept the Terms of Service to continue',
+            acceptTerms: 'You must accept the Terms of Service to continue',
             phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'This field is required.',
             characterLimit: ({limit}) => `Exceeds the maximum length of ${limit} characters`,

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -85,7 +85,7 @@ export default {
         genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se pudo completar. Por favor inténtalo más tarde.',
         error: {
             invalidAmount: 'Monto no válido',
-            acceptedTerms: 'Debes aceptar los Términos de servicio para continuar',
+            acceptTerms: 'Debes aceptar los Términos de servicio para continuar',
             phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'Este campo es obligatorio.',
             characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`,

diff --git a/src/libs/ReimbursementAccountUtils.js b/src/libs/ReimbursementAccountUtils.js
@@ -11,8 +11,7 @@ import lodashGet from 'lodash/get';
  * @returns {*}
  */
 function getDefaultStateForField(reimbursementAccountDraft, reimbursementAccount, fieldName, defaultValue = '') {
-    return lodashGet(reimbursementAccountDraft, fieldName)
-        || lodashGet(reimbursementAccount, ['achData', fieldName], defaultValue);
+    return lodashGet(reimbursementAccountDraft, fieldName, lodashGet(reimbursementAccount, ['achData', fieldName], defaultValue));
 }
 
 export {

diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js
@@ -60,7 +60,7 @@ class TermsStep extends React.Component {
     }
 
     render() {
-        const errorMessage = this.state.error ? this.props.translate('common.error.acceptedTerms') : (ErrorUtils.getLatestErrorMessage(this.props.walletTerms) || '');
+        const errorMessage = this.state.error ? this.props.translate('common.error.acceptTerms') : (ErrorUtils.getLatestErrorMessage(this.props.walletTerms) || '');
         return (
             <>
                 <HeaderWithCloseButton

diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js
@@ -85,7 +85,7 @@ class ACHContractStep extends React.Component {
         }
 
         if (!ValidationUtils.isRequiredFulfilled(values.acceptTermsAndConditions)) {
-            errors.acceptTermsAndConditions = this.props.translate('common.error.acceptedTerms');
+            errors.acceptTermsAndConditions = this.props.translate('common.error.acceptTerms');
         }
 
         if (!ValidationUtils.isRequiredFulfilled(values.certifyTrueInformation)) {

diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js
@@ -47,8 +47,8 @@ class BankAccountManualStep extends React.Component {
         if (!routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber)) {
             errorFields.routingNumber = this.props.translate('bankAccount.error.routingNumber');
         }
-        if (!values.acceptedTerms) {
-            errorFields.acceptedTerms = this.props.translate('common.error.acceptedTerms');
+        if (!values.acceptTerms) {
+            errorFields.acceptTerms = this.props.translate('common.error.acceptTerms');
         }
 
         return errorFields;
@@ -113,7 +113,7 @@ class BankAccountManualStep extends React.Component {
                     />
                     <CheckboxWithLabel
                         style={styles.mt4}
-                        inputID="acceptedTerms"
+                        inputID="acceptTerms"
                         LabelComponent={() => (
                             <Text>
                                 {this.props.translate('common.iAcceptThe')}

diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Payments/AddDebitCardPage.js
@@ -99,8 +99,8 @@ class DebitCardPage extends Component {
             errors.password = this.props.translate('addDebitCardPage.error.password');
         }
 
-        if (!values.acceptedTerms) {
-            errors.acceptedTerms = this.props.translate('common.error.acceptedTerms');
+        if (!values.acceptTerms) {
+            errors.acceptTerms = this.props.translate('common.error.acceptTerms');
         }
 
         return errors;
@@ -186,7 +186,7 @@ class DebitCardPage extends Component {
                         />
                     </View>
                     <CheckboxWithLabel
-                        inputID="acceptedTerms"
+                        inputID="acceptTerms"
                         LabelComponent={() => (
                             <Text>
                                 {`${this.props.translate('common.iAcceptThe')}`}