fix : resolve conflict

juspay · Nov 30, 2023 · 2e31d56 · 2e31d56
2 parents 798b57a + 3f7d40b
commit 2e31d56
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/config/FeatureFlag.json b/config/FeatureFlag.json
@@ -22,4 +22,4 @@
   "business_profile": false,
   "generate_report": false,
   "forgot_password": false
-}
+}
diff --git a/src/screens/HyperSwitch/HSwitchUtils.res b/src/screens/HyperSwitch/HSwitchUtils.res
@@ -480,7 +480,8 @@ module CardLoader = {
 
 let checkStripePlusPayPal = (enumDetails: QuickStartTypes.responseType) => {
   enumDetails.stripeConnected.processorID->Js.String2.length > 0 &&
-    enumDetails.paypalConnected.processorID->Js.String2.length > 0
+  enumDetails.paypalConnected.processorID->Js.String2.length > 0 &&
+  enumDetails.sPTestPayment
     ? true
     : false
 }

diff --git a/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res b/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res
@@ -2,4 +2,5 @@ type paymentType = {
   amount: int,
   currency: string,
   profile_id: string,
+  customer_id: string,
 }
diff --git a/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res b/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res
@@ -2,6 +2,7 @@ let initialValueForForm: string => SDKPaymentTypes.paymentType = profileId => {
   amount: 100,
   currency: "United States-USD",
   profile_id: profileId,
+  customer_id: "hyperswitch_sdk_demo_id",
 }
 
 let getTypedValueForPayment: Js.Json.t => SDKPaymentTypes.paymentType = values => {
@@ -11,6 +12,7 @@ let getTypedValueForPayment: Js.Json.t => SDKPaymentTypes.paymentType = values =
     amount: dictOfValues->getInt("amount", 100),
     currency: dictOfValues->getString("currency", "United States-USD"),
     profile_id: dictOfValues->getString("profile_id", ""),
+    customer_id: dictOfValues->getString("customer_id", ""),
   }
 }
 

diff --git a/src/screens/HyperSwitch/SDKPayment/TestPayment.res b/src/screens/HyperSwitch/SDKPayment/TestPayment.res
@@ -45,6 +45,7 @@ let make = (
             ->Js.Json.number,
           ),
           ("profile_id", initialValues.profile_id->Js.Json.string),
+          ("customer_id", "hyperswitch_sdk_demo_id"->Js.Json.string),
         ])->Js.Json.object_
       let response = await updateDetails(url, body, Post)
       let clientSecret = response->getDictFromJsonObject->getOptionString("client_secret")

diff --git a/src/screens/HyperSwitch/SDKPayment/WebSDK.res b/src/screens/HyperSwitch/SDKPayment/WebSDK.res
@@ -215,16 +215,11 @@ module CheckoutForm = {
       ->ignore
     }
     React.useEffect1(() => {
-      let id = Js.String2.split(clientSecret, "_secret_")[0]->Belt.Option.getWithDefault("")
-      switch Some(id) {
-      | None | Some("") => ()
-      | Some(id) =>
-        hyper.retrievePaymentIntent(id)
-        ->then(_ => {
-          resolve()
-        })
-        ->ignore
-      }
+      hyper.retrievePaymentIntent(clientSecret)
+      ->then(_ => {
+        resolve()
+      })
+      ->ignore
 
       None
     }, [hyper])