payment-kit 1.18.49 → 1.18.51

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

@@ -335,7 +335,11 @@ export function SubscriptionActionsInner({
           } as any,
           onSuccess: () => {
             connect.close();
-            Toast.success(t('customer.overdraftProtection.settingSuccess'));
+            if (!subscription.overdraft_protection?.enabled) {
+              Toast.success(t('customer.overdraftProtection.openSuccess'));
+            } else {
+              Toast.success(t('customer.overdraftProtection.settingSuccess'));
+            }
             setState({ openProtection: false });
             refreshOverdraftProtection();
             // @ts-ignore
@@ -348,7 +352,7 @@ export function SubscriptionActionsInner({
           },
         });
       } else {
-        Toast.success(t('customer.overdraftProtection.settingSuccess'));
+        Toast.success(t('customer.overdraftProtection.closeSuccess'));
         setState({ openProtection: false });
         refreshOverdraftProtection();
         // @ts-ignore

package/src/libs/util.ts

@@ -23,6 +23,8 @@ import { joinURL } from 'ufo';
 
 import { t } from '../locales/index';
 
+export const MAX_SAFE_AMOUNT = 1000000000;
+
 export const formatProductPrice = (
   { prices, unit_label }: { prices: TPrice[]; unit_label: string },
   currency: TPaymentCurrency,
@@ -227,7 +229,7 @@ export const debounce = (fun: Function, wait: number) => {
 
 export function canChangePaymentMethod(subscription: TSubscriptionExpanded) {
   return (
-    ['active', 'trialing'].includes(subscription.status) &&
+    ['active', 'trialing', 'past_due'].includes(subscription.status) &&
     subscription.items.every((x) => getPriceCurrencyOptions(x.price).length > 1)
   );
 }

package/src/locales/en.tsx

@@ -41,6 +41,7 @@ export default flat({
     cancel: 'Cancel',
     know: 'I Know',
     confirm: 'Confirm',
+    maxAmount: 'Max amount is {max}',
     days: {
       sunday: 'Sunday',
       monday: 'Monday',
@@ -518,6 +519,11 @@ export default flat({
       download: 'Download PDF',
       edit: 'Edit Invoice',
       duplicate: 'Duplicate Invoice',
+      returnStake: {
+        title: 'Return Stake',
+        tip: 'Are you sure you want to return the stake? This action will return the stake to the customer immediately.',
+        success: 'Stake return application has been successfully created',
+      },
     },
     subscription: {
       view: 'View subscription',
@@ -873,8 +879,10 @@ export default flat({
       ruleTip:
         'N is the number of cycles, P is the subscription bill amount, Fee is the SubGuard™ service fee, the single fee is {gas} {symbol}',
       min: 'The amount must be greater or equal to {min} {symbol}',
-      settingSuccess: 'Set SubGuard™ Successful',
-      settingError: 'Set SubGuard™ Failed',
+      settingSuccess: 'Settings Updated',
+      settingError: 'Failed to update SubGuard™ settings',
+      openSuccess: 'SubGuard™ Enabled',
+      closeSuccess: 'SubGuard™ Disabled',
       keepStake: 'Keep Remaining Stake For SubGuard™',
       returnStake: 'Return Remaining Stake',
       stake: 'Stake',

package/src/locales/zh.tsx

@@ -49,6 +49,7 @@ export default flat({
       friday: '星期五',
       saturday: '星期六',
     },
+    maxAmount: '最大金额为 {max}',
   },
   notification: {
     preferences: {
@@ -507,6 +508,11 @@ export default flat({
       edit: '编辑账单',
       duplicate: '复制账单',
       attention: '未完成的账单',
+      returnStake: {
+        title: '退还质押',
+        tip: '您确定要退还质押吗？此操作将立即退还质押给客户。',
+        success: '质押退还申请已提交',
+      },
     },
     subscription: {
       view: '查看订阅',
@@ -843,8 +849,10 @@ export default flat({
       rule: '规则：N * ( P + Fee )',
       ruleTip: 'N 为周期数, P 为订阅账单费用, Fee 为订阅守护服务费用，单次费用为 {gas} {symbol}',
       min: '质押金额不得小于 {min} {symbol}',
-      settingSuccess: '订阅守护配置成功',
-      settingError: '订阅守护配置失败',
+      settingSuccess: '配置更新成功',
+      settingError: '配置更新失败',
+      openSuccess: '订阅守护已开启',
+      closeSuccess: '订阅守护已关闭',
       keepStake: '不退还质押',
       returnStake: '退还剩余质押',
       stake: '质押',

package/src/pages/admin/settings/vault-config/edit-form.tsx

@@ -8,6 +8,7 @@ import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 import { useRequest } from 'ahooks';
 import type { TPaymentCurrencyExpanded } from '@blocklet/payment-types';
 import Currency from '../../../../components/currency';
+import { MAX_SAFE_AMOUNT } from '../../../../libs/util';
 
 type EditFormProps = {
   item: TPaymentCurrencyExpanded | null;
@@ -178,6 +179,11 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                       if (Number(value) <= 0) {
                         return t('admin.vaultConfig.depositThresholdRequired');
                       }
+                      if (Number(value) > MAX_SAFE_AMOUNT) {
+                        return t('common.maxAmount', {
+                          max: MAX_SAFE_AMOUNT,
+                        });
+                      }
                       const validPrecision = formatAmountPrecisionLimit(value.toString(), locale, item.decimal || 6);
                       return validPrecision || true;
                     },
@@ -199,6 +205,7 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                         ),
                         inputProps: {
                           min: 0,
+                          max: MAX_SAFE_AMOUNT,
                         },
                       }}
                       sx={{ mt: 1 }}
@@ -223,6 +230,11 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                       if (Number(value) < 0) {
                         return t('admin.vaultConfig.bufferThresholdInvalid');
                       }
+                      if (Number(value) > MAX_SAFE_AMOUNT) {
+                        return t('common.maxAmount', {
+                          max: MAX_SAFE_AMOUNT,
+                        });
+                      }
                       const validPrecision = formatAmountPrecisionLimit(value.toString(), locale, item.decimal || 6);
                       return validPrecision || true;
                     },
@@ -244,6 +256,7 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                         ),
                         inputProps: {
                           min: 0,
+                          max: MAX_SAFE_AMOUNT,
                         },
                       }}
                       sx={{ mt: 1 }}

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

@@ -34,7 +34,7 @@ import { AccountBalanceWalletOutlined, ArrowBackOutlined, ArrowForwardOutlined }
 import Empty from '@arcblock/ux/lib/Empty';
 import { BN, fromUnitToToken } from '@ocap/util';
 import RechargeList from '../../../components/invoice/recharge';
-import { goBackOrFallback } from '../../../libs/util';
+import { goBackOrFallback, MAX_SAFE_AMOUNT } from '../../../libs/util';
 import { useSessionContext } from '../../../contexts/session';
 import { formatSmartDuration, TimeUnit } from '../../../libs/dayjs';
 
@@ -257,6 +257,9 @@ export default function BalanceRechargePage() {
     if (!/^\d*\.?\d*$/.test(value)) return;
     // 不允许以小数点开头
     if (value.startsWith('.')) return;
+    if (Number(value) > MAX_SAFE_AMOUNT) {
+      return;
+    }
     const precision = currency.decimal;
     const errorMessage = formatAmountPrecisionLimit(value, locale, precision || 6);
     setAmountError(errorMessage || '');
@@ -513,6 +516,10 @@ export default function BalanceRechargePage() {
                   InputProps={{
                     endAdornment: <Typography>{currency.symbol}</Typography>,
                     autoComplete: 'off',
+                    inputProps: {
+                      min: 0,
+                      max: MAX_SAFE_AMOUNT,
+                    },
                   }}
                   inputRef={customInputRef}
                 />

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

@@ -35,7 +35,7 @@ import SubscriptionDescription from '../../../components/subscription/descriptio
 import InfoRow from '../../../components/info-row';
 import Currency from '../../../components/currency';
 import SubscriptionMetrics from '../../../components/subscription/metrics';
-import { goBackOrFallback } from '../../../libs/util';
+import { goBackOrFallback, MAX_SAFE_AMOUNT } from '../../../libs/util';
 import CustomerLink from '../../../components/customer/link';
 import { useSessionContext } from '../../../contexts/session';
 import { formatSmartDuration, TimeUnit } from '../../../libs/dayjs';
@@ -191,6 +191,9 @@ export default function RechargePage() {
     if (!/^\d*\.?\d*$/.test(value)) return;
     // 不允许以小数点开头
     if (value.startsWith('.')) return;
+    if (Number(value) > MAX_SAFE_AMOUNT) {
+      return;
+    }
     const precision = subscription.paymentCurrency.maximum_precision || 6;
     const errorMessage = formatAmountPrecisionLimit(value, locale, precision);
     setAmountError(errorMessage || '');
@@ -479,6 +482,10 @@ export default function RechargePage() {
                   InputProps={{
                     endAdornment: <Typography>{subscription.paymentCurrency.symbol}</Typography>,
                     autoComplete: 'off',
+                    inputProps: {
+                      min: 0,
+                      max: MAX_SAFE_AMOUNT,
+                    },
                   }}
                   sx={{ mt: 1 }}
                   inputRef={customInputRef}

package/src/pages/customer/subscription/change-payment.tsx

@@ -203,9 +203,12 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
   };
 
   const onConfirm = async () => {
-    const result = await checkUnpaidInvoices();
-    if (result) {
-      return;
+    // only check unpaid invoices when overdraft protection is enabled
+    if (subscription.overdraft_protection?.enabled) {
+      const result = await checkUnpaidInvoices();
+      if (result) {
+        return;
+      }
     }
     handleSubmit(onSubmit)();
   };
@@ -239,7 +242,7 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
           currency={findCurrency(settings.paymentMethods, selectedCurrencyId) as TPaymentCurrency}
           trialInDays={0}
           billingThreshold={0}
-          showStaking={method.type === 'arcblock'}
+          showStaking={method.type === 'arcblock' && !subscription.billing_thresholds?.no_stake}
         />
       </Stack>
       <Stack direction="column" spacing={2}>

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

@@ -382,9 +382,7 @@ export default function CustomerSubscriptionDetail() {
               <InfoMetric
                 label={
                   <Stack direction="row" alignItems="center" spacing={0.5}>
-                    <Typography variant="body2" component="span">
-                      {t('customer.overdraftProtection.title')}
-                    </Typography>
+                    <Typography component="span">{t('customer.overdraftProtection.title')}</Typography>
                     <MuiLink
                       href="https://www.arcblock.io/content/blog/en/payment-kit-v117-sub-guard#listen-to-the-audio-overview"
                       target="_blank"
@@ -516,9 +514,12 @@ export default function CustomerSubscriptionDetail() {
                     sx={{ color: 'text.link' }}
                     size="small"
                     onClick={async () => {
-                      const result = await checkUnpaidInvoices();
-                      if (result) {
-                        return;
+                      // only check unpaid invoices when overdraft protection is enabled
+                      if (data?.overdraft_protection?.enabled) {
+                        const result = await checkUnpaidInvoices();
+                        if (result) {
+                          return;
+                        }
                       }
                       navigate(`/customer/subscription/${data.id}/change-payment`);
                     }}>