feat: phone country code accept (#452)

rising-dragon401 · Jun 20, 2024 · 8a39d1b · 8a39d1b
1 parent 773c632
commit 8a39d1b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/src/Components/DynamicFields.res b/src/Components/DynamicFields.res
@@ -481,6 +481,7 @@ let make = (
           | ShippingAddressCity
           | ShippingAddressPincode
           | ShippingAddressState
+          | PhoneCountryCode
           | ShippingAddressCountry(_) => React.null
           }}
         </div>
@@ -763,6 +764,7 @@ let make = (
                 | ShippingAddressCountry(_)
                 | CryptoCurrencyNetworks
                 | DateOfBirth
+                | PhoneCountryCode
                 | None => React.null
                 }}
               </div>

diff --git a/src/Payments/PaymentMethodsRecord.res b/src/Payments/PaymentMethodsRecord.res
@@ -11,6 +11,7 @@ type paymentMethodsFields =
   | None
   | BillingName
   | PhoneNumber
+  | PhoneCountryCode
   | AddressLine1
   | AddressLine2
   | AddressCity
@@ -558,6 +559,7 @@ let getPaymentMethodsFieldTypeFromString = (str, isBancontact) => {
   | ("user_shipping_address_state", _) => ShippingAddressState
   | ("user_crypto_currency_network", _) => CryptoCurrencyNetworks
   | ("user_date_of_birth", _) => DateOfBirth
+  | ("user_phone_number_country_code", _) => PhoneCountryCode
   | _ => None
   }
 }

diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
@@ -289,17 +289,32 @@ let useSetInitialRequiredFields = (
       field: RecoilAtomTypes.field,
       item: PaymentMethodsRecord.required_fields,
       isNameField,
+      ~isCountryCodeAvailable=?,
     ) => {
       if isNameField && field.value === "" {
-        setMethod(prev => {
-          ...prev,
-          value: getNameValue(item),
-        })
+        if isCountryCodeAvailable->Option.isSome {
+          setMethod(prev => {
+            ...prev,
+            countryCode: getNameValue(item),
+          })
+        } else {
+          setMethod(prev => {
+            ...prev,
+            value: getNameValue(item),
+          })
+        }
       } else if field.value === "" {
-        setMethod(prev => {
-          ...prev,
-          value: item.value,
-        })
+        if isCountryCodeAvailable->Option.isSome {
+          setMethod(prev => {
+            ...prev,
+            countryCode: item.value,
+          })
+        } else {
+          setMethod(prev => {
+            ...prev,
+            value: item.value,
+          })
+        }
       }
     }
 
@@ -338,6 +353,8 @@ let useSetInitialRequiredFields = (
         }
       | AddressState => setFields(setState, state, requiredField, false)
       | AddressCity => setFields(setCity, city, requiredField, false)
+      | PhoneCountryCode =>
+        setFields(setPhone, phone, requiredField, false, ~isCountryCodeAvailable=true)
       | AddressPincode => setFields(setPostalCode, postalCode, requiredField, false)
       | PhoneNumber => setFields(setPhone, phone, requiredField, false)
       | BlikCode => setFields(setBlikCode, blikCode, requiredField, false)
@@ -427,6 +444,7 @@ let useRequiredFieldsBody = (
     | AddressState => state.value
     | BlikCode => blikCode.value->Utils.removeHyphen
     | PhoneNumber => phone.value
+    | PhoneCountryCode => phone.countryCode->Option.getOr("")
     | Currency(_) => currency
     | Country => country
     | Bank =>
@@ -538,6 +556,7 @@ let useRequiredFieldsBody = (
     state.value,
     blikCode.value,
     phone.value,
+    phone.countryCode,
     currency,
     billingName.value,
     country,