@blocklet/launcher-workflow 2.3.103 → 2.3.105

package/es/components/launch-dedicated.js

@@ -213,7 +213,6 @@ export default function LaunchDedicated({
     }), [STATUS.error, STATUS.launchFailedError].includes(launchState.status) && /*#__PURE__*/_jsx(LaunchResultMessage, {
       variant: "error",
       title: t(`${type}.error.launchFailed`),
-      subTitle: type === 'launch' ? t('launch.error.launchFailedDescription') : '',
       footer: type === 'launch' && /*#__PURE__*/_jsx(Button, {
         color: "primary",
         variant: "contained",

package/es/components/launch-serverless.js

@@ -53,26 +53,23 @@ export default function LaunchServerless({
         className: "content",
         children: [state.loading && /*#__PURE__*/_jsx(LaunchResultMessage, {
           variant: "loading",
-          title: t('prepare.serverless.allocate'),
-          subTitle: t('prepare.serverless.preparing')
+          title: t('prepare.serverless.preparing')
         }), state.error && /*#__PURE__*/_jsx(LaunchResultMessage, {
           variant: "error",
-          title: t('prepare.serverless.allocate'),
-          subTitle: t('prepare.serverless.prepareFailed', {
+          title: t('prepare.serverless.prepareFailed', {
             error: formatError(state.error)
           }),
           footer: /*#__PURE__*/_jsx(Button, {
             size: "small",
             style: {
-              marginTop: '8px'
+              marginTop: '-16px'
             },
             onClick: () => window.location.reload(),
             children: t('common.retry')
           })
         }), state.value && /*#__PURE__*/_jsx(LaunchResultMessage, {
           variant: "success",
-          title: t('prepare.serverless.allocated'),
-          subTitle: t('prepare.serverless.prepared')
+          title: t('prepare.serverless.prepared')
         })]
       })
     })]
@@ -83,6 +80,7 @@ const Container = styled.div`
   flex-direction: column;
   width: 100%;
   height: 100%;
+  padding-top: 100px;
 
   .page-logo {
     display: flex;
@@ -105,6 +103,13 @@ const Container = styled.div`
       .loading-description {
         margin-top: 8px;
       }
+
+      .result-title {
+        font-size: 18px;
+      }
+      .result-title.color-loading {
+        color: ${props => props.theme.palette.primary.main};
+      }
     }
   }
 `;

package/es/locales/en.js

@@ -39,15 +39,13 @@ export default {
   },
   prepare: {
     serverless: {
-      allocate: 'Waiting for space',
-      allocated: 'Blocklet space ready',
-      preparing: 'Preparing blocklet space for you launch request...',
-      prepared: 'Blocklet space is ready for you, redirecting...',
-      prepareFailed: 'Failed to prepare space! {error}'
+      preparing: 'Allocating space on the server. Please wait...',
+      prepared: 'The space is ready. Redirecting to the server to continue the installation...',
+      prepareFailed: 'Failed to allocate space! {error}'
     }
   },
   launch: {
-    pageTitle: 'Prepare Space',
+    pageTitle: 'Preparing Space',
     invalidFftId: 'Invalid Purchase NFT ID',
     launchApp: 'Launch App',
     launching: 'Your Blocklet Space is being baked, please be patient, it usually takes about 5 minutes',

package/es/locales/zh.js

@@ -39,10 +39,9 @@ export default {
   },
   prepare: {
     serverless: {
-      allocate: '等待空间就绪',
-      preparing: '正在为应用启动准备空间...',
-      prepared: '已准备好应用空间，跳转中...',
-      prepareFailed: '准备空间失败! {error}'
+      preparing: '正在服务端分配空间中...',
+      prepared: '空间已准备好，跳转服务器继续安装...',
+      prepareFailed: '分配空间失败! {error}'
     }
   },
   launch: {

package/es/prepare.js

@@ -163,7 +163,7 @@ function Content({
       });
     }
   }, [launchState.value?.launch, params, setParams]);
-  if (launchState.loading || blocklet.loading) {
+  if (blocklet.loading) {
     return /*#__PURE__*/_jsx(Center, {
       relative: "parent",
       children: /*#__PURE__*/_jsx(CircularProgress, {})
@@ -193,7 +193,7 @@ function Content({
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = launchState.value?.launch;
+  const launch = launchState.value?.launch || {};
   if ([LAUNCH_STATUS.paid, LAUNCH_STATUS.nftMinted, LAUNCH_STATUS.allocated].includes(launch.status)) {
     return /*#__PURE__*/_jsx(ConfirmDialog, {
       title: t('purchase.unexpectedLaunchSession.paid'),

package/lib/components/launch-dedicated.js

@@ -224,7 +224,6 @@ function LaunchDedicated(_ref) {
     }), [STATUS.error, STATUS.launchFailedError].includes(launchState.status) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_launchResultMessage.default, {
       variant: "error",
       title: t("".concat(type, ".error.launchFailed")),
-      subTitle: type === 'launch' ? t('launch.error.launchFailedDescription') : '',
       footer: type === 'launch' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
         color: "primary",
         variant: "contained",

package/lib/components/launch-serverless.js

@@ -64,32 +64,29 @@ function LaunchServerless(_ref) {
         className: "content",
         children: [state.loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_launchResultMessage.default, {
           variant: "loading",
-          title: t('prepare.serverless.allocate'),
-          subTitle: t('prepare.serverless.preparing')
+          title: t('prepare.serverless.preparing')
         }), state.error && /*#__PURE__*/(0, _jsxRuntime.jsx)(_launchResultMessage.default, {
           variant: "error",
-          title: t('prepare.serverless.allocate'),
-          subTitle: t('prepare.serverless.prepareFailed', {
+          title: t('prepare.serverless.prepareFailed', {
             error: (0, _formatError.default)(state.error)
           }),
           footer: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
             size: "small",
             style: {
-              marginTop: '8px'
+              marginTop: '-16px'
             },
             onClick: () => window.location.reload(),
             children: t('common.retry')
           })
         }), state.value && /*#__PURE__*/(0, _jsxRuntime.jsx)(_launchResultMessage.default, {
           variant: "success",
-          title: t('prepare.serverless.allocated'),
-          subTitle: t('prepare.serverless.prepared')
+          title: t('prepare.serverless.prepared')
         })]
       })
     })]
   });
 }
-const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n\n  .page-logo {\n    display: flex;\n    justify-content: center;\n    margin-top: 62px;\n    ", " {\n      margin-top: 48px;\n    }\n  }\n\n  .page-body {\n    margin-top: 128px;\n\n    .content {\n      display: flex;\n      align-items: center;\n      flex-direction: column;\n      text-align: center;\n\n      .loading-description {\n        margin-top: 8px;\n      }\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'));
+const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n  padding-top: 100px;\n\n  .page-logo {\n    display: flex;\n    justify-content: center;\n    margin-top: 62px;\n    ", " {\n      margin-top: 48px;\n    }\n  }\n\n  .page-body {\n    margin-top: 128px;\n\n    .content {\n      display: flex;\n      align-items: center;\n      flex-direction: column;\n      text-align: center;\n\n      .loading-description {\n        margin-top: 8px;\n      }\n\n      .result-title {\n        font-size: 18px;\n      }\n      .result-title.color-loading {\n        color: ", ";\n      }\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'), props => props.theme.palette.primary.main);
 LaunchServerless.propTypes = {
   sessionId: _propTypes.default.string.isRequired
 };

package/lib/locales/en.js

@@ -45,15 +45,13 @@ var _default = exports.default = {
   },
   prepare: {
     serverless: {
-      allocate: 'Waiting for space',
-      allocated: 'Blocklet space ready',
-      preparing: 'Preparing blocklet space for you launch request...',
-      prepared: 'Blocklet space is ready for you, redirecting...',
-      prepareFailed: 'Failed to prepare space! {error}'
+      preparing: 'Allocating space on the server. Please wait...',
+      prepared: 'The space is ready. Redirecting to the server to continue the installation...',
+      prepareFailed: 'Failed to allocate space! {error}'
     }
   },
   launch: {
-    pageTitle: 'Prepare Space',
+    pageTitle: 'Preparing Space',
     invalidFftId: 'Invalid Purchase NFT ID',
     launchApp: 'Launch App',
     launching: 'Your Blocklet Space is being baked, please be patient, it usually takes about 5 minutes',

package/lib/locales/zh.js

@@ -45,10 +45,9 @@ var _default = exports.default = {
   },
   prepare: {
     serverless: {
-      allocate: '等待空间就绪',
-      preparing: '正在为应用启动准备空间...',
-      prepared: '已准备好应用空间，跳转中...',
-      prepareFailed: '准备空间失败! {error}'
+      preparing: '正在服务端分配空间中...',
+      prepared: '空间已准备好，跳转服务器继续安装...',
+      prepareFailed: '分配空间失败! {error}'
     }
   },
   launch: {

package/lib/prepare.js

@@ -175,7 +175,7 @@ function Content(_ref) {
       });
     }
   }, [(_launchState$value5 = launchState.value) === null || _launchState$value5 === void 0 ? void 0 : _launchState$value5.launch, params, setParams]);
-  if (launchState.loading || blocklet.loading) {
+  if (blocklet.loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
       relative: "parent",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
@@ -205,7 +205,7 @@ function Content(_ref) {
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = (_launchState$value6 = launchState.value) === null || _launchState$value6 === void 0 ? void 0 : _launchState$value6.launch;
+  const launch = ((_launchState$value6 = launchState.value) === null || _launchState$value6 === void 0 ? void 0 : _launchState$value6.launch) || {};
   if ([_constant.LAUNCH_STATUS.paid, _constant.LAUNCH_STATUS.nftMinted, _constant.LAUNCH_STATUS.allocated].includes(launch.status)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       title: t('purchase.unexpectedLaunchSession.paid'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.103",
+  "version": "2.3.105",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -29,7 +29,7 @@
     "build:lib": "babel src --out-dir lib --copy-files --no-copy-ignored",
     "build:es": "babel --config-file ./babel.config.es.js src --out-dir es --copy-files --no-copy-ignored",
     "autoexports": "node tools/auto-exports.js",
-    "watch": "npm run watch:lib && npm run watch:es && npm run autoexports",
+    "watch": "concurrently \"npm run watch:lib\" \"npm run watch:es\" \"npm run autoexports\"",
     "watch:lib": "babel src --out-dir lib -w --copy-files",
     "watch:es": "babel --config-file ./babel.config.es.js src --out-dir es -w --copy-files",
     "prepublish": "npm run build"
@@ -41,16 +41,16 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.12.44",
-    "@arcblock/icons": "^2.12.44",
-    "@arcblock/license": "^2.12.44",
-    "@arcblock/react-hooks": "^2.12.44",
-    "@arcblock/ux": "^2.12.44",
-    "@blocklet/launcher-layout": "^2.12.44",
-    "@blocklet/launcher-util": "2.3.103",
-    "@blocklet/launcher-ux": "2.3.103",
+    "@arcblock/did-connect": "^2.12.52",
+    "@arcblock/icons": "^2.12.52",
+    "@arcblock/license": "^2.12.52",
+    "@arcblock/react-hooks": "^2.12.52",
+    "@arcblock/ux": "^2.12.52",
+    "@blocklet/launcher-layout": "^2.12.52",
+    "@blocklet/launcher-util": "2.3.105",
+    "@blocklet/launcher-ux": "2.3.105",
     "@blocklet/payment": "^1.14.8",
-    "@blocklet/payment-react": "^1.18.23",
+    "@blocklet/payment-react": "^1.18.24",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^5.17.1",
@@ -85,6 +85,7 @@
     "@babel/preset-env": "^7.26.9",
     "@babel/preset-react": "^7.26.3",
     "babel-plugin-inline-react-svg": "^2.0.2",
+    "concurrently": "^9.1.2",
     "glob": "^10.4.5"
   },
   "exports": {
@@ -105,5 +106,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "fb3b2f0bfde81ee0732bda63008d8c6f55d8e6ab"
+  "gitHead": "f846b89921b0475a10753321cc01e43799e60d86"
 }