fix lint

Expensify · Jan 3, 2024 · 9ce24ae · 9ce24ae
1 parent 72ae19e
commit 9ce24ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/libs/ValidationUtils.ts b/src/libs/ValidationUtils.ts
@@ -35,7 +35,7 @@ function validateCardNumber(value: string): boolean {
  * Validating that this is a valid address (PO boxes are not allowed)
  */
 function isValidAddress(value: string): boolean {
-    if (!CONST.REGEX.ANY_VALUE.test(value) || CONST.REGEX.EMOJIS.test(value)) {
+    if (!CONST.REGEX.ANY_VALUE.test(value) || value.match(CONST.REGEX.EMOJIS)) {
         return false;
     }
 
@@ -310,7 +310,7 @@ function isValidRoutingNumber(routingNumber: string): boolean {
  * Checks that the provided name doesn't contain any emojis
  */
 function isValidCompanyName(name: string) {
-    return !CONST.REGEX.EMOJIS.test(name);
+    return !name.match(CONST.REGEX.EMOJIS);
 }
 
 /**

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -96,14 +96,14 @@ function CompanyStep({reimbursementAccount, reimbursementAccountDraft, getDefaul
             errors.addressStreet = 'bankAccount.error.addressStreet';
         }
 
-        if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
-            errors.addressZipCode = 'bankAccount.error.zipCode';
-        }
-
         if (values.addressCity && !ValidationUtils.isValidAddress(values.addressCity)) {
             errors.addressCity = 'bankAccount.error.addressCity';
         }
 
+        if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
+            errors.addressZipCode = 'bankAccount.error.zipCode';
+        }
+
         if (values.companyPhone && !ValidationUtils.isValidUSPhone(values.companyPhone, true)) {
             errors.companyPhone = 'bankAccount.error.phoneNumber';
         }