payment-kit 1.19.17 → 1.19.19

package/src/pages/customer/recharge/account.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useParams, useNavigate, useSearchParams } from 'react-router-dom';
 import Toast from '@arcblock/ux/lib/Toast';
 import {
   Box,
@@ -77,6 +77,8 @@ const BalanceCard = styled(Card)(({ theme }) => ({
 export default function BalanceRechargePage() {
   const { t, locale } = useLocaleContext();
   const { currencyId } = useParams<{ currencyId: string }>();
+  const [searchParams] = useSearchParams();
+  const rechargeAddress = searchParams.get('rechargeAddress');
   const navigate = useNavigate();
   const { connect } = usePaymentContext();
   const [amount, setAmount] = useState('50');
@@ -103,6 +105,8 @@ export default function BalanceRechargePage() {
   const [currency, setCurrency] = useState<ExtendedPaymentCurrency | null>(null);
   const [relatedSubscriptions, setRelatedSubscriptions] = useState<Subscription[]>([]);
 
+  const paymentAddress = rechargeAddress || payerValue?.paymentAddress || session?.user?.did;
+
   const fetchData = async () => {
     try {
       setLoading(true);
@@ -174,9 +178,11 @@ export default function BalanceRechargePage() {
           ]);
         }
 
-        const supportRecharge = data.currency?.paymentMethod?.type === 'arcblock';
+        const supportRecharge = ['arcblock', 'ethereum', 'base'].includes(data.currency?.paymentMethod?.type);
         if (supportRecharge) {
-          const payerTokenRes = await api.get(`/api/customers/payer-token?currencyId=${currencyId}`);
+          const payerTokenRes = await api.get(
+            `/api/customers/payer-token?currencyId=${currencyId}&payerAddress=${paymentAddress}`
+          );
           if (payerTokenRes?.data) {
             setPayerValue(payerTokenRes.data);
           }
@@ -231,6 +237,7 @@ export default function BalanceRechargePage() {
         customerDid: session?.user?.did,
         currencyId: currency.id,
         amount: Number(amount),
+        rechargeAddress: rechargeAddress || session?.user?.did,
       },
       messages: {
         scan: t('common.connect.defaultScan'),
@@ -291,7 +298,7 @@ export default function BalanceRechargePage() {
     );
   }
 
-  if (currency?.paymentMethod?.type !== 'arcblock') {
+  if (!['arcblock', 'ethereum', 'base'].includes(currency?.paymentMethod?.type || '')) {
     return (
       <Box>
         <Button startIcon={<ArrowBackOutlined />} variant="outlined" onClick={() => goBackOrFallback('/customer')}>
@@ -317,7 +324,7 @@ export default function BalanceRechargePage() {
 
   const currentBalance = formatBNStr(payerValue?.token || '0', currency?.decimal || 0, 6, false);
   const balanceLink = currency?.paymentMethod
-    ? getTokenBalanceLink(currency.paymentMethod, payerValue?.paymentAddress || '')
+    ? getTokenBalanceLink(currency.paymentMethod, paymentAddress || '')
     : undefined;
 
   return (
@@ -362,7 +369,7 @@ export default function BalanceRechargePage() {
                       {t('customer.recharge.receiveAddress')}
                     </Typography>
                     <Typography variant="body1" sx={{ wordBreak: 'break-all', fontFamily: 'monospace' }}>
-                      {payerValue?.paymentAddress || t('customer.balance.addressNotFound')}
+                      {paymentAddress || t('customer.balance.addressNotFound')}
                     </Typography>
                   </Stack>
                   {currency.logo && (
@@ -669,7 +676,7 @@ export default function BalanceRechargePage() {
             {t('customer.recharge.history')}
           </Typography>
 
-          <RechargeList currency_id={currencyId} />
+          <RechargeList currency_id={currencyId} customer_id={session?.user?.did} recharge_address={paymentAddress} />
         </Box>
       )}
     </Root>

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

@@ -537,11 +537,11 @@ export default function RechargePage() {
                   slotProps={{
                     input: {
                       endAdornment: <Typography>{subscription.paymentCurrency.symbol}</Typography>,
+                    },
+                    htmlInput: {
+                      min: 0,
+                      max: MAX_SAFE_AMOUNT,
                       autoComplete: 'off',
-                      inputProps: {
-                        min: 0,
-                        max: MAX_SAFE_AMOUNT,
-                      },
                     },
                   }}
                 />

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

@@ -455,7 +455,12 @@ export default function CustomerSubscriptionDetail() {
                     sx={{
                       alignItems: 'center',
                     }}>
-                    <Typography component="span" fontSize={14} fontWeight={500}>
+                    <Typography
+                      component="span"
+                      sx={{
+                        fontSize: 14,
+                        fontWeight: 500,
+                      }}>
                       {t('customer.overdraftProtection.title')}
                     </Typography>
                     <MuiLink

package/api/src/libs/notification/template/customer-credit-grant-low-balance.ts

@@ -1,151 +0,0 @@
-/* eslint-disable @typescript-eslint/brace-style */
-/* eslint-disable @typescript-eslint/indent */
-import { BN, fromUnitToToken } from '@ocap/util';
-import { getUserLocale } from '../../../integrations/blocklet/notification';
-import { translate } from '../../../locales';
-import { CreditGrant, Customer, PaymentCurrency } from '../../../store/models';
-import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
-import { formatNumber, getCustomerIndexUrl } from '../../util';
-
-export interface CustomerCreditGrantLowBalanceEmailTemplateOptions {
-  creditGrantId: string;
-}
-
-interface CustomerCreditGrantLowBalanceEmailTemplateContext {
-  locale: string;
-  userDid: string;
-  currencySymbol: string;
-  availableAmount: string;
-  totalGrantedAmount: string;
-  lowBalancePercentage: string;
-}
-
-export class CustomerCreditGrantLowBalanceEmailTemplate
-  implements BaseEmailTemplate<CustomerCreditGrantLowBalanceEmailTemplateContext>
-{
-  options: CustomerCreditGrantLowBalanceEmailTemplateOptions;
-
-  constructor(options: CustomerCreditGrantLowBalanceEmailTemplateOptions) {
-    this.options = options;
-  }
-
-  async getContext(): Promise<CustomerCreditGrantLowBalanceEmailTemplateContext> {
-    const creditGrant = await CreditGrant.findByPk(this.options.creditGrantId);
-    if (!creditGrant) {
-      throw new Error(`CreditGrant not found: ${this.options.creditGrantId}`);
-    }
-
-    const customer = await Customer.findByPk(creditGrant.customer_id);
-    if (!customer) {
-      throw new Error(`Customer not found: ${creditGrant.customer_id}`);
-    }
-
-    const paymentCurrency = await PaymentCurrency.findByPk(creditGrant.currency_id);
-    if (!paymentCurrency) {
-      throw new Error(`PaymentCurrency not found: ${creditGrant.currency_id}`);
-    }
-
-    const userDid = customer.did;
-    const locale = await getUserLocale(userDid);
-    const currencySymbol = paymentCurrency.symbol;
-
-    // 计算百分比
-    const available = new BN(creditGrant.remaining_amount);
-    const total = new BN(creditGrant.amount);
-    const percentage = total.gt(new BN(0)) ? available.mul(new BN(100)).div(total).toString() : '0';
-
-    return {
-      locale,
-      userDid,
-      currencySymbol,
-      availableAmount: `${formatNumber(fromUnitToToken(available.toString(), paymentCurrency.decimal))} ${currencySymbol}`,
-      totalGrantedAmount: `${formatNumber(fromUnitToToken(total.toString(), paymentCurrency.decimal))} ${currencySymbol}`,
-      lowBalancePercentage: `${percentage}%`,
-    };
-  }
-
-  async getTemplate(): Promise<BaseEmailTemplateType> {
-    const context = await this.getContext();
-    const { locale, userDid, availableAmount, totalGrantedAmount, lowBalancePercentage } = context;
-
-    // 构建字段
-    const fields = [
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          color: '#9397A1',
-          text: translate('notification.common.account', locale),
-        },
-      },
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          text: userDid,
-        },
-      },
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          color: '#9397A1',
-          text: translate('notification.creditInsufficient.availableCredit', locale),
-        },
-      },
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          color: '#FF6600', // 橙色警告
-          text: `${availableAmount} (${lowBalancePercentage})`,
-        },
-      },
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          color: '#9397A1',
-          text: translate('notification.creditGrantLowBalance.totalGrantedCredit', locale),
-        },
-      },
-      {
-        type: 'text',
-        data: {
-          type: 'plain',
-          text: `${totalGrantedAmount}`,
-        },
-      },
-    ];
-
-    // 构建操作按钮
-    const actions = [
-      {
-        name: translate('notification.common.viewCreditGrant', locale),
-        title: translate('notification.common.viewCreditGrant', locale),
-        link: getCustomerIndexUrl({
-          locale,
-          userDid,
-        }),
-      },
-    ];
-
-    const template: BaseEmailTemplateType = {
-      title: translate('notification.creditGrantLowBalance.title', locale),
-      body: translate('notification.creditGrantLowBalance.body', locale, {
-        availableAmount,
-        totalGrantedAmount,
-      }),
-      attachments: [
-        {
-          type: 'section',
-          fields,
-        },
-      ],
-      // @ts-ignore
-      actions,
-    };
-
-    return template;
-  }
-}