@paykka/card-checkout-ui 0.13.1 → 0.13.5

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

@@ -3,7 +3,7 @@ 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 { normalizedClass, formatAmount } from "../../utils/format.js";
 import { redirectToPayment } from "../../utils/redirect.js";
 import { formatPaymentResult } from "../../utils/payment.js";
 import { isTimeoutError } from "../../api/http.js";
@@ -25,7 +25,6 @@ import { GuideCard } from "../GuideCard/index.js";
 const { bem } = useBEM("shopee-pay");
 const fieldClassNames = bem("field");
 const ShopeePay = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
   const {
     session,
     showEmail = false,
@@ -46,21 +45,21 @@ const ShopeePay = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
         return;
       const newForm = Object.assign(form, { address: addressCore.getAddressState() });
       setForm(newForm);
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
+      (_a = addressFieldRef.current) == null ? void 0 : _a.update(addressCore.getAddressState());
       validateForm();
     },
     updateEmail: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
       const newForm = Object.assign(form, { email: emailState.email });
       setForm(newForm);
-      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
       validateForm();
     },
     payment: () => {
@@ -103,11 +102,11 @@ const ShopeePay = w((props, ref) => {
     setFieldStatus({ ...field });
   };
   const processOnSuccess = (res) => {
-    var _a2, _b2;
+    var _a, _b;
     setSubmitButtonStatus("success");
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
-      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+      returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
     }));
   };
   y(() => {
@@ -129,16 +128,16 @@ const ShopeePay = w((props, ref) => {
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    var _a;
+    (_a = props.onError) == null ? void 0 : _a.call(props, error);
     core.resetEnablePaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      (_a = props.onTimeout) == null ? void 0 : _a.call(props);
       core.resetEnablePaymentMethod();
     },
     [i18n, props.onTimeout]
@@ -168,12 +167,12 @@ const ShopeePay = w((props, ref) => {
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.SHOPEE_PAY);
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.SHOPEE_PAY);
         res = await getShopeePayInfo(
           {
             sessionId: session.sessionId,
@@ -184,10 +183,10 @@ const ShopeePay = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.SHOPEE_PAY);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.SHOPEE_PAY);
         res = await shopeePay(await getPaymentParams(), extraParams, requestOptions);
       }
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       const { status, orderStatus, errorMessage, errorCode, payInfo, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
@@ -214,7 +213,7 @@ const ShopeePay = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_f2 = props.onTimeout) == null ? void 0 : _f2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
@@ -246,8 +245,8 @@ const ShopeePay = w((props, ref) => {
     }
   };
   const validateForm = () => {
-    var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+    var _a;
+    (_a = formRef.current) == null ? void 0 : _a.validate(void 0, false).then(() => {
       setValidated(true);
     }).catch(() => {
       setValidated(false);
@@ -257,12 +256,12 @@ const ShopeePay = w((props, ref) => {
     validateForm();
   }, [form]);
   const onSubmit = async () => {
-    var _a2;
+    var _a;
     setErrorMsg("");
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
-      var _a3;
+    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
+      var _a2;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -277,8 +276,8 @@ const ShopeePay = w((props, ref) => {
     dom && validateForm();
   };
   const Button = () => {
-    var _a2;
-    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    var _a;
+    const transAmount = (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount;
     const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
     const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
@@ -304,24 +303,17 @@ const ShopeePay = w((props, ref) => {
       }
     ) }) });
   };
-  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" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a, _b;
     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),
+        country: ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -334,13 +326,15 @@ const ShopeePay = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.SHOPEE_PAY }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && Button()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && Button()
+          ] })
         ] }) })
       ] })
     }

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

@@ -3,7 +3,7 @@ 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 { normalizedClass, formatAmount } from "../../utils/format.js";
 import { redirectToPayment } from "../../utils/redirect.js";
 import { formatPaymentResult } from "../../utils/payment.js";
 import { isTimeoutError } from "../../api/http.js";
@@ -25,7 +25,6 @@ import { GuideCard } from "../GuideCard/index.js";
 const { bem } = useBEM("tng-wallet");
 const fieldClassNames = bem("field");
 const TNGWallet = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
   const {
     session,
     showEmail = false,
@@ -46,21 +45,21 @@ const TNGWallet = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
         return;
       const newForm = Object.assign(form, { address: addressCore.getAddressState() });
       setForm(newForm);
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
+      (_a = addressFieldRef.current) == null ? void 0 : _a.update(addressCore.getAddressState());
       validateForm();
     },
     updateEmail: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
       const newForm = Object.assign(form, { email: emailState.email });
       setForm(newForm);
-      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
       validateForm();
     },
     payment: () => {
@@ -103,11 +102,11 @@ const TNGWallet = w((props, ref) => {
     setFieldStatus({ ...field });
   };
   const processOnSuccess = (res) => {
-    var _a2, _b2;
+    var _a, _b;
     setSubmitButtonStatus("success");
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
-      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+      returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
     }));
   };
   y(() => {
@@ -129,16 +128,16 @@ const TNGWallet = w((props, ref) => {
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    var _a;
+    (_a = props.onError) == null ? void 0 : _a.call(props, error);
     core.resetEnablePaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      (_a = props.onTimeout) == null ? void 0 : _a.call(props);
       core.resetEnablePaymentMethod();
     },
     [i18n, props.onTimeout]
@@ -168,12 +167,12 @@ const TNGWallet = w((props, ref) => {
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.TNG_WALLET);
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.TNG_WALLET);
         res = await getTNGWalletPayInfo(
           {
             sessionId: session.sessionId,
@@ -184,10 +183,10 @@ const TNGWallet = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.TNG_WALLET);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.TNG_WALLET);
         res = await tngWalletPay(await getPaymentParams(), extraParams, requestOptions);
       }
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       const { status, orderStatus, errorMessage, errorCode, payInfo, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
@@ -214,7 +213,7 @@ const TNGWallet = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_f2 = props.onTimeout) == null ? void 0 : _f2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
@@ -246,8 +245,8 @@ const TNGWallet = w((props, ref) => {
     }
   };
   const validateForm = () => {
-    var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+    var _a;
+    (_a = formRef.current) == null ? void 0 : _a.validate(void 0, false).then(() => {
       setValidated(true);
     }).catch(() => {
       setValidated(false);
@@ -257,12 +256,12 @@ const TNGWallet = w((props, ref) => {
     validateForm();
   }, [form]);
   const onSubmit = async () => {
-    var _a2;
+    var _a;
     setErrorMsg("");
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
-      var _a3;
+    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
+      var _a2;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -277,8 +276,8 @@ const TNGWallet = w((props, ref) => {
     dom && validateForm();
   };
   const Button = () => {
-    var _a2;
-    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    var _a;
+    const transAmount = (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount;
     const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
     const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
@@ -304,24 +303,17 @@ const TNGWallet = w((props, ref) => {
       }
     ) }) });
   };
-  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" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a, _b;
     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),
+        country: ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -334,13 +326,15 @@ const TNGWallet = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.TNG_WALLET }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && Button()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && Button()
+          ] })
         ] }) })
       ] })
     }

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

@@ -13,13 +13,24 @@ import { safeParse } from "../../utils/index.js";
 import { useBreakpoints } from "../../hooks/useBreakpoints.js";
 import { Icon3DSInfo } from "../internal/icons/Icon3DSInfo.js";
 import { Button } from "../internal/Button/Button.js";
+import { THREE_DS_IFRAME_NAME } from "../SecuredFieldsProvider/index.js";
 const { bem } = useBEM("three-ds-auth");
 const ThreeDSAuth = (props) => {
-  const { show = false, onClose, url, incomplete = true, width, height = "72vh", theme } = props;
+  const {
+    show = false,
+    onClose,
+    url,
+    incomplete = true,
+    width,
+    height = "72vh",
+    theme,
+    checkoutId
+  } = props;
   const breakpoints = useBreakpoints();
   const [continueThreeDs, setContinueThreeDs] = h(false);
   const messageHandler = A();
   const iframeRef = A(null);
+  const [iframeName] = h(`${THREE_DS_IFRAME_NAME}-${checkoutId}-${Date.now()}`);
   const { i18n } = useI18n();
   const handleLastThreeDs = () => {
     setContinueThreeDs(true);
@@ -44,6 +55,10 @@ const ThreeDSAuth = (props) => {
           return;
         }
         const feedbackData = safeParse(data);
+        console.log(feedbackData, checkoutId);
+        if (feedbackData.checkoutId !== checkoutId) {
+          return;
+        }
         switch (feedbackData.action) {
           case MessageAction.CHECK_THREE_DS: {
             onChange(false);
@@ -64,13 +79,23 @@ const ThreeDSAuth = (props) => {
       width: modalWidth,
       height,
       style: {
-        maxWidth: "100vw",
-        maxHeight: "100vh",
-        minHeight: "500px",
-        minWidth: "350px"
+        maxWidth: "calc(100vw - 10px)",
+        maxHeight: "calc(100vh - 100px)",
+        minWidth: "300px"
       },
-      children: /* @__PURE__ */ u("div", { className: bem("content"), children: !incomplete || continueThreeDs ? /* @__PURE__ */ u("iframe", { ref: iframeRef, width: "100%", height: "100%", frameBorder: 0, src: url }) : /* @__PURE__ */ u("div", { className: bem("last-three-ds"), children: [
-        /* @__PURE__ */ u(Icon3DSInfo, { size: 60 }),
+      children: /* @__PURE__ */ u("div", { className: bem("content"), children: !incomplete || continueThreeDs ? /* @__PURE__ */ u(
+        "iframe",
+        {
+          ref: iframeRef,
+          name: iframeName,
+          class: bem("three-ds-iframe"),
+          width: "100%",
+          height: "100%",
+          frameBorder: 0,
+          src: url
+        }
+      ) : /* @__PURE__ */ u("div", { className: bem("last-three-ds"), children: [
+        /* @__PURE__ */ u(Icon3DSInfo, { className: bem("last-three-ds-icon"), size: 60 }),
         /* @__PURE__ */ u("div", { className: bem("last-three-ds-title"), children: [
           /* @__PURE__ */ u("div", { children: i18n.get("threeDS.paymentIncomplete") }),
           /* @__PURE__ */ u("div", { children: i18n.get("threeDS.completeFirst") })

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

@@ -2,7 +2,7 @@ import { w, A, F, h, y, q, u, b } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount } from "../../utils/format.js";
+import { normalizedClass, formatAmount } from "../../utils/format.js";
 import { formatPaymentResult } from "../../utils/payment.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
 import { COMMON_CLASS_NAME, PaymentType, PaymentMethod, SessionMode } from "../../constant.js";
@@ -24,7 +24,7 @@ import { SubmitButton } from "../SubmitButton/index.js";
 const { bem } = useBEM("wechat-pay");
 const fieldClassNames = bem("field");
 const WechatPay = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a;
   const { session, core, showEmail = false, showAddress = false } = props;
   const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
@@ -103,9 +103,9 @@ const WechatPay = w((props, ref) => {
     validateForm();
   }, [form]);
   const processOnSuccess = (res) => {
-    var _a2, _b2;
+    var _a2, _b;
     setSubmitButtonStatus("success");
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(
+    (_b = props.onSuccess) == null ? void 0 : _b.call(
       props,
       formatPaymentResult({
         ...res,
@@ -168,12 +168,12 @@ const WechatPay = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h, _i, _j;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.WECHAT_PAY);
+        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.WECHAT_PAY);
         res = await getWechatPayInfo(
           {
             sessionId: session.sessionId,
@@ -184,12 +184,12 @@ const WechatPay = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.WECHAT_PAY);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.WECHAT_PAY);
         res = await wechatPay(await getPaymentParams(), extraParams, requestOptions);
       }
       const { status, orderStatus, errorMessage, payInfo, errorCode, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       if (status === "PROCESSING") {
         if (!orderStatus) {
           setSubmitButtonStatus("unSubmit");
@@ -200,11 +200,11 @@ const WechatPay = w((props, ref) => {
         } else if (orderStatus === "FAILURE") {
           errorMessage && setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
-          (_f2 = props.onError) == null ? void 0 : _f2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          (_f = props.onError) == null ? void 0 : _f.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           return { end: true };
         } else if (orderStatus === "PROCESSING") {
           if (!search) {
-            await ((_g2 = props.onCallWxPayBox) == null ? void 0 : _g2.call(props, payInfo));
+            await ((_g = props.onCallWxPayBox) == null ? void 0 : _g.call(props, payInfo));
             startReFetchPayInfo();
           }
           return { end: false };
@@ -279,13 +279,6 @@ const WechatPay = w((props, ref) => {
     formRef.current = dom;
     dom && validateForm();
   };
-  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 Email = () => {
     return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.email.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
       EmailField,
@@ -297,13 +290,13 @@ const WechatPay = w((props, ref) => {
     ) }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a2, _b;
     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),
+        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -316,13 +309,15 @@ const WechatPay = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
         Email(),
         Address(),
-        ((_g = session == null ? void 0 : session.checkout) == null ? void 0 : _g.paymentType) === PaymentType.RECURRING && RecurringTip(),
-        !!errorMsg && /* @__PURE__ */ u(Info, { className: bem("error"), content: errorMsg }),
-        Button()
-      ] }) })
+        ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.paymentType) === PaymentType.RECURRING && RecurringTip(),
+        /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+          !!errorMsg && /* @__PURE__ */ u(Info, { className: bem("error"), content: errorMsg }),
+          Button()
+        ] })
+      ] }) }) })
     }
   );
 });

package/dist/es/components/business/QRCodeModal/QRCodeModal.js

@@ -16,6 +16,7 @@ const QRCodeModal = (props) => {
     title,
     bgColor = "#FFFFFF",
     textColor = "#1F1F1F",
+    borderColor = "#000000",
     expiredTime,
     amount,
     icon,
@@ -26,12 +27,11 @@ const QRCodeModal = (props) => {
   const breakpoints = useBreakpoints();
   const useRoundBorder = !bgColor || ["transparent", "white", "#FFFFFF"].includes(bgColor);
   const RoundBorder = () => {
-    return /* @__PURE__ */ u("div", { className: bem("round-border"), children: [
-      /* @__PURE__ */ u("div", { className: bem("round-border-item") }),
-      /* @__PURE__ */ u("div", { className: bem("round-border-item") }),
-      /* @__PURE__ */ u("div", { className: bem("round-border-item") }),
-      /* @__PURE__ */ u("div", { className: bem("round-border-item") })
-    ] });
+    return /* @__PURE__ */ u("div", {
+      className: bem("round-border"),
+      // 表示4个边角
+      children: Array.from({ length: 4 }).map((_, index) => /* @__PURE__ */ u("div", { className: bem("round-border-item"), style: { borderColor } }, index))
+    });
   };
   return /* @__PURE__ */ u(
     Modal,

package/dist/es/components/index.js

@@ -39,3 +39,8 @@ import "./ShopeePay/index.js";
 import "./wallets/GCash/GCash.js";
 import "./wallets/Paymaya/Paymaya.js";
 import "./wallets/Zalopay/Zalopay.js";
+import "./wallets/Vietqr/Vietqr.js";
+import "./wallets/Pix/Pix.js";
+import "./wallets/PicPay/PicPay.js";
+import "./wallets/PagaWallet/PagaWallet.js";
+import "./wallets/OpayWallet/OpayWallet.js";

package/dist/es/components/internal/Form/FormItem.js

@@ -5,7 +5,7 @@ import { isNil } from "../../../utils/is.js";
 import "../../../utils/card-brand/brands.js";
 import "../../../utils/system-info/get-browser-info.js";
 import { normalizedClass } from "../../../utils/format.js";
-import { set } from "../../../utils/obj.js";
+import { set } from "../../../utils/object.js";
 import { FormItemContext, FormContext } from "./context.js";
 import { formItemBEM, formItemLabelClassName, formItemErrorMessageClassName } from "./type.js";
 import { getActiveRules } from "./util.js";

package/dist/es/components/internal/Form/util.js

@@ -1,5 +1,5 @@
 import { getIf } from "../../../utils/index.js";
-import { set } from "../../../utils/obj.js";
+import { set } from "../../../utils/object.js";
 import { isArray } from "../../../utils/is.js";
 function isIncludeTrigger(ruleItem, trigger) {
   if (!trigger)