payment-kit 1.13.111 → 1.13.113

package/src/components/subscription/items/actions.tsx

@@ -1,5 +1,5 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TLineItemExpanded } from '@did-pay/types';
+import type { TLineItemExpanded } from '@blocklet/payment-types';
 import { useNavigate } from 'react-router-dom';
 
 import Actions from '../../actions';

package/src/components/subscription/items/index.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TPaymentCurrency, TSubscriptionItemExpanded } from '@did-pay/types';
+import { formatPrice } from '@blocklet/payment-react';
+import type { TPaymentCurrency, TSubscriptionItemExpanded } from '@blocklet/payment-types';
 import { Stack, Typography } from '@mui/material';
 
-import { formatPrice } from '../../../libs/util';
 import Copyable from '../../copyable';
 import Table from '../../table';
 import LineItemActions from './actions';

package/src/components/subscription/items/usage-records.tsx

@@ -1,11 +1,10 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TUsageRecord } from '@did-pay/types';
+import { api, formatToDatetime } from '@blocklet/payment-react';
+import type { TUsageRecord } from '@blocklet/payment-types';
 import { Alert, Box, Button, CircularProgress } from '@mui/material';
 import { useRequest } from 'ahooks';
 import { useState } from 'react';
 
-import api from '../../../libs/api';
-import { formatToDatetime } from '../../../libs/util';
 import ConfirmDialog from '../../confirm';
 import Table from '../../table';
 

package/src/components/subscription/list.tsx

@@ -1,15 +1,14 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { getDurableData } from '@arcblock/ux/lib/Datatable';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TSubscriptionExpanded } from '@did-pay/types';
+import { Status, api, formatTime } from '@blocklet/payment-react';
+import type { TSubscriptionExpanded } from '@blocklet/payment-types';
 import { Alert, CircularProgress, ToggleButton, ToggleButtonGroup } from '@mui/material';
 import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import api from '../../libs/api';
-import { formatSubscriptionProduct, formatTime } from '../../libs/util';
-import Status from '../status';
+import { formatSubscriptionProduct } from '../../libs/util';
 import Table from '../table';
 import SubscriptionActions from './actions';
 import SubscriptionStatus from './status';

package/src/components/subscription/metrics.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TSubscriptionExpanded } from '@did-pay/types';
+import { formatTime } from '@blocklet/payment-react';
+import type { TSubscriptionExpanded } from '@blocklet/payment-types';
 
-import { formatTime } from '../../libs/util';
 import InfoMetric from '../info-metric';
 
 type Props = {

package/src/components/subscription/status.tsx

@@ -1,9 +1,9 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import type { TSubscription } from '@did-pay/types';
+import { Status, formatToDate } from '@blocklet/payment-react';
+import type { TSubscription } from '@blocklet/payment-types';
 import { AccessTimeOutlined } from '@mui/icons-material';
 
-import { formatToDate, getSubscriptionStatusColor } from '../../libs/util';
-import Status from '../status';
+import { getSubscriptionStatusColor } from '../../libs/util';
 
 export default function SubscriptionStatus({
   subscription,

package/src/components/webhook/attempts.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable react/no-unstable-nested-components */
 import CodeBlock from '@arcblock/ux/lib/CodeBlock';
-import type { Paginated, TEvent, TWebhookAttemptExpanded } from '@did-pay/types';
+import { api, formatTime } from '@blocklet/payment-react';
+import type { Paginated, TEvent, TWebhookAttemptExpanded } from '@blocklet/payment-types';
 import { CheckCircleOutlined, ErrorOutlined } from '@mui/icons-material';
 import {
   Box,
@@ -18,8 +19,7 @@ import {
 import { useInfiniteScroll } from 'ahooks';
 import React, { useEffect, useState } from 'react';
 
-import api from '../../libs/api';
-import { formatTime, isSuccessAttempt } from '../../libs/util';
+import { isSuccessAttempt } from '../../libs/util';
 
 const fetchData = (params: Record<string, any> = {}): Promise<Paginated<TWebhookAttemptExpanded>> => {
   const search = new URLSearchParams();

package/src/contexts/products.tsx

@@ -1,10 +1,9 @@
-import type { TProductExpanded } from '@did-pay/types';
+import { api } from '@blocklet/payment-react';
+import type { TProductExpanded } from '@blocklet/payment-types';
 import { Alert, CircularProgress } from '@mui/material';
 import { useRequest } from 'ahooks';
 import { createContext, useContext } from 'react';
 
-import api from '../libs/api';
-
 type ProductsContextType = {
   products: TProductExpanded[];
   refresh: () => void;

package/src/libs/api.ts

@@ -1,20 +1,3 @@
-import { getLocale } from '@arcblock/ux/lib/Locale/context';
-import axios from 'axios';
-import isNull from 'lodash/isNull';
+import { api } from '@blocklet/payment-react';
 
-axios.interceptors.request.use(
-  (config) => {
-    const prefix = window.blocklet ? window.blocklet.prefix : '/';
-    config.baseURL = prefix || '';
-    config.timeout = 200000;
-
-    const livemode = localStorage.getItem('livemode');
-    const locale = getLocale(window.blocklet.languages);
-    config.params = { ...(config.params || {}), livemode: isNull(livemode) ? true : JSON.parse(livemode), locale };
-
-    return config;
-  },
-  (error) => Promise.reject(error)
-);
-
-export default axios;
+export default api;

package/src/libs/dayjs.ts

@@ -1,17 +1,3 @@
-import dayjs from 'dayjs';
-import duration from 'dayjs/plugin/duration';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import timezone from 'dayjs/plugin/timezone'; // dependent on utc plugin
-import utc from 'dayjs/plugin/utc';
-
-import('dayjs/locale/en');
-import('dayjs/locale/zh');
-
-dayjs.extend(relativeTime);
-dayjs.extend(localizedFormat);
-dayjs.extend(duration);
-dayjs.extend(utc);
-dayjs.extend(timezone);
+import { dayjs } from '@blocklet/payment-react';
 
 export default dayjs;