@paykka/card-checkout-ui 0.13.16 → 0.14.0

package/dist/es/components/wallets/PicPay/PicPay.js

@@ -9,7 +9,7 @@ import { redirectToPayment } from "../../../utils/redirect.js";
 import { processPaymentStatus, formatPaymentResult } from "../../../utils/payment.js";
 import { isTimeoutError } from "../../../api/http.js";
 import { getBrowserParams } from "../../../api/modules/get-browser-params.js";
-import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../../constant.js";
+import { PaymentMethod, PaymentCategory, COMMON_CLASS_NAME, SessionMode } from "../../../constant.js";
 import { getPicPayInfo, picPay } from "../../../api/modules/pic-pay/index.js";
 import { PayKKaError } from "../../../core/error.js";
 import "../../../out/worldpay-jsc-origin.js";
@@ -18,7 +18,7 @@ import { useRetry } from "../../../hooks/useRetry.js";
 import { createEmailCore, EmailField } from "../../EmailField/EmailField.js";
 import { SubmitButton } from "../../SubmitButton/index.js";
 import { GuideCard } from "../../GuideCard/index.js";
-import { AddressField } from "../../AddressField/index.js";
+import { DEFAULT_ADDRESS, AddressField } from "../../AddressField/index.js";
 import { Info } from "../../internal/Info/Info.js";
 import "../../internal/Form/type.js";
 import "../../internal/Form/context.js";
@@ -30,6 +30,7 @@ import { CPFField } from "../../CPFField/index.js";
 import { Tip } from "../../Tip/index.js";
 const { bem } = useBEM("pic-pay");
 const fieldClassNames = bem("field");
+const CURR_PAYMENT_METHOD = PaymentMethod.PIC_PAY;
 const PicPay = w((props, ref) => {
   var _a;
   const {
@@ -55,19 +56,20 @@ const PicPay = w((props, ref) => {
       var _a2;
       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());
-      validateForm();
+      const address = addressCore.getAddressState();
+      form.address = address;
+      setForm(form);
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(address);
+      validateFormSilently();
     },
     updateEmail: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      const newForm = Object.assign(form, { email: emailState.email });
-      setForm(newForm);
+      form.email = emailState.email;
+      setForm(form);
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
-      validateForm();
+      validateFormSilently();
     },
     payment: () => {
       hidePaymentButton && onSubmit();
@@ -80,25 +82,20 @@ const PicPay = w((props, ref) => {
   const SFPRef = A(null);
   const cpfFieldRef = A(null);
   const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
-  const { setErrorMsg, fraudDetection, i18n, errorMsg, sessionReady } = usePayState(session, props.core);
+  const { setErrorMsg, fraudDetection, i18n, errorMsg, sessionReady, disabled } = usePayState(session, props.core);
   const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
   const [security, setSecurity] = h(false);
   const formRef = A(null);
   const [form, setForm] = h({
     email: "",
-    address: {
-      country: void 0,
-      province: void 0,
-      city: void 0,
-      area: void 0,
-      postCode: void 0,
-      address1: void 0,
-      address2: void 0
-    },
+    address: { ...DEFAULT_ADDRESS },
     cpf: ""
   });
   const [validated, setValidated] = h(false);
   const [fieldStatus, setFieldStatus] = h();
+  const getPaymentMethodContext = () => ({
+    paymentMethod: CURR_PAYMENT_METHOD
+  });
   const initFieldStatus = () => {
     const { field, sessionMode } = session.checkout;
     const { email, address } = field;
@@ -118,15 +115,15 @@ const PicPay = w((props, ref) => {
     (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
       returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
-    }));
+    }), getPaymentMethodContext());
   };
   y(() => {
-    var _a2;
+    var _a2, _b;
     if (!sessionReady) {
       return;
     }
     const { bill = {}, supportMethods = [], country, sessionMode } = (session == null ? void 0 : session.checkout) || {};
-    if (!supportMethods.includes(PaymentMethod.PIC_PAY)) {
+    if (!supportMethods.includes(CURR_PAYMENT_METHOD)) {
       return;
     }
     initFieldStatus();
@@ -136,23 +133,23 @@ const PicPay = w((props, ref) => {
     country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
     form.address.country = country;
-    if (autoQuery && core.processingPaymentMethod === PaymentMethod.PIC_PAY) {
+    if (autoQuery && ((_b = core.payment) == null ? void 0 : _b.currPaymentMethod.value) === CURR_PAYMENT_METHOD) {
       setSubmitButtonStatus("loading");
       startReFetchPayInfo();
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
-    core.resetEnablePaymentMethod();
+    var _a2, _b;
+    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error, getPaymentMethodContext());
+    (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a2, _b;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
-      core.resetEnablePaymentMethod();
+      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props, "retry", getPaymentMethodContext());
+      (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
     },
     [i18n, props.onTimeout]
   );
@@ -165,7 +162,7 @@ const PicPay = w((props, ref) => {
       sessionId: session.sessionId,
       clientKey: session.clientKey,
       payment: {
-        paymentMethod: PaymentMethod.PIC_PAY
+        paymentMethod: CURR_PAYMENT_METHOD
       },
       customer: {
         document: limitedToNumber(form.cpf)
@@ -188,22 +185,23 @@ const PicPay = w((props, ref) => {
   const pay = async (search = false, timeout) => {
     var _a2, _b, _c, _d, _e;
     try {
+      core.payment.currPaymentMethod.value = CURR_PAYMENT_METHOD;
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.PIC_PAY);
+        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", CURR_PAYMENT_METHOD);
         res = await getPicPayInfo(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
-            paymentMethod: PaymentMethod.PIC_PAY
+            paymentMethod: CURR_PAYMENT_METHOD
           },
           extraParams,
           requestOptions
         );
       } else {
         const paymentParams = await getPaymentParams();
-        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.PIC_PAY);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", CURR_PAYMENT_METHOD);
         if (security) {
           (_e = SFPRef.current) == null ? void 0 : _e.payment(paymentParams, extraParams);
           return { end: true };
@@ -226,13 +224,13 @@ const PicPay = w((props, ref) => {
       }
     }
   };
-  const processAfterPayment = (res, search = false) => {
+  const processAfterPayment = async (res, search = false) => {
     var _a2;
-    !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
+    !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res, getPaymentMethodContext()));
     const { errorMessage, errorCode, payInfo, sessionId } = res;
     sessionId && (session.sessionId = sessionId);
     let end = true;
-    processPaymentStatus(res, {
+    await processPaymentStatus(res, {
       onProcessing: () => {
         if (redirectMode === "auto" && (payInfo == null ? void 0 : payInfo.targetUrl)) {
           redirectToPayment(payInfo);
@@ -248,17 +246,19 @@ const PicPay = w((props, ref) => {
         processPaymentError({ message: errorMessage, code: errorCode });
       },
       onCanceled: () => {
-        var _a3;
+        var _a3, _b;
         setSubmitButtonStatus("unSubmit");
-        (_a3 = props.onTimeout) == null ? void 0 : _a3.call(props);
-        core.resetEnablePaymentMethod();
+        (_a3 = props.onTimeout) == null ? void 0 : _a3.call(props, "channel", getPaymentMethodContext());
+        (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
       },
       onExpired: () => {
         var _a3;
         setSubmitButtonStatus("unSubmit");
-        (_a3 = props.onExpired) == null ? void 0 : _a3.call(props);
+        (_a3 = props.onExpired) == null ? void 0 : _a3.call(props, getPaymentMethodContext());
       },
       onDefault: () => {
+        var _a3;
+        (_a3 = core.payment) == null ? void 0 : _a3.resetCurrPaymentMethod();
         setSubmitButtonStatus("unSubmit");
       }
     });
@@ -270,16 +270,12 @@ const PicPay = w((props, ref) => {
     processOnError(new PayKKaError("API_ERROR", message, { code: error == null ? void 0 : error.code, cause: error }));
     setSubmitButtonStatus("unSubmit");
   };
-  const validateForm = () => {
+  const validateFormSilently = () => {
     var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
-      setValidated(true);
-    }).catch(() => {
-      setValidated(false);
-    });
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => setValidated(true)).catch(() => setValidated(false));
   };
   y(() => {
-    validateForm();
+    validateFormSilently();
   }, [form]);
   const onSubmit = async () => {
     var _a2;
@@ -287,7 +283,7 @@ const PicPay = w((props, ref) => {
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors, getPaymentMethodContext());
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -317,12 +313,12 @@ const PicPay = w((props, ref) => {
     const error = data.errorTip && i18n.get(data.errorTip);
     (_a2 = cpfFieldRef.current) == null ? void 0 : _a2.resetValidation(data.status, error);
     setTimeout(() => {
-      validateForm();
+      validateFormSilently();
     }, 100);
   };
   const setFormRef = (dom) => {
     formRef.current = dom;
-    dom && validateForm();
+    dom && validateFormSilently();
   };
   const Button = () => {
     var _a2;
@@ -334,6 +330,7 @@ const PicPay = w((props, ref) => {
       {
         className: bem("button"),
         status: submitButtonStatus,
+        disabled,
         text,
         loadingText: i18n.get("common.payProcessing"),
         successText: i18n.get("common.paySuccess"),
@@ -348,7 +345,7 @@ const PicPay = w((props, ref) => {
       {
         ref: emailFieldRef,
         value: form.email,
-        disabled: fieldStatus == null ? void 0 : fieldStatus.email.disabled
+        disabled: (fieldStatus == null ? void 0 : fieldStatus.email.disabled) || disabled
       }
     ) }) });
   };
@@ -356,14 +353,13 @@ const PicPay = w((props, ref) => {
     return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    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) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
-        onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
+        onChange: (value) => setForm(Object.assign(form, { address: value })),
+        disabled
       }
     ) }) });
   };
@@ -383,7 +379,9 @@ const PicPay = w((props, ref) => {
             SecuredFieldsProvider,
             {
               ref: SFPRef,
+              core,
               i18n,
+              disabled,
               checkoutId: core.id,
               style: defaultInputStyleConfig,
               sessionMode: (_a = session.checkout) == null ? void 0 : _a.sessionMode,
@@ -392,7 +390,18 @@ const PicPay = w((props, ref) => {
               onPaymentError,
               onPaymentTimeout: ({ message }) => onTimeout(i18n.get(message)),
               onValidStatusChanged: onFieldValidStatusChanged,
-              children: /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(CPFField, { ref: cpfFieldRef, security }) })
+              onEvent: (type, data) => {
+                var _a2, _b;
+                return (_b = (_a2 = core.config).onEvent) == null ? void 0 : _b.call(_a2, type, data);
+              },
+              children: /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
+                CPFField,
+                {
+                  ref: cpfFieldRef,
+                  security,
+                  disabled
+                }
+              ) })
             }
           ),
           Address(),

package/dist/es/components/wallets/Pix/Pix.js

@@ -9,7 +9,7 @@ import { redirectToPayment } from "../../../utils/redirect.js";
 import { processPaymentStatus, formatPaymentResult } from "../../../utils/payment.js";
 import { isTimeoutError } from "../../../api/http.js";
 import { getBrowserParams } from "../../../api/modules/get-browser-params.js";
-import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../../constant.js";
+import { PaymentMethod, PaymentCategory, COMMON_CLASS_NAME, SessionMode } from "../../../constant.js";
 import { getPixPayInfo, pixPay } from "../../../api/modules/pix/index.js";
 import { PayKKaError } from "../../../core/error.js";
 import "../../../out/worldpay-jsc-origin.js";
@@ -18,7 +18,7 @@ import { useRetry } from "../../../hooks/useRetry.js";
 import { createEmailCore, EmailField } from "../../EmailField/EmailField.js";
 import { SubmitButton } from "../../SubmitButton/index.js";
 import { GuideCard } from "../../GuideCard/index.js";
-import { AddressField } from "../../AddressField/index.js";
+import { DEFAULT_ADDRESS, AddressField } from "../../AddressField/index.js";
 import { Info } from "../../internal/Info/Info.js";
 import "../../internal/Form/type.js";
 import "../../internal/Form/context.js";
@@ -30,6 +30,7 @@ import { CPFField } from "../../CPFField/index.js";
 import { Tip } from "../../Tip/index.js";
 const { bem } = useBEM("pix");
 const fieldClassNames = bem("field");
+const CURR_PAYMENT_METHOD = PaymentMethod.PIX;
 const Pix = w((props, ref) => {
   var _a;
   const {
@@ -55,19 +56,20 @@ const Pix = w((props, ref) => {
       var _a2;
       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());
-      validateForm();
+      const address = addressCore.getAddressState();
+      form.address = address;
+      setForm(form);
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(address);
+      validateFormSilently();
     },
     updateEmail: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      const newForm = Object.assign(form, { email: emailState.email });
-      setForm(newForm);
+      form.email = emailState.email;
+      setForm(form);
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
-      validateForm();
+      validateFormSilently();
     },
     payment: () => {
       hidePaymentButton && onSubmit();
@@ -80,25 +82,20 @@ const Pix = w((props, ref) => {
   const SFPRef = A(null);
   const cpfFieldRef = A(null);
   const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
-  const { setErrorMsg, fraudDetection, i18n, errorMsg, sessionReady } = usePayState(session, props.core);
+  const { setErrorMsg, fraudDetection, i18n, errorMsg, sessionReady, disabled } = usePayState(session, props.core);
   const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
   const [security, setSecurity] = h(false);
   const formRef = A(null);
   const [form, setForm] = h({
     email: "",
-    address: {
-      country: void 0,
-      province: void 0,
-      city: void 0,
-      area: void 0,
-      postCode: void 0,
-      address1: void 0,
-      address2: void 0
-    },
+    address: { ...DEFAULT_ADDRESS },
     cpf: ""
   });
   const [validated, setValidated] = h(false);
   const [fieldStatus, setFieldStatus] = h();
+  const getPaymentMethodContext = () => ({
+    paymentMethod: CURR_PAYMENT_METHOD
+  });
   const initFieldStatus = () => {
     const { field, sessionMode } = session.checkout;
     const { email, address } = field;
@@ -118,15 +115,15 @@ const Pix = w((props, ref) => {
     (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
       returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
-    }));
+    }), getPaymentMethodContext());
   };
   y(() => {
-    var _a2;
+    var _a2, _b;
     if (!sessionReady) {
       return;
     }
     const { bill = {}, supportMethods = [], country, sessionMode } = (session == null ? void 0 : session.checkout) || {};
-    if (!supportMethods.includes(PaymentMethod.PIX)) {
+    if (!supportMethods.includes(CURR_PAYMENT_METHOD)) {
       return;
     }
     initFieldStatus();
@@ -136,23 +133,23 @@ const Pix = w((props, ref) => {
     country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
     form.address.country = country;
-    if (autoQuery && core.processingPaymentMethod === PaymentMethod.PIX) {
+    if (autoQuery && ((_b = core.payment) == null ? void 0 : _b.currPaymentMethod.value) === CURR_PAYMENT_METHOD) {
       setSubmitButtonStatus("loading");
       startReFetchPayInfo();
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
-    core.resetEnablePaymentMethod();
+    var _a2, _b;
+    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error, getPaymentMethodContext());
+    (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a2, _b;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
-      core.resetEnablePaymentMethod();
+      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props, "retry", getPaymentMethodContext());
+      (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
     },
     [i18n, props.onTimeout]
   );
@@ -165,7 +162,7 @@ const Pix = w((props, ref) => {
       sessionId: session.sessionId,
       clientKey: session.clientKey,
       payment: {
-        paymentMethod: PaymentMethod.PIX
+        paymentMethod: CURR_PAYMENT_METHOD
       },
       customer: {
         document: limitedToNumber(form.cpf)
@@ -188,22 +185,23 @@ const Pix = w((props, ref) => {
   const pay = async (search = false, timeout) => {
     var _a2, _b, _c, _d, _e;
     try {
+      core.payment.currPaymentMethod.value = CURR_PAYMENT_METHOD;
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.PIX);
+        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", CURR_PAYMENT_METHOD);
         res = await getPixPayInfo(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
-            paymentMethod: PaymentMethod.PIX
+            paymentMethod: CURR_PAYMENT_METHOD
           },
           extraParams,
           requestOptions
         );
       } else {
         const paymentParams = await getPaymentParams();
-        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.PIX);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", CURR_PAYMENT_METHOD);
         if (security) {
           (_e = SFPRef.current) == null ? void 0 : _e.payment(paymentParams, extraParams);
           return { end: true };
@@ -226,16 +224,12 @@ const Pix = w((props, ref) => {
       }
     }
   };
-  const validateForm = () => {
+  const validateFormSilently = () => {
     var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
-      setValidated(true);
-    }).catch(() => {
-      setValidated(false);
-    });
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => setValidated(true)).catch(() => setValidated(false));
   };
   y(() => {
-    validateForm();
+    validateFormSilently();
   }, [form]);
   const onSubmit = async () => {
     var _a2;
@@ -243,7 +237,7 @@ const Pix = w((props, ref) => {
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors, getPaymentMethodContext());
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -253,13 +247,13 @@ const Pix = w((props, ref) => {
       await pay();
     });
   };
-  const processAfterPayment = (res, search = false) => {
+  const processAfterPayment = async (res, search = false) => {
     var _a2;
-    !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
+    !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res, getPaymentMethodContext()));
     const { errorMessage, errorCode, payInfo, sessionId } = res;
     sessionId && (session.sessionId = sessionId);
     let end = true;
-    processPaymentStatus(res, {
+    await processPaymentStatus(res, {
       onProcessing: () => {
         if (redirectMode === "auto" && (payInfo == null ? void 0 : payInfo.targetUrl)) {
           redirectToPayment(payInfo);
@@ -275,17 +269,19 @@ const Pix = w((props, ref) => {
         processPaymentError({ message: errorMessage, code: errorCode });
       },
       onCanceled: () => {
-        var _a3;
+        var _a3, _b;
         setSubmitButtonStatus("unSubmit");
-        (_a3 = props.onTimeout) == null ? void 0 : _a3.call(props);
-        core.resetEnablePaymentMethod();
+        (_a3 = props.onTimeout) == null ? void 0 : _a3.call(props, "channel", getPaymentMethodContext());
+        (_b = core.payment) == null ? void 0 : _b.resetCurrPaymentMethod();
       },
       onExpired: () => {
         var _a3;
         setSubmitButtonStatus("unSubmit");
-        (_a3 = props.onExpired) == null ? void 0 : _a3.call(props);
+        (_a3 = props.onExpired) == null ? void 0 : _a3.call(props, getPaymentMethodContext());
       },
       onDefault: () => {
+        var _a3;
+        (_a3 = core.payment) == null ? void 0 : _a3.resetCurrPaymentMethod();
         setSubmitButtonStatus("unSubmit");
       }
     });
@@ -317,12 +313,12 @@ const Pix = w((props, ref) => {
     const error = data.errorTip && i18n.get(data.errorTip);
     (_a2 = cpfFieldRef.current) == null ? void 0 : _a2.resetValidation(data.status, error);
     setTimeout(() => {
-      validateForm();
+      validateFormSilently();
     }, 100);
   };
   const setFormRef = (dom) => {
     formRef.current = dom;
-    dom && validateForm();
+    dom && validateFormSilently();
   };
   const Button = () => {
     var _a2;
@@ -338,7 +334,8 @@ const Pix = w((props, ref) => {
         loadingText: i18n.get("common.payProcessing"),
         successText: i18n.get("common.paySuccess"),
         onClick: onSubmit,
-        verified: validated
+        verified: validated,
+        disabled
       }
     );
   };
@@ -348,7 +345,7 @@ const Pix = w((props, ref) => {
       {
         ref: emailFieldRef,
         value: form.email,
-        disabled: fieldStatus == null ? void 0 : fieldStatus.email.disabled
+        disabled: (fieldStatus == null ? void 0 : fieldStatus.email.disabled) || disabled
       }
     ) }) });
   };
@@ -356,14 +353,13 @@ const Pix = w((props, ref) => {
     return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    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) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
-        onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
+        onChange: (value) => setForm(Object.assign(form, { address: value })),
+        disabled
       }
     ) }) });
   };
@@ -383,7 +379,9 @@ const Pix = w((props, ref) => {
             SecuredFieldsProvider,
             {
               ref: SFPRef,
+              core,
               i18n,
+              disabled,
               checkoutId: core.id,
               style: defaultInputStyleConfig,
               sessionMode: (_a = session.checkout) == null ? void 0 : _a.sessionMode,
@@ -392,7 +390,11 @@ const Pix = w((props, ref) => {
               onPaymentError,
               onPaymentTimeout: ({ message }) => onTimeout(i18n.get(message)),
               onValidStatusChanged: onFieldValidStatusChanged,
-              children: /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(CPFField, { ref: cpfFieldRef, security }) })
+              onEvent: (type, data) => {
+                var _a2, _b;
+                return (_b = (_a2 = core.config).onEvent) == null ? void 0 : _b.call(_a2, type, data);
+              },
+              children: /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(CPFField, { disabled, ref: cpfFieldRef, security }) })
             }
           ),
           Address(),