Merge branch 'main' of github.com:juspay/hyperswitch-web into locally…

…-connect-documentation

CHANGELOG.md

@@ -1,3 +1,5 @@
+## [0.50.1](https://github.com/juspay/hyperswitch-web/compare/v0.50.0...v0.50.1) (2024-05-06)
+
 # [0.50.0](https://github.com/juspay/hyperswitch-web/compare/v0.49.2...v0.50.0) (2024-05-06)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "main": "index.js",
   "private": true,
   "dependencies": {

src/Components/DynamicFields.res

@@ -59,7 +59,7 @@ let make = (
       ~isAllStoredCardsHaveName,
       (),
     )
-    ->DynamicFieldsUtils.updateDynamicFields(billingAddress, ())
+    ->DynamicFieldsUtils.updateDynamicFields(billingAddress, ~list, ~paymentMethod, ~isSavedCardFlow, ())
     ->Belt.SortArray.stableSortBy(PaymentMethodsRecord.sortPaymentMethodFields)
     //<...>//
   }, (requiredFields, isAllStoredCardsHaveName, isSavedCardFlow))
@@ -149,7 +149,7 @@ let make = (
     cardRef,
     icon,
     cardError,
-    _,
+    setCardError,
     maxCardLength,
   ) = switch cardProps {
   | Some(cardProps) => cardProps
@@ -165,7 +165,7 @@ let make = (
     expiryRef,
     _,
     expiryError,
-    _,
+    setExpiryError,
   ) = switch expiryProps {
   | Some(expiryProps) => expiryProps
   | None => defaultExpiryProps
@@ -181,7 +181,7 @@ let make = (
     cvcRef,
     _,
     cvcError,
-    _,
+    setCvcError,
   ) = switch cvcProps {
   | Some(cvcProps) => cvcProps
   | None => defaultCvcProps
@@ -276,9 +276,17 @@ let make = (
     ~isSavedCardFlow,
     ~isAllStoredCardsHaveName,
     ~setRequiredFieldsBody,
+    ~list,
   )
 
-  let submitCallback = DynamicFieldsUtils.useSubmitCallback()
+  let submitCallback = DynamicFieldsUtils.useSubmitCallback(
+    ~cardNumber,
+    ~setCardError,
+    ~cardExpiry,
+    ~setExpiryError,
+    ~cvcNumber,
+    ~setCvcError,
+  )
   useSubmitPaymentData(submitCallback)
 
   let bottomElement = <InfoElement />
@@ -326,7 +334,7 @@ let make = (
           key={`outside-billing-${index->Int.toString}`}
           className="flex flex-col w-full place-content-between"
           style={ReactDOMStyle.make(
-            ~marginTop=index !== 0 || paymentMethod === "card" ? themeObj.spacingGridColumn : "",
+            ~marginTop=index !== 0 ? themeObj.spacingGridColumn : "",
             ~gridColumnGap=themeObj.spacingGridRow,
             (),
           )}>

src/Payment.res

@@ -228,13 +228,6 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
       checkCardExpiry(getCardElementValue(iframeId, "card-expiry"))
     | _ => true
     }
-    let cardNetwork = {
-      if cardBrand != "" {
-        [("card_network", cardNumber->CardUtils.getCardBrand->JSON.Encode.string)]
-      } else {
-        []
-      }
-    }
     if validFormat {
       let body = switch paymentMode->getPaymentMode {
       | Card =>
@@ -246,7 +239,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
           ~year,
           ~cardHolderName="",
           ~cvcNumber,
-          ~cardBrand=cardNetwork,
+          ~cardBrand,
           (),
         )
       | CardNumberElement =>
@@ -258,7 +251,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
           ~year,
           ~cardHolderName="",
           ~cvcNumber=localCvcNumber,
-          ~cardBrand=cardNetwork,
+          ~cardBrand,
           (),
         )
       | _ => []