Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BrowserSpec.res
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let checkIsSafari = () => {
}

let date = date()
let broswerInfo = () => {
let browserInfo = () => {
let data = UAParser.make()
let osType = data.os.name->Option.getOr("Unknown")
let osVersion = data.os.version->Option.getOr("Unknown")
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Payment.res
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
}, (cardNumber, cvcNumber, cardExpiry, isCVCValid, isExpiryValid, isCardValid))

if integrateError {
<ErrorOccured />
<ErrorOccurred />
} else {
<PaymentTypeContext.provider value={paymentType: paymentType}>
<RenderPaymentMethods
Expand Down
2 changes: 1 addition & 1 deletion src/PaymentMethodCollectElement.res
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ let make = (~integrateError, ~logger) => {
}

if integrateError {
<ErrorOccured />
<ErrorOccurred />
} else {
<div
className="flex flex-col h-screen min-w-[320px] overflow-hidden
Expand Down
28 changes: 14 additions & 14 deletions src/Utilities/PaymentHelpers.res
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ let threeDsAuth = async (~clientSecret, ~logger, ~threeDsMethodComp, ~headers) =
payoutId: None,
},
)
let broswerInfo = BrowserSpec.broswerInfo
let browserInfo = BrowserSpec.browserInfo
let body =
[
("client_secret", clientSecret->JSON.Encode.string),
("device_channel", "BRW"->JSON.Encode.string),
("threeds_method_comp_ind", threeDsMethodComp->JSON.Encode.string),
]
->Array.concat(broswerInfo())
->Array.concat(browserInfo())
->getJsonFromArrayOfJson

let onSuccess = data => data
Expand Down Expand Up @@ -1070,7 +1070,7 @@ let useCompleteAuthorizeHandler = () => {
}
let bodyStr =
[("client_secret", cs->JSON.Encode.string)]
->Array.concatMany([bodyArr, BrowserSpec.broswerInfo()])
->Array.concatMany([bodyArr, BrowserSpec.browserInfo()])
->getJsonFromArrayOfJson
->JSON.stringify

Expand Down Expand Up @@ -1298,12 +1298,12 @@ let usePaymentIntent = (optLogger, paymentType) => {
}
}

let broswerInfo = BrowserSpec.broswerInfo
let browserInfo = BrowserSpec.browserInfo
let intentWithoutMandate = mandatePaymentType => {
let bodyStr =
body
->Array.concatMany([
bodyArr->Array.concat(broswerInfo()),
bodyArr->Array.concat(browserInfo()),
mandatePaymentType->PaymentBody.paymentTypeBody,
])
->getJsonFromArrayOfJson
Expand All @@ -1315,7 +1315,7 @@ let usePaymentIntent = (optLogger, paymentType) => {
let bodyStr =
body
->Array.concat(
bodyArr->Array.concatMany([PaymentBody.mandateBody(mandatePaymentType), broswerInfo()]),
bodyArr->Array.concatMany([PaymentBody.mandateBody(mandatePaymentType), browserInfo()]),
)
->getJsonFromArrayOfJson
->JSON.stringify
Expand Down Expand Up @@ -1348,7 +1348,7 @@ let usePaymentIntent = (optLogger, paymentType) => {
~errortype="payment_methods_empty",
~message="Payment Failed. Try again!",
)
Console.warn("Please enable atleast one Payment method.")
Console.warn("Please enable at least one Payment method.")
}
| (V2, _, LoadedV2(data)) =>
if data.paymentMethodsEnabled->Array.length > 0 {
Expand All @@ -1358,7 +1358,7 @@ let usePaymentIntent = (optLogger, paymentType) => {
~errortype="payment_methods_empty",
~message="Payment Failed. Try again!",
)
Console.warn("Please enable atleast one Payment method.")
Console.warn("Please enable at least one Payment method.")
}
| (V1, SemiLoaded, _)
| (V2, _, SemiLoadedV2) =>
Expand Down Expand Up @@ -1625,14 +1625,14 @@ let paymentIntentForPaymentSession = (
let uri = `${endpoint}/payments/${paymentIntentID}/confirm`
let headers = [("Content-Type", "application/json"), ("api-key", confirmParam.publishableKey)]

let broswerInfo = BrowserSpec.broswerInfo()
let browserInfo = BrowserSpec.browserInfo()

let returnUrlArr = [("return_url", confirmParam.return_url->JSON.Encode.string)]

let bodyStr =
body
->Array.concatMany([
broswerInfo,
browserInfo,
[("client_secret", clientSecret->JSON.Encode.string)],
returnUrlArr,
])
Expand Down Expand Up @@ -2025,12 +2025,12 @@ let usePostSessionTokens = (
->ignore
}

let broswerInfo = BrowserSpec.broswerInfo
let browserInfo = BrowserSpec.browserInfo
let intentWithoutMandate = mandatePaymentType => {
let bodyStr =
body
->Array.concatMany([
bodyArr->Array.concat(broswerInfo()),
bodyArr->Array.concat(browserInfo()),
mandatePaymentType->PaymentBody.paymentTypeBody,
])
->getJsonFromArrayOfJson
Expand All @@ -2042,7 +2042,7 @@ let usePostSessionTokens = (
let bodyStr =
body
->Array.concat(
bodyArr->Array.concatMany([PaymentBody.mandateBody(mandatePaymentType), broswerInfo()]),
bodyArr->Array.concatMany([PaymentBody.mandateBody(mandatePaymentType), browserInfo()]),
)
->getJsonFromArrayOfJson
->JSON.stringify
Expand Down Expand Up @@ -2075,7 +2075,7 @@ let usePostSessionTokens = (
~errortype="payment_methods_empty",
~message="Payment Failed. Try again!",
)
Console.warn("Please enable atleast one Payment method.")
Console.warn("Please enable at least one Payment method.")
}
| SemiLoaded => intentWithoutMandate("")
| _ =>
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/PaymentHelpersV2.res
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ let useSaveCard = (optLogger: option<HyperLoggerTypes.loggerMake>, paymentType:
let endpoint = ApiEndpoint.getApiEndPoint(~publishableKey=confirmParam.publishableKey)
let uri = `${endpoint}/v2/payment-method-sessions/${pmSessionId}/confirm`

let browserInfo = BrowserSpec.broswerInfo
let browserInfo = BrowserSpec.browserInfo
let returnUrlArr = [("return_url", confirmParam.return_url->JSON.Encode.string)]
let bodyStr =
[("client_secret", pmClientSecret->JSON.Encode.string)]
Expand Down
9 changes: 5 additions & 4 deletions src/Utilities/Utils.res
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,9 @@ let getBankKeys = (str, banks: Bank.bankList, default) => {
(banks->Array.find(item => item.displayName == str)->Option.getOr(default)).value
}

// Constructs CSS class strings from a dictionary of styles, handling pseudo-classes and nested selectors
let constructClass = (~classname, ~dict) => {
let puseduoArr = []
let pseudoArr = []
let modifiedArr = []

dict
Expand Down Expand Up @@ -612,15 +613,15 @@ let constructClass = (~classname, ~dict) => {
if !(key->String.startsWith(":")) && !(key->String.startsWith(".")) {
modifiedArr->Array.push(class)->ignore
} else if key->String.startsWith(":") || key->String.startsWith(".") {
puseduoArr->Array.push(class)->ignore
pseudoArr->Array.push(class)->ignore
}
})
->ignore

if classname->String.length == 0 {
`${modifiedArr->Array.join(";")} ${puseduoArr->Array.join(" ")}`
`${modifiedArr->Array.join(";")} ${pseudoArr->Array.join(" ")}`
} else {
`.${classname} {${modifiedArr->Array.join(";")}} ${puseduoArr->Array.join(" ")}`
`.${classname} {${modifiedArr->Array.join(";")}} ${pseudoArr->Array.join(" ")}`
}
}

Expand Down
Loading