diff --git a/src/LoaderController.res b/src/LoaderController.res index c051d5f6..30553b27 100644 --- 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 index 85725a1e..5568b2d5 100644 --- a/src/Payments/CardPayment.res +++ b/src/Payments/CardPayment.res @@ -280,9 +280,10 @@ let make = ( 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)}>
, ~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 index 35569eed..fb39f035 100644 --- a/src/orca-loader/Hyper.res +++ b/src/orca-loader/Hyper.res @@ -415,6 +415,10 @@ let make = (publishableKey, options: option, analyticsInfo: optionOption.getOr(JSON.Encode.null) + ->getDictFromJson + ->getString("customBackendUrl", ""), ) } let confirmCardPaymentFn = (