fix: comments addressed

juspay · May 8, 2024 · 87983aa · 87983aa
1 parent a8485bf
commit 87983aa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/src/LoaderController.res b/src/LoaderController.res
@@ -359,10 +359,17 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
             dict->getJsonObjectFromDict("isReadyToPay")->JSON.Decode.bool->Option.getOr(false)
           )
         }
-        if dict->getDictIsSome("endpoint") {
-          switch dict->getString("endpoint", "") {
-          | "" => ()
-          | endpoint => ApiEndpoint.setApiEndPoint(endpoint)
+        if (
+          dict->getDictIsSome("customBackendUrlVal") &&
+            dict
+            ->getString("customBackendUrlVal", "")
+            ->String.length > 0
+        ) {
+          if dict->getDictIsSome("endpoint") {
+            switch dict->getString("endpoint", "") {
+            | "" => ()
+            | endpoint => ApiEndpoint.setApiEndPoint(endpoint)
+            }
           }
         }
         if dict->getDictIsSome("paymentMethodList") {

diff --git a/src/Payments/CardPayment.res b/src/Payments/CardPayment.res
@@ -280,9 +280,10 @@ let make = (
               </div>
             </div>
             <RenderIf
-              condition={cardError->String.length > 0 ||
-              cvcError->String.length > 0 ||
-              expiryError->String.length > 0}>
+              condition={innerLayout === Compressed &&
+                (cardError->String.length > 0 ||
+                cvcError->String.length > 0 ||
+                expiryError->String.length > 0)}>
               <div
                 className="Error pt-1"
                 style={ReactDOMStyle.make(

diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
@@ -19,9 +19,9 @@ let make = (
   ~publishableKey,
   ~logger: option<OrcaLogger.loggerMake>,
   ~analyticsMetadata,
+  ~customBackendUrl,
 ) => {
   let applePaySessionRef = ref(Nullable.null)
-
   try {
     let iframeRef = []
     let logger = logger->Option.getOr(OrcaLogger.defaultLoggerConfig)
@@ -297,6 +297,7 @@ let make = (
             ("parentURL", "*"->JSON.Encode.string),
             ("analyticsMetadata", analyticsMetadata),
             ("launchTime", launchTime->JSON.Encode.float),
+            ("customBackendUrlVal", customBackendUrl->JSON.Encode.string),
           ]->Dict.fromArray
 
         let wallets = PaymentType.getWallets(newOptions->getDictFromJson, "wallets", logger)

diff --git a/src/orca-loader/Hyper.res b/src/orca-loader/Hyper.res
@@ -415,6 +415,10 @@ let make = (publishableKey, options: option<JSON.t>, analyticsInfo: option<JSON.
           ~clientSecret={clientSecretId},
           ~logger=Some(logger),
           ~analyticsMetadata,
+          ~customBackendUrl=options
+          ->Option.getOr(JSON.Encode.null)
+          ->getDictFromJson
+          ->getString("customBackendUrl", ""),
         )
       }
       let confirmCardPaymentFn = (