payment-kit 1.23.2 → 1.23.4

package/api/src/queues/credit-grant.ts

@@ -511,8 +511,6 @@ async function handleInvoiceCredit(invoiceId: string) {
         const metadata = price.metadata || {};
         const creditConfig = metadata.credit_config || {};
         const quantity = lineItem.quantity || 1;
-        const creditAmount: BN = new BN(creditConfig.credit_amount ?? 1).mul(new BN(quantity));
-
         const currency = await PaymentCurrency.findByPk(creditConfig.currency_id);
 
         if (!currency) {
@@ -520,6 +518,9 @@ async function handleInvoiceCredit(invoiceId: string) {
           throw new Error(`Currency not found: ${creditConfig.currency_id}`);
         }
 
+        const creditAmountPerUnit = fromTokenToUnit(creditConfig.credit_amount ?? '1', currency.decimal);
+        const creditAmount = new BN(creditAmountPerUnit).mul(new BN(quantity)).toString();
+
         let applicabilityConfig: any = {
           scope: {
             type: 'metered',
@@ -614,7 +615,7 @@ async function handleInvoiceCredit(invoiceId: string) {
     try {
       const createPromises = grantsToCreate.map(async (item) => {
         const creditGrant = await createCreditGrant({
-          amount: fromTokenToUnit(item.creditAmount.toString(), item.currency.decimal).toString(),
+          amount: item.creditAmount,
           currency_id: item.currency.id,
           customer_id: invoice.customer.id,
           name: item.price.nickname || item.price.product?.name,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.23.2",
+  "version": "1.23.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -45,35 +45,35 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.17.5",
-    "@arcblock/did": "^1.27.14",
-    "@arcblock/did-connect-react": "^3.2.13",
+    "@arcblock/did": "^1.27.15",
+    "@arcblock/did-connect-react": "^3.2.19",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.27.14",
-    "@arcblock/jwt": "^1.27.14",
-    "@arcblock/react-hooks": "^3.2.13",
-    "@arcblock/ux": "^3.2.13",
-    "@arcblock/validator": "^1.27.14",
-    "@arcblock/vc": "^1.27.14",
-    "@blocklet/did-space-js": "^1.2.9",
-    "@blocklet/error": "^0.3.4",
+    "@arcblock/did-util": "^1.27.15",
+    "@arcblock/jwt": "^1.27.15",
+    "@arcblock/react-hooks": "^3.2.19",
+    "@arcblock/ux": "^3.2.19",
+    "@arcblock/validator": "^1.27.15",
+    "@arcblock/vc": "^1.27.15",
+    "@blocklet/did-space-js": "^1.2.11",
+    "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.5",
     "@blocklet/logger": "^1.17.5",
-    "@blocklet/payment-broker-client": "1.23.2",
-    "@blocklet/payment-react": "1.23.2",
-    "@blocklet/payment-vendor": "1.23.2",
+    "@blocklet/payment-broker-client": "1.23.4",
+    "@blocklet/payment-react": "1.23.4",
+    "@blocklet/payment-vendor": "1.23.4",
     "@blocklet/sdk": "^1.17.5",
-    "@blocklet/ui-react": "^3.2.13",
-    "@blocklet/uploader": "^0.3.14",
-    "@blocklet/xss": "^0.3.12",
+    "@blocklet/ui-react": "^3.2.19",
+    "@blocklet/uploader": "^0.3.16",
+    "@blocklet/xss": "^0.3.14",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/asset": "^1.27.14",
-    "@ocap/client": "^1.27.14",
-    "@ocap/mcrypto": "^1.27.14",
-    "@ocap/util": "^1.27.14",
-    "@ocap/wallet": "^1.27.14",
+    "@ocap/asset": "^1.27.15",
+    "@ocap/client": "^1.27.15",
+    "@ocap/mcrypto": "^1.27.15",
+    "@ocap/util": "^1.27.15",
+    "@ocap/wallet": "^1.27.15",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -130,7 +130,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.5",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.23.2",
+    "@blocklet/payment-types": "1.23.4",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -161,7 +161,7 @@
     "vite": "^7.0.0",
     "vite-node": "^3.2.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.12.4",
+    "vite-plugin-blocklet": "^0.13.1",
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -177,5 +177,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "facbd56b5c169d3999f007f74602a010e6dd0da2"
+  "gitHead": "12cd3cecedb8aa3331a4a24fa093f62cc6630d5b"
 }

package/src/locales/en.tsx

@@ -128,6 +128,7 @@ export default flat({
     },
   },
   admin: {
+    description: 'Manage your products, pricing, billing, and payments.',
     balances: 'Balances',
     trends: 'Trends',
     addresses: 'Addresses',
@@ -1893,6 +1894,7 @@ export default flat({
     },
   },
   integrations: {
+    description: 'Configure and manage how Payment Kit integrates with your application.',
     basicFeatures: 'Basic Features',
     advancedFeatures: 'Advanced Features',
     features: {

package/src/locales/zh.tsx

@@ -127,6 +127,7 @@ export default flat({
     },
   },
   admin: {
+    description: '管理你的产品、定价、账单和支付流程。',
     balances: '余额',
     addresses: '地址',
     trends: '趋势',
@@ -1837,6 +1838,7 @@ export default flat({
     },
   },
   integrations: {
+    description: '用于配置和管理 Payment Kit 与你应用之间的集成方式。',
     basicFeatures: '基础功能',
     advancedFeatures: '高级功能',
     features: {

package/src/pages/admin/index.tsx

@@ -1,4 +1,5 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { useAppInfo } from '@blocklet/ui-react/lib/Dashboard';
 import { Switch, usePaymentContext } from '@blocklet/payment-react';
 import { Chip, Stack } from '@mui/material';
 import React, { isValidElement, useEffect } from 'react';
@@ -43,6 +44,7 @@ const renderNav = (group: string, onChange: Function, groups: { label: string; v
 function Admin() {
   const navigate = useNavigate();
   const { t } = useLocaleContext();
+  const { updateAppInfo } = useAppInfo();
   const settings = usePaymentContext();
   const { group = 'overview' } = useParams();
   const { isPending, startTransition } = useTransitionContext();
@@ -72,6 +74,12 @@ function Admin() {
 
   const group2 = [{ label: t('admin.developers'), value: 'developers' }];
 
+  useEffect(() => {
+    updateAppInfo({
+      description: t('admin.description'),
+    });
+  }, [t]);
+
   return (
     <>
       <ProgressBar pending={isPending} />

package/src/pages/integrations/index.tsx

@@ -1,4 +1,5 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { useAppInfo } from '@blocklet/ui-react/lib/Dashboard';
 import { Stack } from '@mui/material';
 import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -16,6 +17,7 @@ const pages = {
 function Integrations() {
   const navigate = useNavigate();
   const { t } = useLocaleContext();
+  const { updateAppInfo } = useAppInfo();
   const { group = 'overview' } = useParams();
   const { isPending, startTransition } = useTransitionContext();
 
@@ -32,6 +34,12 @@ function Integrations() {
     { label: t('admin.donate.title'), value: 'donations' },
   ];
 
+  useEffect(() => {
+    updateAppInfo({
+      description: t('integrations.description'),
+    });
+  }, [t]);
+
   return (
     <>
       <ProgressBar pending={isPending} />

package/src/pages/integrations/overview.tsx

@@ -99,15 +99,6 @@ export default function Overview() {
         sx={{
           mb: 4,
         }}>
-        <Typography
-          variant="h2"
-          gutterBottom
-          sx={{
-            fontWeight: 'bold',
-            mb: 1,
-          }}>
-          {t('common.welcome')}
-        </Typography>
         <Typography
           variant="body2"
           sx={{