@abtnode/ux 1.16.11-beta-069c3537 → 1.16.11-next-a232f5fb

package/lib/locales/zh.js

@@ -331,10 +331,10 @@ module.exports = {
     appPid: '永久性 DID',
     alsoKnownAs: '曾用 DID',
     skSource: '安装钱包',
-    reloadSuccess: 'Blocklet 重启成功',
-    statusTip: 'Blocklet {status}',
+    reloadSuccess: '应用重启成功',
+    statusTip: '应用{status}',
     initialUptime: '少于1分钟',
-    dashboard: 'Blocklet 控制台',
+    dashboard: '应用控制台',
     noComponent: '应用没有组件，无法启动',
     action: {
       stopDescription: '停止该基石程序将会使页面不可以访问，可能会导致使用它的用户出现错误',
@@ -356,13 +356,13 @@ module.exports = {
       modeTip: '请将节点切换至 DEBUG 模式'
     },
     fromUrl: {
-      title: '安装 Blocklet',
-      label: 'Blocklet Meta URL',
-      description: 'URL 应指向 Blocklet 的 Meta 文件。如果需要指向本地文件，请加上 file:// 前缀，如：file:///Users/foo/blocklet.json。',
+      title: '安装应用',
+      label: '应用Meta URL',
+      description: 'URL 应指向应用的 Meta 文件。如果需要指向本地文件，请加上 file:// 前缀，如：file:///Users/foo/blocklet.json。',
       confirm: '安装',
       step0: '输入 URL',
       step1: '确认 Meta 信息',
-      existTipPrefix: '已存在相同 DID 的 Blocklet， 版本为',
+      existTipPrefix: '已存在相同 DID 的应用， 版本为',
       existTipSuffix: '，请安装更高版本。'
     },
     index: {
@@ -380,14 +380,14 @@ module.exports = {
       description: '应用描述',
       sk: '应用账户私钥',
       logo: '（即将废弃）应用 Logo 地址或路径',
-      logoSquare: '正方形 Logo 地址或路径 (可选，默认使用发布到 Store 的 Blocklet Logo)',
+      logoSquare: '正方形 Logo 地址或路径 (可选，默认使用发布到 Store 的应用Logo)',
       logoRect: '横版 Logo 地址或路径 (可选)',
       logoFavicon: 'favicon 地址或路径 (可选，默认和正方形 Logo 相同)',
       clusterSize: '以 Cluster 模式启动时的实例数量',
       deletable: {
         name: '删除保护',
-        enable: '此 Blocklet 当前不可被删除',
-        disable: '此 Blocklet 当前可以被删除'
+        enable: '此应用当前不可被删除',
+        disable: '此应用当前可以被删除'
       },
       walletType: {
         name: '钱包类型',
@@ -420,8 +420,8 @@ module.exports = {
         updatedTip: '访问控制已修改'
       },
       disabledText: '请在 ".env" 文件或 "blocklet.yml" 文件中编辑环境变量',
-      changedTip: '配置已更新，请重启 Blocklet',
-      missingRequired: '缺少启动 Blocklet 的必填项',
+      changedTip: '配置已更新，请重启应用',
+      missingRequired: '缺少启动应用的必填项',
       gotoFix: '去修复',
       environment: {
         key: '配置键',
@@ -457,7 +457,7 @@ module.exports = {
       cacheDir: '缓存目录'
     },
     runtimeInfo: {
-      noRunning: '当 Blocklet 运行时才可以获得运行信息！',
+      noRunning: '当应用运行时才可以获得运行信息！',
       memoryUsage: '内存',
       cpuUsage: 'CPU',
       uptime: '启动时长',
@@ -500,8 +500,8 @@ module.exports = {
       noUpdate: '没有需要更新的组件',
       add: '添加组件',
       selectComponent: '选择组件',
-      selectRegistry: '选择 Blocklet 商店',
-      selectRegistryTip: '您可以切换 Blocklet 商店以查看更多组件',
+      selectRegistry: '选择应用商店',
+      selectRegistryTip: '您可以切换应用商店以查看更多组件',
       selectInstance: '选择实例',
       selectInstanceTip: '您可以选择已有实例 或 创建新的实例。已有实例将使用之前保存的配置和数据',
       newInstance: '创建新实例',
@@ -512,7 +512,7 @@ module.exports = {
       deleteDescription: '删除后此组件将无法访问。确认删除？',
       purchase: '需要支付',
       tip: {
-        stopBlocklet: '请先停止运行 Blocklet',
+        stopBlocklet: '请先停止运行应用',
         notDynamic: '只有动态添加的组件才能被删除',
         requiredBy: '{name} 需要该组件'
       },
@@ -540,7 +540,7 @@ module.exports = {
     router: {
       urlPath: 'URL 路径',
       securitySetting: '安全设置',
-      noRunning: 'Blocklet 当前未启动。无法通过以下地址访问！',
+      noRunning: '应用当前未启动。无法通过以下地址访问！',
       checkUrlAccessible: '检查地址的是否可访问',
       urlInaccessible: '可能因为网络的原因，该地址暂时无法访问',
       noAccessibleUrl: '没有可访问的地址',
@@ -551,14 +551,14 @@ module.exports = {
       currentDomainTip: '你正在通过该域名访问当前页面'
     },
     export: {
-      title: '导出 Blocklet',
+      title: '导出应用',
       name: '包名称',
       nameTip: 'e.g. "my-blocklet-name" or "@my-scope/blocklet-name"',
       result: '接下来',
       exportSource: '导出源代码',
-      success: 'Blocklet 导出成功',
+      success: '应用导出成功',
       resultTipStart: '使用',
-      resultTipEnd: '你可以在几分钟内构建并发布这个 Blocklet',
+      resultTipEnd: '你可以在几分钟内构建并发布这个应用',
       uploadedComponentTip: '无法导出直接上传的组件：'
     },
     migrate: {
@@ -580,8 +580,8 @@ module.exports = {
       }
     },
     error: {
-      isRunning: 'Blocklet 正在运行，请先停止运行',
-      isInProgress: 'Blocklet 正在进行中，请等待完成'
+      isRunning: '应用正在运行，请先停止运行',
+      isInProgress: '应用正在进行中，请等待完成'
     }
   },
   dashboard: {
@@ -590,7 +590,7 @@ module.exports = {
     routingEngine: '路由引擎',
     ownerNftURL: '所有者 NFT',
     expirationLeft: '有效期还剩',
-    startFromCrashTip: 'Blocklet Server 上次未正常退出，请手动启动需要运行的 blocklet.'
+    startFromCrashTip: '应用Server 上次未正常退出，请手动启动需要运行的 blocklet.'
   },
   store: {
     nameSort: '名称',
@@ -626,16 +626,16 @@ module.exports = {
       waiting: '等待购买完成...',
       purchase: {
         title: '获取凭证',
-        description: '安装此 Blocklet 之前你需要支付一定数量的通证以完成购买'
+        description: '安装此应用之前你需要支付一定数量的通证以完成购买'
       },
       verify: {
         title: '验证凭证',
-        description: '如果你已经购买过此 Blocklet，提供购买凭证 NFT 即可完成安装',
+        description: '如果你已经购买过此应用，提供购买凭证 NFT 即可完成安装',
         auth: {
           title: '需要验证购买凭证',
           scan: '用你的 DID 钱包扫描下面的二维码以提供购买凭证',
           confirm: '请在 DID 钱包上确认',
-          success: '你的购买凭证已经验证通过，Blocklet 正在安装中'
+          success: '你的购买凭证已经验证通过，应用正在安装中'
         }
       },
       auth: {
@@ -796,7 +796,7 @@ module.exports = {
     validation: {
       urlRequired: 'URL 是必填的',
       redirectCodeRequired: '重定向码是必选的',
-      didRequired: 'Blocklet 是必选的',
+      didRequired: '应用是必选的',
       pathPrefixTooLong: '请求的前缀不能超过30个字符',
       pathPrefixCannotBeEmpty: '请求的前缀不能为空',
       domainRequired: '节点域名不能为空',
@@ -866,7 +866,7 @@ module.exports = {
         pathPrefixTip: "如果你填写了 '/prefix'，那么所有以其为前缀的请求都会被转发到配置的基石程序",
         blocklet: '把请求代理到哪个服务？',
         port: '把请求代理到哪个端口？',
-        portTip: '这里的默认值是 Blocklet 默认监听的端口，如果你的 Blocklet 会启用多个端口，你可以根据需要自定义'
+        portTip: '这里的默认值是应用默认监听的端口，如果你的应用会启用多个端口，你可以根据需要自定义'
       },
       delete: {
         title: '删除规则',
@@ -946,7 +946,7 @@ module.exports = {
         switchLabel: '请求限流',
         rate: '限流速率({rate} 请求/秒)',
         ipHeaderLabel: '自定义客户端 IP 头部(可选)',
-        ipHeaderDesc: '如果 Blocklet Server 运行在一些代理后面，可以在这里设置客户端真实 IP 的头部；可选，如果不填将使用默认值。'
+        ipHeaderDesc: '如果应用Server 运行在一些代理后面，可以在这里设置客户端真实 IP 的头部；可选，如果不填将使用默认值。'
       },
       cacheEnabled: {
         switchLabel: '启用网关缓存'
@@ -1179,7 +1179,6 @@ module.exports = {
     alreadyInstalled: '应用 {name} 已经安装到当前节点，无需重复安装',
     alreadyExists: '该应用已经存在，跳转中...',
     launchSuccess: '{appName} 已经启动成功！',
-    selectAbtNode: '选择节点',
     nextStep: '下一步',
     purchased: '已购买',
     purchase: '购买',
@@ -1199,7 +1198,6 @@ module.exports = {
     newVersionDesc: '应用已经存在，但当前版本可更新',
     later: '稍后',
     upgradeNow: '现在更新',
-    abtnodeLicenseName: '节点许可',
     introduction: '简介',
     welcome: '欢迎来到应用启动向导',
     accept: '许可协议',
@@ -1210,24 +1208,25 @@ module.exports = {
     launched: '启动',
     confirmInstall: '确认安装',
     dialog: {
-      title: '需要您的授权',
-      freeDescription: '你需要提供应用空间 NFT 或节点通行证凭据来启动应用',
-      freeServerlessDescription: '请提应用空间 NFT',
-      nonFreeDescription: '你需要提供应用购买凭证和节点通行证来启动应用',
-      confirm: '在您的 DID 钱包上确认',
+      title: '成为应用所有者',
+      nftFreeDescription: '请提空间购买凭证并创建应用账户以继续',
+      nftPaidDescription: '请提空间购买凭证、应用购买凭证、创建应用账户以继续',
+      freeDescription: '请创建应用账户以继续',
+      paidDescription: '请提供应用购买凭证、并创建应用账户以继续',
+      confirm: '在 DID 钱包上确认',
       success: '授权成功',
       authorizationTimeout: '授权超时'
     },
     waiting: {
-      verifying: '验证应用元数据',
-      downloading: '下载应用包',
-      extracting: '提取应用包的数据',
-      downloadingComponent: '下载中: {name}',
-      extractingComponent: '提取中: {name}',
-      installing: '安装应用和设置组件',
+      verifying: '验证应用元数据...',
+      downloading: '下载应用包...',
+      extracting: '提取应用包的数据...',
+      downloadingComponent: '下载 {name}',
+      extractingComponent: '提取 {name}',
+      installing: '安装应用置组件...',
       installed: '已安装',
-      starting: '正在启动...',
-      done: '安装完成'
+      starting: '正在启动应用...',
+      done: '等待应用就绪...'
     },
     error: {
       loadMetaFailed: '获取应用信息出错',

package/lib/logs/download.js

@@ -17,8 +17,8 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _formatName = _interopRequireDefault(require("@abtnode/util/lib/format-name"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../contexts/node");
-var _toast = _interopRequireDefault(require("../toast"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const DAYS = [1, 7];
@@ -58,7 +58,7 @@ function DownloadLog(_ref) {
       setIsDownloading(false);
     } catch (error) {
       setIsDownloading(false);
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
     }
   };
   const onDaysChange = e => {

package/lib/store/delete.js

@@ -10,8 +10,8 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../contexts/node");
-var _toast = _interopRequireDefault(require("../toast"));
 var _deleteConfirm = _interopRequireDefault(require("../delete-confirm"));
 var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -48,7 +48,7 @@ function DeleteStore(_ref) {
         onDelete();
       }
     } catch (err) {
-      _toast.default.error("Remove Blocklet Store Error: ".concat((0, _util.formatError)(err)));
+      _Toast.default.error("Remove Blocklet Store Error: ".concat((0, _util.formatError)(err)));
     } finally {
       setLoading(false);
       setConfirmSetting(null);

package/lib/team/members/index.js

@@ -27,7 +27,7 @@ var _RelativeTime = _interopRequireDefault(require("@arcblock/ux/lib/RelativeTim
 var _constant = require("@abtnode/constant");
 var _useUrlState = _interopRequireDefault(require("@ahooksjs/use-url-state"));
 var _ahooks = require("ahooks");
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _blocklet = require("../../contexts/blocklet");
@@ -50,6 +50,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); } /* eslint-disable react/no-unstable-nested-components */ /* eslint-disable jsx-a11y/aria-role */
+;
 const ROLE_ALL = '$all';
 const ROLE_NONE = '$none';
 const getCount = (counts, name) => {
@@ -216,14 +217,14 @@ function MemberList(_ref2) {
       setRowCount(res.paging.total);
     }).catch(err => {
       setLoading(false);
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     });
   };
   const getUserCounts = () => {
     api.getUsersCountPerRole().then(res => {
       setUserCounts(res.counts || []);
     }).catch(err => {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     });
   };
   const handleUserChange = data => {

package/lib/team/members/member.js

@@ -7,7 +7,7 @@ exports.default = Member;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _notistack = require("notistack");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -113,9 +113,6 @@ function Member(_ref3) {
     issuances: null,
     tab: initTab || defaultTab
   });
-  const {
-    enqueueSnackbar
-  } = (0, _notistack.useSnackbar)();
   const getData = async (_teamDid, _userDid) => {
     try {
       const res = await api.doBatchQuery({
@@ -143,10 +140,7 @@ function Member(_ref3) {
       pageState.user = res.getUser.user || {};
       pageState.issuances = res.getPassportIssuances.list || [];
     } catch (err) {
-      enqueueSnackbar((0, _util.formatError)(err), {
-        autoHideDuration: 5000,
-        variant: 'error'
-      });
+      _Toast.default.error((0, _util.formatError)(err));
     }
   };
   (0, _react.useEffect)(() => {

package/lib/team/members/passport-issuances.js

@@ -7,7 +7,7 @@ exports.default = PassportIssuances;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _notistack = require("notistack");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _node = require("../../contexts/node");
@@ -37,9 +37,6 @@ function PassportIssuances(_ref) {
   } = (0, _react.useContext)(_context.LocaleContext);
   const [delConfirm, setDelConfirm] = (0, _react.useState)(null);
   const [loading, setLoading] = (0, _react.useState)(false);
-  const {
-    enqueueSnackbar
-  } = (0, _notistack.useSnackbar)();
   const {
     endpoint
   } = (0, _team.useTeamContext)();
@@ -60,10 +57,7 @@ function PassportIssuances(_ref) {
       });
       onRefresh();
     } catch (error) {
-      enqueueSnackbar(error.message, {
-        autoHideDuration: 5000,
-        variant: 'error'
-      });
+      _Toast.default.error(error.message);
     } finally {
       setLoading(false);
       setDelConfirm(null);

package/lib/team/members/passports.js

@@ -7,9 +7,9 @@ exports.default = Passports;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _notistack = require("notistack");
 var _get = _interopRequireDefault(require("lodash/get"));
 var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Add = _interopRequireDefault(require("@mui/icons-material/Add"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
@@ -100,9 +100,6 @@ function Passports(_ref2) {
     api,
     inService
   } = (0, _node.useNodeContext)();
-  const {
-    enqueueSnackbar
-  } = (0, _notistack.useSnackbar)();
   const [loading, setLoading] = (0, _react.useState)(false);
   const [toggleConfirm, setToggleConfirm] = (0, _react.useState)(null);
   const [showIssueDialog, setShowIssueDialog] = (0, _react.useState)(false);
@@ -127,10 +124,7 @@ function Passports(_ref2) {
       });
       refreshTeam();
     } catch (err) {
-      enqueueSnackbar((0, _util.formatError)(err), {
-        autoHideDuration: 5000,
-        variant: 'error'
-      });
+      _Toast.default.error((0, _util.formatError)(err));
     } finally {
       setLoading(false);
       setToggleConfirm(null);

package/lib/team/members/toggle-user-approval.js

@@ -7,7 +7,7 @@ exports.default = ToggleUserApproval;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -66,7 +66,7 @@ function ToggleUserApproval(_ref) {
       onSuccess();
       refresh();
     } catch (error) {
-      _toast.default.error((0, _util.formatError)(error));
+      _Toast.default.error((0, _util.formatError)(error));
       onError();
     } finally {
       setLoading(false);

package/lib/team/passports/color.js

@@ -16,7 +16,7 @@ var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/
 var _util = require("@blocklet/meta/lib/util");
 var _passportColor = require("@abtnode/auth/lib/util/passport-color");
 var _constant = require("@blocklet/constant");
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _blocklet = require("../../contexts/blocklet");
 var _util2 = require("../../util");
@@ -61,7 +61,7 @@ function PassportColor(_ref) {
       });
       onSuccess();
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     } finally {
       setLoading(false);
     }

package/lib/team/passports/detail.js

@@ -17,7 +17,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util = require("../../util");
@@ -72,7 +72,7 @@ function PassportDetail(_ref) {
       });
       onDelete();
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     } finally {
       setLoading(false);
       setDelConfirm(null);
@@ -104,10 +104,10 @@ function PassportDetail(_ref) {
           grantNames
         }
       });
-      _toast.default.success(t('common.saveSuccess'));
+      _Toast.default.success(t('common.saveSuccess'));
       onSuccess();
     } catch (err) {
-      _toast.default.error((0, _util.formatError)(err));
+      _Toast.default.error((0, _util.formatError)(err));
     } finally {
       setLoading(false);
     }

package/lib/team/passports/index.js

@@ -16,7 +16,7 @@ var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _LockIcon = _interopRequireDefault(require("@arcblock/icons/lib/LockIcon"));
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
 var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/create-passport-svg"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util = require("../../util");
@@ -73,10 +73,10 @@ function PassportList() {
       });
       refreshTeam();
       await (0, _util.sleep)(800);
-      _toast.default.success(t('common.configSuccess'));
+      _Toast.default.success(t('common.configSuccess'));
       setLoading(false);
     } catch (error) {
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
       setLoading(false);
     }
   };

package/lib/team/passports/trusted-factories.js

@@ -20,7 +20,7 @@ var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
 var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -73,11 +73,11 @@ function TrustedFactories(_ref) {
       });
       await (0, _util.sleep)(800);
       setLoading(false);
-      _toast.default.success(t('common.saveSuccess'));
+      _Toast.default.success(t('common.saveSuccess'));
       setDelConfirm(null);
     } catch (err) {
       setLoading(false);
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     }
   };
   const filterFactories = trustedFactories.filter(x => !search || x.factoryAddress.toLowerCase().includes(search.toLowerCase()));

package/lib/team/passports/trusted-factory.js

@@ -26,7 +26,7 @@ var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util = require("../../util");
@@ -108,11 +108,11 @@ function TrustedFactory(_ref) {
         }
       });
       await (0, _util.sleep)(800);
-      _toast.default.success(t('common.saveSuccess'));
+      _Toast.default.success(t('common.saveSuccess'));
       onSuccess();
     } catch (err) {
       console.error(err);
-      _toast.default.error((0, _util.formatError)(err));
+      _Toast.default.error((0, _util.formatError)(err));
     } finally {
       setState({
         loading: false

package/lib/team/passports/trusted-issuer.js

@@ -20,7 +20,7 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _constant = require("@abtnode/constant");
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util = require("../../util");
@@ -104,11 +104,11 @@ function TrustedIssuer(_ref) {
       });
       await (0, _util.sleep)(800);
       setLoading(false);
-      _toast.default.success(t('common.saveSuccess'));
+      _Toast.default.success(t('common.saveSuccess'));
       onSuccess();
     } catch (err) {
       setLoading(false);
-      _toast.default.error((0, _util.formatError)(err));
+      _Toast.default.error((0, _util.formatError)(err));
     }
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {

package/lib/team/passports/trusted-issuers.js

@@ -19,7 +19,7 @@ var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
 var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -65,7 +65,7 @@ function TrustedIssuers(_ref) {
     const index = trustedPassports.findIndex(x => x.issuerDid === did);
     if (index === -1) {
       // should not be here
-      _toast.default.error('Cannot find passports');
+      _Toast.default.error('Cannot find passports');
     }
     const trustedList = [...trustedPassports];
     trustedList.splice(index, 1);
@@ -79,11 +79,11 @@ function TrustedIssuers(_ref) {
       });
       await (0, _util.sleep)(800);
       setLoading(false);
-      _toast.default.success(t('common.saveSuccess'));
+      _Toast.default.success(t('common.saveSuccess'));
       setDelConfirm(false);
     } catch (err) {
       setLoading(false);
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     }
   };
   const filteredIssuers = trustedPassports.filter(x => !search || x.issuerDid.toLowerCase().includes(search.toLowerCase()));

package/lib/util/index.js

@@ -7,7 +7,13 @@ exports.checkIsWildcardDomain = exports.checkInputByType = exports.appendParams
 exports.deepDecodeURIComponent = deepDecodeURIComponent;
 exports.extractStatusUrlFromNextWorkflow = extractStatusUrlFromNextWorkflow;
 exports.formatDateTime = formatDateTime;
-exports.formatError = exports.formatDiskSize = void 0;
+exports.formatDiskSize = void 0;
+Object.defineProperty(exports, "formatError", {
+  enumerable: true,
+  get: function get() {
+    return _formatError.default;
+  }
+});
 exports.formatFactoryPrice = formatFactoryPrice;
 exports.formatRegistryScreenshotPath = exports.formatRegistryLogoPath = exports.formatPerson = exports.formatMountPoint = exports.formatLocale = void 0;
 exports.formatTime = formatTime;
@@ -57,6 +63,7 @@ var _checkAccessibleBrowser = _interopRequireDefault(require("@abtnode/util/lib/
 var _axios = _interopRequireDefault(require("@abtnode/util/lib/axios"));
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
+var _formatError = _interopRequireDefault(require("@abtnode/util/lib/format-error"));
 var _window$env;
 /* eslint-disable max-len */
 /* eslint-disable implicit-arrow-linebreak */
@@ -263,18 +270,6 @@ function formatTime(date) {
 function formatDateTime(date) {
   return (0, _dayjs.default)(date).format('YYYY-MM-DD HH:mm');
 }
-/**
- *
- * @param { {message: string} | {errors: {message: string}[] }} error
- * @returns {string}
- */
-const formatError = error => {
-  if (Array.isArray(error.errors)) {
-    return error.errors.map(x => x.message).join('\n');
-  }
-  return error.message;
-};
-exports.formatError = formatError;
 const formatLocale = function formatLocale() {
   let locale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'en';
   if (locale === 'zh') {