From a569dacede738ba4f7464966a323e14d19170028 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Thu, 3 Oct 2024 18:28:11 +0530
Subject: [PATCH] fix: customer-acceptance for saved pm (#709)

---
 src/Components/SaveDetailsCheckbox.res |  2 +-
 src/Components/SavedMethods.res        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Components/SaveDetailsCheckbox.res b/src/Components/SaveDetailsCheckbox.res
index d94ce2d0..fb8b5953 100644
--- a/src/Components/SaveDetailsCheckbox.res
+++ b/src/Components/SaveDetailsCheckbox.res
@@ -61,7 +61,7 @@ let make = (~isChecked, ~setIsChecked) => {
     <label className={`container CheckboxInput ${checkedState}`}>
       <input type_={`checkbox`} onChange />
       <div className={`checkmark CheckboxInput ${checkedState} mt-1`} />
-      <div className={`CheckboxLabel ${checkBoxLabelState} ml-2 w-11/12`}>
+      <div className={`CheckboxLabel ${checkBoxLabelState} ml-2 w-11/12 opacity-50 text-xs`}>
         {React.string(saveCardCheckboxLabel)}
       </div>
     </label>
diff --git a/src/Components/SavedMethods.res b/src/Components/SavedMethods.res
index fd7dbcce..ae2dbdf1 100644
--- a/src/Components/SavedMethods.res
+++ b/src/Components/SavedMethods.res
@@ -11,6 +11,7 @@ let make = (
   open CardUtils
   open Utils
   open UtilityHooks
+
   let {themeObj, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let (showFields, setShowFields) = Recoil.useRecoilState(RecoilAtoms.showCardFieldsAtom)
   let areRequiredFieldsValid = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsValid)
@@ -72,13 +73,12 @@ let make = (
   | _ => false
   }
   let empty = cvcNumber == ""
-  let customerMethod =
+  let customerMethod = React.useMemo(_ =>
     savedMethods
-    ->Array.filter(savedMethod => {
-      savedMethod.paymentToken === paymentTokenVal
-    })
+    ->Array.filter(savedMethod => savedMethod.paymentToken === paymentTokenVal)
     ->Array.get(0)
     ->Option.getOr(PaymentType.defaultCustomerMethods)
+  , [paymentTokenVal])
   let isUnknownPaymentMethod = customerMethod.paymentMethod === ""
   let isCardPaymentMethod = customerMethod.paymentMethod === "card"
   let isCardPaymentMethodValid = !customerMethod.requiresCvv || (complete && !empty)
@@ -100,7 +100,7 @@ let make = (
     let json = ev.data->safeParse
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
 
-    let isCustomerAcceptanceRequired = customerMethod.recurringEnabled->not
+    let isCustomerAcceptanceRequired = customerMethod.recurringEnabled->not || isSaveCardsChecked
 
     let savedPaymentMethodBody = switch customerMethod.paymentMethod {
     | "card" =>