payment-kit 1.13.129 → 1.13.131

package/api/src/libs/session.ts

@@ -60,13 +60,13 @@ export function getCheckoutAmount(items: TLineItemExpanded[], currencyId: string
   const total = items
     .reduce((acc, x) => {
       const price = x.upsell_price || x.price;
-      if (price.type === 'recurring') {
+      if (price?.type === 'recurring') {
         renew = renew.add(new BN(getPriceUintAmountByCurrency(price, currencyId)).mul(new BN(x.quantity)));
 
         if (includeFreeTrial) {
           return acc;
         }
-        if (price.recurring?.usage_type === 'metered') {
+        if (price?.recurring?.usage_type === 'metered') {
           return acc;
         }
       }

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.129
+version: 1.13.131
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.129",
+  "version": "1.13.131",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.108",
     "@arcblock/ux": "^2.9.23",
     "@blocklet/logger": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/payment-react": "1.13.129",
+    "@blocklet/payment-react": "1.13.131",
     "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
     "@blocklet/ui-react": "^2.9.23",
     "@blocklet/uploader": "^0.0.69",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.129",
+    "@blocklet/payment-types": "1.13.131",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4ad81bea01de3268d9cf0bda552a0a0a67abd85d"
+  "gitHead": "a1a5072b1a0c564cce5ba4aee5fc4801cfef4a46"
 }

package/src/app.tsx

@@ -4,6 +4,7 @@ import Center from '@arcblock/ux/lib/Center';
 import { LocaleProvider } from '@arcblock/ux/lib/Locale/context';
 import { ThemeProvider, createTheme } from '@arcblock/ux/lib/Theme';
 import { ToastProvider } from '@arcblock/ux/lib/Toast';
+import { MiniInvoiceList } from '@blocklet/payment-react';
 import { CircularProgress } from '@mui/material';
 import React, { Suspense } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -77,6 +78,7 @@ function App() {
                   </Layout>
                 }
               />
+              <Route key="subscription-embed" path="/customer/embed/subscription" element={<MiniInvoiceList />} />,
               <Route
                 key="customer-invoice"
                 path="/customer/invoice/:id"

package/src/global.css

@@ -13,9 +13,6 @@ a:hover {
   color: rgba(0, 0, 0, 0.87);
   text-decoration: underline;
 }
-a:visited {
-  color: rgba(0, 0, 0, 0.87);
-}
 
 .MuiButton-sizeSmall {
   font-weight: 500;

package/src/pages/admin/billing/subscriptions/detail.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
-import { api, formatError, formatTime } from '@blocklet/payment-react';
+import { TxLink, api, formatError, formatTime } from '@blocklet/payment-react';
 import type { TProduct, TSubscriptionExpanded } from '@blocklet/payment-types';
 import { ArrowBackOutlined, Edit } from '@mui/icons-material';
 import { Alert, Box, Button, CircularProgress, Stack, Typography } from '@mui/material';
@@ -10,7 +10,6 @@ import { useRequest, useSetState } from 'ahooks';
 import { isEmpty } from 'lodash';
 import { Link } from 'react-router-dom';
 
-import TxLink from '../../../../components/blockchain/tx';
 import Copyable from '../../../../components/copyable';
 import Currency from '../../../../components/currency';
 import EventList from '../../../../components/event/list';

package/src/pages/admin/payments/intents/detail.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
-import { Amount, Status, api, formatError, formatTime } from '@blocklet/payment-react';
+import { Amount, Status, TxLink, api, formatError, formatTime } from '@blocklet/payment-react';
 import type { TPaymentIntentExpanded } from '@blocklet/payment-types';
 import { ArrowBackOutlined, Edit, InfoOutlined } from '@mui/icons-material';
 import { Alert, Box, Button, CircularProgress, Stack, Tooltip, Typography } from '@mui/material';
@@ -11,7 +11,6 @@ import { useRequest, useSetState } from 'ahooks';
 import { isEmpty } from 'lodash';
 import { Link } from 'react-router-dom';
 
-import TxLink from '../../../../components/blockchain/tx';
 import Copyable from '../../../../components/copyable';
 import Currency from '../../../../components/currency';
 import EventList from '../../../../components/event/list';

package/src/pages/customer/invoice.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
-import { Status, api, formatError, formatTime } from '@blocklet/payment-react';
+import { Status, TxLink, api, formatError, formatTime } from '@blocklet/payment-react';
 import type { TInvoiceExpanded } from '@blocklet/payment-types';
 import { ArrowBackOutlined } from '@mui/icons-material';
 import { Alert, Box, Button, CircularProgress, Grid, Stack, Typography } from '@mui/material';
@@ -9,7 +9,6 @@ import { useRequest, useSetState } from 'ahooks';
 import { useEffect } from 'react';
 import { Link, useParams, useSearchParams } from 'react-router-dom';
 
-import TxLink from '../../components/blockchain/tx';
 import Currency from '../../components/currency';
 import InfoRow from '../../components/info-row';
 import InvoiceTable from '../../components/invoice/table';

package/src/pages/customer/subscription/detail.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { api, formatTime } from '@blocklet/payment-react';
+import { TxLink, api, formatTime } from '@blocklet/payment-react';
 import type { TSubscriptionExpanded } from '@blocklet/payment-types';
 import { ArrowBackOutlined } from '@mui/icons-material';
 import { Alert, Box, CircularProgress, Stack, Typography } from '@mui/material';
@@ -8,7 +8,6 @@ import { styled } from '@mui/system';
 import { useRequest } from 'ahooks';
 import { Link, useNavigate, useParams } from 'react-router-dom';
 
-import TxLink from '../../../components/blockchain/tx';
 import Currency from '../../../components/currency';
 import InfoRow from '../../../components/info-row';
 import InvoiceList from '../../../components/invoice/list';

package/src/components/blockchain/tx.tsx

@@ -1,77 +0,0 @@
-import type { PaymentDetails, TPaymentMethod } from '@blocklet/payment-types';
-import { OpenInNewOutlined } from '@mui/icons-material';
-import { Link, Stack, Typography } from '@mui/material';
-import { joinURL } from 'ufo';
-
-const getTxLink = (method: TPaymentMethod, details: PaymentDetails) => {
-  if (method.type === 'arcblock' && details.arcblock?.tx_hash) {
-    return {
-      link: joinURL(method.settings.arcblock?.explorer_host as string, '/txs', details.arcblock?.tx_hash as string),
-      text: details.arcblock?.tx_hash as string,
-    };
-  }
-  if (method.type === 'bitcoin' && details.bitcoin?.tx_hash) {
-    return {
-      link: joinURL(method.settings.bitcoin?.explorer_host as string, '/tx', details.bitcoin?.tx_hash as string),
-      text: details.bitcoin?.tx_hash as string,
-    };
-  }
-  if (method.type === 'ethereum' && details.ethereum?.tx_hash) {
-    return {
-      link: joinURL(method.settings.ethereum?.explorer_host as string, '/tx', details.ethereum?.tx_hash as string),
-      text: details.ethereum?.tx_hash as string,
-    };
-  }
-  if (method.type === 'stripe') {
-    const dashboard = method.livemode ? 'https://dashboard.stripe.com' : 'https://dashboard.stripe.com/test';
-    return {
-      link: joinURL(
-        method.settings.stripe?.dashboard || dashboard,
-        'payments',
-        details.stripe?.payment_intent_id as string
-      ),
-      text: details.stripe?.payment_intent_id as string,
-    };
-  }
-
-  return { text: 'N/A', link: '' };
-};
-
-TxLink.defaultProps = {
-  mode: 'dashboard',
-};
-
-export default function TxLink(props: {
-  details: PaymentDetails;
-  method: TPaymentMethod;
-  mode?: 'customer' | 'dashboard';
-}) {
-  if (!props.details || (props.mode === 'customer' && props.method.type === 'stripe')) {
-    return (
-      <Typography component="small" color="text.secondary">
-        None
-      </Typography>
-    );
-  }
-
-  const { text, link } = getTxLink(props.method, props.details);
-
-  if (link) {
-    return (
-      <Link href={link} target="_blank" rel="noopener noreferrer">
-        <Stack component="span" direction="row" alignItems="center" spacing={1}>
-          <Typography component="span" color="primary">
-            {text.length > 40 ? [text.slice(0, 8), text.slice(-8)].join('...') : text}
-          </Typography>
-          <OpenInNewOutlined fontSize="small" />
-        </Stack>
-      </Link>
-    );
-  }
-
-  return (
-    <Typography component="small" color="text.secondary">
-      None
-    </Typography>
-  );
-}