payment-kit 1.13.285 → 1.13.287

package/.eslintrc.js

@@ -13,5 +13,6 @@ module.exports = {
     'import/prefer-default-export': 'off',
     'react-hooks/exhaustive-deps': 'off',
     'jsx-a11y/no-noninteractive-element-interactions': 'off',
+    '@typescript-eslint/indent': 'off',
   },
 };

package/api/src/integrations/stripe/resource.ts

@@ -44,7 +44,7 @@ export async function ensureStripeProduct(internal: Product, method: PaymentMeth
     attrs.unit_label = internal.unit_label;
   }
   if (internal.statement_descriptor) {
-    attrs.statement_descriptor = internal.statement_descriptor;
+    attrs.statement_descriptor_suffix = internal.statement_descriptor;
   }
 
   const product = await client.products.create(attrs);
@@ -175,7 +175,7 @@ export async function ensureStripePaymentIntent(
         enabled: true,
         allow_redirects: 'never',
       },
-      statement_descriptor: internal.statement_descriptor,
+      statement_descriptor_suffix: internal.statement_descriptor,
       metadata: {
         appPid: env.appPid,
         id: internal.id,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.285",
+  "version": "1.13.287",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,29 +43,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "1.16.28",
-    "@arcblock/did": "^1.18.123",
+    "@arcblock/did": "^1.18.124",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.10.1",
-    "@arcblock/did-util": "^1.18.123",
-    "@arcblock/jwt": "^1.18.123",
-    "@arcblock/ux": "^2.10.1",
-    "@arcblock/validator": "^1.18.123",
+    "@arcblock/did-connect": "^2.10.3",
+    "@arcblock/did-util": "^1.18.124",
+    "@arcblock/jwt": "^1.18.124",
+    "@arcblock/ux": "^2.10.3",
+    "@arcblock/validator": "^1.18.124",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.13.285",
+    "@blocklet/payment-react": "1.13.287",
     "@blocklet/sdk": "1.16.28",
-    "@blocklet/ui-react": "^2.10.1",
-    "@blocklet/uploader": "^0.1.11",
+    "@blocklet/ui-react": "^2.10.3",
+    "@blocklet/uploader": "^0.1.18",
     "@mui/icons-material": "^5.15.19",
     "@mui/lab": "^5.0.0-alpha.170",
     "@mui/material": "^5.15.19",
     "@mui/styles": "^5.15.19",
     "@mui/system": "^5.15.15",
-    "@ocap/asset": "^1.18.123",
-    "@ocap/client": "^1.18.123",
-    "@ocap/mcrypto": "^1.18.123",
-    "@ocap/util": "^1.18.123",
-    "@ocap/wallet": "^1.18.123",
+    "@ocap/asset": "^1.18.124",
+    "@ocap/client": "^1.18.124",
+    "@ocap/mcrypto": "^1.18.124",
+    "@ocap/util": "^1.18.124",
+    "@ocap/wallet": "^1.18.124",
     "@react-pdf/renderer": "^3.4.4",
     "@stripe/react-stripe-js": "^2.7.1",
     "@stripe/stripe-js": "^2.4.0",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.13.285",
+    "@blocklet/payment-types": "1.13.287",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -143,7 +143,7 @@
     "type-fest": "^4.19.0",
     "typescript": "^4.9.5",
     "vite": "^5.2.12",
-    "vite-plugin-blocklet": "^0.7.9",
+    "vite-plugin-blocklet": "^0.8.1",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "zx": "^7.2.3"
@@ -158,5 +158,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d95d4a86102a7394461680849860140aa372ab06"
+  "gitHead": "a0dac51aff70028e5996af607181e285ea2bb770"
 }

package/src/components/metadata/editor.tsx

@@ -1,8 +1,10 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Button, CircularProgress, Stack } from '@mui/material';
+import { isObject } from 'lodash';
 import type { EventHandler } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
+import { isObjectContent } from '../../libs/util';
 import MetadataForm from './form';
 
 export default function MetadataEditor({
@@ -20,7 +22,10 @@ export default function MetadataEditor({
   const metadata = data.metadata || {};
   const methods = useForm<any>({
     defaultValues: {
-      metadata: Object.keys(metadata).map((key: string) => ({ key, value: metadata[key] })),
+      metadata: Object.keys(metadata).map((key: string) => ({
+        key,
+        value: isObject(metadata[key]) ? JSON.stringify(metadata[key]) : metadata[key],
+      })),
     },
   });
 
@@ -31,7 +36,16 @@ export default function MetadataEditor({
   };
   const onSubmit = () => {
     handleSubmit(async (formData: any) => {
-      await onSave(formData);
+      const payload = {
+        ...(formData || {}),
+        metadata: Array.isArray(formData.metadata)
+          ? formData.metadata.reduce((acc: any, x: any) => {
+              acc[x.key] = isObjectContent(x.value) ? JSON.parse(x.value) : x.value;
+              return acc;
+            }, {})
+          : [],
+      };
+      await onSave(payload);
       reset();
       onCancel(null);
     })();

package/src/components/metadata/list.tsx

@@ -3,6 +3,7 @@ import { Typography } from '@mui/material';
 import isEmpty from 'lodash/isEmpty';
 import isObject from 'lodash/isObject';
 
+import { isObjectContent } from '../../libs/util';
 import InfoRow from '../info-row';
 
 export default function MetadataList({ data }: { data: any }) {
@@ -12,14 +13,22 @@ export default function MetadataList({ data }: { data: any }) {
     return <Typography color="text.secondary">{t('common.metadata.empty')}</Typography>;
   }
 
+  const formatValue = (value: any) => {
+    if (isObjectContent(value)) {
+      return <pre>{JSON.stringify(JSON.parse(value), null, 2)}</pre>;
+    }
+    if (isObject(value)) {
+      return <pre>{JSON.stringify(value, null, 2)}</pre>;
+    }
+    return value;
+  };
+
   // skip non-string values
   return (
     <>
-      {Object.keys(data || {})
-        .filter((key) => isObject(data[key]) === false)
-        .map((key) => (
-          <InfoRow key={key} label={key} value={data[key]} />
-        ))}
+      {Object.keys(data || {}).map((key) => (
+        <InfoRow key={key} label={key} value={formatValue(data[key])} />
+      ))}
     </>
   );
 }

package/src/libs/util.ts

@@ -14,6 +14,7 @@ import type {
 } from '@blocklet/payment-types';
 import { Hasher } from '@ocap/mcrypto';
 import { hexToNumber } from '@ocap/util';
+import { isObject } from 'lodash';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
 import { joinURL } from 'ufo';
@@ -224,3 +225,11 @@ export function goBackOrFallback(fallback: string) {
     }
   }, 500);
 }
+
+export function isObjectContent(value: string) {
+  try {
+    return isObject(JSON.parse(value));
+  } catch (err) {
+    return false;
+  }
+}