payment-kit 1.16.18 → 1.16.19

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.16.19
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.16.18",
+  "version": "1.16.19",
   "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.16.19",
     "@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.16.19",
     "@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": "a033985b46d5c80b56f2ed9dc86d808fb60d9db1"
 }

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>;