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

…ick-to-pay

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.106.14](https://github.com/juspay/hyperswitch-web/compare/v0.106.13...v0.106.14) (2024-12-23)
+
+
+### Bug Fixes
+
+* display saved method screen condition and dynamic fields values updation issue in saved card screen ([#848](https://github.com/juspay/hyperswitch-web/issues/848)) ([aa0d088](https://github.com/juspay/hyperswitch-web/commit/aa0d088c7c56425ff815564cf79e740996649751))
+
 ## [0.106.13](https://github.com/juspay/hyperswitch-web/compare/v0.106.12...v0.106.13) (2024-12-19)
 
 ## [0.106.12](https://github.com/juspay/hyperswitch-web/compare/v0.106.11...v0.106.12) (2024-12-18)

package.json

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

src/Components/DynamicFields.res

@@ -331,7 +331,7 @@ let make = (
 
   let spacedStylesForBiilingDetails = isSpacedInnerLayout ? "p-2" : "my-2"
 
-  <RenderIf condition={fieldsArr->Array.length > 0}>
+  <RenderIf condition={!isSavedCardFlow && fieldsArr->Array.length > 0}>
     {<>
       {dynamicFieldsToRenderOutsideBilling
       ->Array.mapWithIndex((item, index) => {

src/Components/SavedCardItem.res

@@ -37,6 +37,7 @@ let make = (
   ~savedCardlength,
   ~cvcProps,
   ~paymentType,
+  ~setRequiredFieldsBody,
 ) => {
   let {themeObj, config, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let {hideExpiredPaymentMethods, displayDefaultSavedPaymentIcon} = Recoil.useRecoilValueFromAtom(
@@ -207,6 +208,14 @@ let make = (
                 </div>
               </RenderIf>
               <RenderIf condition={isActive}>
+                <DynamicFields
+                  paymentType
+                  paymentMethod=paymentItem.paymentMethod
+                  paymentMethodType
+                  setRequiredFieldsBody
+                  isSavedCardFlow=true
+                  savedMethod=paymentItem
+                />
                 <Surcharge
                   paymentMethod=paymentItem.paymentMethod
                   paymentMethodType

src/Components/SavedMethods.res

@@ -35,7 +35,7 @@ let make = (
   let (showFields, setShowFields) = Recoil.useRecoilState(RecoilAtoms.showCardFieldsAtom)
   let areRequiredFieldsValid = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsValid)
   let isManualRetryEnabled = Recoil.useRecoilValueFromAtom(RecoilAtoms.isManualRetryEnabled)
-  let (requiredFieldsBody, _) = React.useState(_ => Dict.make())
+  let (requiredFieldsBody, setRequiredFieldsBody) = React.useState(_ => Dict.make())
   let loggerState = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
   let setUserError = message => {
     postFailedSubmitResponse(~errortype="validation_error", ~message)
@@ -95,6 +95,7 @@ let make = (
           savedCardlength
           cvcProps
           paymentType
+          setRequiredFieldsBody
         />
       )
       ->React.array}

src/PaymentElement.res

@@ -109,8 +109,8 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
             ? NoResult(isGuestCustomer)
             : LoadedSavedCards(finalSavedPaymentMethods, isGuestCustomer)
         )
-        setShowFields(prev =>
-          (finalSavedPaymentMethods->Array.length == 0 || prev) &&
+        setShowFields(_ =>
+          finalSavedPaymentMethods->Array.length == 0 &&
             isShowPaymentMethodsDependingOnClickToPay->not
         )
       }