From c4e1ba50fc85ff31d1373bd7704fed8b694ff57c Mon Sep 17 00:00:00 2001
From: Arush <arush.kapoor@juspay.in>
Date: Mon, 6 May 2024 18:40:31 +0530
Subject: [PATCH] fix(dynamicfields): combined Dynamic Fields for credit and
 debit

---
 src/Components/DynamicFields.res     | 10 ++++++++++
 src/Utilities/DynamicFieldsUtils.res | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/Components/DynamicFields.res b/src/Components/DynamicFields.res
index e57334d6..17286e39 100644
--- a/src/Components/DynamicFields.res
+++ b/src/Components/DynamicFields.res
@@ -29,9 +29,19 @@ let make = (
     ~paymentMethodType,
   )
 
+  let creditPaymentMethodTypes = if paymentMethod === "card" {
+    PaymentUtils.usePaymentMethodTypeFromList(~paymentMethodListValue, ~paymentMethod, ~paymentMethodType="credit")
+  } else {
+    PaymentMethodsRecord.defaultPaymentMethodType
+  }
+
   let requiredFieldsWithBillingDetails = React.useMemo(() => {
     if paymentMethod === "card" {
+      let creditRequiredFields = creditPaymentMethodTypes.required_fields
+
       paymentMethodTypes.required_fields
+      ->Array.concat(creditRequiredFields)
+      ->DynamicFieldsUtils.removeRequiredFieldsDuplicates
     } else if (
       PaymentMethodsRecord.dynamicFieldsEnabledPaymentMethods->Array.includes(paymentMethodType)
     ) {
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index e4a92084..c0de9772 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -783,3 +783,23 @@ let useAreAllRequiredFieldsPrefilled = (
     acc && requiredField.value != ""
   })
 }
+
+let removeRequiredFieldsDuplicates = (
+  requiredFields: array<PaymentMethodsRecord.required_fields>,
+) => {
+  let (_, requiredFields) = requiredFields->Array.reduce(([], []), (
+    (requiredFieldKeys, uniqueRequiredFields),
+    item,
+  ) => {
+    let requiredField = item.required_field
+
+    if requiredFieldKeys->Array.includes(requiredField)->not {
+      requiredFieldKeys->Array.push(requiredField)
+      uniqueRequiredFields->Array.push(item)
+    }
+
+    (requiredFieldKeys, uniqueRequiredFields)
+  })
+
+  requiredFields
+}