Fix validation when phoneNumber and State are empty.

theticketfairy · Jun 6, 2023 · e78812e · e78812e
1 parent ce5b48c
commit e78812e
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/containers/billingInfo/Billing.tsx b/src/containers/billingInfo/Billing.tsx
@@ -738,18 +738,20 @@ const Billing = forwardRef<SessionHandleType, IBillingProps>(
         }
       }
 
-      if (
-        isPhoneRequired &&
-        !isPhoneHidden &&
-        validatePhoneNumber({
+      if (isPhoneRequired && !isPhoneHidden) {
+        const phoneValidation = validatePhoneNumber({
           phoneNumber: phone,
           customError: texts?.form?.phoneInput?.customError,
+          countryCode: phoneCountryCode.current,
         })
-      ) {
+
         if (isLoading) {
           setIsLoading(false)
         }
-        return false
+
+        if (phoneValidation) {
+          return false
+        }
       }
 
       return true
@@ -1095,8 +1097,14 @@ const Billing = forwardRef<SessionHandleType, IBillingProps>(
         isRegistering: !loggedUserFirstName && !storedToken.current,
       })
 
-      const isExtraDataValid = checkExtraDataValid()
-      if (isExtraDataValid) {
+      if (config.isCheckoutAlwaysButtonEnabled) {
+        if (!checkBasicDataValid()) {
+          return
+        }
+      }
+
+      const isExtraDataValidErrors = checkExtraDataValid()
+      if (isExtraDataValidErrors) {
         return
       }