@paykka/card-checkout-ui 0.11.6 → 0.13.2

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

@@ -1,10 +1,12 @@
 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 { deepMerge } from "../../utils/object.js";
+import { formatPaymentResult } from "../../utils/payment.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { SessionMode, PaymentMethod } from "../../constant.js";
 import { getApplePayInfo, applePay, getMerchantSession } from "../../api/modules/apple-pay/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
@@ -29,7 +31,7 @@ async function applePayEnv(id) {
   if (!id || !ApplePaySession)
     return false;
   if (!((_a = ApplePaySession.canMakePayments) == null ? void 0 : _a.call(ApplePaySession))) {
-    return;
+    return false;
   }
   const capabilities = await ((_b = ApplePaySession.applePayCapabilities) == null ? void 0 : _b.call(ApplePaySession, id));
   if ([
@@ -42,21 +44,39 @@ async function applePayEnv(id) {
   return false;
 }
 const { bem } = useBEM("apple-pay");
+const DEFAULT_APPLE_PAY_CONFIG = {
+  request: {
+    requiredBillingContactFields: ["name", "email"],
+    requiredShippingContactFields: ["email"]
+  },
+  button: {
+    buttonStyle: "black",
+    buttonType: "plain"
+  }
+};
 const ApplePay = w((props) => {
-  const { session, isDropIn } = props;
+  const { session, isDropIn, core, config } = props;
   let applePaySession;
   const { i18n, sessionReady, fraudDetection } = usePayState(session, props.core);
   const [errorMsg, setErrorMsg] = h("");
   const [showApplePay, setShowApplePay] = h(false);
-  const getPaymentSuccessData = () => ({
-    returnUrl: session == null ? void 0 : session.checkout.returnUrl
-  });
+  const applePayConfig = deepMerge(DEFAULT_APPLE_PAY_CONFIG, config || {});
+  const processOnSuccess = (res) => {
+    var _a, _b;
+    (_b = props.onSuccess) == null ? void 0 : _b.call(
+      props,
+      formatPaymentResult({
+        ...res,
+        returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
+      })
+    );
+  };
   y(() => {
-    var _a, _b, _c;
+    var _a, _b;
     if (!sessionReady) {
       return;
     }
-    const { status, paymentMethod = [], sessionMode } = (session == null ? void 0 : session.checkout) || {};
+    const { status, supportMethods = [], sessionMode } = (session == null ? void 0 : session.checkout) || {};
     if (sessionMode === SessionMode.DROP_IN && !isDropIn) {
       (_b = (_a = props.core.config).onInitError) == null ? void 0 : _b.call(
         _a,
@@ -64,20 +84,18 @@ const ApplePay = w((props) => {
       );
       return;
     }
-    if (!paymentMethod.includes(PaymentMethod.APPLE_PAY)) {
+    if (!supportMethods.includes(PaymentMethod.APPLE_PAY)) {
       return;
     }
     loadApplePayJS(
       async () => {
-        var _a2, _b2, _c2, _d;
+        var _a2, _b2, _c, _d, _e;
+        (_a2 = props.onLoad) == null ? void 0 : _a2.call(props, true);
         const envSupported = await applePayEnv(
-          (_c2 = (_b2 = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.channelParams) == null ? void 0 : _b2.applePay) == null ? void 0 : _c2.merchantIdentifier
+          (_d = (_c = (_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.channelParams) == null ? void 0 : _c.applePay) == null ? void 0 : _d.merchantIdentifier
         );
-        if (!envSupported) {
-          return;
-        }
-        setShowApplePay(true);
-        (_d = props.onLoad) == null ? void 0 : _d.call(props, true);
+        (_e = props.onCanUse) == null ? void 0 : _e.call(props, envSupported);
+        setShowApplePay(envSupported);
       },
       () => {
         var _a2;
@@ -86,7 +104,7 @@ const ApplePay = w((props) => {
       }
     );
     if (status === "SUCCESS") {
-      (_c = props.onSuccess) == null ? void 0 : _c.call(props, getPaymentSuccessData());
+      processOnSuccess(session == null ? void 0 : session.checkout);
     }
   }, [sessionReady]);
   const onTimeout = q(
@@ -105,59 +123,72 @@ const ApplePay = w((props) => {
   const { start: startReFetchPayInfo } = useRetry((timeout) => pay(true, timeout), {
     onTimeout: () => onTimeout(i18n.get("common.queryTimeout"))
   });
+  const getPaymentParams = async (token, billingContact, shippingContact) => {
+    var _a, _b;
+    const phone = parseE164(billingContact == null ? void 0 : billingContact.phoneNumber);
+    return {
+      sessionId: session.sessionId,
+      clientKey: session.clientKey,
+      bill: {
+        firstName: billingContact == null ? void 0 : billingContact.familyName,
+        lastName: billingContact == null ? void 0 : billingContact.givenName,
+        addressLine1: (_a = billingContact == null ? void 0 : billingContact.addressLines) == null ? void 0 : _a[0],
+        addressLine2: (_b = billingContact == null ? void 0 : billingContact.addressLines) == null ? void 0 : _b[1],
+        state: billingContact == null ? void 0 : billingContact.administrativeArea,
+        city: billingContact == null ? void 0 : billingContact.locality,
+        postalCode: billingContact == null ? void 0 : billingContact.postalCode,
+        areaCode: phone == null ? void 0 : phone.areaCode,
+        phoneNumber: phone == null ? void 0 : phone.phoneNumber,
+        email: (billingContact == null ? void 0 : billingContact.emailAddress) || (shippingContact == null ? void 0 : shippingContact.emailAddress) || (session == null ? void 0 : session.checkout.bill.email),
+        country: billingContact == null ? void 0 : billingContact.countryCode
+      },
+      payment: {
+        paymentMethod: PaymentMethod.APPLE_PAY,
+        tokenData: JSON.stringify({ token })
+      },
+      browser: await getBrowserParams({
+        fraudDetectionId: await (fraudDetection == null ? void 0 : fraudDetection.getFraudDetectionId())
+      })
+    };
+  };
   async function pay(search = false, timeout, token, billingContact, shippingContact) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     setErrorMsg("");
     try {
-      const res = await (search ? getApplePayInfo(
-        {
-          sessionId: session.sessionId,
-          clientKey: session.clientKey
-        },
-        { locale: i18n.locale, timeout }
-      ) : async function() {
-        var _a2, _b2;
-        const phone = parseE164(billingContact == null ? void 0 : billingContact.phoneNumber);
-        return applePay(
+      const requestOptions = { locale: i18n.locale, timeout };
+      let res = null;
+      if (search) {
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.APPLE_PAY);
+        res = await getApplePayInfo(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
-            token: JSON.stringify({
-              token
-            }),
-            bill: {
-              firstName: billingContact == null ? void 0 : billingContact.familyName,
-              lastName: billingContact == null ? void 0 : billingContact.givenName,
-              addressLine1: (_a2 = billingContact == null ? void 0 : billingContact.addressLines) == null ? void 0 : _a2[0],
-              addressLine2: (_b2 = billingContact == null ? void 0 : billingContact.addressLines) == null ? void 0 : _b2[1],
-              state: billingContact == null ? void 0 : billingContact.administrativeArea,
-              city: billingContact == null ? void 0 : billingContact.locality,
-              postalCode: billingContact == null ? void 0 : billingContact.postalCode,
-              areaCode: phone == null ? void 0 : phone.areaCode,
-              phoneNumber: phone == null ? void 0 : phone.phoneNumber,
-              email: (billingContact == null ? void 0 : billingContact.emailAddress) || (shippingContact == null ? void 0 : shippingContact.emailAddress) || (session == null ? void 0 : session.checkout.bill.email),
-              country: billingContact == null ? void 0 : billingContact.countryCode
-            },
-            browser: await getBrowserParams({
-              fraudDetectionId: await (fraudDetection == null ? void 0 : fraudDetection.getFraudDetectionId())
-            })
+            paymentMethod: PaymentMethod.APPLE_PAY
           },
-          props.core,
-          { locale: i18n.locale }
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.APPLE_PAY);
+        res = await applePay(
+          await getPaymentParams(token, billingContact, shippingContact),
+          extraParams,
+          requestOptions
         );
-      }());
-      const { status, orderStatus, errorMessage, errorCode } = res;
+      }
+      const { status, orderStatus, errorMessage, errorCode, sessionId } = res;
+      sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
         if (orderStatus === "SUCCESS") {
           applePaySession.completePayment({ status: 0 });
-          (_a = props.onSuccess) == null ? void 0 : _a.call(props, getPaymentSuccessData());
+          processOnSuccess(res);
           return { end: true };
         } else if (orderStatus === "PROCESSING") {
           !search && await startReFetchPayInfo();
           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 }));
+          errorMessage && setErrorMsg(errorMessage);
+          (_e = props.onError) == null ? void 0 : _e.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           applePaySession.completePayment({
             status: 1,
             errors: [new ApplePayError("unknown", void 0, errorMessage)]
@@ -165,7 +196,7 @@ const ApplePay = w((props) => {
           return { end: true };
         } else if (orderStatus === "AUTHORIZED") {
           applePaySession.completePayment({ status: 0 });
-          (_c = props.onAuthorized) == null ? void 0 : _c.call(props);
+          (_f = props.onAuthorized) == null ? void 0 : _f.call(props);
           return { end: true };
         } else if (!orderStatus) {
           applePaySession.completePayment({
@@ -175,15 +206,15 @@ const ApplePay = w((props) => {
           return { end: true };
         }
       } else if (status === "SUCCESS") {
-        (_d = props.onSuccess) == null ? void 0 : _d.call(props, getPaymentSuccessData());
+        processOnSuccess(res);
         applePaySession.completePayment({ status: 0 });
         return { end: true };
       } else if (status === "EXPIRED") {
-        (_e = props.onExpired) == null ? void 0 : _e.call(props);
+        (_g = props.onExpired) == null ? void 0 : _g.call(props);
         applePaySession.abort();
         return { end: true };
       }
-      (_f = props.onSuccess) == null ? void 0 : _f.call(props, getPaymentSuccessData());
+      processOnSuccess(res);
       return { end: true };
     } catch (error) {
       if (isTimeoutError(error)) {
@@ -195,8 +226,8 @@ const ApplePay = w((props) => {
         }
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
-        setErrorMsg(message);
-        (_g = props.onError) == null ? void 0 : _g.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        message && setErrorMsg(message);
+        (_h = props.onError) == null ? void 0 : _h.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         applePaySession.completePayment({
           status: 1,
           errors: [new ApplePayError("unknown", void 0, message)]
@@ -206,15 +237,15 @@ const ApplePay = w((props) => {
     }
   }
   function onApplePayButtonClicked() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     (_a = props.onBtnClick) == null ? void 0 : _a.call(props);
     if (!ApplePaySession) {
       return;
     }
     const checkout = session == null ? void 0 : session.checkout;
     const { applePay: applePay2 } = (checkout == null ? void 0 : checkout.channelParams) ?? {};
-    const requiredBillingContactFields = ["name", "email"];
-    if (((_b = checkout == null ? void 0 : checkout.bill) == null ? void 0 : _b.billingAddressCollection) === "REQUIRED") {
+    const requiredBillingContactFields = ((_b = applePayConfig.request) == null ? void 0 : _b.requiredBillingContactFields) || [];
+    if (((_c = checkout == null ? void 0 : checkout.bill) == null ? void 0 : _c.billingAddressCollection) === "REQUIRED") {
       requiredBillingContactFields.push("postalAddress");
     }
     const request = {
@@ -224,10 +255,10 @@ const ApplePay = w((props) => {
       // 接口取：会员注册地址
       requiredBillingContactFields,
       // 接口取：required:  "name", "postalAddress", "email"； 否则： "name", "email"
-      requiredShippingContactFields: ["email"],
+      requiredShippingContactFields: (_d = applePayConfig.request) == null ? void 0 : _d.requiredShippingContactFields,
       currencyCode: (checkout == null ? void 0 : checkout.transAmount.currency) ?? "",
       // 接口取
-      supportedNetworks: ((_d = (_c = applePay2 == null ? void 0 : applePay2.supportedNetworks) == null ? void 0 : _c.map) == null ? void 0 : _d.call(_c, (item) => underscoreToUpperCamelCase(item))) ?? [],
+      supportedNetworks: ((_f = (_e = applePay2 == null ? void 0 : applePay2.supportedNetworks) == null ? void 0 : _e.map) == null ? void 0 : _f.call(_e, (item) => underscoreToUpperCamelCase(item))) ?? [],
       // 接口获取
       total: {
         label: (checkout == null ? void 0 : checkout.theme.merchantName) ?? "",
@@ -264,12 +295,13 @@ const ApplePay = w((props) => {
     applePaySession.begin();
   }
   const Button = () => {
+    var _a, _b;
     return /* @__PURE__ */ u("div", { className: bem("button"), children: /* @__PURE__ */ u(
       "apple-pay-button",
       {
         id: "apple-pay-button",
-        buttonstyle: "black",
-        type: "plain",
+        buttonstyle: (_a = applePayConfig.button) == null ? void 0 : _a.buttonStyle,
+        type: (_b = applePayConfig.button) == null ? void 0 : _b.buttonType,
         onClick: onApplePayButtonClicked
       }
     ) });

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

@@ -3,18 +3,17 @@ 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";
-import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../constant.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../constant.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";
@@ -26,7 +25,6 @@ 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,
@@ -34,7 +32,8 @@ const Boost = w((props, ref) => {
     redirectMode = "auto",
     core,
     autoQuery = true,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -46,26 +45,28 @@ const Boost = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a2;
+      var _a;
       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());
+      const newForm = Object.assign(form, { address: addressCore.getAddressState() });
+      setForm(newForm);
+      (_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;
-      setForm(Object.assign(form, { email: emailState.email }));
-      form.email = emailState.email;
-      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      const newForm = Object.assign(form, { email: emailState.email });
+      setForm(newForm);
+      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
       validateForm();
     },
     payment: () => {
       hidePaymentButton && onSubmit();
     }
   }));
-  const addressState = createAddressCore();
+  const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
@@ -76,13 +77,13 @@ const Boost = w((props, ref) => {
   const [form, setForm] = h({
     email: "",
     address: {
-      country: "",
-      province: "",
-      city: "",
-      area: "",
-      postCode: "",
-      address1: "",
-      address2: ""
+      country: void 0,
+      province: void 0,
+      city: void 0,
+      area: void 0,
+      postCode: void 0,
+      address1: void 0,
+      address2: void 0
     }
   });
   const [validated, setValidated] = h(false);
@@ -100,33 +101,43 @@ const Boost = w((props, ref) => {
     }
     setFieldStatus({ ...field });
   };
+  const processOnSuccess = (res) => {
+    var _a, _b;
+    setSubmitButtonStatus("success");
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
+      ...res,
+      returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
+    }));
+  };
   y(() => {
     if (!sessionReady) {
       return;
     }
-    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
-    if (!paymentMethod.includes(PaymentMethod.BOOST)) {
+    const { bill = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
+    if (!supportMethods.includes(PaymentMethod.BOOST)) {
       return;
     }
     initFieldStatus();
     setIsCheckoutEnabled(true);
+    country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
+    form.address.country = country;
     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);
+    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]
@@ -144,34 +155,49 @@ const Boost = w((props, ref) => {
       },
       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
+        addressLine1: form.address.address1,
+        addressLine2: form.address.address2,
+        postalCode: form.address.postCode,
+        country: form.address.country,
+        district: form.address.area,
+        state: form.address.province ? addressCore.getLabel(form.address.province, addressCore.getProvinceOption()) ?? form.address.province : void 0,
+        city: form.address.city ? addressCore.getLabel(form.address.city, addressCore.getCityOptions()) ?? form.address.city : void 0
       },
       browser: await getBrowserParams()
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a, _b, _c, _d, _e, _f, _g;
     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;
+      let res = null;
+      if (search) {
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.BOOST);
+        res = await getBoostPayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.BOOST
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.BOOST);
+        res = await boostPay(await getPaymentParams(), extraParams, requestOptions);
+      }
+      !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") {
         if (!orderStatus) {
           setSubmitButtonStatus("unSubmit");
           return { end: true };
         } else if (orderStatus === "SUCCESS") {
-          setSubmitButtonStatus("success");
-          (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props);
+          processOnSuccess(res);
           return { end: true };
         } else if (orderStatus === "FAILURE") {
-          setErrorMsg(errorMessage);
+          errorMessage && setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
           processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           return { end: true };
@@ -187,17 +213,16 @@ const Boost = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
       } else if (status === "SUCCESS") {
-        setSubmitButtonStatus("success");
-        (_d2 = props.onSuccess) == null ? void 0 : _d2.call(props);
+        processOnSuccess(res);
         return { end: true };
       } else if (status === "EXPIRED") {
         setSubmitButtonStatus("unSubmit");
-        (_e2 = props.onExpired) == null ? void 0 : _e2.call(props);
+        (_g = props.onExpired) == null ? void 0 : _g.call(props);
         return { end: true };
       }
       setSubmitButtonStatus("unSubmit");
@@ -212,7 +237,7 @@ const Boost = w((props, ref) => {
         }
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
-        setErrorMsg(message);
+        message && setErrorMsg(message);
         processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
@@ -220,8 +245,8 @@ const Boost = 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);
@@ -231,12 +256,12 @@ const Boost = 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;
-      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressState.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
+      var _a2;
+      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
+      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -251,8 +276,8 @@ const Boost = 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(
@@ -278,24 +303,17 @@ const Boost = 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 }))
       }
     ) }) });
@@ -305,15 +323,18 @@ const Boost = w((props, ref) => {
     {
       value: {
         i18n,
-        session
+        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.BOOST }),
-        /* @__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()
+          ] })
         ] }) })
       ] })
     }