@paykka/card-checkout-ui 0.8.0 → 0.9.2

package/dist/es/components/ApplePay/index.js

@@ -1,13 +1,13 @@
 import { w, h, y, q, u, b } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
 import { SessionMode, PaymentMethod } from "../../constant.js";
+import "../../utils/card-brand/brands.js";
+import "../../utils/system-info/get-browser-info.js";
+import { parseE164, underscoreToUpperCamelCase } from "../../utils/format.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
 import { getApplePayInfo, applePay, getMerchantSession } from "../../api/modules/apple-pay/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
-import "../../utils/card-brand/brands.js";
-import "../../utils/system-info/get-browser-info.js";
-import { parseE164, underscoreToUpperCamelCase } from "../../utils/format.js";
 import { PayKKaError } from "../../core/error.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
@@ -60,7 +60,7 @@ const ApplePay = w((props) => {
     if (sessionMode === SessionMode.DROP_IN && !isDropIn) {
       (_b = (_a = props.core.config).onInitError) == null ? void 0 : _b.call(
         _a,
-        new PayKKaError("ERROR", "Please send the correct mode when creating the checkout")
+        new PayKKaError("ERROR", "Please send the correct session when creating the checkout")
       );
       return;
     }
@@ -142,24 +142,19 @@ const ApplePay = w((props) => {
               fraudDetectionId: fraudDetection == null ? void 0 : fraudDetection.fraudDetectionID
             })
           },
+          props.core,
           { locale: i18n.locale }
         );
       }());
       const { status, orderStatus, errorMessage, errorCode } = res;
       if (status === "PROCESSING") {
         if (orderStatus === "SUCCESS") {
-          applePaySession.completePayment({
-            status: 0
-          });
+          applePaySession.completePayment({ status: 0 });
           (_a = props.onSuccess) == null ? void 0 : _a.call(props, getPaymentSuccessData());
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (orderStatus === "PROCESSING") {
           !search && await startReFetchPayInfo();
-          return {
-            end: !search
-          };
+          return { end: !search };
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
           (_b = props.onError) == null ? void 0 : _b.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
@@ -167,45 +162,29 @@ const ApplePay = w((props) => {
             status: 1,
             errors: [new ApplePayError("unknown", void 0, errorMessage)]
           });
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (orderStatus === "AUTHORIZED") {
-          applePaySession.completePayment({
-            status: 0
-          });
+          applePaySession.completePayment({ status: 0 });
           (_c = props.onAuthorized) == null ? void 0 : _c.call(props);
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (!orderStatus) {
           applePaySession.completePayment({
             status: 1,
             errors: [new ApplePayError("unknown", void 0, "")]
           });
-          return {
-            end: true
-          };
+          return { end: true };
         }
       } else if (status === "SUCCESS") {
         (_d = props.onSuccess) == null ? void 0 : _d.call(props, getPaymentSuccessData());
-        applePaySession.completePayment({
-          status: 0
-        });
-        return {
-          end: true
-        };
+        applePaySession.completePayment({ status: 0 });
+        return { end: true };
       } else if (status === "EXPIRED") {
         (_e = props.onExpired) == null ? void 0 : _e.call(props);
         applePaySession.abort();
-        return {
-          end: true
-        };
+        return { end: true };
       }
       (_f = props.onSuccess) == null ? void 0 : _f.call(props, getPaymentSuccessData());
-      return {
-        end: true
-      };
+      return { end: true };
     } catch (error) {
       if (isTimeoutError(error)) {
         if (search) {

package/dist/es/components/Boost/index.js

@@ -0,0 +1,322 @@
+import { w, F, A, h, y, q, u, b } from "../../core.js";
+import { useBEM } from "../../hooks/useBEM.js";
+import { CoreContext } from "../../core/context.js";
+import "../../utils/card-brand/brands.js";
+import "../../utils/system-info/get-browser-info.js";
+import { cssVarPrefix, normalizedClass, formatAmount } from "../../utils/format.js";
+import { redirectToPayment } from "../../utils/redirect.js";
+import { isTimeoutError } from "../../api/http.js";
+import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../constant.js";
+import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { getBoostPayInfo, boostPay } from "../../api/modules/boost/index.js";
+import { PayKKaError } from "../../core/error.js";
+import { hidePaymentButton } from "../../config.js";
+import { usePayState } from "../../hooks/usePayState.js";
+import { useRetry } from "../../hooks/useRetry.js";
+import { createEmailCore, EmailField } from "../EmailField/EmailField.js";
+import { createAddressCore } from "../../core/Address.js";
+import { SubmitButton } from "../SubmitButton/index.js";
+import "../internal/Form/type.js";
+import "../internal/Form/context.js";
+import "../internal/Form/FormItem.js";
+import { Form } from "../internal/Form/Form.js";
+import { AddressField } from "../AddressField/index.js";
+import { Info } from "../internal/Info/Info.js";
+import { GuideCard } from "../GuideCard/index.js";
+const { bem } = useBEM("boost");
+const fieldClassNames = bem("field");
+const Boost = w((props, ref) => {
+  var _a, _b, _c, _d, _e, _f;
+  const {
+    session,
+    showEmail = false,
+    showAddress = false,
+    redirectMode = "auto",
+    core,
+    autoQuery = true,
+    showGuideCard = true
+  } = props;
+  F(ref, () => ({
+    stopRetry: () => {
+      setSubmitButtonStatus("unSubmit");
+      stopReFetchPayInfo();
+    },
+    startRetry: (timeout) => {
+      setSubmitButtonStatus("loading");
+      startReFetchPayInfo({ timeout });
+    },
+    updateAddress: () => {
+      var _a2;
+      if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
+        return;
+      setForm(Object.assign(form, { address: addressState.getAddressState() }));
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressState.getAddressState());
+    },
+    updateEmail: () => {
+      var _a2;
+      if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
+        return;
+      setForm(Object.assign(form, { email: emailState.email }));
+      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+    },
+    payment: () => {
+      hidePaymentButton && onSubmit();
+    }
+  }));
+  const addressState = createAddressCore();
+  const emailState = createEmailCore();
+  const addressFieldRef = A(null);
+  const emailFieldRef = A(null);
+  const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
+  const { setErrorMsg, i18n, errorMsg, sessionReady } = usePayState(session);
+  const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
+  const formRef = A(null);
+  const [form, setForm] = h({
+    email: "",
+    address: {
+      country: "",
+      province: "",
+      city: "",
+      area: "",
+      postCode: "",
+      address1: "",
+      address2: ""
+    }
+  });
+  const [validated, setValidated] = h(false);
+  const [fieldStatus, setFieldStatus] = h();
+  const initFieldStatus = () => {
+    const { field, sessionMode } = session.checkout;
+    const { email, address } = field;
+    if (sessionMode === SessionMode.COMPONENT) {
+      if (email.disabled) {
+        email.show = showEmail;
+      }
+      if (showAddress && !(address == null ? void 0 : address.show)) {
+        address.show = true;
+      }
+    }
+    setFieldStatus({ ...field });
+  };
+  y(() => {
+    if (!sessionReady) {
+      return;
+    }
+    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
+    if (!paymentMethod.includes(PaymentMethod.BOOST)) {
+      return;
+    }
+    initFieldStatus();
+    setIsCheckoutEnabled(true);
+    form.email = bill.email ?? "";
+    if (autoQuery && core.processingPaymentMethod === PaymentMethod.BOOST) {
+      setSubmitButtonStatus("loading");
+      startReFetchPayInfo();
+    }
+  }, [sessionReady]);
+  const processOnError = (error) => {
+    var _a2;
+    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    core.resetEnablePaymentMethod();
+  };
+  const onTimeout = q(
+    (message) => {
+      var _a2;
+      setErrorMsg(message || i18n.get("common.payTimeout"));
+      setSubmitButtonStatus("unSubmit");
+      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      core.resetEnablePaymentMethod();
+    },
+    [i18n, props.onTimeout]
+  );
+  const { start: startReFetchPayInfo, stop: stopReFetchPayInfo } = useRetry(
+    (timeout) => pay(true, timeout),
+    { onTimeout: () => onTimeout(i18n.get("common.queryTimeout")) }
+  );
+  const getPaymentParams = async () => {
+    return {
+      sessionId: session.sessionId,
+      clientKey: session.clientKey,
+      payment: {
+        paymentMethod: PaymentMethod.BOOST
+      },
+      bill: {
+        email: form.email,
+        ...form.address,
+        province: addressState.getLabel(form.address.province, addressState.getProvinceOption()) ?? form.address.province,
+        city: addressState.getLabel(form.address.city, addressState.getCityOptions()) ?? form.address.city
+      },
+      browser: await getBrowserParams()
+    };
+  };
+  const pay = async (search = false, timeout) => {
+    var _a2, _b2, _c2, _d2, _e2;
+    try {
+      const paymentParams = await getPaymentParams();
+      const requestOptions = { locale: i18n.locale, timeout };
+      const res = search ? await getBoostPayInfo(
+        { sessionId: session.sessionId, clientKey: session.clientKey },
+        requestOptions
+      ) : await boostPay(paymentParams, props.core, requestOptions);
+      !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
+      const { status, orderStatus, errorMessage, errorCode, payInfo } = res;
+      if (status === "PROCESSING") {
+        if (!orderStatus) {
+          setSubmitButtonStatus("unSubmit");
+          return { end: true };
+        } else if (orderStatus === "SUCCESS") {
+          setSubmitButtonStatus("success");
+          (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props);
+          return { end: true };
+        } else if (orderStatus === "FAILURE") {
+          setErrorMsg(errorMessage);
+          setSubmitButtonStatus("unSubmit");
+          processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          return { end: true };
+        } else if (orderStatus === "PROCESSING") {
+          if (!search) {
+            if (redirectMode === "auto" && payInfo) {
+              redirectToPayment(payInfo);
+              return { end: true };
+            } else {
+              startReFetchPayInfo();
+            }
+          }
+          return { end: false };
+        } else if (orderStatus === "CANCELED") {
+          setSubmitButtonStatus("unSubmit");
+          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          core.resetEnablePaymentMethod();
+          return { end: true };
+        }
+      } else if (status === "SUCCESS") {
+        setSubmitButtonStatus("success");
+        (_d2 = props.onSuccess) == null ? void 0 : _d2.call(props);
+        return { end: true };
+      } else if (status === "EXPIRED") {
+        setSubmitButtonStatus("unSubmit");
+        (_e2 = props.onExpired) == null ? void 0 : _e2.call(props);
+        return { end: true };
+      }
+      setSubmitButtonStatus("unSubmit");
+      return { end: true };
+    } catch (error) {
+      if (isTimeoutError(error)) {
+        if (search) {
+          return { end: false };
+        } else {
+          onTimeout();
+          return { end: true };
+        }
+      } else {
+        const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
+        setErrorMsg(message);
+        processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        setSubmitButtonStatus("unSubmit");
+        return { end: true };
+      }
+    }
+  };
+  const validateForm = () => {
+    var _a2;
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+      setValidated(true);
+    }).catch(() => {
+      setValidated(false);
+    });
+  };
+  y(() => {
+    validateForm();
+  }, [form]);
+  const onSubmit = async () => {
+    var _a2;
+    setErrorMsg("");
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
+      var _a3;
+      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressState.setValidateAllFields(true);
+      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      if (errors) {
+        setSubmitButtonStatus("unSubmit");
+        return;
+      }
+      setErrorMsg("");
+      setSubmitButtonStatus("loading");
+      await pay();
+    });
+  };
+  const setFormRef = (dom) => {
+    formRef.current = dom;
+    dom && validateForm();
+  };
+  const Button = () => {
+    var _a2;
+    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
+    const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
+    return /* @__PURE__ */ u(
+      SubmitButton,
+      {
+        className: bem("button"),
+        status: submitButtonStatus,
+        text,
+        loadingText: i18n.get("common.payProcessing"),
+        successText: i18n.get("common.paySuccess"),
+        onClick: onSubmit,
+        verified: validated
+      }
+    );
+  };
+  const Email = () => {
+    return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.email.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
+      EmailField,
+      {
+        ref: emailFieldRef,
+        value: form.email,
+        disabled: fieldStatus == null ? void 0 : fieldStatus.email.disabled
+      }
+    ) }) });
+  };
+  const formStyle = {
+    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
+    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
+    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
+    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
+    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
+  };
+  const ErrorMessage = () => {
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }) });
+  };
+  const Address = () => {
+    var _a2, _b2;
+    return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.address.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
+      AddressField,
+      {
+        ref: addressFieldRef,
+        value: form.address,
+        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.bill.country),
+        onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
+      }
+    ) }) });
+  };
+  return /* @__PURE__ */ u(
+    CoreContext.Provider,
+    {
+      value: {
+        i18n,
+        session
+      },
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+        showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.BOOST }),
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+          Email(),
+          Address(),
+          ErrorMessage(),
+          !hidePaymentButton && Button()
+        ] }) })
+      ] })
+    }
+  );
+});
+export {
+  Boost
+};

package/dist/es/components/Card/index.js

@@ -1,10 +1,10 @@
 import { w, A, h, F, y, q, T, u, b } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
 import { PaymentType, SessionMode, CardPaymentMethods, COMMON_CLASS_NAME, PaymentMethod } from "../../constant.js";
+import { intersection } from "../../utils/index.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
 import { getCardPayInfo, cardPay } from "../../api/modules/card/index.js";
 import { CoreContext } from "../../core/context.js";
-import { intersection } from "../../utils/index.js";
 import { PayKKaError } from "../../core/error.js";
 import { hidePaymentButton } from "../../config.js";
 import { defaultInputStyleConfig } from "../../types/index.js";
@@ -37,7 +37,6 @@ import { findCardBrand } from "../../utils/card-brand/index.js";
 import { separateInputStyle } from "../../utils/style.js";
 import { createPromise } from "../../utils/create-promise.js";
 import { cssVarPrefix, normalizedClass, trimAll, formatAmount } from "../../utils/format.js";
-import { isUndefined } from "../../utils/is.js";
 const { bem } = useBEM("card");
 const fieldClassNames = bem("field");
 const Card = w((props, ref) => {
@@ -52,10 +51,11 @@ const Card = w((props, ref) => {
     threeDSFrame,
     styles,
     enable3DSModal = true,
-    isDropIn
+    isDropIn,
+    core
   } = props;
-  let addressState = createAddressCore();
-  let emailState = createEmailCore();
+  const addressState = createAddressCore();
+  const emailState = createEmailCore();
   const { i18n, fraudDetection, sessionReady } = usePayState(session);
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
@@ -103,6 +103,8 @@ const Card = w((props, ref) => {
     },
     updateEmail: () => {
       var _a2;
+      if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
+        return;
       setForm(Object.assign(form, { email: emailState.email }));
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
     },
@@ -117,18 +119,19 @@ const Card = w((props, ref) => {
     };
   };
   const initFieldStatus = () => {
-    const field = session.checkout.field;
+    const { field, sessionMode } = session.checkout;
     const { email, address, holderName } = field;
-    if (showEmail && !(email == null ? void 0 : email.show)) {
-      email.show = true;
-      email.disabled = true;
-    }
-    if (showAddress && !(address == null ? void 0 : address.show)) {
-      address.show = true;
-    }
-    if (showHolderName && !(holderName == null ? void 0 : holderName.show)) {
-      holderName.show = true;
-      holderName.disabled = true;
+    if (sessionMode === SessionMode.COMPONENT) {
+      if (email.disabled) {
+        email.show = showEmail;
+      }
+      if (showAddress && !(address == null ? void 0 : address.show)) {
+        address.show = true;
+      }
+      if (showHolderName && !(holderName == null ? void 0 : holderName.show)) {
+        holderName.show = true;
+        holderName.disabled = true;
+      }
     }
     setFieldStatus({ ...field });
   };
@@ -148,7 +151,7 @@ const Card = w((props, ref) => {
     if (sessionMode === SessionMode.DROP_IN && !isDropIn) {
       (_b2 = (_a2 = props.core.config).onInitError) == null ? void 0 : _b2.call(
         _a2,
-        new PayKKaError("ERROR", "Please send the correct mode when creating the checkout")
+        new PayKKaError("ERROR", "Please send the correct session when creating the checkout")
       );
       return;
     }
@@ -172,6 +175,7 @@ const Card = w((props, ref) => {
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
       (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      core.resetEnablePaymentMethod();
     },
     [i18n, props.onTimeout]
   );
@@ -179,6 +183,11 @@ const Card = w((props, ref) => {
     var _a2;
     (_a2 = props.onSuccess) == null ? void 0 : _a2.call(props, getPaymentSuccessData());
   };
+  const processOnError = (error) => {
+    var _a2;
+    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    core.resetEnablePaymentMethod();
+  };
   const { start: startReFetchPayInfo } = useRetry((timeout) => pay(true, timeout), {
     onTimeout: () => onTimeout(i18n.get("common.queryTimeout"))
   });
@@ -277,7 +286,7 @@ const Card = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2;
     try {
       const paymentParams = await getPaymentParams();
       if (!search && security) {
@@ -285,10 +294,16 @@ const Card = w((props, ref) => {
         return { end: true };
       }
       const options = { locale: i18n.locale, timeout };
-      const res = search ? await getCardPayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        options
-      ) : await cardPay(paymentParams, options);
+      let res = {};
+      if (search) {
+        res = await getCardPayInfo(
+          { sessionId: session.sessionId, clientKey: session.clientKey },
+          options
+        );
+      } else {
+        const extraParams = (_c2 = (_b2 = core.config)._getExtraParams) == null ? void 0 : _c2.call(_b2, "payment", paymentParams.payment.paymentMethod);
+        res = await cardPay(paymentParams, extraParams, options);
+      }
       return processAfterPayment(res, search);
     } catch (error) {
       if (isTimeoutError(error)) {
@@ -301,7 +316,7 @@ const Card = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_b2 = props.onError) == null ? void 0 : _b2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_d2 = props.onError) == null ? void 0 : _d2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         stopReFetchCardPay3DSInfo();
         return { end: true };
@@ -330,7 +345,7 @@ const Card = w((props, ref) => {
     checkThreeDS();
   };
   const processAfterPayment = (res, search = false) => {
-    var _a2, _b2, _c2;
+    var _a2, _b2;
     const { status, orderStatus, errorMessage, errorCode, threeDSUrl } = res;
     if (status === "PROCESSING") {
       if (!orderStatus) {
@@ -344,10 +359,10 @@ const Card = w((props, ref) => {
       } else if (orderStatus === "FAILURE") {
         setErrorMsg(errorMessage);
         setSubmitButtonStatus("unSubmit");
-        (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+        processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
       } else if (orderStatus === "AUTHORIZED") {
         setSubmitButtonStatus("unSubmit");
-        (_b2 = props.onAuthorized) == null ? void 0 : _b2.call(props);
+        (_a2 = props.onAuthorized) == null ? void 0 : _a2.call(props);
       } else if (orderStatus === "IN_THREED") {
         processThreeDS(threeDSUrl, false);
       } else if (orderStatus === "IN_PREVIOUS_THREED") {
@@ -360,19 +375,17 @@ const Card = w((props, ref) => {
       return { end: true };
     } else if (status === "EXPIRED") {
       setSubmitButtonStatus("unSubmit");
-      (_c2 = props.onExpired) == null ? void 0 : _c2.call(props);
+      (_b2 = props.onExpired) == null ? void 0 : _b2.call(props);
       return { end: true };
     }
     setSubmitButtonStatus("unSubmit");
-    processOnSuccess();
     return { end: true };
   };
   const processPaymentError = (error) => {
-    var _a2;
     const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
     setErrorMsg(message);
     setSubmitButtonStatus("unSubmit");
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+    processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
   };
   const validateForm = () => {
     var _a2;
@@ -386,12 +399,10 @@ const Card = w((props, ref) => {
     validateForm();
   }, [form]);
   const Button = () => {
-    const { transAmount } = (session == null ? void 0 : session.checkout) ?? {};
-    let { symbol = "", amount = "", digits } = transAmount ?? {};
-    let amountStr = "";
-    if (amount && !isUndefined(digits))
-      amountStr = formatAmount(+amount, digits);
-    const text = i18n.get("common.pay") + (Number(amount) ? ` ${symbol}${amountStr}` : "");
+    var _a2;
+    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
+    const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
       SubmitButton,
       {
@@ -420,7 +431,7 @@ const Card = w((props, ref) => {
     }
   );
   async function checkThreeDS(search = false, timeout = 2e4) {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2;
     if (!session)
       return { end: true };
     try {
@@ -441,10 +452,10 @@ const Card = w((props, ref) => {
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
-          (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
         } else if (orderStatus === "AUTHORIZED") {
           setSubmitButtonStatus("unSubmit");
-          (_b2 = props.onAuthorized) == null ? void 0 : _b2.call(props);
+          (_a2 = props.onAuthorized) == null ? void 0 : _a2.call(props);
         } else if (orderStatus === "IN_THREED") {
           setSubmitButtonStatus("loading");
           !search && startReFetchCardPay3DSInfo();
@@ -464,7 +475,7 @@ const Card = w((props, ref) => {
         return { end: true };
       } else if (status === "EXPIRED") {
         setSubmitButtonStatus("unSubmit");
-        (_c2 = props.onExpired) == null ? void 0 : _c2.call(props);
+        (_b2 = props.onExpired) == null ? void 0 : _b2.call(props);
         stopReFetchCardPay3DSInfo();
         return { end: true };
       }
@@ -483,7 +494,7 @@ const Card = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_d2 = props.onError) == null ? void 0 : _d2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_c2 = props.onError) == null ? void 0 : _c2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         stopReFetchCardPay3DSInfo();
         return { end: true };

package/dist/es/components/CardBrands/index.js

@@ -33,8 +33,8 @@ function CardBrands(props) {
     };
   }, []);
   return /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem(), className), style, children: [
-    brands.slice(0, max - 1).map((brand) => /* @__PURE__ */ u(brand.icon, { size: 32 }, brand.code)),
-    !!lastBrand && /* @__PURE__ */ u(lastBrand.icon, { size: 32 }, lastBrand.code),
+    brands.slice(0, max - 1).map((brand) => brand.icon && /* @__PURE__ */ u(brand.icon, { size: 32 }, brand.code)),
+    !!(lastBrand == null ? void 0 : lastBrand.icon) && /* @__PURE__ */ u(lastBrand.icon, { size: 32 }, lastBrand.code),
     left > 0 && /* @__PURE__ */ u("div", { className: bem("more"), children: [
       "+",
       left