@blocklet/payment-react 1.13.213 → 1.13.215

package/es/checkout/donate.js

@@ -37,7 +37,7 @@ const createOrUpdateDonation = (settings, livemode = true) => {
 const supporterCache = {};
 const fetchSupporters = (target) => {
   if (!supporterCache[target]) {
-    supporterCache[target] = api.get(`/api/donations?&target=${target}`).then((res) => res.data).finally(() => {
+    supporterCache[target] = api.get("/api/donations", { params: { target } }).then((res) => res.data).finally(() => {
       setTimeout(() => {
         delete supporterCache[target];
       }, 3e3);
@@ -45,7 +45,7 @@ const fetchSupporters = (target) => {
   }
   return supporterCache[target];
 };
-function SupporterAvatar({ supporters = [], total, currency, method }) {
+function SupporterAvatar({ supporters = [], total = 0, currency, method }) {
   const { t } = useLocaleContext();
   const customers = uniqBy(supporters, "customer_did");
   return /* @__PURE__ */ jsxs(
@@ -80,7 +80,7 @@ function SupporterAvatar({ supporters = [], total, currency, method }) {
     }
   );
 }
-function SupporterTable({ supporters = [], total, currency, method }) {
+function SupporterTable({ supporters = [], total = 0, currency, method }) {
   const { t } = useLocaleContext();
   return /* @__PURE__ */ jsxs(Box, { display: "flex", flexDirection: "column", alignItems: "center", sx: { width: "100%" }, gap: { xs: 0.5, sm: 1 }, children: [
     /* @__PURE__ */ jsx(Typography, { component: "p", color: "text.secondary", children: t("payment.checkout.donation.summary", { total }) }),

package/es/util.d.ts

@@ -10,8 +10,8 @@ export declare function formatDateTime(date: Date | string | number, locale?: st
 export declare const formatLocale: (locale?: string) => string;
 export declare const formatPrettyMsLocale: (locale: string) => "zh_CN" | "en_US";
 export declare const formatError: (err: any) => any;
-export declare function formatBNStr(str?: string, decimals?: number, precision?: number, trim?: boolean): any;
-export declare function formatNumber(n: number | string, precision?: number, trim?: boolean): any;
+export declare function formatBNStr(str?: string, decimals?: number, precision?: number, trim?: boolean): string;
+export declare function formatNumber(n: number | string, precision?: number, trim?: boolean): string;
 export declare const formatPrice: (price: TPrice, currency: TPaymentCurrency, unit_label?: string, quantity?: number, bn?: boolean, locale?: string) => string;
 export declare const formatPriceAmount: (price: TPrice, currency: TPaymentCurrency, unit_label?: string, quantity?: number, bn?: boolean) => string;
 export declare function getStatementDescriptor(items: any[]): any;

package/es/util.js

@@ -78,7 +78,12 @@ export function formatNumber(n, precision = 6, trim = true) {
     thousandSeparated: true,
     ...(precision || precision === 0) && { mantissa: precision }
   };
-  return trim ? trimEnd(num.format(options), "0.") : num.format(options);
+  const result = num.format(options);
+  if (!trim) {
+    return result;
+  }
+  const [left, right] = result.split(".");
+  return right ? [left, trimEnd(right, "0")].filter(Boolean).join(".") : left;
 }
 export const formatPrice = (price, currency, unit_label, quantity = 1, bn = true, locale = "en") => {
   if (price.custom_unit_amount) {

package/lib/checkout/donate.js

@@ -31,7 +31,11 @@ const createOrUpdateDonation = (settings, livemode = true) => {
 const supporterCache = {};
 const fetchSupporters = target => {
   if (!supporterCache[target]) {
-    supporterCache[target] = _api.default.get(`/api/donations?&target=${target}`).then(res => res.data).finally(() => {
+    supporterCache[target] = _api.default.get("/api/donations", {
+      params: {
+        target
+      }
+    }).then(res => res.data).finally(() => {
       setTimeout(() => {
         delete supporterCache[target];
       }, 3e3);
@@ -41,7 +45,7 @@ const fetchSupporters = target => {
 };
 function SupporterAvatar({
   supporters = [],
-  total,
+  total = 0,
   currency,
   method
 }) {
@@ -86,7 +90,7 @@ function SupporterAvatar({
 }
 function SupporterTable({
   supporters = [],
-  total,
+  total = 0,
   currency,
   method
 }) {

package/lib/util.d.ts

@@ -10,8 +10,8 @@ export declare function formatDateTime(date: Date | string | number, locale?: st
 export declare const formatLocale: (locale?: string) => string;
 export declare const formatPrettyMsLocale: (locale: string) => "zh_CN" | "en_US";
 export declare const formatError: (err: any) => any;
-export declare function formatBNStr(str?: string, decimals?: number, precision?: number, trim?: boolean): any;
-export declare function formatNumber(n: number | string, precision?: number, trim?: boolean): any;
+export declare function formatBNStr(str?: string, decimals?: number, precision?: number, trim?: boolean): string;
+export declare function formatNumber(n: number | string, precision?: number, trim?: boolean): string;
 export declare const formatPrice: (price: TPrice, currency: TPaymentCurrency, unit_label?: string, quantity?: number, bn?: boolean, locale?: string) => string;
 export declare const formatPriceAmount: (price: TPrice, currency: TPaymentCurrency, unit_label?: string, quantity?: number, bn?: boolean) => string;
 export declare function getStatementDescriptor(items: any[]): any;

package/lib/util.js

@@ -132,7 +132,12 @@ function formatNumber(n, precision = 6, trim = true) {
       mantissa: precision
     })
   };
-  return trim ? (0, _trimEnd.default)(num.format(options), "0.") : num.format(options);
+  const result = num.format(options);
+  if (!trim) {
+    return result;
+  }
+  const [left, right] = result.split(".");
+  return right ? [left, (0, _trimEnd.default)(right, "0")].filter(Boolean).join(".") : left;
 }
 const formatPrice = (price, currency, unit_label, quantity = 1, bn = true, locale = "en") => {
   if (price.custom_unit_amount) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.213",
+  "version": "1.13.215",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -90,7 +90,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
-    "@blocklet/payment-types": "1.13.213",
+    "@blocklet/payment-types": "1.13.215",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
     "@storybook/addon-links": "^7.6.13",
@@ -119,5 +119,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "209467c5da3ab2fa17f5ce802bcd8b086e7c08e5"
+  "gitHead": "cb347916f1833065915dc149f2557944393f83d2"
 }

package/src/checkout/donate.tsx

@@ -64,7 +64,7 @@ const supporterCache: { [key: string]: Promise<DonateHistory> } = {};
 const fetchSupporters = (target: string): Promise<DonateHistory> => {
   if (!supporterCache[target]) {
     supporterCache[target] = api
-      .get(`/api/donations?&target=${target}`)
+      .get('/api/donations', { params: { target } })
       .then((res) => res.data)
       .finally(() => {
         setTimeout(() => {
@@ -77,7 +77,7 @@ const fetchSupporters = (target: string): Promise<DonateHistory> => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function SupporterAvatar({ supporters = [], total, currency, method }: DonateHistory) {
+function SupporterAvatar({ supporters = [], total = 0, currency, method }: DonateHistory) {
   const { t } = useLocaleContext();
   const customers = uniqBy(supporters, 'customer_did');
   return (
@@ -114,7 +114,7 @@ function SupporterAvatar({ supporters = [], total, currency, method }: DonateHis
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function SupporterTable({ supporters = [], total, currency, method }: DonateHistory) {
+function SupporterTable({ supporters = [], total = 0, currency, method }: DonateHistory) {
   const { t } = useLocaleContext();
   return (
     <Box display="flex" flexDirection="column" alignItems="center" sx={{ width: '100%' }} gap={{ xs: 0.5, sm: 1 }}>

package/src/util.ts

@@ -118,7 +118,12 @@ export function formatNumber(n: number | string, precision: number = 6, trim: bo
     thousandSeparated: true,
     ...((precision || precision === 0) && { mantissa: precision }),
   };
-  return trim ? trimEnd(num.format(options), '0.') : num.format(options);
+  const result = num.format(options);
+  if (!trim) {
+    return result;
+  }
+  const [left, right] = result.split('.');
+  return right ? [left, trimEnd(right, '0')].filter(Boolean).join('.') : left;
 }
 
 export const formatPrice = (