@blocklet/launcher-workflow 2.2.48 → 2.2.49

package/es/checkout.js

@@ -16,6 +16,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import useAsync from 'react-use/lib/useAsync';
 import useSetState from 'react-use/lib/useSetState';
 import joinURL from 'url-join';
+import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import Confirm from '@arcblock/ux/lib/Dialog/confirm';
 import ResultMessage from '@blocklet/launcher-layout/lib/launch-result-message';
 import formatError from '@blocklet/launcher-util/es/format-error';
@@ -92,8 +93,10 @@ function CheckoutPage({
     paying: false,
     planId: params.get('planId'),
     sessionId: params.get('sessionId'),
-    paymentMethod: params.get('paymentMethod')
+    paymentMethod: params.get('paymentMethod'),
+    autoLogin: true
   });
+  const browser = useBrowser();
   const navigate = useNavigate();
   const {
     create,
@@ -173,6 +176,17 @@ function CheckoutPage({
       paying: false
     });
   };
+  const ensureLogin = () => {
+    return new Promise(resolve => {
+      if (!session.user) {
+        session.login(() => {
+          resolve();
+        });
+      } else {
+        resolve();
+      }
+    });
+  };
   const handlePay = () => {
     if (enableBlockletAgreement && !state.agreed) {
       setState({
@@ -185,10 +199,21 @@ function CheckoutPage({
       }, 2000);
       return;
     }
-    setState({
-      showPayment: true,
-      paying: true
-    });
+    if (browser.wallet) {
+      ensureLogin().then(() => {
+        setState({
+          showPayment: true,
+          paying: true,
+          autoLogin: false
+        });
+      });
+    } else {
+      setState({
+        showPayment: true,
+        paying: true,
+        autoLogin: true
+      });
+    }
   };
   const handleConnected = result => {
     if (isPurchaseOnly) {
@@ -405,7 +430,8 @@ function CheckoutPage({
         forceSwitch: !session?.user,
         // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
         sourceAppPid: session?.user?.sourceAppPid
-      }
+      },
+      autoLogin: state.autoLogin
     }), /*#__PURE__*/_jsx(Confirm, {
       open: state.showPaidDialog.open,
       disableEscapeKeyDown: true,

package/es/purchase.js

@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import Button from '@arcblock/ux/lib/Button';
 import Center from '@arcblock/ux/lib/Center';
+import useConnect from '@arcblock/did-connect/lib/Connect/use-connect';
 import CompactLayout from '@blocklet/launcher-layout/lib/compact-layout';
 import { NFT_TYPE_SERVERLESS } from '@blocklet/launcher-util/es/constant';
 import useMobile from '@blocklet/launcher-ux/lib/use-mobile';
@@ -19,6 +20,7 @@ import joinURL from 'url-join';
 import { API_DID_PREFIX } from '@arcblock/did-connect/lib/constant';
 import ResultMessage from '@blocklet/launcher-layout/lib/launch-result-message';
 import formatError from '@blocklet/launcher-util/es/format-error';
+import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import '@splidejs/splide/dist/css/splide.min.css';
 var NextIcon = function NextIcon(props) {
   return /*#__PURE__*/_jsx("svg", {
@@ -90,9 +92,12 @@ function PurchasePage({
   const {
     session,
     storage,
-    events,
-    connectApi
+    events
   } = useSessionContext();
+  const {
+    connectApi,
+    connectHolder
+  } = useConnect();
   const [params, setParams] = useSearchParams();
   const {
     routerPrefix,
@@ -120,6 +125,7 @@ function PurchasePage({
   const api = create({
     baseURL: didPayPrefix
   });
+  const browser = useBrowser();
   const selectPlan = launch => {
     if (!state.plans.length) {
       return;
@@ -330,34 +336,76 @@ function PurchasePage({
       console.error('parse product feature failed:', error);
     }
   }
-  const handleRedeem = () => {
-    connectApi.openPopup({
-      useSocket: false,
-      locale,
-      action: 'redeem',
-      prefix: `${window.location.origin}${joinURL(baseURL || '', API_DID_PREFIX)}`,
-      onSuccess: handleRedeemed,
-      checkTimeout: 60 * 5000,
-      showDownload: false,
-      extraParams: {
-        planId: state.planId || state.plans[0]._id,
-        sessionId: state.sessionId,
-        forceSwitch: !session?.user,
-        // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
-        sourceAppPid: session?.user?.sourceAppPid,
-        provider: 'wallet'
-      },
-      messages: {
-        title: t('redeem.dialog.title'),
-        scan: t('redeem.dialog.scan'),
-        confirm: t('redeem.dialog.confirm'),
-        success: t('redeem.dialog.success')
-      },
-      baseUrl: window.location.origin
-    }, {
-      locale
+  const ensureLogin = () => {
+    return new Promise(resolve => {
+      if (!session.user) {
+        session.login(() => {
+          resolve();
+        });
+      } else {
+        resolve();
+      }
     });
   };
+  const handleRedeem = () => {
+    if (browser.wallet) {
+      // HACK: 钱包客户端中因为打开浏览器 Tab 的限制，所以在钱包客户端浏览器中使用 “登录 -> 兑换（购买）" 两步的流程
+      ensureLogin().then(() => {
+        connectApi.open({
+          useSocket: false,
+          locale,
+          action: 'redeem',
+          prefix: `${window.location.origin}${joinURL(baseURL || '', API_DID_PREFIX)}`,
+          onSuccess: handleRedeemed,
+          checkTimeout: 60 * 5000,
+          showDownload: false,
+          extraParams: {
+            planId: state.planId || state.plans[0]._id,
+            sessionId: state.sessionId,
+            forceSwitch: !session?.user,
+            // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
+            sourceAppPid: session?.user?.sourceAppPid,
+            provider: 'wallet'
+          },
+          messages: {
+            title: t('redeem.dialog.title'),
+            scan: t('redeem.dialog.scan'),
+            confirm: t('redeem.dialog.confirm'),
+            success: t('redeem.dialog.success')
+          }
+        }, {
+          locale
+        });
+      });
+    } else {
+      connectApi.openPopup({
+        useSocket: false,
+        locale,
+        action: 'redeem',
+        prefix: `${window.location.origin}${joinURL(baseURL || '', API_DID_PREFIX)}`,
+        onSuccess: handleRedeemed,
+        checkTimeout: 60 * 5000,
+        showDownload: false,
+        extraParams: {
+          planId: state.planId || state.plans[0]._id,
+          sessionId: state.sessionId,
+          forceSwitch: !session?.user,
+          // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
+          sourceAppPid: session?.user?.sourceAppPid,
+          provider: 'wallet'
+        },
+        messages: {
+          title: t('redeem.dialog.title'),
+          scan: t('redeem.dialog.scan'),
+          confirm: t('redeem.dialog.confirm'),
+          success: t('redeem.dialog.success')
+        },
+        baseUrl: window.location.origin
+      }, {
+        locale
+      });
+    }
+  };
   const handleRedeemed = ({
     sessionToken,
     nftId,
@@ -521,7 +569,7 @@ function PurchasePage({
           })
         })]
       })
-    }), session.user && /*#__PURE__*/_jsx(InProgressSession, {})]
+    }), session.user && /*#__PURE__*/_jsx(InProgressSession, {}), connectHolder]
   });
 }
 const Container = styled(Layout)`

package/lib/checkout.js

@@ -21,6 +21,7 @@ var _reactRouterDom = require("react-router-dom");
 var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
+var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 var _confirm = _interopRequireDefault(require("@arcblock/ux/lib/Dialog/confirm"));
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _formatError = _interopRequireDefault(require("@blocklet/launcher-util/es/format-error"));
@@ -44,8 +45,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var SpaceIcon = function SpaceIcon(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("svg", _objectSpread(_objectSpread({}, props), {}, {
@@ -107,8 +108,10 @@ function CheckoutPage(_ref) {
     paying: false,
     planId: params.get('planId'),
     sessionId: params.get('sessionId'),
-    paymentMethod: params.get('paymentMethod')
+    paymentMethod: params.get('paymentMethod'),
+    autoLogin: true
   });
+  const browser = (0, _useBrowser.default)();
   const navigate = (0, _reactRouterDom.useNavigate)();
   const {
     create,
@@ -189,6 +192,17 @@ function CheckoutPage(_ref) {
       paying: false
     });
   };
+  const ensureLogin = () => {
+    return new Promise(resolve => {
+      if (!session.user) {
+        session.login(() => {
+          resolve();
+        });
+      } else {
+        resolve();
+      }
+    });
+  };
   const handlePay = () => {
     if (enableBlockletAgreement && !state.agreed) {
       setState({
@@ -201,10 +215,21 @@ function CheckoutPage(_ref) {
       }, 2000);
       return;
     }
-    setState({
-      showPayment: true,
-      paying: true
-    });
+    if (browser.wallet) {
+      ensureLogin().then(() => {
+        setState({
+          showPayment: true,
+          paying: true,
+          autoLogin: false
+        });
+      });
+    } else {
+      setState({
+        showPayment: true,
+        paying: true,
+        autoLogin: true
+      });
+    }
   };
   const handleConnected = result => {
     if (isPurchaseOnly) {
@@ -423,7 +448,8 @@ function CheckoutPage(_ref) {
         forceSwitch: !(session !== null && session !== void 0 && session.user),
         // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
         sourceAppPid: session === null || session === void 0 || (_session$user3 = session.user) === null || _session$user3 === void 0 ? void 0 : _session$user3.sourceAppPid
-      }
+      },
+      autoLogin: state.autoLogin
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       open: state.showPaidDialog.open,
       disableEscapeKeyDown: true,

package/lib/components/checkbox.js

@@ -17,8 +17,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var CheckedIcon = function CheckedIcon(props) {

package/lib/components/launch-dedicated.js

@@ -30,8 +30,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const STATUS = {
   waiting: 0,
   // 未使用

package/lib/components/layout/body.js

@@ -15,8 +15,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 const Body = /*#__PURE__*/(0, _react.forwardRef)(function Body(_ref, ref) {

package/lib/components/layout/footer.js

@@ -14,8 +14,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function Footer(_ref) {

package/lib/components/layout/index.js

@@ -14,8 +14,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function Layout(_ref) {

package/lib/components/plan.js

@@ -24,8 +24,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }

package/lib/contexts/request.js

@@ -17,8 +17,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 _axios.default.defaults.timeout = 200000;
 const RequestContext = /*#__PURE__*/(0, _react.createContext)();
 const {

package/lib/purchase.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
+var _useConnect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect/use-connect"));
 var _compactLayout = _interopRequireDefault(require("@blocklet/launcher-layout/lib/compact-layout"));
 var _constant = require("@blocklet/launcher-util/es/constant");
 var _useMobile = _interopRequireDefault(require("@blocklet/launcher-ux/lib/use-mobile"));
@@ -24,6 +25,7 @@ var _urlJoin = _interopRequireDefault(require("url-join"));
 var _constant2 = require("@arcblock/did-connect/lib/constant");
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _formatError = _interopRequireDefault(require("@blocklet/launcher-util/es/format-error"));
+var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 require("@splidejs/splide/dist/css/splide.min.css");
 var _inProgressSession = _interopRequireDefault(require("./components/in-progress-session"));
 var _layout = _interopRequireDefault(require("./components/layout"));
@@ -45,8 +47,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var NextIcon = function NextIcon(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", _objectSpread(_objectSpread({}, props), {}, {
@@ -104,9 +106,12 @@ function PurchasePage(_ref) {
   const {
     session,
     storage,
-    events,
-    connectApi
+    events
   } = (0, _session.useSessionContext)();
+  const {
+    connectApi,
+    connectHolder
+  } = (0, _useConnect.default)();
   const [params, setParams] = (0, _reactRouterDom.useSearchParams)();
   const {
     routerPrefix,
@@ -134,6 +139,7 @@ function PurchasePage(_ref) {
   const api = create({
     baseURL: didPayPrefix
   });
+  const browser = (0, _useBrowser.default)();
   const selectPlan = launch => {
     if (!state.plans.length) {
       return;
@@ -348,35 +354,78 @@ function PurchasePage(_ref) {
       console.error('parse product feature failed:', error);
     }
   }
-  const handleRedeem = () => {
-    var _session$user;
-    connectApi.openPopup({
-      useSocket: false,
-      locale,
-      action: 'redeem',
-      prefix: "".concat(window.location.origin).concat((0, _urlJoin.default)(baseURL || '', _constant2.API_DID_PREFIX)),
-      onSuccess: handleRedeemed,
-      checkTimeout: 60 * 5000,
-      showDownload: false,
-      extraParams: {
-        planId: state.planId || state.plans[0]._id,
-        sessionId: state.sessionId,
-        forceSwitch: !(session !== null && session !== void 0 && session.user),
-        // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
-        sourceAppPid: session === null || session === void 0 || (_session$user = session.user) === null || _session$user === void 0 ? void 0 : _session$user.sourceAppPid,
-        provider: 'wallet'
-      },
-      messages: {
-        title: t('redeem.dialog.title'),
-        scan: t('redeem.dialog.scan'),
-        confirm: t('redeem.dialog.confirm'),
-        success: t('redeem.dialog.success')
-      },
-      baseUrl: window.location.origin
-    }, {
-      locale
+  const ensureLogin = () => {
+    return new Promise(resolve => {
+      if (!session.user) {
+        session.login(() => {
+          resolve();
+        });
+      } else {
+        resolve();
+      }
     });
   };
+  const handleRedeem = () => {
+    if (browser.wallet) {
+      // HACK: 钱包客户端中因为打开浏览器 Tab 的限制，所以在钱包客户端浏览器中使用 “登录 -> 兑换（购买）" 两步的流程
+      ensureLogin().then(() => {
+        var _session$user;
+        connectApi.open({
+          useSocket: false,
+          locale,
+          action: 'redeem',
+          prefix: "".concat(window.location.origin).concat((0, _urlJoin.default)(baseURL || '', _constant2.API_DID_PREFIX)),
+          onSuccess: handleRedeemed,
+          checkTimeout: 60 * 5000,
+          showDownload: false,
+          extraParams: {
+            planId: state.planId || state.plans[0]._id,
+            sessionId: state.sessionId,
+            forceSwitch: !(session !== null && session !== void 0 && session.user),
+            // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
+            sourceAppPid: session === null || session === void 0 || (_session$user = session.user) === null || _session$user === void 0 ? void 0 : _session$user.sourceAppPid,
+            provider: 'wallet'
+          },
+          messages: {
+            title: t('redeem.dialog.title'),
+            scan: t('redeem.dialog.scan'),
+            confirm: t('redeem.dialog.confirm'),
+            success: t('redeem.dialog.success')
+          }
+        }, {
+          locale
+        });
+      });
+    } else {
+      var _session$user2;
+      connectApi.openPopup({
+        useSocket: false,
+        locale,
+        action: 'redeem',
+        prefix: "".concat(window.location.origin).concat((0, _urlJoin.default)(baseURL || '', _constant2.API_DID_PREFIX)),
+        onSuccess: handleRedeemed,
+        checkTimeout: 60 * 5000,
+        showDownload: false,
+        extraParams: {
+          planId: state.planId || state.plans[0]._id,
+          sessionId: state.sessionId,
+          forceSwitch: !(session !== null && session !== void 0 && session.user),
+          // HACK: 在 openPopup 阶段需要手动添加 sourceAppPid 字段
+          sourceAppPid: session === null || session === void 0 || (_session$user2 = session.user) === null || _session$user2 === void 0 ? void 0 : _session$user2.sourceAppPid,
+          provider: 'wallet'
+        },
+        messages: {
+          title: t('redeem.dialog.title'),
+          scan: t('redeem.dialog.scan'),
+          confirm: t('redeem.dialog.confirm'),
+          success: t('redeem.dialog.success')
+        },
+        baseUrl: window.location.origin
+      }, {
+        locale
+      });
+    }
+  };
   const handleRedeemed = _ref3 => {
     let {
       sessionToken,
@@ -541,7 +590,7 @@ function PurchasePage(_ref) {
           })
         })]
       })
-    }), session.user && /*#__PURE__*/(0, _jsxRuntime.jsx)(_inProgressSession.default, {})]
+    }), session.user && /*#__PURE__*/(0, _jsxRuntime.jsx)(_inProgressSession.default, {}), connectHolder]
   });
 }
 const Container = (0, _styled.default)(_layout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .container-inner {\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 100%;\n    height: 100%;\n  }\n\n  .plan-list {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n\n    @media (min-width: 900px) {\n      margin-top: 20px;\n    }\n\n    @media (min-width: 680px) and (max-width: 899px) {\n      justify-content: center;\n    }\n\n    .toc {\n      min-width: 180px;\n      margin-right: 20px;\n    }\n\n    button.splide__pagination__page.is-active {\n      background: #9397a1;\n    }\n  }\n\n  .splide__pagination-custom {\n    bottom: -24px;\n  }\n\n  .footer {\n    display: flex;\n    justify-content: ", ";\n    align-item: center;\n    margin-top: auto;\n    padding-top: 16px;\n    padding-bottom: ", ";\n\n    > * {\n      margin: 0 8px;\n      ", " {\n        margin: 0 16px;\n      }\n    }\n\n    @media (max-width: ", "px) {\n      flex-direction: column;\n      align-items: center;\n    }\n\n    .footer-left {\n      display: flex;\n      gap: 16px;\n      align-items: center;\n      justify-content: space-between;\n\n      .select-space {\n        order: 1;\n        color: #000;\n\n        &:hover {\n          text-decoration: underline !important;\n        }\n      }\n\n      .redeem-button {\n        order: 1;\n      }\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        flex-direction: column;\n\n        .redeem-button {\n          width: 100%;\n          order: 2;\n        }\n      }\n    }\n\n    .button-next {\n      min-width: 200px;\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        margin-top: 20px;\n      }\n    }\n  }\n"])), props => props.embed ? 'space-between' : 'flex-end', props => props.embed ? '0' : '16px', props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.2.48",
+  "version": "2.2.49",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -41,20 +41,20 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.8.20",
-    "@arcblock/icons": "^2.8.20",
-    "@arcblock/license": "^2.8.20",
-    "@arcblock/react-hooks": "^2.8.20",
-    "@arcblock/ux": "^2.8.20",
-    "@blocklet/launcher-layout": "2.2.48",
-    "@blocklet/launcher-util": "2.2.48",
-    "@blocklet/launcher-ux": "2.2.48",
-    "@blocklet/payment": "^1.13.65",
-    "@emotion/react": "^11.11.1",
+    "@arcblock/did-connect": "^2.8.24",
+    "@arcblock/icons": "^2.8.24",
+    "@arcblock/license": "^2.8.24",
+    "@arcblock/react-hooks": "^2.8.24",
+    "@arcblock/ux": "^2.8.24",
+    "@blocklet/launcher-layout": "2.2.49",
+    "@blocklet/launcher-util": "2.2.49",
+    "@blocklet/launcher-ux": "2.2.49",
+    "@blocklet/payment": "^1.13.87",
+    "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.19",
-    "@mui/material": "^5.14.19",
-    "@ocap/util": "^1.18.103",
+    "@mui/icons-material": "^5.15.2",
+    "@mui/material": "^5.15.2",
+    "@ocap/util": "^1.18.108",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
@@ -70,14 +70,14 @@
     "lodash.throttle": "^4.1.1",
     "prop-types": "^15.8.1",
     "react-lottie-player": "^1.5.5",
-    "react-router-dom": "^6.20.1",
+    "react-router-dom": "^6.21.1",
     "react-use": "^17.4.2",
     "url-join": "^4.0.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.5",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.7",
     "@babel/preset-react": "^7.23.3",
     "babel-plugin-inline-react-svg": "^2.0.2",
     "glob": "^10.3.10",
@@ -101,5 +101,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "95e2aba074d38f74501bf7a661b145e3f23056a4"
+  "gitHead": "697f27715d2ba135fb140659bdb56e835450dd43"
 }