payment-kit 1.16.18 → 1.17.0

package/api/src/libs/overdraft-protection.ts

@@ -6,7 +6,8 @@ export const overdraftProtectionKey = 'overdraft-protection';
 
 export async function ensureOverdraftProtectionPrice(livemode = true) {
   try {
-    const exist = await Price.findOne({ where: { lookup_key: overdraftProtectionKey, livemode } });
+    const lookUpKey = livemode ? overdraftProtectionKey : `${overdraftProtectionKey}-test`;
+    const exist = await Price.findOne({ where: { lookup_key: lookUpKey, livemode } });
     if (exist) {
       const product = await Product.findByPk(exist.product_id);
       return {
@@ -44,7 +45,7 @@ export async function ensureOverdraftProtectionPrice(livemode = true) {
           nickname: '',
           type: 'one_time',
           unit_amount: '1',
-          lookup_key: overdraftProtectionKey,
+          lookup_key: lookUpKey,
           recurring: {},
           transform_quantity: { divide_by: 1, round: 'up' },
           tiers: [],

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.16.18",
+  "version": "1.17.0",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.18.165",
     "@blocklet/js-sdk": "^1.16.36",
     "@blocklet/logger": "^1.16.36",
-    "@blocklet/payment-react": "1.16.18",
+    "@blocklet/payment-react": "1.17.0",
     "@blocklet/sdk": "^1.16.36",
     "@blocklet/ui-react": "^2.11.15",
     "@blocklet/uploader": "^0.1.60",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.36",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.16.18",
+    "@blocklet/payment-types": "1.17.0",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -166,5 +166,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "ea644d08efdbfba6034a3ec09eac4d7160bcba66"
+  "gitHead": "b25f7f7c1990a01db3c43dff90eecb65f37bd5d7"
 }

package/src/components/customer/overdraft-protection.tsx

@@ -19,9 +19,9 @@ import {
 } from '@mui/material';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import { EventHandler, useState } from 'react';
-import { api, Switch, useMobile } from '@blocklet/payment-react';
+import { api, formatAmountPrecisionLimit, Switch, useMobile } from '@blocklet/payment-react';
 import { useRequest } from 'ahooks';
-import { BN, fromUnitToToken } from '@ocap/util';
+import { BN, fromTokenToUnit, fromUnitToToken } from '@ocap/util';
 import type { TPaymentCurrency, TSubscriptionExpanded } from '@blocklet/payment-types';
 import Currency from '../currency';
 
@@ -32,6 +32,21 @@ const fetchCycleAmount = (
   return api.get(`/api/subscriptions/${subscriptionId}/cycle-amount`, { params }).then((res) => res.data);
 };
 
+function safeAdd(currency: { decimal: number }, ...numbers: string[]) {
+  if (!numbers.length) return '0';
+  if (!numbers.every((n) => /^-?\d*\.?\d*$/.test(n))) {
+    throw new Error('Invalid number format');
+  }
+
+  const decimal = currency?.decimal || 18;
+  const sum = numbers.reduce((total, num) => {
+    const unitAmount = fromTokenToUnit(num, decimal);
+    return new BN(total).add(new BN(unitAmount));
+  }, new BN(0));
+
+  return fromUnitToToken(sum.toString(), decimal);
+}
+
 type OverdraftProtectionDialogProps = {
   value: {
     enabled: boolean;
@@ -48,6 +63,7 @@ type OverdraftProtectionDialogProps = {
     symbol: string;
     logo: string;
     decimal: number;
+    maximum_precision?: number;
   };
   subscription: TSubscriptionExpanded;
 };
@@ -66,7 +82,7 @@ export default function OverdraftProtectionDialog({
   currency,
   subscription,
 }: OverdraftProtectionDialogProps) {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const { isMobile } = useMobile();
   const [customAmount, setCustomAmount] = useState(false);
   const [presetAmounts, setPresetAmounts] = useState<{ amount: string; cycles: number }[]>([]);
@@ -298,6 +314,14 @@ export default function OverdraftProtectionDialog({
                             symbol: currency.symbol,
                           });
                         }
+                        const validPrecision = formatAmountPrecisionLimit(
+                          val.toString(),
+                          locale,
+                          currency?.maximum_precision || 6
+                        );
+                        if (validPrecision) {
+                          return validPrecision;
+                        }
                         return true;
                       },
                     })}
@@ -325,11 +349,11 @@ export default function OverdraftProtectionDialog({
             {amount && Number(amount) > 0 && !methods.formState.errors.amount && (
               <Typography variant="body2" sx={{ color: 'text.lighter', mt: '8px !important' }} fontSize={12}>
                 {t('customer.overdraftProtection.total', {
-                  total: Number(amount) + Number(availableAmount),
+                  total: safeAdd(currency, amount, availableAmount),
                   symbol: currency.symbol,
                 })}
                 {formatEstimatedDuration(
-                  Math.floor((Number(amount) + Number(availableAmount)) / Number(estimateAmount))
+                  Math.floor(Number(safeAdd(currency, amount, availableAmount)) / Number(estimateAmount))
                 )}
               </Typography>
             )}

package/src/components/product/edit-price.tsx

@@ -27,7 +27,7 @@ export default function EditPrice({
     mode: 'onChange',
     defaultValues: {
       ...price,
-      unit_amount: fromUnitToToken(price.unit_amount, price.currency.decimal),
+      unit_amount: fromUnitToToken(price.unit_amount, price.currency?.decimal),
       // @ts-ignore
       model: getPricingModel(price as any),
       metadata: isEmpty(price.metadata)
@@ -40,7 +40,7 @@ export default function EditPrice({
           }
         : DEFAULT_PRICE.recurring,
       currency_options: cloneDeep(price.currency_options).map((x: any) => {
-        x.unit_amount = fromUnitToToken(x.unit_amount, x.currency.decimal);
+        x.unit_amount = fromUnitToToken(x.unit_amount, x.currency?.decimal);
         return x;
       }),
     },

package/src/pages/admin/index.tsx

@@ -122,7 +122,9 @@ function Admin() {
           </label>
         </Stack>
       </Stack>
-      <div className="page-content">{isValidElement(TabComponent) ? TabComponent : <TabComponent />}</div>
+      <div className="page-content" key={settings.livemode ? 'live' : 'test'}>
+        {isValidElement(TabComponent) ? TabComponent : <TabComponent />}
+      </div>
     </>
   );
 }

package/src/pages/admin/products/prices/detail.tsx

@@ -294,7 +294,7 @@ export default function PriceDetail(props: { id: string }) {
                         // eslint-disable-next-line react/no-unstable-nested-components
                         customBodyRenderLite: (_: any, index: number) => {
                           const item = data.currency_options[index] as any;
-                          return <Currency logo={item.currency.logo} name={item.currency.symbol} />;
+                          return <Currency logo={item.currency?.logo} name={item.currency?.symbol} />;
                         },
                       },
                     },

package/src/pages/admin/products/products/detail.tsx

@@ -46,7 +46,7 @@ export default function ProductDetail(props: { id: string }) {
   const { t, locale } = useLocaleContext();
   const { isMobile } = useMobile();
   const navigate = useNavigate();
-  const { settings } = usePaymentContext();
+  const { settings, setLivemode } = usePaymentContext();
   const [state, setState] = useSetState({
     adding: {
       price: false,
@@ -62,7 +62,11 @@ export default function ProductDetail(props: { id: string }) {
     },
   });
 
-  const { loading, error, data, runAsync } = useRequest(() => getProduct(props.id));
+  const { loading, error, data, runAsync } = useRequest(() => getProduct(props.id), {
+    onSuccess: (res) => {
+      setLivemode(!!res.livemode);
+    },
+  });
 
   if (error) {
     return <Alert severity="error">{error.message}</Alert>;