@paykka/card-checkout-ui 0.11.6 → 0.13.2

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

@@ -1,10 +1,12 @@
 import { w, F, h, q, y, A, 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 { extractAreaCodeAndPhoneNumber } 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 { getGooglePayInfo, googlePay } from "../../api/modules/google-pay/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
@@ -14,7 +16,7 @@ import { useRetry } from "../../hooks/useRetry.js";
 import { Info } from "../internal/Info/Info.js";
 import { loadScript } from "../../utils/load.js";
 import { ThreeDSAuth } from "../ThreeDS/index.js";
-function createGooglePay(checkout, pay, onClick, onCanUse) {
+function createGooglePay(checkout, googlePayConfig, pay, onClick, onCanUse) {
   const {
     transAmount,
     theme: { merchantName }
@@ -128,6 +130,7 @@ function createGooglePay(checkout, pay, onClick, onCanUse) {
     paymentsClient2.isReadyToPay(getGoogleIsReadyToPayRequest()).then(function(response) {
       if (response.result) {
         addGooglePayButton(container);
+        onCanUse == null ? void 0 : onCanUse(true);
       } else {
         onCanUse == null ? void 0 : onCanUse(false);
       }
@@ -138,10 +141,7 @@ function createGooglePay(checkout, pay, onClick, onCanUse) {
   function addGooglePayButton(container) {
     const paymentsClient2 = getGooglePaymentsClient();
     const button = paymentsClient2.createButton({
-      buttonColor: "default",
-      buttonType: "pay",
-      buttonRadius: 8,
-      buttonSizeMode: "fill",
+      ...googlePayConfig == null ? void 0 : googlePayConfig.button,
       onClick: onGooglePaymentButtonClicked,
       allowedPaymentMethods: [baseCardPaymentMethod]
     });
@@ -175,9 +175,19 @@ const loadGooglePayJS = (onload, onerror) => {
   });
 };
 const { bem } = useBEM("google-pay");
+const DEFAULT_GOOGLE_PAY_CONFIG = {
+  button: {
+    buttonColor: "default",
+    buttonType: "pay",
+    buttonRadius: 8,
+    buttonSizeMode: "fill",
+    buttonBorderType: "default_border"
+  }
+};
 const GooglePay = w((props, ref) => {
   var _a;
-  const { session, threeDSFrame, isDropIn } = props;
+  const { session, threeDSFrame, isDropIn, core } = props;
+  const googlePayConfig = deepMerge(DEFAULT_GOOGLE_PAY_CONFIG, props.config || {});
   F(ref, () => ({
     checkThreeDS
   }));
@@ -195,15 +205,19 @@ const GooglePay = w((props, ref) => {
     },
     [i18n, props.onTimeout]
   );
-  const getPaymentSuccessData = () => ({
-    returnUrl: session == null ? void 0 : session.checkout.returnUrl
-  });
+  const processOnSuccess = (res) => {
+    var _a2, _b;
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
+      ...res,
+      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+    }));
+  };
   y(() => {
-    var _a2, _b, _c;
+    var _a2, _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 = (_a2 = props.core.config).onInitError) == null ? void 0 : _b.call(
         _a2,
@@ -211,7 +225,7 @@ const GooglePay = w((props, ref) => {
       );
       return;
     }
-    if (!paymentMethod.includes(PaymentMethod.GOOGLE_PAY)) {
+    if (!supportMethods.includes(PaymentMethod.GOOGLE_PAY)) {
       return;
     }
     loadGooglePayJS(
@@ -228,7 +242,7 @@ const GooglePay = w((props, ref) => {
     );
     setHosted(sessionMode === SessionMode.HOSTED);
     if (status === "SUCCESS") {
-      (_c = props.onSuccess) == null ? void 0 : _c.call(props, getPaymentSuccessData());
+      processOnSuccess(session == null ? void 0 : session.checkout);
     }
   }, [sessionReady]);
   const processThreeDS = (threeDSUrl, incomplete) => {
@@ -258,50 +272,66 @@ const GooglePay = w((props, ref) => {
       onTimeout: () => onTimeout(i18n.get("common.queryTimeout"))
     }
   );
+  const getPaymentParams = async (token, billAddress) => {
+    const phone = extractAreaCodeAndPhoneNumber(billAddress == null ? void 0 : billAddress.phoneNumber);
+    return {
+      sessionId: session.sessionId,
+      clientKey: session.clientKey,
+      payment: {
+        paymentMethod: PaymentMethod.GOOGLE_PAY,
+        tokenData: token ?? ""
+      },
+      bill: {
+        firstName: billAddress == null ? void 0 : billAddress.name,
+        addressLine1: billAddress == null ? void 0 : billAddress.address1,
+        addressLine2: (billAddress == null ? void 0 : billAddress.address2) ?? "" + (billAddress == null ? void 0 : billAddress.address3) ?? "",
+        country: billAddress == null ? void 0 : billAddress.countryCode,
+        state: billAddress == null ? void 0 : billAddress.administrativeArea,
+        city: billAddress == null ? void 0 : billAddress.locality,
+        email: billAddress == null ? void 0 : billAddress.email,
+        postalCode: billAddress == null ? void 0 : billAddress.postalCode,
+        phoneNumber: phone == null ? void 0 : phone.phoneNumber,
+        areaCode: phone == null ? void 0 : phone.areaCode
+      },
+      browser: await getBrowserParams({
+        fraudDetectionId: await (fraudDetection == null ? void 0 : fraudDetection.getFraudDetectionId())
+      })
+    };
+  };
   async function pay(token, billAddress, search = false, timeout) {
-    var _a2, _b, _c, _d, _e, _f, _g, _h;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
     setErrorMsg("");
     if (!search) {
       (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props);
     }
     try {
-      const res = await (search ? getGooglePayInfo(
-        {
-          sessionId: session.sessionId,
-          clientKey: session.clientKey
-        },
-        { locale: i18n.locale, timeout }
-      ) : async function() {
-        const phone = extractAreaCodeAndPhoneNumber(billAddress == null ? void 0 : billAddress.phoneNumber);
-        return googlePay(
+      const requestOptions = { locale: i18n.locale, timeout };
+      let res = null;
+      if (search) {
+        const extraParams = (_c = (_b = core.config)._getExtraParams) == null ? void 0 : _c.call(_b, "query", PaymentMethod.GOOGLE_PAY);
+        res = await getGooglePayInfo(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
-            token: token ?? "",
-            bill: {
-              firstName: billAddress == null ? void 0 : billAddress.name,
-              addressLine1: billAddress == null ? void 0 : billAddress.address1,
-              addressLine2: (billAddress == null ? void 0 : billAddress.address2) ?? "" + (billAddress == null ? void 0 : billAddress.address3) ?? "",
-              country: billAddress == null ? void 0 : billAddress.countryCode,
-              state: billAddress == null ? void 0 : billAddress.administrativeArea,
-              city: billAddress == null ? void 0 : billAddress.locality,
-              email: billAddress == null ? void 0 : billAddress.email,
-              postalCode: billAddress == null ? void 0 : billAddress.postalCode,
-              phoneNumber: phone == null ? void 0 : phone.phoneNumber,
-              areaCode: phone == null ? void 0 : phone.areaCode
-            },
-            browser: await getBrowserParams({
-              fraudDetectionId: await (fraudDetection == null ? void 0 : fraudDetection.getFraudDetectionId())
-            })
+            paymentMethod: PaymentMethod.GOOGLE_PAY
           },
-          props.core,
-          { locale: i18n.locale }
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_e = (_d = core.config)._getExtraParams) == null ? void 0 : _e.call(_d, "payment", PaymentMethod.GOOGLE_PAY);
+        res = await googlePay(
+          await getPaymentParams(token, billAddress),
+          extraParams,
+          requestOptions
         );
-      }());
-      const { status, orderStatus, errorMessage, threeDSUrl, errorCode } = res;
+      }
+      const { status, orderStatus, errorMessage, payInfo = {}, errorCode, sessionId } = res;
+      const { threeDSUrl } = payInfo;
+      sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
         if (orderStatus === "SUCCESS") {
-          (_b = props.onSuccess) == null ? void 0 : _b.call(props, getPaymentSuccessData());
+          processOnSuccess(res);
           return {
             end: true,
             res: { transactionState: "SUCCESS" }
@@ -313,33 +343,33 @@ const GooglePay = w((props, ref) => {
             res: res2.res
           } : await startReFetchPayInfo();
         } else if (orderStatus === "FAILURE") {
-          setErrorMsg(errorMessage);
-          (_c = props.onError) == null ? void 0 : _c.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          errorMessage && setErrorMsg(errorMessage);
+          (_f = props.onError) == null ? void 0 : _f.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           return {
             end: true,
             res: {
               transactionState: "ERROR",
               error: {
                 intent: "PAYMENT_AUTHORIZATION",
-                message: errorMessage,
+                message: errorMessage || "",
                 reason: "OTHER_ERROR"
               }
             }
           };
         } else if (orderStatus === "AUTHORIZED") {
-          (_d = props.onAuthorized) == null ? void 0 : _d.call(props);
+          (_g = props.onAuthorized) == null ? void 0 : _g.call(props);
           return {
             end: true,
             res: { transactionState: "SUCCESS" }
           };
         } else if (orderStatus === "IN_THREED") {
-          processThreeDS(threeDSUrl, false);
+          threeDSUrl && processThreeDS(threeDSUrl, false);
           return {
             end: true,
             res: { transactionState: "SUCCESS" }
           };
         } else if (orderStatus === "IN_PREVIOUS_THREED") {
-          processThreeDS(threeDSUrl, true);
+          threeDSUrl && processThreeDS(threeDSUrl, true);
           return {
             end: true,
             res: { transactionState: "SUCCESS" }
@@ -351,19 +381,19 @@ const GooglePay = w((props, ref) => {
           };
         }
       } else if (status === "SUCCESS") {
-        (_e = props.onSuccess) == null ? void 0 : _e.call(props, getPaymentSuccessData());
+        processOnSuccess(res);
         return {
           end: true,
           res: { transactionState: "SUCCESS" }
         };
       } else if (status === "EXPIRED") {
-        (_f = props.onExpired) == null ? void 0 : _f.call(props);
+        (_h = props.onExpired) == null ? void 0 : _h.call(props);
         return {
           end: true,
           res: { transactionState: "SUCCESS" }
         };
       }
-      (_g = props.onSuccess) == null ? void 0 : _g.call(props, getPaymentSuccessData());
+      processOnSuccess(res);
       return {
         end: false,
         res: { transactionState: "SUCCESS" }
@@ -389,7 +419,7 @@ const GooglePay = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_h = props.onError) == null ? void 0 : _h.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_i = props.onError) == null ? void 0 : _i.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         return {
           end: true,
           res: {
@@ -416,11 +446,13 @@ const GooglePay = w((props, ref) => {
     if (!session)
       return { end: true };
     try {
+      const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.GOOGLE_PAY);
       const res = await getGooglePayInfo(
         {
           sessionId: session.sessionId,
           clientKey: session.clientKey
         },
+        extraParams,
         {
           locale: i18n.locale
         }
@@ -430,9 +462,9 @@ const GooglePay = w((props, ref) => {
         if (orderStatus === "PROCESSING") {
           startReFetchPayInfo();
         } else if (orderStatus === "FAILURE") {
-          setErrorMsg(errorMessage);
+          errorMessage && setErrorMsg(errorMessage);
         } else if (orderStatus === "AUTHORIZED") {
-          (_a2 = props.onAuthorized) == null ? void 0 : _a2.call(props);
+          (_c = props.onAuthorized) == null ? void 0 : _c.call(props);
         } else if (orderStatus === "IN_THREED") {
           !search && startReFetchCardPay3DSInfo();
           return { end: false };
@@ -443,15 +475,15 @@ const GooglePay = w((props, ref) => {
         stopReFetchCardPay3DSInfo();
         return { end: true };
       } else if (status === "SUCCESS") {
-        (_b = props.onSuccess) == null ? void 0 : _b.call(props, getPaymentSuccessData());
+        processOnSuccess(res);
         stopReFetchCardPay3DSInfo();
         return { end: true };
       } else if (status === "EXPIRED") {
-        (_c = props.onExpired) == null ? void 0 : _c.call(props);
+        (_d = props.onExpired) == null ? void 0 : _d.call(props);
         stopReFetchCardPay3DSInfo();
         return { end: true };
       }
-      (_d = props.onSuccess) == null ? void 0 : _d.call(props, getPaymentSuccessData());
+      processOnSuccess(res);
       stopReFetchCardPay3DSInfo();
       return { end: true };
     } catch (error) {
@@ -475,6 +507,7 @@ const GooglePay = w((props, ref) => {
     if (containRef && (session == null ? void 0 : session.checkout) && showGooglePay) {
       const { onGooglePayLoaded } = createGooglePay(
         session == null ? void 0 : session.checkout,
+        googlePayConfig,
         pay,
         props.onBtnClick,
         props.onCanUse
@@ -493,6 +526,7 @@ const GooglePay = w((props, ref) => {
       {
         show: showThreeDSModal,
         theme: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.theme,
+        checkoutId: core.id,
         ...threeDSInfo,
         onClose: handleCloseThreeDSModal
       }

package/dist/es/components/GrabPay/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 { getGrabPayInfo, grabPay } from "../../api/modules/grab-pay/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("grab-pay");
 const fieldClassNames = bem("field");
 const GrabPay = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
   const {
     session,
     showEmail = false,
@@ -34,7 +32,8 @@ const GrabPay = w((props, ref) => {
     core,
     redirectMode = "auto",
     autoQuery = true,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -46,26 +45,28 @@ const GrabPay = 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 GrabPay = 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 GrabPay = 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.GRAB_PAY)) {
+    const { bill = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
+    if (!supportMethods.includes(PaymentMethod.GRAB_PAY)) {
       return;
     }
     initFieldStatus();
     setIsCheckoutEnabled(true);
+    country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
+    form.address.country = country;
     if (autoQuery && core.processingPaymentMethod === PaymentMethod.GRAB_PAY) {
       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 GrabPay = 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 getGrabPayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        requestOptions
-      ) : await grabPay(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.GRAB_PAY);
+        res = await getGrabPayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.GRAB_PAY
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.GRAB_PAY);
+        res = await grabPay(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 GrabPay = 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 GrabPay = 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 GrabPay = 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 GrabPay = 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 GrabPay = 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 GrabPay = 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 GrabPay = 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.GRAB_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()
+          ] })
         ] }) })
       ] })
     }