payment-kit 1.17.6 → 1.17.7

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.17.6
+version: 1.17.7
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.19.3",
     "@blocklet/js-sdk": "^1.16.37",
     "@blocklet/logger": "^1.16.37",
-    "@blocklet/payment-react": "1.17.6",
+    "@blocklet/payment-react": "1.17.7",
     "@blocklet/sdk": "^1.16.37",
     "@blocklet/ui-react": "^2.11.27",
     "@blocklet/uploader": "^0.1.64",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.37",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.17.6",
+    "@blocklet/payment-types": "1.17.7",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -166,5 +166,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "50e93ab4340be53c9d9bd18718c6db26048578c5"
+  "gitHead": "f2a439af19e405746a6663b4dbef8a96231a1076"
 }

package/src/components/payment-currency/add.tsx

@@ -1,20 +1,57 @@
-/* eslint-disable no-nested-ternary */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import { api, formatError } from '@blocklet/payment-react';
-import type { TPaymentCurrency, TPaymentMethod } from '@blocklet/payment-types';
+import type { TPaymentCurrency, TPaymentMethodExpanded } from '@blocklet/payment-types';
 import { AddOutlined } from '@mui/icons-material';
-import { Button, CircularProgress } from '@mui/material';
+import {
+  Button,
+  CircularProgress,
+  TextField,
+  Autocomplete,
+  Box,
+  Typography,
+  Avatar,
+  Stack,
+  Divider,
+} from '@mui/material';
 import { useSetState } from 'ahooks';
 import { FormProvider, useForm } from 'react-hook-form';
 import { dispatch } from 'use-bus';
-
+import { useEffect } from 'react';
 import DrawerForm from '../drawer-form';
 import PaymentCurrencyForm from './form';
 
-export default function PaymentCurrencyAdd({ method, onClose }: { method: TPaymentMethod; onClose: () => void }) {
+const loadTokenList = () =>
+  import(
+    /* webpackChunkName: "payment-token-list" */
+    './tokenList.json'
+  );
+interface TokenInfo {
+  address: string;
+  chainId: number;
+  decimals: number;
+  name: string;
+  symbol: string;
+  logoURI?: string;
+}
+
+export default function PaymentCurrencyAdd({
+  method,
+  onClose,
+}: {
+  method: TPaymentMethodExpanded;
+  onClose: () => void;
+}) {
   const { t } = useLocaleContext();
-  const [state, setState] = useSetState({ loading: false });
+  const [state, setState] = useSetState<{
+    loading: boolean;
+    tokenListLoading: boolean;
+    availableTokens: TokenInfo[];
+  }>({
+    loading: false,
+    tokenListLoading: false,
+    availableTokens: [],
+  });
 
   const methods = useForm<TPaymentCurrency>({
     defaultValues: {
@@ -25,7 +62,39 @@ export default function PaymentCurrencyAdd({ method, onClose }: { method: TPayme
       contract: '',
     },
   });
-  const { handleSubmit } = methods;
+  const { handleSubmit, setValue } = methods;
+
+  const showTokenSelect = ['ethereum', 'base'].includes(method.type);
+
+  // @ts-ignore
+  const chainId = method?.settings?.[method.type]?.chain_id || '';
+
+  useEffect(() => {
+    if (showTokenSelect && !state.availableTokens.length) {
+      setState({ tokenListLoading: true });
+      loadTokenList().then((module) => {
+        const availableTokens = showTokenSelect
+          ? // @ts-ignore
+            ((module.default?.[chainId] as TokenInfo[]) || []).filter(
+              (token: TokenInfo) => !(method.payment_currencies || []).find((c: any) => c.contract === token.address)
+            )
+          : [];
+        setState({
+          availableTokens,
+          tokenListLoading: false,
+        });
+      });
+    }
+  }, [showTokenSelect, chainId]);
+
+  const handleTokenSelect = (token: TokenInfo | null) => {
+    if (token) {
+      setValue('name', token.name);
+      setValue('description', `${token.name} (${token.symbol})`);
+      setValue('logo', token.logoURI || '');
+      setValue('contract', token.address);
+    }
+  };
 
   const onSubmit = (data: TPaymentCurrency) => {
     setState({ loading: true });
@@ -54,10 +123,64 @@ export default function PaymentCurrencyAdd({ method, onClose }: { method: TPayme
       width={640}
       addons={
         <Button variant="contained" size="small" onClick={handleSubmit(onSubmit)} disabled={state.loading}>
-          {state.loading ? <CircularProgress size="small" /> : t('admin.paymentCurrency.save')}
+          {state.loading ? <CircularProgress size={20} /> : t('admin.paymentCurrency.save')}
         </Button>
       }>
       <FormProvider {...methods}>
+        {showTokenSelect && (
+          <Box sx={{ mb: 3 }}>
+            <Autocomplete
+              disablePortal
+              options={state.availableTokens}
+              loading={state.tokenListLoading}
+              getOptionLabel={(option: TokenInfo) => option.symbol}
+              onChange={(_, value) => handleTokenSelect(value)}
+              renderInput={(params) => (
+                <TextField
+                  {...params}
+                  label={t('admin.paymentCurrency.quickAdd')}
+                  placeholder={t('admin.paymentCurrency.searchToken')}
+                  fullWidth
+                />
+              )}
+              renderOption={(props, option) => (
+                <Box
+                  component="li"
+                  {...props}
+                  sx={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: 1,
+                    cursor: 'pointer',
+                    '&:hover': {
+                      backgroundColor: 'action.hover',
+                    },
+                  }}>
+                  <Avatar
+                    src={option.logoURI || option.symbol}
+                    alt={option.symbol}
+                    sx={{
+                      width: 24,
+                      height: 24,
+                    }}
+                  />
+                  <Stack>
+                    <Typography fontWeight={500}>{option.name}</Typography>
+                    <Typography variant="caption" color="text.secondary">
+                      {option.symbol}
+                    </Typography>
+                  </Stack>
+                </Box>
+              )}
+              isOptionEqualToValue={(option, value) => option.address === value.address}
+            />
+            <Divider sx={{ my: 3 }}>
+              <Typography variant="caption" color="text.secondary">
+                {t('admin.paymentCurrency.orManualInput')}
+              </Typography>
+            </Divider>
+          </Box>
+        )}
         <PaymentCurrencyForm />
       </FormProvider>
     </DrawerForm>