, ~country=?, ()) => {
- let country = switch country {
- | Some(val) => val
- | None => clientCountry.isoAlpha2
- }
+ let country = country->Option.getOr(clientCountry.isoAlpha2)
let countryPostal = Utils.getCountryPostal(country, postalCodes)
- countryPostal.regex == "" ? "" : countryPostal.regex
+ countryPostal.regex
}
let setRightIconForCvc = (~cardEmpty, ~cardInvalid, ~color, ~cardComplete) => {
+ open Utils
if cardEmpty {
-
+
} else if cardInvalid {
-
+
} else if cardComplete {
-
+
} else {
-
+
}
}
diff --git a/src/CharcoalTheme.res b/src/CharcoalTheme.res
index 2711ef31e..172a0bb61 100644
--- a/src/CharcoalTheme.res
+++ b/src/CharcoalTheme.res
@@ -173,7 +173,7 @@ let charcoalRules = theme =>
"fontWeight": theme.fontWeightLight,
"fontSize": theme.fontSizeLg,
},
- }->toJson
+ }->Identity.anyTypeToJson
let default = charcoal
let defaultRules = charcoalRules
diff --git a/src/Components/AddressPaymentInput.res b/src/Components/AddressPaymentInput.res
index e9783d719..a24b4d0d0 100644
--- a/src/Components/AddressPaymentInput.res
+++ b/src/Components/AddressPaymentInput.res
@@ -67,9 +67,7 @@ let make = (~paymentType, ~className="") => {
let checkPostalValidity = (
postal: RecoilAtomTypes.field,
- setPostal: (
- OrcaPaymentPage.RecoilAtomTypes.field => OrcaPaymentPage.RecoilAtomTypes.field
- ) => unit,
+ setPostal: (RecoilAtomTypes.field => RecoilAtomTypes.field) => unit,
regex,
) => {
if RegExp.test(regex->RegExp.fromString, postal.value) && postal.value !== "" && regex !== "" {
@@ -168,7 +166,7 @@ let make = (~paymentType, ~className="") => {
let submitCallback = React.useCallback((ev: Window.event) => {
let json = ev.data->JSON.parseExn
- let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
+ let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
if confirm.doSubmit {
if line1.value == "" {
setLine1(prev => {
diff --git a/src/Components/BlikCodePaymentInput.res b/src/Components/BlikCodePaymentInput.res
index 455ed147c..a4439b193 100644
--- a/src/Components/BlikCodePaymentInput.res
+++ b/src/Components/BlikCodePaymentInput.res
@@ -42,7 +42,7 @@ let make = () => {
let submitCallback = React.useCallback((ev: Window.event) => {
let json = ev.data->JSON.parseExn
- let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
+ let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
if confirm.doSubmit {
if blikCode.value == "" {
setblikCode(prev => {
diff --git a/src/Components/DynamicFields.res b/src/Components/DynamicFields.res
index bef9f90ae..0a5a1dcac 100644
--- a/src/Components/DynamicFields.res
+++ b/src/Components/DynamicFields.res
@@ -13,6 +13,7 @@ let make = (
~cvcProps=None,
~isBancontact=false,
) => {
+ open Utils
React.useEffect(() => {
setRequiredFieldsBody(_ => Dict.make())
None
@@ -125,9 +126,8 @@ let make = (
let (stateJson, setStatesJson) = React.useState(_ => None)
- let bankNames =
- Bank.getBanks(paymentMethodType)->Utils.getBankNames(paymentMethodTypes.bank_names)
- let countryNames = Utils.getCountryNames(Country.getCountry(paymentMethodType))
+ let bankNames = Bank.getBanks(paymentMethodType)->getBankNames(paymentMethodTypes.bank_names)
+ let countryNames = getCountryNames(Country.getCountry(paymentMethodType))
let setCurrency = val => {
setCurrency(val)
@@ -226,11 +226,7 @@ let make = (
None
})
- let _regex = CardUtils.postalRegex(
- postalCodes,
- ~country={Utils.getCountryCode(country).isoAlpha2},
- (),
- )
+ let _regex = CardUtils.postalRegex(postalCodes, ~country={getCountryCode(country).isoAlpha2}, ())
let onPostalChange = ev => {
let val = ReactEvent.Form.target(ev)["value"]
@@ -282,7 +278,7 @@ let make = (
)
let submitCallback = DynamicFieldsUtils.useSubmitCallback()
- Utils.useSubmitPaymentData(submitCallback)
+ useSubmitPaymentData(submitCallback)
let bottomElement =
@@ -518,7 +514,7 @@ let make = (
fieldName=localeString.stateLabel
value=state
setValue=setState
- options={options->Utils.getStateNames({
+ options={options->getStateNames({
value: country,
isValid: None,
errorString: "",
@@ -640,7 +636,7 @@ let make = (
fieldName=localeString.stateLabel
value=state
setValue=setState
- options={options->Utils.getStateNames({
+ options={options->getStateNames({
value: country,
isValid: None,
errorString: "",
diff --git a/src/Components/EmailPaymentInput.res b/src/Components/EmailPaymentInput.res
index ac8b7945a..367f34468 100644
--- a/src/Components/EmailPaymentInput.res
+++ b/src/Components/EmailPaymentInput.res
@@ -17,15 +17,15 @@ let make = (~paymentType) => {
let val: string = ReactEvent.Form.target(ev)["value"]
setEmail(prev => {
value: val,
- isValid: val->Utils.isEmailValid,
- errorString: val->Utils.isEmailValid->Option.getOr(false) ? "" : prev.errorString,
+ isValid: val->isEmailValid,
+ errorString: val->isEmailValid->Option.getOr(false) ? "" : prev.errorString,
})
}
let onBlur = ev => {
let val = ReactEvent.Focus.target(ev)["value"]
setEmail(prev => {
...prev,
- isValid: val->Utils.isEmailValid,
+ isValid: val->isEmailValid,
})
}
@@ -42,7 +42,7 @@ let make = (~paymentType) => {
let submitCallback = React.useCallback((ev: Window.event) => {
let json = ev.data->JSON.parseExn
- let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
+ let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
if confirm.doSubmit {
if email.value == "" {
setEmail(prev => {
diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index bb33eb92e..0c411e645 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -1,7 +1,5 @@
@send external postMessage: (Window.window, JSON.t, string) => unit = "postMessage"
-external eventToJson: 'a => JSON.t = "%identity"
-
module Loader = {
@react.component
let make = () => {
@@ -16,8 +14,8 @@ module Loader = {
@react.component
let make = () => {
open RecoilAtoms
+ open Utils
let (showLoader, setShowLoader) = React.useState(() => false)
-
let {themeObj, localeString} = configAtom->Recoil.useRecoilValueFromAtom
let {sdkHandleConfirmPayment} = optionAtom->Recoil.useRecoilValueFromAtom
let (isPayNowButtonDisable, setIsPayNowButtonDisable) = payNowButtonDisable->Recoil.useRecoilState
@@ -26,8 +24,8 @@ let make = () => {
let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
let handleMessage = (event: Types.event) => {
- let json = event.data->eventToJson->OrcaUtils.getStringfromjson("")->OrcaUtils.safeParse
- let dict = json->Utils.getDictFromJson
+ let json = event.data->Identity.anyTypeToJson->getStringFromJson("")->safeParse
+ let dict = json->getDictFromJson
switch dict->Dict.get("submitSuccessful") {
| Some(_) =>
setIsPayNowButtonDisable(_ => false)
@@ -40,7 +38,7 @@ let make = () => {
setIsPayNowButtonDisable(_ => true)
setShowLoader(_ => true)
EventListenerManager.addSmartEventListener("message", handleMessage, "onSubmitSuccessful")
- Utils.handlePostMessage([("handleSdkConfirm", confirmPayload)])
+ handlePostMessage([("handleSdkConfirm", confirmPayload)])
}
diff --git a/src/Components/PaymentDropDownField.res b/src/Components/PaymentDropDownField.res
index 53b48f4d0..d63b61037 100644
--- a/src/Components/PaymentDropDownField.res
+++ b/src/Components/PaymentDropDownField.res
@@ -2,9 +2,7 @@ open RecoilAtoms
@react.component
let make = (
~value: RecoilAtomTypes.field,
- ~setValue: (
- OrcaPaymentPage.RecoilAtomTypes.field => OrcaPaymentPage.RecoilAtomTypes.field
- ) => unit,
+ ~setValue: (RecoilAtomTypes.field => RecoilAtomTypes.field) => unit,
~fieldName,
~options,
~disabled=false,
diff --git a/src/Components/SavedCardItem.res b/src/Components/SavedCardItem.res
index d14cd0cfa..c4f9efa17 100644
--- a/src/Components/SavedCardItem.res
+++ b/src/Components/SavedCardItem.res
@@ -167,7 +167,7 @@ let make = (
list
paymentMethod=paymentItem.paymentMethod
paymentMethodType
- cardBrand={cardBrand->CardUtils.cardType}
+ cardBrand={cardBrand->CardUtils.getCardType}
/>
diff --git a/src/Components/SavedMethods.res b/src/Components/SavedMethods.res
index e98fe2dad..944506758 100644
--- a/src/Components/SavedMethods.res
+++ b/src/Components/SavedMethods.res
@@ -43,7 +43,7 @@ let make = (
switch obj.card.scheme {
| Some(ele) => ele
| None => ""
- }->cardType,
+ }->getCardType,
""->CardTheme.getPaymentMode,
)
}
@@ -130,9 +130,9 @@ let make = (
~bodyArr=savedPaymentMethodBody
->Dict.fromArray
->JSON.Encode.object
- ->OrcaUtils.flattenObject(true)
- ->OrcaUtils.mergeTwoFlattenedJsonDicts(requiredFieldsBody)
- ->OrcaUtils.getArrayOfTupleFromDict,
+ ->flattenObject(true)
+ ->mergeTwoFlattenedJsonDicts(requiredFieldsBody)
+ ->getArrayOfTupleFromDict,
~confirmParam=confirm.confirmParams,
~handleUserError=false,
(),
diff --git a/src/DefaultTheme.res b/src/DefaultTheme.res
index 99dd6bc17..791bf7070 100644
--- a/src/DefaultTheme.res
+++ b/src/DefaultTheme.res
@@ -185,7 +185,7 @@ let defaultRules = theme =>
"fontWeight": theme.fontWeightLight,
"fontSize": theme.fontSizeLg,
},
- }->toJson
+ }->Identity.anyTypeToJson
let default = default
let defaultRules = defaultRules
diff --git a/src/Hooks/CommonHooks.res b/src/Hooks/CommonHooks.res
index 523895a17..e25667f9b 100644
--- a/src/Hooks/CommonHooks.res
+++ b/src/Hooks/CommonHooks.res
@@ -28,8 +28,6 @@ external addEventListener: (element, string, event => unit) => unit = "addEventL
@send
external removeEventListener: (element, string, event => unit) => unit = "removeEventListener"
-external dictToObj: Dict.t<'a> => {..} = "%identity"
-
let useScript = (src: string) => {
let (status, setStatus) = React.useState(_ => src != "" ? "loading" : "idle")
React.useEffect(() => {
@@ -66,7 +64,7 @@ let useScript = (src: string) => {
let updateKeys = (dict, keyPair, setKeys) => {
let (key, value) = keyPair
- let valueStr = value->JSON.Decode.string->Option.getOr("")
+ let valueStr = value->Utils.getStringFromJson("")
let valueBool = default => value->JSON.Decode.bool->Option.getOr(default)
if dict->Utils.getDictIsSome(key) {
switch key {
diff --git a/src/Hooks/OutsideClick.res b/src/Hooks/OutsideClick.res
index a4c5fe87d..8ebf5c3c9 100644
--- a/src/Hooks/OutsideClick.res
+++ b/src/Hooks/OutsideClick.res
@@ -1,4 +1,3 @@
-external ffToDomType: {..} => Dom.node_like<'a> = "%identity"
@send external contains: (Dom.element, {..}) => bool = "contains"
type ref =
diff --git a/src/LoaderController.res b/src/LoaderController.res
index f4f7e3624..60e1430a5 100644
--- a/src/LoaderController.res
+++ b/src/LoaderController.res
@@ -23,7 +23,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
let {config} = configAtom
let {iframeId} = keys
- let handlePostMessage = data => Utils.handlePostMessage(data, ~targetOrigin=keys.parentURL)
+ let handlePostMessage = data => handlePostMessage(data, ~targetOrigin=keys.parentURL)
let setUserFullName = Recoil.useLoggedSetRecoilState(userFullName, "fullName", logger)
let setUserEmail = Recoil.useLoggedSetRecoilState(userEmailAddress, "email", logger)
@@ -56,7 +56,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
})
if optionsPayment.defaultValues.billingDetails.address.country === "" {
let clientTimeZone = CardUtils.dateTimeFormat().resolvedOptions().timeZone
- let clientCountry = Utils.getClientCountry(clientTimeZone)
+ let clientCountry = getClientCountry(clientTimeZone)
setUserAddressCountry(prev => {
...prev,
value: clientCountry.countryName,
@@ -94,7 +94,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
let (default, defaultRules) = (themeValues.default, themeValues.defaultRules)
let config = CardTheme.itemToObjMapper(paymentOptions, default, defaultRules, logger)
- let localeString = Utils.getWarningString(optionsDict, "locale", "", ~logger)
+ let optionsLocaleString = getWarningString(optionsDict, "locale", "", ~logger)
let optionsAppearance = CardTheme.getAppearance(
"appearance",
@@ -105,7 +105,9 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
)
let appearance =
optionsAppearance == CardTheme.defaultAppearance ? config.appearance : optionsAppearance
-
+ let localeString = CardTheme.getLocaleObject(
+ optionsLocaleString == "" ? config.locale : optionsLocaleString,
+ )
setConfig(_ => {
config: {
appearance,
@@ -115,9 +117,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
loader: config.loader,
},
themeObj: appearance.variables,
- localeString: localeString == ""
- ? CardTheme.getLocaleObject(config.locale)
- : CardTheme.getLocaleObject(localeString),
+ localeString,
showLoader: config.loader == Auto || config.loader == Always,
})
}
@@ -128,7 +128,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
logger.setLogInitiated()
let updatedState: PaymentType.loadType = switch paymentlist {
| Loading =>
- showCardFormByDefault && Utils.checkPriorityList(paymentMethodOrder) ? SemiLoaded : Loading
+ showCardFormByDefault && checkPriorityList(paymentMethodOrder) ? SemiLoaded : Loading
| x => x
}
let finalLoadLatency = if launchTime <= 0.0 {
@@ -174,7 +174,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
CardUtils.genreateFontsLink(config.fonts)
let dict = config.appearance.rules->getDictFromJson
if dict->Dict.toArray->Array.length > 0 {
- Utils.generateStyleSheet("", dict, "themestyle")
+ generateStyleSheet("", dict, "themestyle")
}
switch paymentMode->CardTheme.getPaymentMode {
| Payment => ()
@@ -189,7 +189,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
->Array.map(item => {
let (class, dict) = item
if dict->Dict.toArray->Array.length > 0 {
- Utils.generateStyleSheet(class, dict, "widgetstyle")->ignore
+ generateStyleSheet(class, dict, "widgetstyle")->ignore
}
})
->ignore
@@ -243,7 +243,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
logger.setMetadata(metadata)
}
if dict->getDictIsSome("paymentOptions") {
- let paymentOptions = dict->Utils.getDictFromObj("paymentOptions")
+ let paymentOptions = dict->getDictFromObj("paymentOptions")
let clientSecret = getWarningString(paymentOptions, "clientSecret", "", ~logger)
setKeys(prev => {
@@ -252,7 +252,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
})
logger.setClientSecret(clientSecret)
- switch OrcaUtils.getThemePromise(paymentOptions) {
+ switch getThemePromise(paymentOptions) {
| Some(promise) =>
promise
->then(res => {
@@ -267,7 +267,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
})
}
}
- let newLaunchTime = dict->Utils.getFloat("launchTime", 0.0)
+ let newLaunchTime = dict->getFloat("launchTime", 0.0)
setLaunchTime(_ => newLaunchTime)
let initLoadlatency = Date.now() -. newLaunchTime
logger.setLogInfo(
@@ -293,7 +293,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
)
}
} else if dict->getDictIsSome("paymentOptions") {
- let paymentOptions = dict->Utils.getDictFromObj("paymentOptions")
+ let paymentOptions = dict->getDictFromObj("paymentOptions")
let clientSecret = getWarningString(paymentOptions, "clientSecret", "", ~logger)
setKeys(prev => {
@@ -302,7 +302,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
})
logger.setClientSecret(clientSecret)
- switch OrcaUtils.getThemePromise(paymentOptions) {
+ switch getThemePromise(paymentOptions) {
| Some(promise) =>
promise
->then(res => {
@@ -326,18 +326,18 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
| Some(val) =>
setKeys(prev => {
...prev,
- clientSecret: Some(val->JSON.Decode.string->Option.getOr("")),
+ clientSecret: Some(val->getStringFromJson("")),
})
setConfig(prev => {
...prev,
config: {
...prev.config,
- clientSecret: val->JSON.Decode.string->Option.getOr(""),
+ clientSecret: val->getStringFromJson(""),
},
})
| None => ()
}
- switch OrcaUtils.getThemePromise(optionsDict) {
+ switch getThemePromise(optionsDict) {
| Some(promise) =>
promise
->then(res => {
@@ -370,11 +370,11 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
let updatedState: PaymentType.loadType =
list == Dict.make()->JSON.Encode.object
? LoadError(list)
- : switch list->Utils.getDictFromJson->Dict.get("error") {
+ : switch list->getDictFromJson->Dict.get("error") {
| Some(_) => LoadError(list)
| None =>
let isNonEmptyPaymentMethodList =
- list->Utils.getDictFromJson->Utils.getArray("payment_methods")->Array.length > 0
+ list->getDictFromJson->getArray("payment_methods")->Array.length > 0
isNonEmptyPaymentMethodList ? Loaded(list) : LoadError(list)
}
@@ -489,7 +489,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
}
React.useEffect(() => {
- Utils.handlePostMessage([
+ handlePostMessage([
("iframeHeight", (divH +. 1.0)->JSON.Encode.float),
("iframeId", iframeId->JSON.Encode.string),
])
diff --git a/src/MidnightTheme.res b/src/MidnightTheme.res
index 4b6c1201c..6c897f34f 100644
--- a/src/MidnightTheme.res
+++ b/src/MidnightTheme.res
@@ -194,7 +194,7 @@ let midnightRules = theme =>
"fontWeight": theme.fontWeightLight,
"fontSize": theme.fontSizeLg,
},
- }->toJson
+ }->Identity.anyTypeToJson
let default = midnight
let defaultRules = midnightRules
diff --git a/src/Payment.res b/src/Payment.res
index 7ef3f0763..2c8b333a0 100644
--- a/src/Payment.res
+++ b/src/Payment.res
@@ -49,11 +49,13 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
let brand = getCardBrand(cardNumber)
let maxLength = getMaxLength(cardNumber)
let isNotBancontact = selectedOption !== "bancontact_card" && brand == ""
- ((brand == "" && !showFields) || !showFields) && isNotBancontact
- ? (cardScheme, maxLength)
- : (brand, maxLength)
+ !showFields && isNotBancontact ? (cardScheme, maxLength) : (brand, maxLength)
}, (cardNumber, cardScheme, showFields))
+ let cardType = React.useMemo1(() => {
+ cardBrand->getCardType
+ }, [cardBrand])
+
let clientTimeZone = dateTimeFormat().resolvedOptions().timeZone
let clientCountry = Utils.getClientCountry(clientTimeZone)
@@ -94,7 +96,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
let changeCardNumber = ev => {
let val = ReactEvent.Form.target(ev)["value"]
logInputChangeInfo("cardNumber", logger)
- let card = val->formatCardNumber(cardBrand->cardType)
+ let card = val->formatCardNumber(cardType)
let clearValue = card->clearSpaces
setCardValid(clearValue, setIsCardValid)
if cardValid(clearValue, cardBrand) {
@@ -293,7 +295,9 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
}
}
- let paymentType = paymentMode->getPaymentMode
+ let paymentType = React.useMemo1(() => {
+ paymentMode->getPaymentMode
+ }, [paymentMode])
React.useEffect0(() => {
let handleFun = (ev: Window.event) => {
@@ -338,31 +342,23 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
Utils.handleMessage(handleDoSubmit, "")
}, (cardNumber, cvcNumber, cardExpiry, isCVCValid, isExpiryValid, isCardValid))
- let cardBrandIcon = getCardBrandIcon(cardBrand->cardType, paymentMode->getPaymentMode)
-
React.useEffect(() => {
setCardError(_ =>
- switch isCardValid {
- | Some(val) => val ? "" : localeString.inValidCardErrorText
- | None => ""
- }
+ isCardValid->Option.getOr(true) ? "" : localeString.inValidCardErrorText
)
None
}, [isCardValid])
React.useEffect(() => {
setCvcError(_ =>
- switch isCVCValid {
- | Some(val) => val ? "" : localeString.inCompleteCVCErrorText
- | None => ""
- }
+ isCVCValid->Option.getOr(true) ? "" : localeString.inCompleteCVCErrorText
)
None
}, [isCVCValid])
React.useEffect(() => {
setExpiryError(_ =>
- switch (isExpiryValid, isExipryComplete(cardExpiry)) {
+ switch (isExpiryValid, isExpiryComplete(cardExpiry)) {
| (Some(true), true) => ""
| (Some(false), true) => localeString.pastExpiryErrorText
| (Some(_), false) => localeString.inCompleteExpiryErrorText
@@ -370,10 +366,13 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
}
)
None
- }, (isExpiryValid, isExipryComplete(cardExpiry)))
+ }, (isExpiryValid, isExpiryComplete(cardExpiry)))
- let animate = cardBrand->cardType == NOTFOUND ? "animate-slideLeft" : "animate-slideRight"
- let icon = cardBrandIcon
+ let icon = React.useMemo(() => {
+ let animate = cardType == NOTFOUND ? "animate-slideLeft" : "animate-slideRight"
+ let cardBrandIcon = getCardBrandIcon(cardType, paymentType)
+ cardBrandIcon
+ }, (cardType, paymentType))
let cardProps: CardUtils.cardProps = (
isCardValid,
diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res
index cbbbc9ae5..a3a985a23 100644
--- a/src/Payments/ApplePay.res
+++ b/src/Payments/ApplePay.res
@@ -76,9 +76,9 @@ let make = (
requestBody
->Dict.fromArray
->JSON.Encode.object
- ->OrcaUtils.flattenObject(true)
- ->OrcaUtils.mergeTwoFlattenedJsonDicts(requiredFieldsBody)
- ->OrcaUtils.getArrayOfTupleFromDict
+ ->flattenObject(true)
+ ->mergeTwoFlattenedJsonDicts(requiredFieldsBody)
+ ->getArrayOfTupleFromDict
intent(
~bodyArr=requiredFieldsBodyArr,
~confirmParam={
@@ -246,7 +246,7 @@ let make = (
)
setApplePayClicked(_ => true)
open Promise
- OrcaUtils.makeOneClickHandlerPromise(sdkHandleOneClickConfirmPayment)
+ makeOneClickHandlerPromise(sdkHandleOneClickConfirmPayment)
->then(result => {
let result = result->JSON.Decode.bool->Option.getOr(false)
if result {
@@ -363,38 +363,36 @@ let make = (
}, (areRequiredFieldsValid, areRequiredFieldsEmpty))
useSubmitPaymentData(submitCallback)
- {
- isWallet
- ?
-
- {if showApplePay {
- if showApplePayLoader {
-
- } else {
-
- }
- } else {
- React.null
- }}
-
+
+
+ {if showApplePayLoader {
+
+ } else {
+
+ }}
+
+