fix: resolved conflicts

Author: sakksham7

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.125.0",
+  "version": "0.126.0",
   "main": "index.js",
   "private": true,
   "dependencies": {

package.json

@@ -749,3 +749,26 @@ let emitIsFormReadyForSubmission = isFormReadyForSubmission =>
   Utils.messageParentWindow([
     ("isFormReadyForSubmission", isFormReadyForSubmission->JSON.Encode.bool),
   ])
+
+let checkIfCardBinIsBlocked = (cardNumber, blockedBinsList) => {
+  open PaymentType
+  switch blockedBinsList {
+  | Loading // If still loading, allow payment to proceed
+  | LoadError(_) // If error loading, allow payment to proceed
+  | SemiLoaded => false // If semi-loaded, allow payment to proceed
+  | Loaded(data) => {
+      let cardBin = cardNumber->CardValidations.clearSpaces->String.substring(~start=0, ~end=6)
+      if cardBin->String.length >= 6 {
+        // The response is directly an array of blocked bins
+        let blockedBins = data->JSON.Decode.array->Option.getOr([])
+        blockedBins->Array.some(item => {
+          let binData = item->Utils.getDictFromJson
+          let fingerprintId = binData->Utils.getString("fingerprint_id", "")
+          fingerprintId === cardBin
+        })
+      } else {
+        false // If card number is too short, don't block
+      }
+    }
+  }
+}

public/icons/orca.svg

@@ -1,6 +1,5 @@
 open CardUtils
 open CardThemeType
-open CardTheme
 open LoggerUtils
 open RecoilAtoms
 
@@ -9,6 +8,7 @@ let useCardForm = (~logger, ~paymentType) => {
   let cardScheme = Recoil.useRecoilValueFromAtom(cardBrand)
   let showPaymentMethodsScreen = Recoil.useRecoilValueFromAtom(showPaymentMethodsScreen)
   let selectedOption = Recoil.useRecoilValueFromAtom(selectedOptionAtom)
+  let blockedBinsList = Recoil.useRecoilValueFromAtom(blockedBins)
   let paymentToken = Recoil.useRecoilValueFromAtom(paymentTokenAtom)
   let paymentMethodListValue = Recoil.useRecoilValueFromAtom(PaymentUtils.paymentMethodListValue)
   let paymentMethodListValueV2 = Recoil.useRecoilValueFromAtom(
@@ -112,12 +112,22 @@ let useCardForm = (~logger, ~paymentType) => {
     logInputChangeInfo("cardNumber", logger)
     let card = val->formatCardNumber(cardType)
     let clearValue = card->CardValidations.clearSpaces
-    setCardValid(clearValue, cardBrand, setIsCardValid)
+
+    // Check if card BIN is blocked
+    let isCardBlocked = CardUtils.checkIfCardBinIsBlocked(clearValue, blockedBinsList)
+    if isCardBlocked {
+      setCardError(_ => localeString.blockedCardText)
+      setIsCardValid(_ => Some(false))
+    } else {
+      setCardValid(clearValue, cardBrand, setIsCardValid)
+    }
+
     if (
       focusCardValid(clearValue, cardBrand) &&
       PaymentUtils.checkIsCardSupported(clearValue, cardBrand, supportedCardBrands)->Option.getOr(
         false,
-      )
+      ) &&
+      !isCardBlocked
     ) {
       handleInputFocus(~currentRef=cardRef, ~destinationRef=expiryRef)
     }
@@ -254,20 +264,28 @@ let useCardForm = (~logger, ~paymentType) => {
   }
 
   React.useEffect(() => {
+    // Check if card is blocked first
+    let isCardBlocked = CardUtils.checkIfCardBinIsBlocked(
+      cardNumber->CardValidations.clearSpaces,
+      blockedBinsList,
+    )
+
     let cardError = switch (
       isCardSupported->Option.getOr(true),
       isCardValid->Option.getOr(true),
       cardNumber->String.length == 0,
+      isCardBlocked,
     ) {
-    | (_, _, true) => ""
-    | (true, true, _) => ""
-    | (true, _, _) => localeString.inValidCardErrorText
-    | (_, _, _) => CardUtils.getCardBrandInvalidError(~cardBrand, ~localeString)
+    | (_, _, _, true) => localeString.blockedCardText
+    | (_, _, true, _) => ""
+    | (true, true, _, _) => ""
+    | (true, _, _, _) => localeString.inValidCardErrorText
+    | _ => CardUtils.getCardBrandInvalidError(~cardBrand, ~localeString)
     }
     let cardError = isCardValid->Option.isSome ? cardError : ""
     setCardError(_ => cardError)
     None
-  }, [isCardValid, isCardSupported])
+  }, (isCardValid, isCardSupported, cardNumber, blockedBinsList))
 
   React.useEffect(() => {
     setCvcError(_ => isCVCValid->Option.getOr(true) ? "" : localeString.inCompleteCVCErrorText)

src/CardUtils.res

@@ -8,6 +8,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
   let (keys, setKeys) = Recoil.useRecoilState(keys)
   let (paymentMethodList, setPaymentMethodList) = Recoil.useRecoilState(paymentMethodList)
   let (_, setSessions) = Recoil.useRecoilState(sessions)
+  let setBlockedBins = Recoil.useSetRecoilState(blockedBins)
   let (options, setOptions) = Recoil.useRecoilState(elementOptions)
   let (optionsPayment, setOptionsPayment) = Recoil.useRecoilState(optionAtom)
   let setPaymentManagementList = Recoil.useSetRecoilState(paymentManagementList)
@@ -647,6 +648,10 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
         if dict->Dict.get("applePaySessionObjNotPresent")->Option.isSome {
           setIsApplePayReady(prev => prev && false)
         }
+        if dict->getDictIsSome("blockedBins") {
+          let blockedBins = dict->getJsonObjectFromDict("blockedBins")
+          setBlockedBins(_ => Loaded(blockedBins))
+        }
       } catch {
       | _ => setIntegrateErrorError(_ => true)
       }

src/Hooks/CommonCardProps.res

@@ -89,6 +89,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   cardExpiredText: `انتهت صلاحية هذه البطاقة`,
   cardHeader: `معلومات البطاقة`,
   cardBrandConfiguredErrorText: str => `${str} غير مدعوم في الوقت الحالي.`,
+  blockedCardText: "هذه البطاقة غير مسموحة للمدفوعات.",
   currencyNetwork: `شبكات العملات`,
   expiryPlaceholder: `MM / YY`,
   dateOfBirth: `تاريخ الميلاد`,
@@ -173,6 +174,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   payment_methods_duit_now: `DuitNow`,
   payment_methods_revolut_pay: `ريفولت باي`,
   payment_methods_affirm: `أفيرم`,
+  payment_methods_pay_safe_card: `PaysafeCard`,
   payment_methods_crypto_currency: `العملات الرقمية`,
   payment_methods_card: `بطاقة`,
   payment_methods_klarna: `كلارنا`,

src/LoaderController.res

@@ -89,6 +89,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   cardExpiredText: `Aquesta targeta ha caducat`,
   cardHeader: `Informació de la targeta`,
   cardBrandConfiguredErrorText: str => `${str} no està suportat en aquest moment.`,
+  blockedCardText: "Aquesta targeta no està permesa per a pagaments.",
   currencyNetwork: `Xarxes de Monedes`,
   expiryPlaceholder: `MM / AA`,
   dateOfBirth: `Data de naixement`,
@@ -172,6 +173,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   payment_methods_duit_now: `DuitNow`,
   payment_methods_revolut_pay: `Revolut Pay`,
   payment_methods_affirm: `Affirm`,
+  payment_methods_pay_safe_card: `PaysafeCard`,
   payment_methods_crypto_currency: `Crypto`,
   payment_methods_card: `Carte`,
   payment_methods_klarna: `Klarna`,

src/LocaleStrings/ArabicLocale.res

@@ -89,6 +89,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   cardExpiredText: `此卡已过期`,
   cardHeader: `卡片信息`,
   cardBrandConfiguredErrorText: str => `${str} 目前不支持。`,
+  blockedCardText: "此卡不允许用于付款。",
   currencyNetwork: `货币网络`,
   expiryPlaceholder: `MM / YY`,
   dateOfBirth: `出生日期`,
@@ -170,6 +171,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   payment_methods_duit_now: `DuitNow`,
   payment_methods_revolut_pay: `Revolut Pay`,
   payment_methods_affirm: `Affirm`,
+  payment_methods_pay_safe_card: `PaysafeCard`,
   payment_methods_crypto_currency: `加密货币`,
   payment_methods_card: `卡`,
   payment_methods_klarna: `Klarna`,

src/LocaleStrings/CatalanLocale.res

@@ -89,6 +89,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   cardExpiredText: `Diese Karte ist abgelaufen`,
   cardHeader: `Kartendaten`,
   cardBrandConfiguredErrorText: str => `${str} wird derzeit nicht unterstützt.`,
+  blockedCardText: "Diese Karte ist für Zahlungen nicht zugelassen.",
   currencyNetwork: `Währungsnetzwerke`,
   expiryPlaceholder: `MM / JJ`,
   dateOfBirth: `Geburtsdatum`,
@@ -171,6 +172,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   payment_methods_duit_now: `DuitNow`,
   payment_methods_revolut_pay: `Revolut Pay`,
   payment_methods_affirm: `Affirm`,
+  payment_methods_pay_safe_card: `PaysafeCard`,
   payment_methods_crypto_currency: `Krypto`,
   payment_methods_card: `Karte`,
   payment_methods_klarna: `Klarna`,