@blocklet/launcher-workflow 2.0.10 → 2.0.11

package/lib/checkout.js

@@ -85,6 +85,7 @@ function CheckoutPage() {
   } = (0, _session.useSessionContext)();
   const [showAgreement, setShowAgreement] = (0, _react.useState)(false);
   const [showPayment, setShowPayment] = (0, _react.useState)(false);
+  const [paying, setPaying] = (0, _react.useState)(false);
   const [agree, setAgree] = (0, _react.useState)(false);
   const [showPaidDialog, setShowPaidDialog] = (0, _useSetState.default)({
     open: false,
@@ -139,27 +140,34 @@ function CheckoutPage() {
   const switchPayment = method => {
     setPaymentMethod(method);
   };
+  const handleCancelPay = () => {
+    setShowPayment(false);
+    setPaying(false);
+  };
   const handlePay = async () => {
     if (session.user) {
       setShowPayment(true);
+      setPaying(true);
       return;
     }
-    if (!(session !== null && session !== void 0 && session.user)) {
-      const paymentTokenURL = (0, _urlJoin.default)(didPayPrefix, "/did/purchase/token?productId=".concat(planId, "&paymentMethodId=").concat(paymentMethod._id));
-      const {
-        data
-      } = await api.get(paymentTokenURL);
-      session.login((results, decrypt) => {
+    setPaying(true);
+    const paymentTokenURL = (0, _urlJoin.default)(didPayPrefix, "/did/purchase/token?productId=".concat(planId, "&paymentMethodId=").concat(paymentMethod._id));
+    const {
+      data
+    } = await api.get(paymentTokenURL);
+    session.login({
+      onSuccess: (results, decrypt) => {
         const [, purchaseResult] = results;
         return handlePaid(purchaseResult, decrypt);
-      }, {
+      },
+      onCancel: () => handleCancelPay(),
+      extraParams: {
         nw: data.url,
         forceConnected: false,
         saveConnect: false
-      });
-    }
+      }
+    });
   };
-  const handleCancelPay = () => setShowPayment(false);
   const handlePaid = async _ref => {
     let {
       nftId
@@ -171,7 +179,7 @@ function CheckoutPage() {
           open: true,
           nftId
         });
-        setShowPayment(false);
+        handleCancelPay();
         return;
       }
       searchParams.set('launchType', 'serverless');
@@ -180,11 +188,11 @@ function CheckoutPage() {
       pathname: (0, _urlJoin.default)(routerPrefix, "/launch/".concat(nftId)),
       search: searchParams.toString()
     });
-    setShowPayment(false);
+    handleCancelPay();
   };
   const handlePayFailed = () => {
     // TODO: Toast 错误
-    setShowPayment(false);
+    handleCancelPay(false);
   };
   const calculateTotalPayment = prices => {
     if (!paymentMethod) {
@@ -310,15 +318,15 @@ function CheckoutPage() {
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "actions",
         children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
-          loading: showPayment,
+          loading: paying,
           className: "button-previous",
           variant: "outlined",
           onClick: () => navigate(-1),
           children: t('common.previous')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
-          loading: showPayment,
+          loading: paying,
           className: "button-pay",
-          disabled: showPayment || !planId || !paymentMethod || !agree,
+          disabled: paying || showPayment || !planId || !paymentMethod || !agree,
           variant: "contained",
           onClick: handlePay,
           children: t('common.pay')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -36,13 +36,13 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.5.16",
-    "@arcblock/icons": "^2.5.16",
-    "@arcblock/license": "^2.5.16",
-    "@arcblock/ux": "^2.5.16",
-    "@blocklet/launcher-layout": "2.0.10",
-    "@blocklet/launcher-util": "2.0.10",
-    "@blocklet/launcher-ux": "2.0.10",
+    "@arcblock/did-connect": "^2.5.17",
+    "@arcblock/icons": "^2.5.17",
+    "@arcblock/license": "^2.5.17",
+    "@arcblock/ux": "^2.5.17",
+    "@blocklet/launcher-layout": "2.0.11",
+    "@blocklet/launcher-util": "2.0.11",
+    "@blocklet/launcher-ux": "2.0.11",
     "@did-pay/react": "^1.9.46",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
@@ -72,5 +72,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^2.0.2"
   },
-  "gitHead": "e9fa27a72da394ca198138b12efc2de73b6393d8"
+  "gitHead": "ee6f6158f0702e91e44236af73a66a1e25d94714"
 }