@blocklet/payment-react 1.18.20 → 1.18.22

package/lib/components/over-due-invoice-payment.js

@@ -43,7 +43,8 @@ function OverdueInvoicePayment({
   detailLinkOptions = {
     enabled: true
   },
-  successToast = true
+  successToast = true,
+  alertMessage = ""
 }) {
   const {
     t
@@ -274,19 +275,25 @@ function OverdueInvoicePayment({
       });
     }
     if (customerId) {
+      let title = "";
       if (summaryList.length === 1) {
-        return t("payment.customer.overdue.title", {
+        title = t("payment.customer.overdue.title", {
           subscriptionCount: data.subscriptionCount || 0,
           count: data.invoices?.length,
           total: (0, _util.formatAmount)(summaryList[0]?.amount, summaryList[0]?.currency?.decimal),
           symbol: summaryList[0]?.currency?.symbol,
           method: getMethodText(summaryList[0]?.method)
         });
+      } else {
+        title = t("payment.customer.overdue.simpleTitle", {
+          subscriptionCount: data.subscriptionCount || 0,
+          count: data.invoices?.length
+        });
       }
-      return t("payment.customer.overdue.simpleTitle", {
-        subscriptionCount: data.subscriptionCount || 0,
-        count: data.invoices?.length
-      });
+      if (alertMessage) {
+        return `${title}${alertMessage}`;
+      }
+      return `${title}${t("payment.customer.overdue.defaultAlert")}`;
     }
     return "";
   };
@@ -442,6 +449,7 @@ OverdueInvoicePayment.defaultProps = {
   },
   subscriptionId: void 0,
   customerId: void 0,
-  successToast: true
+  successToast: true,
+  alertMessage: ""
 };
 module.exports = OverdueInvoicePayment;

package/lib/libs/phone-validator.d.ts

@@ -1,2 +1,9 @@
 export declare const getPhoneUtil: () => Promise<any>;
 export declare const validatePhoneNumber: (phoneNumber: string) => Promise<any>;
+/**
+ * Format a phone number to international format
+ * @param phoneNumber The original phone number
+ * @param defaultCountry Default country code (ISO 3166-1 alpha-2)
+ * @returns Formatted phone number
+ */
+export declare const formatPhone: (phoneNumber: string | undefined, defaultCountry?: string) => string;

package/lib/libs/phone-validator.js

@@ -3,13 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validatePhoneNumber = exports.getPhoneUtil = void 0;
+exports.validatePhoneNumber = exports.getPhoneUtil = exports.formatPhone = void 0;
 let phoneUtil = null;
 const getPhoneUtil = async () => {
   if (!phoneUtil) {
-    const {
-      PhoneNumberUtil
-    } = await Promise.resolve().then(() => require("google-libphonenumber"));
+    const result = await Promise.resolve().then(() => require("google-libphonenumber"));
+    const PhoneNumberUtil = (result.default || result)?.PhoneNumberUtil;
+    if (!PhoneNumberUtil) {
+      throw new Error("PhoneNumberUtil not found");
+    }
     phoneUtil = PhoneNumberUtil.getInstance();
   }
   return phoneUtil;
@@ -17,7 +19,13 @@ const getPhoneUtil = async () => {
 exports.getPhoneUtil = getPhoneUtil;
 const validatePhoneNumber = async phoneNumber => {
   try {
-    const util = await getPhoneUtil();
+    let util = null;
+    try {
+      util = await getPhoneUtil();
+    } catch (err) {
+      const pattern = /^[+]?[(]?[0-9]{3}[)]?[-\s.]?[0-9]{3}[-\s.]?[0-9]{4,6}$/im;
+      return pattern.test(phoneNumber);
+    }
     const parsed = util.parseAndKeepRawInput(phoneNumber);
     return util.isValidNumber(parsed);
   } catch (err) {
@@ -25,4 +33,87 @@ const validatePhoneNumber = async phoneNumber => {
     return false;
   }
 };
-exports.validatePhoneNumber = validatePhoneNumber;
+exports.validatePhoneNumber = validatePhoneNumber;
+const formatPhone = (phoneNumber, defaultCountry = "US") => {
+  if (!phoneNumber || phoneNumber.trim() === "") {
+    return "";
+  }
+  const cleanedNumber = phoneNumber.replace(/[^\d+]/g, "");
+  if (cleanedNumber.startsWith("+")) {
+    return cleanedNumber;
+  }
+  const COUNTRY_CODES = {
+    US: "1",
+    // United States
+    CA: "1",
+    // Canada
+    CN: "86",
+    // China
+    HK: "852",
+    // Hong Kong
+    IN: "91",
+    // India
+    UK: "44",
+    // United Kingdom
+    GB: "44",
+    // United Kingdom
+    JP: "81",
+    // Japan
+    KR: "82",
+    // South Korea
+    AU: "61",
+    // Australia
+    DE: "49",
+    // Germany
+    FR: "33",
+    // France
+    IT: "39",
+    // Italy
+    ES: "34",
+    // Spain
+    BR: "55",
+    // Brazil
+    RU: "7",
+    // Russia
+    MX: "52",
+    // Mexico
+    SG: "65",
+    // Singapore
+    AE: "971"
+    // UAE
+  };
+
+  const COUNTRY_PATTERNS = [[/^1[3-9]\d{9}$/, "86"],
+  // China mobile: 11 digits, starts with 1
+  [/^\d{10}$/, "1"],
+  // US/Canada: 10 digits
+  [/^[6-9]\d{9}$/, "91"],
+  // India: 10 digits, starts with 6-9
+  [/^0[1-9]\d{8,9}$/, "81"],
+  // Japan: 10-11 digits, starts with 0
+  [/^07\d{9}$/, "44"],
+  // UK mobile: 11 digits, starts with 07
+  [/^04\d{8}$/, "61"],
+  // Australia mobile: 10 digits, starts with 04
+  [/^01[0-9]\d{7,8}$/, "82"],
+  // Korea mobile: 10-11 digits, starts with 01
+  [/^[0-9]\d{8}$/, "86"]
+  // China landline: 9 digits
+  ];
+
+  let numberToFormat = cleanedNumber;
+  if (numberToFormat.startsWith("0")) {
+    numberToFormat = numberToFormat.substring(1);
+  }
+  for (const [pattern, countryCode2] of COUNTRY_PATTERNS) {
+    if (pattern.test(cleanedNumber)) {
+      if (cleanedNumber.startsWith("0") && !["1", "86"].includes(countryCode2)) {
+        return `+${countryCode2}${cleanedNumber.substring(1)}`;
+      }
+      return `+${countryCode2}${cleanedNumber}`;
+    }
+  }
+  const countryCode = COUNTRY_CODES[defaultCountry.toUpperCase()] || defaultCountry;
+  return `+${countryCode}${numberToFormat}`;
+};
+exports.formatPhone = formatPhone;

package/lib/locales/en.js

@@ -249,7 +249,7 @@ module.exports = (0, _flat.default)({
         warning: "Past due invoices need to be paid immediately, otherwise you can not make new purchases anymore.",
         alert: {
           title: "You have unpaid invoices",
-          description: "Seems you have unpaid invoices from previous subscriptions, new purchases are not allowed unless you have paid all past due invoices.",
+          customMessage: "Please pay immediately, otherwise new purchases or subscriptions will be prohibited.",
           confirm: "Pay Now"
         },
         view: "View Due Invoices"
@@ -325,9 +325,10 @@ module.exports = (0, _flat.default)({
         owner: "Subscription Owner"
       },
       overdue: {
-        title: "You have {count} due invoices for {subscriptionCount} subscriptions, totaling {total} {symbol}{method}. Please pay immediately to avoid service disruption.",
-        simpleTitle: "You have {count} due invoices. Please pay now to ensure uninterrupted service.",
-        empty: "Great! You have no due invoices."
+        title: "You have {count} due invoices for {subscriptionCount} subscriptions, totaling {total} {symbol}{method}. ",
+        simpleTitle: "You have {count} due invoices. ",
+        empty: "Great! You have no due invoices.",
+        defaultAlert: "Please pay immediately to avoid service disruption."
       }
     },
     invoice: {

package/lib/locales/zh.js

@@ -250,6 +250,7 @@ module.exports = (0, _flat.default)({
         alert: {
           title: "\u4F60\u6709\u6B20\u8D39\u8D26\u5355",
           description: "\u770B\u8D77\u6765\u4F60\u6709\u6B20\u8D39\u7684\u8D26\u5355\uFF0C\u5728\u4F60\u652F\u4ED8\u6240\u6709\u6B20\u8D39\u8D26\u5355\u4E4B\u524D\uFF0C\u65B0\u7684\u8D2D\u4E70\u6216\u8005\u8BA2\u9605\u5C06\u88AB\u7981\u6B62\uFF0C\u8BF7\u4E0D\u8981\u8C03\u76AE\u3002",
+          customMessage: "\u8BF7\u7ACB\u5373\u652F\u4ED8\uFF0C\u5426\u5219\u65B0\u7684\u8D2D\u4E70\u6216\u8005\u8BA2\u9605\u5C06\u88AB\u7981\u6B62\u3002",
           confirm: "\u53BB\u652F\u4ED8"
         },
         view: "\u67E5\u770B\u6B20\u8D39\u660E\u7EC6"
@@ -325,9 +326,10 @@ module.exports = (0, _flat.default)({
         owner: "\u8BA2\u9605\u62E5\u6709\u8005"
       },
       overdue: {
-        title: "\u60A8\u6709 {count} \u5F20\u6B20\u8D39\u8D26\u5355\uFF0C\u6D89\u53CA {subscriptionCount} \u4E2A\u8BA2\u9605\uFF0C\u603B\u91D1\u989D {total} {symbol}{method}\u3002\u8BF7\u7ACB\u5373\u652F\u4ED8\uFF0C\u4EE5\u514D\u5F71\u54CD\u60A8\u7684\u4F7F\u7528\u3002",
-        simpleTitle: "\u60A8\u6709 {count} \u5F20\u6B20\u8D39\u8D26\u5355\uFF0C\u8BF7\u7ACB\u5373\u652F\u4ED8\uFF0C\u4EE5\u514D\u5F71\u54CD\u60A8\u7684\u4F7F\u7528\u3002",
-        empty: "\u606D\u559C\uFF01\u60A8\u5F53\u524D\u6CA1\u6709\u6B20\u8D39\u8D26\u5355\u3002"
+        title: "\u60A8\u6709 {count} \u5F20\u6B20\u8D39\u8D26\u5355\uFF0C\u6D89\u53CA {subscriptionCount} \u4E2A\u8BA2\u9605\uFF0C\u603B\u91D1\u989D {total} {symbol}{method}\u3002",
+        simpleTitle: "\u60A8\u6709 {count} \u5F20\u6B20\u8D39\u8D26\u5355,",
+        empty: "\u606D\u559C\uFF01\u60A8\u5F53\u524D\u6CA1\u6709\u6B20\u8D39\u8D26\u5355\u3002",
+        defaultAlert: "\u8BF7\u7ACB\u5373\u652F\u4ED8\uFF0C\u4EE5\u514D\u5F71\u54CD\u60A8\u7684\u4F7F\u7528\u3002"
       }
     },
     invoice: {

package/lib/payment/donation-form.js

@@ -28,6 +28,7 @@ var _productDonation = _interopRequireDefault(require("./product-donation"));
 var _confirm = _interopRequireDefault(require("../components/confirm"));
 var _paymentBeneficiaries = _interopRequireDefault(require("../components/payment-beneficiaries"));
 var _donation = _interopRequireDefault(require("./skeleton/donation"));
+var _phoneValidator = require("../libs/phone-validator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const getBenefits = async (id, url) => {
   const {
@@ -89,18 +90,18 @@ function PaymentInner({
     defaultValues: {
       customer_name: customer?.name || session?.user?.fullName || "",
       customer_email: customer?.email || session?.user?.email || "",
-      customer_phone: customer?.phone || session?.user?.phone || "",
+      customer_phone: (0, _phoneValidator.formatPhone)(customer?.phone || session?.user?.phone || ""),
       payment_method: defaultMethodId,
       payment_currency: defaultCurrencyId,
       billing_address: Object.assign({
-        country: "",
-        state: "",
-        city: "",
-        line1: "",
-        line2: "",
-        postal_code: ""
+        country: session?.user?.address?.country || "",
+        state: session?.user?.address?.province || "",
+        city: session?.user?.address?.city || "",
+        line1: session?.user?.address?.line1 || "",
+        line2: session?.user?.address?.line2 || "",
+        postal_code: session?.user?.address?.postalCode || ""
       }, customer?.address || {}, {
-        country: (0, _util2.isValidCountry)(customer?.address?.country || "") ? customer?.address?.country : "us"
+        country: (0, _util2.isValidCountry)(customer?.address?.country || session?.user?.address?.country || "") ? customer?.address?.country : "us"
       })
     }
   });

package/lib/payment/form/index.js

@@ -18,7 +18,6 @@ var _ufo = require("ufo");
 var _useBus = require("use-bus");
 var _isEmail = _interopRequireDefault(require("validator/es/lib/isEmail"));
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
-var _confirm = _interopRequireDefault(require("../../components/confirm"));
 var _input = _interopRequireDefault(require("../../components/input"));
 var _payment = require("../../contexts/payment");
 var _subscription = require("../../hooks/subscription");
@@ -31,6 +30,7 @@ var _stripe = _interopRequireDefault(require("./stripe"));
 var _mobile = require("../../hooks/mobile");
 var _phoneValidator = require("../../libs/phone-validator");
 var _loadingButton = _interopRequireDefault(require("../../components/loading-button"));
+var _overDueInvoicePayment = _interopRequireDefault(require("../../components/over-due-invoice-payment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const waitForCheckoutComplete = async sessionId => {
   let result;
@@ -58,6 +58,36 @@ const hasDidWallet = user => {
   return connected.some(x => x.provider === "wallet");
 };
 exports.hasDidWallet = hasDidWallet;
+const setUserFormValues = (userInfo, currentValues, setValue, options = {}) => {
+  const {
+    preferExisting = true
+  } = options;
+  const basicFields = {
+    customer_name: userInfo.name || userInfo.fullName,
+    customer_email: userInfo.email,
+    customer_phone: (0, _phoneValidator.formatPhone)(userInfo.phone)
+  };
+  const addressFields = {
+    "billing_address.state": userInfo.address?.state || userInfo.address?.province,
+    "billing_address.line1": userInfo.address?.line1,
+    "billing_address.line2": userInfo.address?.line2,
+    "billing_address.city": userInfo.address?.city,
+    "billing_address.postal_code": userInfo.address?.postal_code || userInfo.address?.postalCode,
+    "billing_address.country": userInfo.address?.country
+  };
+  if (options.showPhone) {
+    addressFields["billing_address.country"] = userInfo.metadata?.phone?.country || userInfo.address?.country;
+  }
+  const allFields = {
+    ...addressFields,
+    ...basicFields
+  };
+  Object.entries(allFields).forEach(([field, value]) => {
+    if (!preferExisting || !currentValues[field.split(".")[0]]) {
+      setValue(field, value);
+    }
+  });
+};
 PaymentForm.defaultProps = {
   onlyShowBtn: false,
   isDonation: false
@@ -148,22 +178,28 @@ function PaymentForm({
   (0, _react.useEffect)(() => {
     if (session?.user) {
       const values = getValues();
-      if (!values.customer_name) {
-        setValue("customer_name", session.user.fullName);
-      }
-      if (!values.customer_email) {
-        setValue("customer_email", session.user.email);
-      }
-      if (!values.customer_phone) {
-        setValue("customer_phone", session.user.phone);
-      }
-    }
-    if (!session?.user) {
-      setValue("customer_name", "");
-      setValue("customer_email", "");
-      setValue("customer_phone", "");
+      setUserFormValues(session.user, values, setValue, {
+        preferExisting: false,
+        showPhone: checkoutSession.phone_number_collection?.enabled
+      });
+    } else {
+      setUserFormValues({
+        name: "",
+        email: "",
+        phone: "",
+        address: {
+          state: "",
+          line1: "",
+          line2: "",
+          city: "",
+          postal_code: ""
+        }
+      }, {}, setValue, {
+        preferExisting: false,
+        showPhone: checkoutSession.phone_number_collection?.enabled
+      });
     }
-  }, [session?.user, getValues, setValue]);
+  }, [session?.user, getValues, setValue, checkoutSession.phone_number_collection?.enabled]);
   (0, _react.useEffect)(() => {
     setValue("payment_method", currencies[paymentCurrencyIndex]?.method?.id);
     setValue("payment_currency", currencies[paymentCurrencyIndex]?.id);
@@ -199,7 +235,7 @@ function PaymentForm({
   });
   const method = paymentMethods.find(x => x.id === paymentMethod);
   const isDonationMode = checkoutSession?.submit_type === "donate" && isDonation;
-  const showForm = session?.user;
+  const showForm = !!session?.user;
   const skipBindWallet = method.type === "stripe";
   const handleConnected = async () => {
     try {
@@ -232,33 +268,9 @@ function PaymentForm({
     } = await _api.default.get("/api/customers/me?fallback=1");
     if (profile) {
       const values = getValues();
-      if (!values.customer_name) {
-        setValue("customer_name", profile.name);
-      }
-      if (!values.customer_email) {
-        setValue("customer_email", profile.email);
-      }
-      if (!values.customer_phone) {
-        setValue("customer_phone", profile.phone);
-      }
-      if (profile.address?.country) {
-        setValue("billing_address.country", profile.address.country);
-      }
-      if (profile.address?.state) {
-        setValue("billing_address.state", profile.address.state);
-      }
-      if (profile.address?.line1) {
-        setValue("billing_address.line1", profile.address.line1);
-      }
-      if (profile.address?.line2) {
-        setValue("billing_address.line2", profile.address.line2);
-      }
-      if (profile.address?.city) {
-        setValue("billing_address.city", profile.address.city);
-      }
-      if (profile.address?.postal_code) {
-        setValue("billing_address.postal_code", profile.address.postal_code);
-      }
+      setUserFormValues(profile, values, setValue, {
+        showPhone: checkoutSession.phone_number_collection?.enabled
+      });
     }
   };
   const onFormSubmit = async data => {
@@ -445,15 +457,31 @@ function PaymentForm({
             }
           }), state.submitting || state.paying ? t("payment.checkout.processing") : buttonText]
         })
-      }), state.customerLimited && /* @__PURE__ */(0, _jsxRuntime.jsx)(_confirm.default, {
-        onConfirm: () => window.open((0, _ufo.joinURL)((0, _util.getPrefix)(), `/customer/invoice/past-due?referer=${encodeURIComponent(window.location.href)}`), "_self"),
-        onCancel: () => setState({
-          customerLimited: false
-        }),
-        confirm: t("payment.customer.pastDue.alert.confirm"),
-        title: t("payment.customer.pastDue.alert.title"),
-        message: t("payment.customer.pastDue.alert.description"),
-        color: "primary"
+      }), state.customerLimited && /* @__PURE__ */(0, _jsxRuntime.jsx)(_overDueInvoicePayment.default, {
+        customerId: customer?.id || session?.user?.did,
+        onPaid: () => {
+          setState({
+            customerLimited: false
+          });
+          onAction();
+        },
+        alertMessage: t("payment.customer.pastDue.alert.customMessage"),
+        detailLinkOptions: {
+          enabled: true,
+          onClick: () => {
+            setState({
+              customerLimited: false
+            });
+            window.open((0, _ufo.joinURL)((0, _util.getPrefix)(), `/customer/invoice/past-due?referer=${encodeURIComponent(window.location.href)}`), "_self");
+          }
+        },
+        dialogProps: {
+          open: state.customerLimited,
+          onClose: () => setState({
+            customerLimited: false
+          }),
+          title: t("payment.customer.pastDue.alert.title")
+        }
       })]
     });
   }
@@ -600,15 +628,31 @@ function PaymentForm({
           })
         })]
       })
-    }), state.customerLimited && /* @__PURE__ */(0, _jsxRuntime.jsx)(_confirm.default, {
-      onConfirm: () => window.open((0, _ufo.joinURL)((0, _util.getPrefix)(), `/customer/invoice/past-due?referer=${encodeURIComponent(window.location.href)}`), "_self"),
-      onCancel: () => setState({
-        customerLimited: false
-      }),
-      confirm: t("payment.customer.pastDue.alert.confirm"),
-      title: t("payment.customer.pastDue.alert.title"),
-      message: t("payment.customer.pastDue.alert.description"),
-      color: "primary"
+    }), state.customerLimited && /* @__PURE__ */(0, _jsxRuntime.jsx)(_overDueInvoicePayment.default, {
+      customerId: customer?.id || session?.user?.didssion?.user?.did,
+      onPaid: () => {
+        setState({
+          customerLimited: false
+        });
+        onAction();
+      },
+      alertMessage: t("payment.customer.pastDue.alert.customMessage"),
+      detailLinkOptions: {
+        enabled: true,
+        onClick: () => {
+          setState({
+            customerLimited: false
+          });
+          window.open((0, _ufo.joinURL)((0, _util.getPrefix)(), `/customer/invoice/past-due?referer=${encodeURIComponent(window.location.href)}`), "_self");
+        }
+      },
+      dialogProps: {
+        open: state.customerLimited,
+        onClose: () => setState({
+          customerLimited: false
+        }),
+        title: t("payment.customer.pastDue.alert.title")
+      }
     })]
   });
 }

package/lib/payment/form/phone.js

@@ -24,6 +24,18 @@ function PhoneInput({
     setValue
   } = (0, _reactHookForm.useFormContext)();
   const values = getValues();
+  const isUpdatingRef = (0, _react.useRef)(false);
+  const safeUpdate = (0, _react.useCallback)(callback => {
+    if (isUpdatingRef.current) return;
+    try {
+      isUpdatingRef.current = true;
+      callback();
+    } finally {
+      requestAnimationFrame(() => {
+        isUpdatingRef.current = false;
+      });
+    }
+  }, []);
   const {
     phone,
     handlePhoneValueChange,
@@ -35,8 +47,10 @@ function PhoneInput({
     value: values[props.name] || "",
     countries: _reactInternationalPhone.defaultCountries,
     onChange: data => {
-      setValue(props.name, data.phone);
-      setValue(countryFieldName, data.country);
+      safeUpdate(() => {
+        setValue(props.name, data.phone);
+        setValue(countryFieldName, data.country);
+      });
     }
   });
   const userCountry = (0, _reactHookForm.useWatch)({
@@ -44,14 +58,16 @@ function PhoneInput({
     name: countryFieldName
   });
   (0, _react.useEffect)(() => {
-    if (userCountry !== country) {
+    if (!userCountry || userCountry === country) return;
+    safeUpdate(() => {
       setCountry(userCountry);
-    }
-  }, [userCountry]);
-  const onCountryChange = v => {
-    setCountry(v);
-    setValue(countryFieldName, v);
-  };
+    });
+  }, [userCountry, country, setCountry, safeUpdate]);
+  const onCountryChange = (0, _react.useCallback)(v => {
+    safeUpdate(() => {
+      setCountry(v);
+    });
+  }, [setCountry, safeUpdate]);
   return (
     // @ts-ignore
     /* @__PURE__ */

package/lib/payment/index.js

@@ -28,6 +28,7 @@ var _payment2 = _interopRequireDefault(require("./skeleton/payment"));
 var _success = _interopRequireDefault(require("./success"));
 var _summary = _interopRequireDefault(require("./summary"));
 var _mobile = require("../hooks/mobile");
+var _phoneValidator = require("../libs/phone-validator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 PaymentInner.defaultProps = {
   completed: false,
@@ -68,18 +69,18 @@ function PaymentInner({
     defaultValues: {
       customer_name: customer?.name || session?.user?.fullName || "",
       customer_email: customer?.email || session?.user?.email || "",
-      customer_phone: customer?.phone || session?.user?.phone || "",
+      customer_phone: (0, _phoneValidator.formatPhone)(customer?.phone || session?.user?.phone || ""),
       payment_method: defaultMethodId,
       payment_currency: defaultCurrencyId,
       billing_address: Object.assign({
-        country: "",
-        state: "",
-        city: "",
-        line1: "",
-        line2: "",
-        postal_code: ""
+        country: session?.user?.address?.country || "",
+        state: session?.user?.address?.province || "",
+        city: session?.user?.address?.city || "",
+        line1: session?.user?.address?.line1 || "",
+        line2: session?.user?.address?.line2 || "",
+        postal_code: session?.user?.address?.postalCode || ""
       }, customer?.address || {}, {
-        country: (0, _util2.isValidCountry)(customer?.address?.country || "") ? customer?.address?.country : "us"
+        country: (0, _util2.isValidCountry)(customer?.address?.country || session?.user?.address?.country || "") ? customer?.address?.country : "us"
       })
     }
   });

package/lib/payment/product-donation.js

@@ -47,9 +47,6 @@ function ProductDonation({
     }
   };
   const getDefaultPreset = () => {
-    if (settings?.amount?.preset) {
-      return formatAmount(settings.amount.preset);
-    }
     try {
       const savedPreset = localStorage.getItem(getUserStorageKey(DONATION_PRESET_KEY_BASE));
       if (savedPreset) {
@@ -65,7 +62,13 @@ function ProductDonation({
     }
     if (presets.length > 0) {
       const middleIndex = Math.floor(presets.length / 2);
-      return presets[middleIndex] || presets[0];
+      return presets[middleIndex];
+    }
+    if (settings?.amount?.preset) {
+      return formatAmount(settings.amount.preset);
+    }
+    if (presets.length > 0) {
+      return presets[0];
     }
     return "0";
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.18.20",
+  "version": "1.18.22",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -54,10 +54,10 @@
     }
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.12.36",
-    "@arcblock/ux": "^2.12.36",
+    "@arcblock/did-connect": "^2.12.43",
+    "@arcblock/ux": "^2.12.43",
     "@arcblock/ws": "^1.19.15",
-    "@blocklet/ui-react": "^2.12.36",
+    "@blocklet/ui-react": "^2.12.43",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
@@ -93,7 +93,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@blocklet/payment-types": "1.18.20",
+    "@blocklet/payment-types": "1.18.22",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -124,5 +124,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "f71a0013f704d58e4c04ebfcc5a35480a0942bcc"
+  "gitHead": "844883f56da79c1222fc5aa1b445abb2859e3230"
 }