@blocklet/payment-react 1.13.214 → 1.13.216

package/es/checkout/donate.js

@@ -175,7 +175,6 @@ export default function CheckoutDonate({ settings, livemode, onPaid, onError })
             title: settings.title,
             maxWidth: "md",
             showCloseButton: true,
-            disableBackdropClick: true,
             disableEscapeKeyDown: true,
             onClose: (e, reason) => setState({ open: reason === "backdropClick" }),
             children: /* @__PURE__ */ jsx(Box, { sx: { mb: 1, mt: -2 }, children: /* @__PURE__ */ jsx(

package/es/history/invoice/list.d.ts

@@ -3,17 +3,19 @@ type Props = {
     customer_id?: string;
     subscription_id?: string;
     currency_id?: string;
+    include_staking?: boolean;
     status?: string;
     pageSize?: number;
     target?: string;
     action?: string;
 };
-declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, status, pageSize, target, action, }: Props): import("react").JSX.Element;
+declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, status, pageSize, target, action, }: Props): import("react").JSX.Element;
 declare namespace CustomerInvoiceList {
     var defaultProps: {
         customer_id: string;
         subscription_id: string;
         currency_id: string;
+        include_staking: boolean;
         status: string;
         pageSize: number;
         target: string;

package/es/history/invoice/list.js

@@ -48,6 +48,7 @@ export default function CustomerInvoiceList({
   customer_id,
   subscription_id,
   currency_id,
+  include_staking,
   status,
   pageSize,
   target,
@@ -58,7 +59,16 @@ export default function CustomerInvoiceList({
   const { data, loadMore, loadingMore, loading } = useInfiniteScroll(
     (d) => {
       const page = d ? Math.ceil(d.list.length / size) + 1 : 1;
-      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id, ignoreZero: true });
+      return fetchData({
+        page,
+        pageSize: size,
+        status,
+        customer_id,
+        currency_id,
+        subscription_id,
+        include_staking,
+        ignore_zero: true
+      });
     },
     {
       reloadDeps: [customer_id, subscription_id, status]
@@ -120,6 +130,7 @@ CustomerInvoiceList.defaultProps = {
   customer_id: "",
   subscription_id: "",
   currency_id: "",
+  include_staking: false,
   status: "open,paid,uncollectible",
   pageSize: 10,
   target: "_self",

package/es/history/mini-invoice/list.js

@@ -53,7 +53,8 @@ export default function MiniInvoiceList() {
       status: "open,paid,uncollectible",
       subscription_id: subscriptionId,
       authToken,
-      ignoreZero: true
+      ignore_zero: true,
+      include_staking: true
     })
   );
   if (error) {

package/es/history/payment/list.js

@@ -70,14 +70,7 @@ export default function CustomerPaymentList({ customer_id }) {
             ] }) }),
             /* @__PURE__ */ jsx(Box, { flex: 3, children: /* @__PURE__ */ jsx(Status, { label: item.status, color: getPaymentIntentStatusColor(item.status) }) }),
             /* @__PURE__ */ jsx(Box, { flex: 3, children: /* @__PURE__ */ jsx(Typography, { children: item.description || "-" }) }),
-            /* @__PURE__ */ jsx(Box, { flex: 3, sx: { minWidth: "220px" }, children: item.payment_details?.arcblock?.tx_hash && /* @__PURE__ */ jsx(
-              TxLink,
-              {
-                details: item.payment_details,
-                method: item.paymentMethod,
-                mode: "customer"
-              }
-            ) })
+            /* @__PURE__ */ jsx(Box, { flex: 3, sx: { minWidth: "220px" }, children: (item.payment_details?.arcblock?.tx_hash || item.payment_details?.ethereum?.tx_hash) && /* @__PURE__ */ jsx(TxLink, { details: item.payment_details, method: item.paymentMethod, mode: "customer" }) })
           ]
         },
         item.id

package/es/payment/form/index.js

@@ -171,6 +171,7 @@ export default function PaymentForm({
             containerEl: void 0,
             action: checkoutSession.mode,
             prefix: joinURL(window.location.origin, getPrefix(), "/api/did"),
+            saveConnect: false,
             extraParams: { checkoutSessionId: checkoutSession.id },
             onSuccess: async () => {
               connect.close();

package/lib/checkout/donate.js

@@ -262,7 +262,6 @@ function CheckoutDonate({
       title: settings.title,
       maxWidth: "md",
       showCloseButton: true,
-      disableBackdropClick: true,
       disableEscapeKeyDown: true,
       onClose: (e, reason) => setState({
         open: reason === "backdropClick"

package/lib/history/invoice/list.d.ts

@@ -3,17 +3,19 @@ type Props = {
     customer_id?: string;
     subscription_id?: string;
     currency_id?: string;
+    include_staking?: boolean;
     status?: string;
     pageSize?: number;
     target?: string;
     action?: string;
 };
-declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, status, pageSize, target, action, }: Props): import("react").JSX.Element;
+declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, status, pageSize, target, action, }: Props): import("react").JSX.Element;
 declare namespace CustomerInvoiceList {
     var defaultProps: {
         customer_id: string;
         subscription_id: string;
         currency_id: string;
+        include_staking: boolean;
         status: string;
         pageSize: number;
         target: string;

package/lib/history/invoice/list.js

@@ -51,6 +51,7 @@ function CustomerInvoiceList({
   customer_id,
   subscription_id,
   currency_id,
+  include_staking,
   status,
   pageSize,
   target,
@@ -74,7 +75,8 @@ function CustomerInvoiceList({
       customer_id,
       currency_id,
       subscription_id,
-      ignoreZero: true
+      include_staking,
+      ignore_zero: true
     });
   }, {
     reloadDeps: [customer_id, subscription_id, status]
@@ -213,6 +215,7 @@ CustomerInvoiceList.defaultProps = {
   customer_id: "",
   subscription_id: "",
   currency_id: "",
+  include_staking: false,
   status: "open,paid,uncollectible",
   pageSize: 10,
   target: "_self",

package/lib/history/mini-invoice/list.js

@@ -47,7 +47,8 @@ function MiniInvoiceList() {
     status: "open,paid,uncollectible",
     subscription_id: subscriptionId,
     authToken,
-    ignoreZero: true
+    ignore_zero: true,
+    include_staking: true
   }));
   if (error) {
     return /* @__PURE__ */(0, _jsxRuntime.jsx)(Position, {

package/lib/history/payment/list.js

@@ -120,7 +120,7 @@ function CustomerPaymentList({
           sx: {
             minWidth: "220px"
           },
-          children: item.payment_details?.arcblock?.tx_hash && /* @__PURE__ */(0, _jsxRuntime.jsx)(_tx.default, {
+          children: (item.payment_details?.arcblock?.tx_hash || item.payment_details?.ethereum?.tx_hash) && /* @__PURE__ */(0, _jsxRuntime.jsx)(_tx.default, {
             details: item.payment_details,
             method: item.paymentMethod,
             mode: "customer"

package/lib/payment/form/index.js

@@ -206,6 +206,7 @@ function PaymentForm({
             containerEl: void 0,
             action: checkoutSession.mode,
             prefix: (0, _ufo.joinURL)(window.location.origin, (0, _util.getPrefix)(), "/api/did"),
+            saveConnect: false,
             extraParams: {
               checkoutSessionId: checkoutSession.id
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.214",
+  "version": "1.13.216",
   "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.214",
+    "@blocklet/payment-types": "1.13.216",
     "@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": "430206bb27ea5749a12717d5bd3caf00a04b610a"
+  "gitHead": "bc5219c800ae2b18883ac598bf91d4c1c2e71523"
 }

package/src/checkout/donate.tsx

@@ -234,7 +234,6 @@ export default function CheckoutDonate({ settings, livemode, onPaid, onError }:
         title={settings.title}
         maxWidth="md"
         showCloseButton
-        disableBackdropClick
         disableEscapeKeyDown
         onClose={(e: any, reason: string) => setState({ open: reason === 'backdropClick' })}>
         <Box sx={{ mb: 1, mt: -2 }}>

package/src/history/invoice/list.tsx

@@ -39,6 +39,7 @@ type Props = {
   customer_id?: string;
   subscription_id?: string;
   currency_id?: string;
+  include_staking?: boolean;
   status?: string;
   pageSize?: number;
   target?: string;
@@ -67,6 +68,7 @@ export default function CustomerInvoiceList({
   customer_id,
   subscription_id,
   currency_id,
+  include_staking,
   status,
   pageSize,
   target,
@@ -78,7 +80,16 @@ export default function CustomerInvoiceList({
   const { data, loadMore, loadingMore, loading } = useInfiniteScroll<Result>(
     (d) => {
       const page = d ? Math.ceil(d.list.length / size) + 1 : 1;
-      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id, ignoreZero: true });
+      return fetchData({
+        page,
+        pageSize: size,
+        status,
+        customer_id,
+        currency_id,
+        subscription_id,
+        include_staking,
+        ignore_zero: true,
+      });
     },
     {
       reloadDeps: [customer_id, subscription_id, status],
@@ -183,6 +194,7 @@ CustomerInvoiceList.defaultProps = {
   customer_id: '',
   subscription_id: '',
   currency_id: '',
+  include_staking: false,
   status: 'open,paid,uncollectible',
   pageSize: 10,
   target: '_self',

package/src/history/mini-invoice/list.tsx

@@ -61,7 +61,8 @@ export default function MiniInvoiceList() {
       status: 'open,paid,uncollectible',
       subscription_id: subscriptionId,
       authToken,
-      ignoreZero: true,
+      ignore_zero: true,
+      include_staking: true,
     })
   );
 

package/src/history/payment/list.tsx

@@ -58,14 +58,14 @@ export default function CustomerPaymentList({ customer_id }: Props) {
 
   const hasMore = data && data.list.length < data.count;
 
-  const grouped = groupByDate(data.list as any);
+  const grouped = groupByDate(data.list);
 
   return (
     <Stack direction="column" gap={1} sx={{ mt: 1 }}>
       {Object.entries(grouped).map(([date, payments]) => (
         <Box key={date}>
           <Typography sx={{ fontWeight: 'bold', color: 'text.secondary', mt: 2, mb: 1 }}>{date}</Typography>
-          {payments.map((item) => (
+          {payments.map((item: TPaymentIntentExpanded) => (
             <Stack
               key={item.id}
               direction={{
@@ -95,12 +95,8 @@ export default function CustomerPaymentList({ customer_id }: Props) {
                 <Typography>{item.description || '-'}</Typography>
               </Box>
               <Box flex={3} sx={{ minWidth: '220px' }}>
-                {(item as any).payment_details?.arcblock?.tx_hash && (
-                  <TxLink
-                    details={(item as any).payment_details}
-                    method={(item as any).paymentMethod}
-                    mode="customer"
-                  />
+                {(item.payment_details?.arcblock?.tx_hash || item.payment_details?.ethereum?.tx_hash) && (
+                  <TxLink details={item.payment_details} method={item.paymentMethod} mode="customer" />
                 )}
               </Box>
             </Stack>

package/src/payment/form/index.tsx

@@ -224,6 +224,7 @@ export default function PaymentForm({
             containerEl: undefined as unknown as Element,
             action: checkoutSession.mode,
             prefix: joinURL(window.location.origin, getPrefix(), '/api/did'),
+            saveConnect: false,
             extraParams: { checkoutSessionId: checkoutSession.id },
             onSuccess: async () => {
               connect.close();