payment-kit 1.13.108 → 1.13.110

package/api/src/libs/hooks.ts

@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 import { spawnSync } from 'child_process';
-import { chmodSync, existsSync, mkdirSync, symlinkSync } from 'fs';
-import { dirname, join } from 'path';
+import { join } from 'path';
 
 // eslint-disable-next-line import/prefer-default-export
 export async function ensureSqliteBinaryFile() {
@@ -18,19 +17,6 @@ export async function ensureSqliteBinaryFile() {
 
   const appDir = process.env.BLOCKLET_APP_DIR!;
 
-  // link `node-pre-gyp` to .bin for download or build sqlite3
-  try {
-    const srcPath = join(appDir, 'node_modules/@mapbox/node-pre-gyp/bin/node-pre-gyp');
-    const binPath = join(appDir, 'node_modules/.bin/node-pre-gyp');
-    if (!existsSync(binPath) && existsSync(srcPath)) {
-      mkdirSync(dirname(binPath), { recursive: true });
-      symlinkSync(srcPath, binPath);
-      chmodSync(binPath, '755');
-    }
-  } catch (error) {
-    console.warn(error.message);
-  }
-
   spawnSync('npm', ['run', 'install'], {
     cwd: join(appDir, 'node_modules/sqlite3'),
     stdio: 'inherit',

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

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "payment-kit",
-  "version": "1.13.108",
+  "version": "1.13.110",
   "scripts": {
-    "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
+    "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
     "lint:fix": "npm run lint -- --fix",
@@ -98,7 +98,7 @@
     "rimraf": "^3.0.2",
     "sequelize": "^6.35.1",
     "sql-where-parser": "^2.2.1",
-    "sqlite3": "^5.1.6",
+    "sqlite3": "^5.1.7",
     "stripe": "^13.11.0",
     "typewriter-effect": "^2.21.0",
     "ufo": "^1.3.2",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.22",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.108",
+    "@did-pay/types": "1.13.110",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "2d898eb6fb22e234d95e5da8adb5e9ffdb1e0cb2"
+  "gitHead": "d62b501d4c5ea402b0b6bfd989a301f9b6b7bea3"
 }

package/src/components/layout/admin.tsx

@@ -79,7 +79,7 @@ export default function Layout(props: any) {
     return (
       <Center>
         <Stack maxWidth="sm" direction="column" alignItems="center" spacing={3}>
-          <Avatar src={window.blocklet.appLogo} sx={{ width: 80, height: 80 }} />
+          <Avatar src={window.blocklet.appLogo} sx={{ width: 80, height: 80 }} variant="rounded" />
           <Stack direction="column" alignItems="center" spacing={3}>
             <Typography variant="h4">{window.blocklet.appName}</Typography>
             <Button size="large" variant="contained" color="secondary" onClick={handleLogin}>

package/src/components/price/form.tsx

@@ -74,7 +74,7 @@ PriceForm.defaultProps = {
 
 const INPUT_WIDTH = 260;
 
-const hasMoreCurrency = (methods: TPaymentMethodExpanded[]) => {
+const hasMoreCurrency = (methods: TPaymentMethodExpanded[] = []) => {
   return methods.every((method) => method.payment_currencies.length > 1) || methods.length > 1;
 };
 
@@ -83,7 +83,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
 
   const { t } = useLocaleContext();
   const { control, setValue, getFieldState } = useFormContext();
-  const { settings, livemode } = useSettingsContext();
+  const { settings = {} as any, livemode } = useSettingsContext();
 
   const currencies = useFieldArray({ control, name: getFieldName('currency_options') });
 
@@ -92,6 +92,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
   const isMetered = useWatch({ control, name: getFieldName('recurring.usage_type') }) === 'metered';
   const isCustomInterval = useWatch({ control, name: getFieldName('recurring.interval_config') }) === 'month_2';
   const model = useWatch({ control, name: getFieldName('model') });
+  const positive = (v: number) => v >= 0;
 
   return (
     <Root direction="column" alignItems="flex-start" spacing={2}>
@@ -146,8 +147,12 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
                 type="number"
                 size="small"
                 sx={{ width: INPUT_WIDTH }}
-                error={!!getFieldState(getFieldName('unit_amount')).error}
-                helperText={getFieldState(getFieldName('unit_amount')).error?.message}
+                error={!!getFieldState(getFieldName('unit_amount')).error || !positive(field.value)}
+                helperText={
+                  !positive(field.value)
+                    ? t('admin.price.unit_amount.positive')
+                    : getFieldState(getFieldName('unit_amount')).error?.message
+                }
                 InputProps={{
                   endAdornment: <InputAdornment position="end">{settings.baseCurrency.symbol}</InputAdornment>,
                 }}

package/src/components/status.tsx

@@ -6,7 +6,14 @@ export default function Status(props: ChipProps) {
       size="small"
       variant="outlined"
       {...props}
-      sx={{ ...(props.sx || {}), borderRadius: '4px', height: 20, lineHeight: 1, textTransform: 'capitalize' }}
+      sx={{
+        ...(props.sx || {}),
+        borderRadius: '4px',
+        height: 20,
+        lineHeight: 1,
+        textTransform: 'capitalize',
+        marginRight: '10px',
+      }}
     />
   );
 }

package/tsconfig.json

@@ -3,6 +3,8 @@
     "files": true
   },
   "compilerOptions": {
+    "ignoreDeprecations": "5.0",
+
     /* Visit https://aka.ms/tsconfig to read more about this file */
     /* Projects */
     // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */