From fd967b20e16e6ad36a5baa071fbd15c55f9f8b40 Mon Sep 17 00:00:00 2001
From: Saksham Sharma <saksham.sharma.001@Saksham-Sharma-LWR61FHHHW.local>
Date: Tue, 20 Aug 2024 15:21:33 +0530
Subject: [PATCH 1/3] refactor: sdk pay now always enabled

---
 src/Components/PayNowButton.res | 12 ++----------
 src/Hooks/UtilityHooks.res      |  6 ------
 src/TabCard.res                 |  3 ---
 src/Utilities/RecoilAtoms.res   |  1 -
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index 5c043baff..a6affdced 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -16,15 +16,10 @@ let make = () => {
   let (showLoader, setShowLoader) = React.useState(() => false)
   let {themeObj, localeString} = configAtom->Recoil.useRecoilValueFromAtom
   let {sdkHandleConfirmPayment} = optionAtom->Recoil.useRecoilValueFromAtom
-  let (isPayNowButtonDisable, setIsPayNowButtonDisable) = payNowButtonDisable->Recoil.useRecoilState
 
   let confirmPayload = sdkHandleConfirmPayment->PaymentBody.confirmPayloadForSDKButton
   let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
 
-  React.useEffect1(() => {
-    setIsPayNowButtonDisable(_ => !sdkHandleConfirmPayment.allowButtonBeforeValidation)
-    None
-  }, [sdkHandleConfirmPayment.allowButtonBeforeValidation])
 
   let handleMessage = (event: Types.event) => {
     let json = event.data->Identity.anyTypeToJson->getStringFromJson("")->safeParse
@@ -32,7 +27,6 @@ let make = () => {
     switch dict->Dict.get("submitSuccessful") {
     | Some(submitSuccessfulVal) =>
       if !(submitSuccessfulVal->JSON.Decode.bool->Option.getOr(false)) {
-        setIsPayNowButtonDisable(_ => false)
         setShowLoader(_ => false)
       }
     | None => ()
@@ -40,7 +34,6 @@ let make = () => {
   }
 
   let handleOnClick = _ => {
-    setIsPayNowButtonDisable(_ => true)
     setShowLoader(_ => true)
     EventListenerManager.addSmartEventListener("message", handleMessage, "onSubmitSuccessful")
     handlePostMessage([("handleSdkConfirm", confirmPayload)])
@@ -48,15 +41,14 @@ let make = () => {
 
   <div className="flex flex-col gap-1 h-auto w-full items-center">
     <button
-      disabled=isPayNowButtonDisable
       onClick=handleOnClick
       className={`w-full flex flex-row justify-center items-center`}
       style={
         borderRadius: themeObj.buttonBorderRadius,
         backgroundColor: themeObj.buttonBackgroundColor,
         height: themeObj.buttonHeight,
-        cursor: {isPayNowButtonDisable ? "not-allowed" : "pointer"},
-        opacity: {isPayNowButtonDisable ? "0.6" : "1"},
+        cursor: "pointer",
+        opacity: "1",
         width: themeObj.buttonWidth,
         border: `${themeObj.buttonBorderWidth} solid ${themeObj.buttonBorderColor}`,
       }>
diff --git a/src/Hooks/UtilityHooks.res b/src/Hooks/UtilityHooks.res
index 722000f08..09a4ef605 100644
--- a/src/Hooks/UtilityHooks.res
+++ b/src/Hooks/UtilityHooks.res
@@ -14,14 +14,8 @@ let useHandlePostMessages = (~complete, ~empty, ~paymentType, ~savedMethod=false
   open RecoilAtoms
 
   let loggerState = Recoil.useRecoilValueFromAtom(loggerAtom)
-  let setIsPayNowButtonDisable = Recoil.useSetRecoilState(payNowButtonDisable)
-  let {sdkHandleConfirmPayment} = Recoil.useRecoilValueFromAtom(optionAtom)
 
   React.useEffect(() => {
-    if !sdkHandleConfirmPayment.allowButtonBeforeValidation {
-      let isCompletelyFilled = complete && paymentType !== ""
-      setIsPayNowButtonDisable(_ => !isCompletelyFilled)
-    }
     Utils.handlePostMessageEvents(~complete, ~empty, ~paymentType, ~loggerState, ~savedMethod)
     None
   }, (complete, empty, paymentType))
diff --git a/src/TabCard.res b/src/TabCard.res
index 4d1dd7217..f9bf64793 100644
--- a/src/TabCard.res
+++ b/src/TabCard.res
@@ -4,8 +4,6 @@ let make = (~paymentOption: PaymentMethodsRecord.paymentFieldsInfo, ~isActive: b
   let {themeObj, localeString} = Recoil.useRecoilValueFromAtom(configAtom)
   let {readOnly, customMethodNames} = Recoil.useRecoilValueFromAtom(optionAtom)
   let setSelectedOption = Recoil.useSetRecoilState(selectedOptionAtom)
-  let {sdkHandleConfirmPayment} = optionAtom->Recoil.useRecoilValueFromAtom
-  let setIsPayNowButtonDisable = Recoil.useSetRecoilState(payNowButtonDisable)
   let (tabClass, tabLabelClass, tabIconClass) = React.useMemo(
     () => isActive ? ("Tab--selected", "TabLabel--selected", "TabIcon--selected") : ("", "", ""),
     [isActive],
@@ -17,7 +15,6 @@ let make = (~paymentOption: PaymentMethodsRecord.paymentFieldsInfo, ~isActive: b
     paymentOption.icon,
   )
   let onClick = _ => {
-    setIsPayNowButtonDisable(_ => !sdkHandleConfirmPayment.allowButtonBeforeValidation)
     setSelectedOption(_ => paymentOption.paymentMethodName)
   }
   <button
diff --git a/src/Utilities/RecoilAtoms.res b/src/Utilities/RecoilAtoms.res
index a4ffde6a7..46438cf75 100644
--- a/src/Utilities/RecoilAtoms.res
+++ b/src/Utilities/RecoilAtoms.res
@@ -22,7 +22,6 @@ let paymentTokenAtom = Recoil.atom(
 let showCardFieldsAtom = Recoil.atom("showCardFields", false)
 let phoneJson = Recoil.atom("phoneJson", Loading)
 let cardBrand = Recoil.atom("cardBrand", "")
-let payNowButtonDisable = Recoil.atom("payNowButtonDisable", true)
 let paymentMethodCollectOptionAtom = Recoil.atom(
   "paymentMethodCollectOptions",
   PaymentMethodCollectUtils.defaultPaymentMethodCollectOptions,

From 64c2e6ab4c0d5dcab30958f99af89f9f7ea5c167 Mon Sep 17 00:00:00 2001
From: Saksham Sharma <saksham.sharma.001@Saksham-Sharma-LWR61FHHHW.local>
Date: Tue, 20 Aug 2024 17:50:48 +0530
Subject: [PATCH 2/3] refactor: minor refactor

---
 src/Components/PayNowButton.res | 8 ++++++--
 src/Utilities/RecoilAtoms.res   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index a6affdced..b0298f63c 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -16,6 +16,7 @@ let make = () => {
   let (showLoader, setShowLoader) = React.useState(() => false)
   let {themeObj, localeString} = configAtom->Recoil.useRecoilValueFromAtom
   let {sdkHandleConfirmPayment} = optionAtom->Recoil.useRecoilValueFromAtom
+  let (isPayNowButtonDisable, setIsPayNowButtonDisable) = payNowButtonDisable->Recoil.useRecoilState
 
   let confirmPayload = sdkHandleConfirmPayment->PaymentBody.confirmPayloadForSDKButton
   let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
@@ -27,6 +28,7 @@ let make = () => {
     switch dict->Dict.get("submitSuccessful") {
     | Some(submitSuccessfulVal) =>
       if !(submitSuccessfulVal->JSON.Decode.bool->Option.getOr(false)) {
+        setIsPayNowButtonDisable(_ => false)
         setShowLoader(_ => false)
       }
     | None => ()
@@ -34,6 +36,7 @@ let make = () => {
   }
 
   let handleOnClick = _ => {
+    setIsPayNowButtonDisable(_ => true)
     setShowLoader(_ => true)
     EventListenerManager.addSmartEventListener("message", handleMessage, "onSubmitSuccessful")
     handlePostMessage([("handleSdkConfirm", confirmPayload)])
@@ -41,14 +44,15 @@ let make = () => {
 
   <div className="flex flex-col gap-1 h-auto w-full items-center">
     <button
+      disabled=isPayNowButtonDisable
       onClick=handleOnClick
       className={`w-full flex flex-row justify-center items-center`}
       style={
         borderRadius: themeObj.buttonBorderRadius,
         backgroundColor: themeObj.buttonBackgroundColor,
         height: themeObj.buttonHeight,
-        cursor: "pointer",
-        opacity: "1",
+        cursor: {isPayNowButtonDisable ? "not-allowed" : "pointer"},
+        opacity: {isPayNowButtonDisable ? "0.6" : "1"},
         width: themeObj.buttonWidth,
         border: `${themeObj.buttonBorderWidth} solid ${themeObj.buttonBorderColor}`,
       }>
diff --git a/src/Utilities/RecoilAtoms.res b/src/Utilities/RecoilAtoms.res
index 46438cf75..58167a440 100644
--- a/src/Utilities/RecoilAtoms.res
+++ b/src/Utilities/RecoilAtoms.res
@@ -22,6 +22,7 @@ let paymentTokenAtom = Recoil.atom(
 let showCardFieldsAtom = Recoil.atom("showCardFields", false)
 let phoneJson = Recoil.atom("phoneJson", Loading)
 let cardBrand = Recoil.atom("cardBrand", "")
+let payNowButtonDisable = Recoil.atom("payNowButtonDisable", false)
 let paymentMethodCollectOptionAtom = Recoil.atom(
   "paymentMethodCollectOptions",
   PaymentMethodCollectUtils.defaultPaymentMethodCollectOptions,

From c68877623606692b64af72b2f478e277e68cab21 Mon Sep 17 00:00:00 2001
From: Saksham Sharma <saksham.sharma.001@Saksham-Sharma-LWR61FHHHW.local>
Date: Wed, 21 Aug 2024 11:15:06 +0530
Subject: [PATCH 3/3] refactor: local state instead of an atom

---
 src/Components/PayNowButton.res | 2 +-
 src/Types/PaymentType.res       | 3 ---
 src/Utilities/RecoilAtoms.res   | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index b0298f63c..eb2207f50 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -14,9 +14,9 @@ let make = () => {
   open RecoilAtoms
   open Utils
   let (showLoader, setShowLoader) = React.useState(() => false)
+  let (isPayNowButtonDisable, setIsPayNowButtonDisable) = React.useState(() => false)
   let {themeObj, localeString} = configAtom->Recoil.useRecoilValueFromAtom
   let {sdkHandleConfirmPayment} = optionAtom->Recoil.useRecoilValueFromAtom
-  let (isPayNowButtonDisable, setIsPayNowButtonDisable) = payNowButtonDisable->Recoil.useRecoilState
 
   let confirmPayload = sdkHandleConfirmPayment->PaymentBody.confirmPayloadForSDKButton
   let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
diff --git a/src/Types/PaymentType.res b/src/Types/PaymentType.res
index 98e6a7741..5eb0d9065 100644
--- a/src/Types/PaymentType.res
+++ b/src/Types/PaymentType.res
@@ -146,7 +146,6 @@ type sdkHandleConfirmPayment = {
   handleConfirm: bool,
   buttonText?: string,
   confirmParams: ConfirmType.confirmParams,
-  allowButtonBeforeValidation: bool,
 }
 
 type options = {
@@ -287,7 +286,6 @@ let defaultBillingAddress = {
 let defaultSdkHandleConfirmPayment = {
   handleConfirm: false,
   confirmParams: ConfirmType.defaultConfirm,
-  allowButtonBeforeValidation: false,
 }
 
 let defaultOptions = {
@@ -985,7 +983,6 @@ let getSdkHandleConfirmPaymentProps = dict => {
   handleConfirm: dict->getBool("handleConfirm", false),
   buttonText: ?dict->getOptionString("buttonText"),
   confirmParams: dict->getDictFromDict("confirmParams")->getConfirmParams,
-  allowButtonBeforeValidation: dict->getBool("allowButtonBeforeValidation", false),
 }
 
 let itemToObjMapper = (dict, logger) => {
diff --git a/src/Utilities/RecoilAtoms.res b/src/Utilities/RecoilAtoms.res
index 58167a440..46438cf75 100644
--- a/src/Utilities/RecoilAtoms.res
+++ b/src/Utilities/RecoilAtoms.res
@@ -22,7 +22,6 @@ let paymentTokenAtom = Recoil.atom(
 let showCardFieldsAtom = Recoil.atom("showCardFields", false)
 let phoneJson = Recoil.atom("phoneJson", Loading)
 let cardBrand = Recoil.atom("cardBrand", "")
-let payNowButtonDisable = Recoil.atom("payNowButtonDisable", false)
 let paymentMethodCollectOptionAtom = Recoil.atom(
   "paymentMethodCollectOptions",
   PaymentMethodCollectUtils.defaultPaymentMethodCollectOptions,