Merge pull request #5073 from Expensify/aldo_show-all-errors-vba-company

Highlight all errors in VBA flow - Company step
Expensify · Sep 14, 2021 · 0f4abe1 · 0f4abe1
2 parents def9cb7 + 52aef15
commit 0f4abe1
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 108 deletions.
diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js
@@ -5,7 +5,7 @@ import {
 import Str from 'expensify-common/lib/str';
 import ExpensiTextInputLabel from './ExpensiTextInputLabel';
 import Text from '../Text';
-import {propTypes, defaultProps} from './propTypes';
+import {propTypes, defaultProps} from './baseExpensiTextInputPropTypes';
 import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 

diff --git a/src/components/ExpensiTextInput/propTypes.js → ...extInput/baseExpensiTextInputPropTypes.js b/src/components/ExpensiTextInput/propTypes.js → ...extInput/baseExpensiTextInputPropTypes.js
@@ -33,7 +33,7 @@ const defaultProps = {
     label: '',
     errorText: '',
     placeholder: '',
-    error: false,
+    hasError: false,
     containerStyles: [],
     translateX: -22,
     inputStyle: [],

diff --git a/src/components/ExpensiTextInput/index.android.js b/src/components/ExpensiTextInput/index.android.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import styles from '../../styles/styles';
 import BaseExpensiTextInput from './BaseExpensiTextInput';
-import {propTypes, defaultProps} from './propTypes';
+import {propTypes, defaultProps} from './baseExpensiTextInputPropTypes';
 
 const ExpensiTextInput = forwardRef((props, ref) => (
     <BaseExpensiTextInput

diff --git a/src/components/ExpensiTextInput/index.ios.js b/src/components/ExpensiTextInput/index.ios.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import styles from '../../styles/styles';
 import BaseExpensiTextInput from './BaseExpensiTextInput';
-import {propTypes, defaultProps} from './propTypes';
+import {propTypes, defaultProps} from './baseExpensiTextInputPropTypes';
 
 const ExpensiTextInput = forwardRef((props, ref) => (
     <BaseExpensiTextInput

diff --git a/src/components/ExpensiTextInput/index.js b/src/components/ExpensiTextInput/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import styles from '../../styles/styles';
 import BaseExpensiTextInput from './BaseExpensiTextInput';
-import {propTypes, defaultProps} from './propTypes';
+import {propTypes, defaultProps} from './baseExpensiTextInputPropTypes';
 
 const ExpensiTextInput = forwardRef((props, ref) => (
     <BaseExpensiTextInput

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -385,6 +385,9 @@ export default {
             taxID: 'Please enter a valid Tax ID Number',
             website: 'Please enter a valid website',
             zipCode: 'Please enter a valid zip code',
+            phoneNumber: 'Please enter a valid phone number',
+            companyName: 'Please enter a valid legal business name',
+            addressCity: 'Please enter a valid city',
             addressStreet: 'Please enter a valid address street that is not a PO Box',
             addressState: 'Please select a valid state',
             incorporationDate: 'Please enter a valid incorporation date',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -385,6 +385,9 @@ export default {
             taxID: 'Ingrese un número de identificación fiscal válido',
             website: 'Ingrese un sitio web válido',
             zipCode: 'Ingrese un código postal válido',
+            phoneNumber: 'Ingrese un teléfono válido',
+            companyName: 'Ingrese un nombre comercial legal válido',
+            addressCity: 'Ingrese una ciudad válida',
             addressStreet: 'Ingrese una calle de dirección válida que no sea un apartado postal',
             addressState: 'Por favor, selecciona un estado',
             incorporationDate: 'Ingrese una fecha de incorporación válida',

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
@@ -1,4 +1,5 @@
 import moment from 'moment';
+import _ from 'underscore';
 import CONST from '../CONST';
 import {showBankAccountFormValidationError, showBankAccountErrorModal} from './actions/BankAccounts';
 import {translateLocal} from './translate';
@@ -17,6 +18,21 @@ function isValidAddress(value) {
     return !CONST.REGEX.PO_BOX.test(value);
 }
 
+/**
+ * Used to validate a value that is "required".
+ *
+ * @param {*} value
+ * @returns {Boolean}
+ */
+function isRequiredFulfilled(value) {
+    if (_.isString(value)) {
+        return !_.isEmpty(value.trim());
+    }
+    if (_.isArray(value) || _.isObject(value)) {
+        return !_.isEmpty(value);
+    }
+    return Boolean(value);
+}
 
 /**
  * Validate date fields
@@ -111,4 +127,5 @@ export {
     isValidIndustryCode,
     isValidIdentity,
     isValidZipCode,
+    isRequiredFulfilled,
 };