@blocklet/payment-react 1.19.23 → 1.20.1

package/lib/payment/form/index.js

@@ -161,6 +161,7 @@ function PaymentForm({
     creditInsufficientInfo: null
   });
   const currencies = (0, _util2.flattenPaymentMethods)(paymentMethods);
+  const searchParams = (0, _util2.getQueryParams)(window.location.href);
   const onCheckoutComplete = (0, _ahooks.useMemoizedFn)(async ({
     response
   }) => {
@@ -673,6 +674,18 @@ function PaymentForm({
     }),
     confirm: t("common.confirm")
   });
+  const getRedirectUrl = () => {
+    if (searchParams.redirect) {
+      return decodeURIComponent(searchParams.redirect);
+    }
+    if (checkoutSession.success_url) {
+      return checkoutSession.success_url;
+    }
+    if (paymentLink?.after_completion?.redirect?.url) {
+      return paymentLink.after_completion.redirect.url;
+    }
+    return void 0;
+  };
   if (onlyShowBtn) {
     return /* @__PURE__ */(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
@@ -780,7 +793,7 @@ function PaymentForm({
               mode: checkoutSession.mode,
               onConfirm: onStripeConfirm,
               onCancel: onStripeCancel,
-              returnUrl: checkoutSession?.success_url
+              returnUrl: getRedirectUrl()
             })]
           })
         }), showForm && /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {

package/lib/payment/summary.js

@@ -331,7 +331,7 @@ function PaymentSummary({
           mt: 2.5,
           mb: 2.5
         }
-      }), staking > 0 && /* @__PURE__ */(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      }), +staking > 0 && /* @__PURE__ */(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {
           direction: "row",
           spacing: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.19.23",
+  "version": "1.20.1",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -54,16 +54,16 @@
     }
   },
   "dependencies": {
-    "@arcblock/did-connect-react": "^3.1.32",
-    "@arcblock/ux": "^3.1.32",
-    "@arcblock/ws": "^1.23.1",
-    "@blocklet/theme": "^3.1.32",
-    "@blocklet/ui-react": "^3.1.32",
+    "@arcblock/did-connect-react": "^3.1.33",
+    "@arcblock/ux": "^3.1.33",
+    "@arcblock/ws": "^1.24.7",
+    "@blocklet/theme": "^3.1.33",
+    "@blocklet/ui-react": "^3.1.33",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/util": "^1.23.1",
+    "@ocap/util": "^1.24.7",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "@vitejs/plugin-legacy": "^7.0.0",
@@ -94,7 +94,7 @@
     "@babel/core": "^7.27.4",
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
-    "@blocklet/payment-types": "1.19.23",
+    "@blocklet/payment-types": "1.20.1",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -125,5 +125,5 @@
     "vite-plugin-babel": "^1.3.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
-  "gitHead": "1bb6bff218ad207b078af97a1700bfe1dc85817a"
+  "gitHead": "7b2ae13171bfff930083efd2b93974a8fa403de1"
 }

package/src/libs/util.ts

@@ -1047,6 +1047,7 @@ export function formatTotalPrice({
       totalAmount: '0',
     };
   }
+  // @ts-expect-error 这里有问题
   const unitValue = new BN(price.custom_unit_amount || price.unit_amount);
   const currency: TPaymentCurrency = price?.currency ?? {};
 

package/src/payment/form/index.tsx

@@ -30,6 +30,7 @@ import {
   formatError,
   formatQuantityInventory,
   getPrefix,
+  getQueryParams,
   getStatementDescriptor,
   getTokenBalanceLink,
   isCrossOrigin,
@@ -229,6 +230,7 @@ export default function PaymentForm({
   });
 
   const currencies = flattenPaymentMethods(paymentMethods);
+  const searchParams = getQueryParams(window.location.href);
 
   const onCheckoutComplete = useMemoizedFn(async ({ response }: { response: TCheckoutSession }) => {
     if (response.id === checkoutSession.id && state.paid === false) {
@@ -743,6 +745,19 @@ export default function PaymentForm({
     />
   );
 
+  const getRedirectUrl = () => {
+    if (searchParams.redirect) {
+      return decodeURIComponent(searchParams.redirect);
+    }
+    if (checkoutSession.success_url) {
+      return checkoutSession.success_url;
+    }
+    if (paymentLink?.after_completion?.redirect?.url) {
+      return paymentLink.after_completion.redirect.url;
+    }
+    return undefined;
+  };
+
   if (onlyShowBtn) {
     return (
       <>
@@ -850,7 +865,7 @@ export default function PaymentForm({
                   mode={checkoutSession.mode}
                   onConfirm={onStripeConfirm}
                   onCancel={onStripeCancel}
-                  returnUrl={checkoutSession?.success_url}
+                  returnUrl={getRedirectUrl()}
                 />
               )}
             </Stack>

package/src/payment/summary.tsx

@@ -348,9 +348,8 @@ export default function PaymentSummary({
         ) : (
           ProductCardList
         )}
-
         <Divider sx={{ mt: 2.5, mb: 2.5 }} />
-        {staking > 0 && (
+        {+staking > 0 && (
           <>
             <Stack
               direction="row"