fix: HS-111: relsolved merge conflicts

juspay · Feb 1, 2024 · 666c646 · 666c646
2 parents 57f0c5a + 789ecb9
commit 666c646
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Payments/CardPayment.res b/src/Payments/CardPayment.res
@@ -147,7 +147,7 @@ let make = (
     ~isCvcValidValue,
   )
 
-  let submitCallback = React.useCallback((ev: Window.event) => {
+  let submitCallback = React.useCallback2((ev: Window.event) => {
     let json = ev.data->Js.Json.parseExn
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
     let (month, year) = CardUtils.getExpiryDates(cardExpiry)
@@ -224,7 +224,7 @@ let make = (
         }
       }
     }
-  })
+  }, (areRequiredFieldsValid, requiredFieldsBody))
   submitPaymentData(submitCallback)
 
   let paymentMethod = isBancontact ? "bank_redirect" : "card"

diff --git a/src/Payments/PaymentMethodsRecord.res b/src/Payments/PaymentMethodsRecord.res
@@ -187,7 +187,7 @@ let paymentMethodsFields = [
   {
     paymentMethodName: "sofort",
     icon: Some(icon("sofort", ~size=19)),
-    fields: [FullName, Email, Country, InfoElement],
+    fields: [InfoElement],
     displayName: "Sofort",
     miniIcon: None,
   },
@@ -230,7 +230,7 @@ let paymentMethodsFields = [
     paymentMethodName: "eps",
     icon: Some(icon("eps", ~size=19, ~width=25)),
     displayName: "EPS",
-    fields: [Bank, FullName, InfoElement],
+    fields: [InfoElement],
     miniIcon: None,
   },
   {
@@ -321,7 +321,7 @@ let paymentMethodsFields = [
     paymentMethodName: "ideal",
     icon: Some(icon("ideal", ~size=19, ~width=25)),
     displayName: "iDEAL",
-    fields: [Bank, FullName, InfoElement],
+    fields: [InfoElement],
     miniIcon: None,
   },
   {
@@ -564,6 +564,9 @@ let dynamicFieldsEnabledPaymentMethods = [
   "apple_pay",
   "bancontact_card",
   "open_banking_uk",
+  "eps",
+  "ideal",
+  "sofort",
   "pix_transfer",
 ]