refactor: moved dynamic fields payment method array inside dynamic fi…

…eld utils
juspay · Nov 7, 2024 · 3755c5c · 3755c5c
1 parent f86f7dc
commit 3755c5c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/src/Components/DynamicFields.res b/src/Components/DynamicFields.res
@@ -1,4 +1,3 @@
-open RecoilAtoms
 @react.component
 let make = (
   ~paymentType,
@@ -12,7 +11,9 @@ let make = (
   ~cvcProps=None,
   ~isBancontact=false,
 ) => {
+  open DynamicFieldsUtils
   open Utils
+  open RecoilAtoms
   let paymentMethodListValue = Recoil.useRecoilValueFromAtom(PaymentUtils.paymentMethodListValue)
 
   React.useEffect(() => {
@@ -41,20 +42,16 @@ let make = (
 
       paymentMethodTypes.required_fields
       ->Array.concat(creditRequiredFields)
-      ->DynamicFieldsUtils.removeRequiredFieldsDuplicates
-    } else if (
-      PaymentMethodsRecord.dynamicFieldsEnabledPaymentMethods->Array.includes(paymentMethodType)
-    ) {
+      ->removeRequiredFieldsDuplicates
+    } else if dynamicFieldsEnabledPaymentMethods->Array.includes(paymentMethodType) {
       paymentMethodTypes.required_fields
     } else {
       []
     }
   }, (paymentMethod, paymentMethodTypes.required_fields, paymentMethodType))
 
   let requiredFields = React.useMemo(() => {
-    requiredFieldsWithBillingDetails->DynamicFieldsUtils.removeBillingDetailsIfUseBillingAddress(
-      billingAddress,
-    )
+    requiredFieldsWithBillingDetails->removeBillingDetailsIfUseBillingAddress(billingAddress)
   }, [requiredFieldsWithBillingDetails])
 
   let isAllStoredCardsHaveName = React.useMemo(() => {
@@ -69,7 +66,7 @@ let make = (
       ~isSavedCardFlow,
       ~isAllStoredCardsHaveName,
     )
-    ->DynamicFieldsUtils.updateDynamicFields(billingAddress)
+    ->updateDynamicFields(billingAddress)
     ->Belt.SortArray.stableSortBy(PaymentMethodsRecord.sortPaymentMethodFields)
     //<...>//
   }, (requiredFields, isAllStoredCardsHaveName, isSavedCardFlow))
@@ -255,7 +252,7 @@ let make = (
     }
   }
 
-  DynamicFieldsUtils.useRequiredFieldsEmptyAndValid(
+  useRequiredFieldsEmptyAndValid(
     ~requiredFields,
     ~fieldsArr,
     ~countryNames,
@@ -268,14 +265,14 @@ let make = (
     ~cvcNumber,
   )
 
-  DynamicFieldsUtils.useSetInitialRequiredFields(
+  useSetInitialRequiredFields(
     ~requiredFields={
       billingAddress.usePrefilledValues === Auto ? requiredFieldsWithBillingDetails : requiredFields
     },
     ~paymentMethodType,
   )
 
-  DynamicFieldsUtils.useRequiredFieldsBody(
+  useRequiredFieldsBody(
     ~requiredFields,
     ~paymentMethodType,
     ~cardNumber,
@@ -286,7 +283,7 @@ let make = (
     ~setRequiredFieldsBody,
   )
 
-  let submitCallback = DynamicFieldsUtils.useSubmitCallback()
+  let submitCallback = useSubmitCallback()
   useSubmitPaymentData(submitCallback)
 
   let bottomElement = <InfoElement />
@@ -307,11 +304,11 @@ let make = (
   }
 
   let dynamicFieldsToRenderOutsideBilling = React.useMemo(() => {
-    fieldsArr->Array.filter(DynamicFieldsUtils.isFieldTypeToRenderOutsideBilling)
+    fieldsArr->Array.filter(isFieldTypeToRenderOutsideBilling)
   }, [fieldsArr])
 
   let dynamicFieldsToRenderInsideBilling = React.useMemo(() => {
-    fieldsArr->Array.filter(field => !(field->DynamicFieldsUtils.isFieldTypeToRenderOutsideBilling))
+    fieldsArr->Array.filter(field => !(field->isFieldTypeToRenderOutsideBilling))
   }, [fieldsArr])
 
   let isInfoElementPresent = dynamicFieldsToRenderInsideBilling->Array.includes(InfoElement)

diff --git a/src/Payments/PaymentMethodsRecord.res b/src/Payments/PaymentMethodsRecord.res
@@ -661,29 +661,6 @@ let getFieldType = (dict, isBancontact) => {
   }
 }
 
-let dynamicFieldsEnabledPaymentMethods = [
-  "crypto_currency",
-  "debit",
-  "credit",
-  "blik",
-  "google_pay",
-  "apple_pay",
-  "bancontact_card",
-  "open_banking_uk",
-  "eps",
-  "ideal",
-  "sofort",
-  "pix_transfer",
-  "giropay",
-  "local_bank_transfer_transfer",
-  "afterpay_clearpay",
-  "mifinity",
-  "upi_collect",
-  "sepa",
-  "affirm",
-  "ach",
-]
-
 let getIsBillingField = requiredFieldType => {
   switch requiredFieldType {
   | AddressLine1

diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
@@ -1,5 +1,28 @@
 open RecoilAtoms
 
+let dynamicFieldsEnabledPaymentMethods = [
+  "crypto_currency",
+  "debit",
+  "credit",
+  "blik",
+  "google_pay",
+  "apple_pay",
+  "bancontact_card",
+  "open_banking_uk",
+  "eps",
+  "ideal",
+  "sofort",
+  "pix_transfer",
+  "giropay",
+  "local_bank_transfer_transfer",
+  "afterpay_clearpay",
+  "mifinity",
+  "upi_collect",
+  "sepa",
+  "affirm",
+  "ach",
+]
+
 let getName = (item: PaymentMethodsRecord.required_fields, field: RecoilAtomTypes.field) => {
   let fieldNameArr = field.value->String.split(" ")
   let requiredFieldsArr = item.required_field->String.split(".")