@abtnode/ux 1.16.24 → 1.16.25-beta-fe54d1bc

package/es/blocklet/component/component-cell.js

@@ -247,9 +247,10 @@ export default function ComponentCell({
     justifyContent: "flex-start",
     alignItems: "center",
     children: [/*#__PURE__*/_jsxs(Box, {
+      pl: 2,
       width: {
         xs: 300,
-        md: 300
+        md: 400
       },
       display: "flex",
       alignItems: "center",

package/es/blocklet/component/index.js

@@ -392,10 +392,7 @@ export default function BlockletComponent({
       })
     }), !!blocklet.site.rules.length && /*#__PURE__*/_jsx(Box, {
       mt: 0,
-      ml: {
-        xs: '-16px',
-        md: '-28px'
-      },
+      ml: -1.5,
       children: /*#__PURE__*/_jsx(RuleList, {})
     }), !!updateConfirm && /*#__PURE__*/_jsx(Dialog, {
       open: true,

package/es/hooks/blocklet.js

@@ -46,7 +46,8 @@ export function useBlocklet({
   useSubscription,
   getIP,
   useLocaleContext,
-  disableSubscription
+  disableSubscription,
+  getOptionalComponents
 }) {
   const {
     t,
@@ -76,7 +77,8 @@ export function useBlocklet({
       } = await client.getBlocklet({
         input: {
           did,
-          attachRuntimeInfo: true
+          attachRuntimeInfo: true,
+          getOptionalComponents
         }
       });
       await fixBlocklet(data, {
@@ -128,7 +130,8 @@ export function useBlocklet({
         blocklet: data
       } = await client.getBlocklet({
         input: {
-          did
+          did,
+          getOptionalComponents
         }
       });
       if (data) {

package/es/locales/ar.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'استخدم محفظة DID الخاصة بك للمطالبة بالجواز السفر',
       confirm: 'قم بتأكيد على محفظتك الرقمية DID',
       success: 'تمت إضافة جواز السفر بنجاح في محفظتك',
-      loginWithPassport: 'اتصِل بجواز السفر هذا'
+      loginWithPassport: 'اتصِل بجواز السفر هذا',
+      autoClose: 'سيتم إغلاق الصفحة تلقائيًا في {seconds} ثانية',
+      autoJump: 'سوف يتم الانتقال التلقائي للصفحة في {seconds} ثانية.'
     }
   },
   lostPassport: {

package/es/locales/de.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Verwenden Sie Ihre DID-Brieftasche, um den Reisepass zu beantragen',
       confirm: 'Bestätigen Sie auf Ihrer DID Wallet',
       success: 'Der Reisepass wurde erfolgreich zu Ihrer Brieftasche hinzugefügt',
-      loginWithPassport: 'Verbinden Sie sich mit diesem Reisepass'
+      loginWithPassport: 'Verbinden Sie sich mit diesem Reisepass',
+      autoClose: 'Die Seite schließt automatisch in {seconds}s',
+      autoJump: 'Die Seite wird in {seconds}s automatisch weitergeleitet.'
     }
   },
   lostPassport: {

package/es/locales/en.js

@@ -1436,7 +1436,9 @@ export default {
       scan: 'Use your DID Wallet to claim the passport',
       confirm: 'Confirm on your DID Wallet',
       success: 'The passport has been successfully added in your wallet',
-      loginWithPassport: 'Connect with this Passport'
+      loginWithPassport: 'Connect with this Passport',
+      autoClose: 'Page will auto close in {seconds}s',
+      autoJump: 'Page will auto jump in {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/es.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Utiliza tu Billetera DID para reclamar el pasaporte',
       confirm: 'Confirma en tu billetera de DID',
       success: 'El pasaporte se ha añadido correctamente a tu billetera',
-      loginWithPassport: 'Conéctate con este Pasaporte'
+      loginWithPassport: 'Conéctate con este Pasaporte',
+      autoClose: 'La página se cerrará automáticamente en {seconds}s',
+      autoJump: 'La página saltará automáticamente en {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/fr.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Utilisez votre portefeuille DID pour demander le passeport',
       confirm: 'Confirmez sur votre portefeuille DID',
       success: 'Le passeport a été ajouté avec succès à votre portefeuille',
-      loginWithPassport: 'Connectez-vous avec ce passeport'
+      loginWithPassport: 'Connectez-vous avec ce passeport',
+      autoClose: 'La page se fermera automatiquement dans {seconds}s',
+      autoJump: 'La page sera automatiquement sautée dans {seconds}s.'
     }
   },
   lostPassport: {

package/es/locales/hi.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'अपने डीआईडी वॉलेट का उपयोग करें और पासपोर्ट का दावा करें',
       confirm: 'अपने डीआईड़ वॉलेट पर पुष्टि करें',
       success: 'आपकी वॉलेट में पासपोर्ट सफलतापूर्वक जोड़ा गया है',
-      loginWithPassport: 'इस पासपोर्ट से जुड़ें'
+      loginWithPassport: 'इस पासपोर्ट से जुड़ें',
+      autoClose: '{seconds}सेकंड में पेज आपूर्ति हो जाएगा',
+      autoJump: 'पृष्ठ {seconds} सेकंड में ऑटोमेटिक जंप करेगा।'
     }
   },
   lostPassport: {

package/es/locales/id.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Gunakan Dompet DID Anda untuk mengklaim paspor',
       confirm: 'Konfirmasi di Dompet DID Anda',
       success: 'Paspor telah berhasil ditambahkan di dompet Anda',
-      loginWithPassport: 'Hubungkan dengan paspor ini'
+      loginWithPassport: 'Hubungkan dengan paspor ini',
+      autoClose: 'Halaman akan ditutup otomatis dalam {seconds}s',
+      autoJump: 'Halaman akan otomatis loncat dalam {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/ja.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'パスポートを請求するためにあなたのDIDウォレットを使用してください',
       confirm: 'あなたのDIDウォレットで確認してください',
       success: 'パスポートがウォレットに正常に追加されました',
-      loginWithPassport: 'このパスポートで接続してください'
+      loginWithPassport: 'このパスポートで接続してください',
+      autoClose: '{seconds}秒後にページが自動的に閉じます',
+      autoJump: '{seconds}s 後にページが自動的にジャンプします'
     }
   },
   lostPassport: {

package/es/locales/ko.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'DID 지갑을 사용하여 여권을 신청하세요',
       confirm: '귀하의 DID 지갑에서 확인하십시오.',
       success: '여권이 지갑에 성공적으로 추가되었습니다',
-      loginWithPassport: '이 여권을 통해 연결하세요'
+      loginWithPassport: '이 여권을 통해 연결하세요',
+      autoClose: '{seconds}초 후에 페이지가 자동으로 닫힙니다',
+      autoJump: '페이지는 {seconds}s 후에 자동으로 이동합니다'
     }
   },
   lostPassport: {

package/es/locales/pt.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Use sua Carteira DID para solicitar o passaporte',
       confirm: 'Confirme em sua Carteira DID',
       success: 'O passaporte foi adicionado com sucesso em sua carteira',
-      loginWithPassport: 'Conecte-se com este passaporte'
+      loginWithPassport: 'Conecte-se com este passaporte',
+      autoClose: 'A página será fechada automaticamente em {seconds}s',
+      autoJump: 'A página será redirecionada automaticamente em {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/ru.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Используйте свой кошелек DID, чтобы получить паспорт',
       confirm: 'Подтвердите на вашем кошельке DID',
       success: 'Паспорт успешно добавлен в ваш кошелек',
-      loginWithPassport: 'Подключитесь с помощью этого паспорта'
+      loginWithPassport: 'Подключитесь с помощью этого паспорта',
+      autoClose: 'Страница закроется автоматически через {seconds} секунд',
+      autoJump: 'Страница автоматически перейдет через {seconds} секунд.'
     }
   },
   lostPassport: {

package/es/locales/th.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'ใช้กระเป๋าเงินดิจิตอลของคุณเพื่อเรียกร้องหนังสือเดินทาง',
       confirm: 'ยืนยันในกระเป๋าเงิน DID ของคุณ',
       success: 'หนังสือเดินทางถูกเพิ่มเข้าไปในกระเป๋าเงินของคุณเรียบร้อยแล้ว',
-      loginWithPassport: 'เชื่อมต่อกับพาสปอร์ตนี้'
+      loginWithPassport: 'เชื่อมต่อกับพาสปอร์ตนี้',
+      autoClose: 'หน้าจอจะปิดอัตโนมัติในอีก {seconds}s',
+      autoJump: 'หน้าจะกระโดดอัตโนมัติใน {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/vi.js

@@ -1444,7 +1444,9 @@ export default {
       scan: 'Sử dụng Ví DID của bạn để yêu cầu hộ chiếu',
       confirm: 'Xác nhận trên Ví DID của bạn',
       success: 'Hộ chiếu đã được thêm vào ví của bạn thành công',
-      loginWithPassport: 'Kết nối với hộ chiếu này'
+      loginWithPassport: 'Kết nối với hộ chiếu này',
+      autoClose: 'Trang sẽ tự đóng sau {seconds}s',
+      autoJump: 'Trang sẽ tự động chuyển đến trong {seconds}s'
     }
   },
   lostPassport: {

package/es/locales/zh-tw.js

@@ -1444,7 +1444,9 @@ export default {
       scan: '使用您的DID錢包來申領護照',
       confirm: '在你的 DID 錢包上確認',
       success: '護照已成功添加到您的錢包',
-      loginWithPassport: '連接到此護照'
+      loginWithPassport: '連接到此護照',
+      autoClose: '頁面將在 {seconds} 秒後自動關閉',
+      autoJump: '頁面將在 {seconds} 秒後自動轉跳'
     }
   },
   lostPassport: {

package/es/locales/zh.js

@@ -1451,7 +1451,9 @@ export default {
       confirm: '在您的 DID 钱包上确认',
       success: '通行证已成功添加到您的 DID 钱包',
       loginWithPassport: '用此通行证连接',
-      scan: '使用您的DID钱包来申领护照'
+      scan: '使用您的DID钱包来申领护照',
+      autoClose: '页面将在 {seconds} 秒后自动关闭',
+      autoJump: '页面将在 {seconds} 秒后自动跳转'
     }
   },
   lostPassport: {

package/es/lost-passport.js

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-unstable-nested-components */
-import { useContext } from 'react';
+import { useContext, useRef, useState } from 'react';
 import styled from '@emotion/styled';
-import { useNavigate, Link } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
@@ -16,9 +16,9 @@ import Avatar from '@mui/material/Avatar';
 import Button from '@arcblock/ux/lib/Button';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
+import { useCountDown, useReactive } from 'ahooks';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
-import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
-import { useReactive } from 'ahooks';
+import isFunction from 'lodash/isFunction';
 import CardSelector from './card-selector';
 import DidAddress from './did-address';
 import wrapLocale from './wrap-locale';
@@ -29,6 +29,7 @@ const isFromWallet = () => {
   const {
     searchParams
   } = new URL(window.location.href);
+  // NOTICE: 这个参数由钱包中拼接得来，用于判断是否来源于钱包客户端（可以走不同的处理逻辑）
   return searchParams.get('fromWallet') === '1';
 };
 
@@ -67,7 +68,8 @@ function LostPassport({
   SessionContext,
   webWalletUrl,
   createPassportSvg,
-  passportColor
+  passportColor,
+  onLogin
 }) {
   const {
     api,
@@ -79,6 +81,10 @@ function LostPassport({
     success: false,
     activeStep: 0
   });
+  const staticState = useRef({
+    sessionToken: '',
+    refreshToken: ''
+  });
   const {
     setPassportId,
     clearPassportId
@@ -87,10 +93,10 @@ function LostPassport({
     t,
     locale
   } = useContext(LocaleContext);
-  const navigate = useNavigate();
   const {
     wallet: isWalletWebview
   } = useBrowser();
+  const [leftTime, setLeftTime] = useState(0);
 
   // eslint-disable-next-line no-undef
   const {
@@ -105,36 +111,50 @@ function LostPassport({
   const onSelectPassport = () => {
     onNext();
   };
-  const onReceivePassport = result => {
+  const onReceivePassport = (result, decrypt) => {
     if (result?.passportId) {
       setPassportId(result.passportId);
     }
+    if (result?.sessionToken) {
+      staticState.current.sessionToken = decrypt(result.sessionToken);
+    }
+    if (result?.refreshToken) {
+      staticState.current.refreshToken = decrypt(result.refreshToken);
+    }
     pageState.success = true;
     onNext();
   };
-  const onUsePassport = () => {
+  const safeLogout = () => {
+    return new Promise(resolve => {
+      try {
+        session.logout(() => {
+          resolve();
+        });
+      } catch (err) {
+        // Do nothing
+        resolve();
+      }
+    });
+  };
+  const onUsePassport = async () => {
     if (isWalletWebview && isFromWallet()) {
       import('dsbridge').then(jsBridge => {
         jsBridge.call('arcClosePage');
       });
       return;
     }
-    try {
-      session.logout();
-    } catch (err) {
-      // Do nothing
+    await safeLogout();
+    if (isFunction(onLogin)) {
+      onLogin({
+        sessionToken: staticState.current.sessionToken,
+        refreshToken: staticState.current.refreshToken
+      });
     }
     const redirect = searchParams.get('redirect');
     if (redirect) {
       window.location.replace(redirect);
       return;
     }
-    if ((window.env?.apiPrefix || '').startsWith(WELLKNOWN_SERVICE_PATH_PREFIX)) {
-      navigate(`${WELLKNOWN_SERVICE_PATH_PREFIX}/connect`, {
-        replace: true
-      });
-      return;
-    }
 
     // HACK: 因为默认页面不会处理 passportId 的逻辑，所以需要清除存储的信息
     clearPassportId();
@@ -143,6 +163,12 @@ function LostPassport({
   const handleChangePassport = event => {
     pageState.passport = event.target.value;
   };
+  const [countdown] = useCountDown({
+    leftTime,
+    onEnd: () => {
+      onUsePassport();
+    }
+  });
   const steps = [{
     label: t('lostPassport.selectPassport'),
     content: () => {
@@ -264,31 +290,45 @@ function LostPassport({
     }
   }, {
     label: t('common.complete'),
-    content: () => /*#__PURE__*/_jsxs(Box, {
-      textAlign: "center",
-      children: [/*#__PURE__*/_jsx(Box, {
-        mb: 3,
-        color: "success.main",
-        children: /*#__PURE__*/_jsx(CheckCircleIcon, {
+    content: () => {
+      if (leftTime === 0) {
+        setLeftTime(3000);
+      }
+      return /*#__PURE__*/_jsxs(Box, {
+        textAlign: "center",
+        children: [/*#__PURE__*/_jsx(Box, {
+          mb: 3,
+          color: "success.main",
+          children: /*#__PURE__*/_jsx(CheckCircleIcon, {
+            style: {
+              fontSize: 60
+            }
+          })
+        }), /*#__PURE__*/_jsx(Typography, {
+          component: "p",
+          variant: "body1",
+          className: "subheader",
+          children: t('issuePassport.dialog.success')
+        }), /*#__PURE__*/_jsx(Typography, {
+          component: "p",
+          variant: "body2",
+          color: "gray",
+          children: isWalletWebview && isFromWallet() ? t('issuePassport.dialog.autoClose', {
+            seconds: Math.round(countdown / 1000)
+          }) : t('issuePassport.dialog.autoJump', {
+            seconds: Math.round(countdown / 1000)
+          })
+        }), /*#__PURE__*/_jsx(Button, {
           style: {
-            fontSize: 60
-          }
-        })
-      }), /*#__PURE__*/_jsx(Typography, {
-        component: "p",
-        variant: "body1",
-        className: "subheader",
-        children: t('issuePassport.dialog.success')
-      }), /*#__PURE__*/_jsx(Button, {
-        style: {
-          marginTop: 40
-        },
-        variant: "contained",
-        color: "primary",
-        onClick: onUsePassport,
-        children: t('issuePassport.dialog.loginWithPassport')
-      })]
-    })
+            marginTop: 40
+          },
+          variant: "contained",
+          color: "primary",
+          onClick: onUsePassport,
+          children: t('issuePassport.dialog.loginWithPassport')
+        })]
+      });
+    }
   }];
   return /*#__PURE__*/_jsx(Div, {
     children: /*#__PURE__*/_jsxs("div", {

package/es/team/members/index.js

@@ -590,6 +590,7 @@ const Div = styled.div`
 
           .badge {
             display: flex;
+            flex-shrink: 0;
             justify-content: center;
             align-items: center;
             width: 20px;

package/lib/blocklet/component/component-cell.js

@@ -264,9 +264,10 @@ function ComponentCell(_ref) {
     justifyContent: "flex-start",
     alignItems: "center",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      pl: 2,
       width: {
         xs: 300,
-        md: 300
+        md: 400
       },
       display: "flex",
       alignItems: "center",

package/lib/blocklet/component/index.js

@@ -420,10 +420,7 @@ function BlockletComponent(_ref) {
       })
     }), !!blocklet.site.rules.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       mt: 0,
-      ml: {
-        xs: '-16px',
-        md: '-28px'
-      },
+      ml: -1.5,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ruleList.default, {})
     }), !!updateConfirm && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
       open: true,

package/lib/hooks/blocklet.js

@@ -62,7 +62,8 @@ function useBlocklet(_ref) {
     useSubscription,
     getIP,
     useLocaleContext,
-    disableSubscription
+    disableSubscription,
+    getOptionalComponents
   } = _ref;
   const {
     t,
@@ -95,7 +96,8 @@ function useBlocklet(_ref) {
       } = await client.getBlocklet({
         input: {
           did,
-          attachRuntimeInfo: true
+          attachRuntimeInfo: true,
+          getOptionalComponents
         }
       });
       await (0, _util2.fixBlocklet)(data, {
@@ -148,7 +150,8 @@ function useBlocklet(_ref) {
         blocklet: data
       } = await client.getBlocklet({
         input: {
-          did
+          did,
+          getOptionalComponents
         }
       });
       if (data) {

package/lib/locales/ar.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'استخدم محفظة DID الخاصة بك للمطالبة بالجواز السفر',
       confirm: 'قم بتأكيد على محفظتك الرقمية DID',
       success: 'تمت إضافة جواز السفر بنجاح في محفظتك',
-      loginWithPassport: 'اتصِل بجواز السفر هذا'
+      loginWithPassport: 'اتصِل بجواز السفر هذا',
+      autoClose: 'سيتم إغلاق الصفحة تلقائيًا في {seconds} ثانية',
+      autoJump: 'سوف يتم الانتقال التلقائي للصفحة في {seconds} ثانية.'
     }
   },
   lostPassport: {

package/lib/locales/de.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Verwenden Sie Ihre DID-Brieftasche, um den Reisepass zu beantragen',
       confirm: 'Bestätigen Sie auf Ihrer DID Wallet',
       success: 'Der Reisepass wurde erfolgreich zu Ihrer Brieftasche hinzugefügt',
-      loginWithPassport: 'Verbinden Sie sich mit diesem Reisepass'
+      loginWithPassport: 'Verbinden Sie sich mit diesem Reisepass',
+      autoClose: 'Die Seite schließt automatisch in {seconds}s',
+      autoJump: 'Die Seite wird in {seconds}s automatisch weitergeleitet.'
     }
   },
   lostPassport: {

package/lib/locales/en.js

@@ -1442,7 +1442,9 @@ var _default = exports.default = {
       scan: 'Use your DID Wallet to claim the passport',
       confirm: 'Confirm on your DID Wallet',
       success: 'The passport has been successfully added in your wallet',
-      loginWithPassport: 'Connect with this Passport'
+      loginWithPassport: 'Connect with this Passport',
+      autoClose: 'Page will auto close in {seconds}s',
+      autoJump: 'Page will auto jump in {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/es.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Utiliza tu Billetera DID para reclamar el pasaporte',
       confirm: 'Confirma en tu billetera de DID',
       success: 'El pasaporte se ha añadido correctamente a tu billetera',
-      loginWithPassport: 'Conéctate con este Pasaporte'
+      loginWithPassport: 'Conéctate con este Pasaporte',
+      autoClose: 'La página se cerrará automáticamente en {seconds}s',
+      autoJump: 'La página saltará automáticamente en {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/fr.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Utilisez votre portefeuille DID pour demander le passeport',
       confirm: 'Confirmez sur votre portefeuille DID',
       success: 'Le passeport a été ajouté avec succès à votre portefeuille',
-      loginWithPassport: 'Connectez-vous avec ce passeport'
+      loginWithPassport: 'Connectez-vous avec ce passeport',
+      autoClose: 'La page se fermera automatiquement dans {seconds}s',
+      autoJump: 'La page sera automatiquement sautée dans {seconds}s.'
     }
   },
   lostPassport: {

package/lib/locales/hi.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'अपने डीआईडी वॉलेट का उपयोग करें और पासपोर्ट का दावा करें',
       confirm: 'अपने डीआईड़ वॉलेट पर पुष्टि करें',
       success: 'आपकी वॉलेट में पासपोर्ट सफलतापूर्वक जोड़ा गया है',
-      loginWithPassport: 'इस पासपोर्ट से जुड़ें'
+      loginWithPassport: 'इस पासपोर्ट से जुड़ें',
+      autoClose: '{seconds}सेकंड में पेज आपूर्ति हो जाएगा',
+      autoJump: 'पृष्ठ {seconds} सेकंड में ऑटोमेटिक जंप करेगा।'
     }
   },
   lostPassport: {

package/lib/locales/id.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Gunakan Dompet DID Anda untuk mengklaim paspor',
       confirm: 'Konfirmasi di Dompet DID Anda',
       success: 'Paspor telah berhasil ditambahkan di dompet Anda',
-      loginWithPassport: 'Hubungkan dengan paspor ini'
+      loginWithPassport: 'Hubungkan dengan paspor ini',
+      autoClose: 'Halaman akan ditutup otomatis dalam {seconds}s',
+      autoJump: 'Halaman akan otomatis loncat dalam {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/ja.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'パスポートを請求するためにあなたのDIDウォレットを使用してください',
       confirm: 'あなたのDIDウォレットで確認してください',
       success: 'パスポートがウォレットに正常に追加されました',
-      loginWithPassport: 'このパスポートで接続してください'
+      loginWithPassport: 'このパスポートで接続してください',
+      autoClose: '{seconds}秒後にページが自動的に閉じます',
+      autoJump: '{seconds}s 後にページが自動的にジャンプします'
     }
   },
   lostPassport: {

package/lib/locales/ko.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'DID 지갑을 사용하여 여권을 신청하세요',
       confirm: '귀하의 DID 지갑에서 확인하십시오.',
       success: '여권이 지갑에 성공적으로 추가되었습니다',
-      loginWithPassport: '이 여권을 통해 연결하세요'
+      loginWithPassport: '이 여권을 통해 연결하세요',
+      autoClose: '{seconds}초 후에 페이지가 자동으로 닫힙니다',
+      autoJump: '페이지는 {seconds}s 후에 자동으로 이동합니다'
     }
   },
   lostPassport: {

package/lib/locales/pt.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Use sua Carteira DID para solicitar o passaporte',
       confirm: 'Confirme em sua Carteira DID',
       success: 'O passaporte foi adicionado com sucesso em sua carteira',
-      loginWithPassport: 'Conecte-se com este passaporte'
+      loginWithPassport: 'Conecte-se com este passaporte',
+      autoClose: 'A página será fechada automaticamente em {seconds}s',
+      autoJump: 'A página será redirecionada automaticamente em {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/ru.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Используйте свой кошелек DID, чтобы получить паспорт',
       confirm: 'Подтвердите на вашем кошельке DID',
       success: 'Паспорт успешно добавлен в ваш кошелек',
-      loginWithPassport: 'Подключитесь с помощью этого паспорта'
+      loginWithPassport: 'Подключитесь с помощью этого паспорта',
+      autoClose: 'Страница закроется автоматически через {seconds} секунд',
+      autoJump: 'Страница автоматически перейдет через {seconds} секунд.'
     }
   },
   lostPassport: {

package/lib/locales/th.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'ใช้กระเป๋าเงินดิจิตอลของคุณเพื่อเรียกร้องหนังสือเดินทาง',
       confirm: 'ยืนยันในกระเป๋าเงิน DID ของคุณ',
       success: 'หนังสือเดินทางถูกเพิ่มเข้าไปในกระเป๋าเงินของคุณเรียบร้อยแล้ว',
-      loginWithPassport: 'เชื่อมต่อกับพาสปอร์ตนี้'
+      loginWithPassport: 'เชื่อมต่อกับพาสปอร์ตนี้',
+      autoClose: 'หน้าจอจะปิดอัตโนมัติในอีก {seconds}s',
+      autoJump: 'หน้าจะกระโดดอัตโนมัติใน {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/vi.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: 'Sử dụng Ví DID của bạn để yêu cầu hộ chiếu',
       confirm: 'Xác nhận trên Ví DID của bạn',
       success: 'Hộ chiếu đã được thêm vào ví của bạn thành công',
-      loginWithPassport: 'Kết nối với hộ chiếu này'
+      loginWithPassport: 'Kết nối với hộ chiếu này',
+      autoClose: 'Trang sẽ tự đóng sau {seconds}s',
+      autoJump: 'Trang sẽ tự động chuyển đến trong {seconds}s'
     }
   },
   lostPassport: {

package/lib/locales/zh-tw.js

@@ -1450,7 +1450,9 @@ var _default = exports.default = {
       scan: '使用您的DID錢包來申領護照',
       confirm: '在你的 DID 錢包上確認',
       success: '護照已成功添加到您的錢包',
-      loginWithPassport: '連接到此護照'
+      loginWithPassport: '連接到此護照',
+      autoClose: '頁面將在 {seconds} 秒後自動關閉',
+      autoJump: '頁面將在 {seconds} 秒後自動轉跳'
     }
   },
   lostPassport: {

package/lib/locales/zh.js

@@ -1457,7 +1457,9 @@ var _default = exports.default = {
       confirm: '在您的 DID 钱包上确认',
       success: '通行证已成功添加到您的 DID 钱包',
       loginWithPassport: '用此通行证连接',
-      scan: '使用您的DID钱包来申领护照'
+      scan: '使用您的DID钱包来申领护照',
+      autoClose: '页面将在 {seconds} 秒后自动关闭',
+      autoJump: '页面将在 {seconds} 秒后自动跳转'
     }
   },
   lostPassport: {

package/lib/lost-passport.js

@@ -21,9 +21,9 @@ var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
-var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
-var _constant = require("@abtnode/constant");
 var _ahooks = require("ahooks");
+var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
+var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _cardSelector = _interopRequireDefault(require("./card-selector"));
 var _didAddress = _interopRequireDefault(require("./did-address"));
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
@@ -38,6 +38,7 @@ const isFromWallet = () => {
   const {
     searchParams
   } = new URL(window.location.href);
+  // NOTICE: 这个参数由钱包中拼接得来，用于判断是否来源于钱包客户端（可以走不同的处理逻辑）
   return searchParams.get('fromWallet') === '1';
 };
 
@@ -78,7 +79,8 @@ function LostPassport(_ref2) {
     SessionContext,
     webWalletUrl,
     createPassportSvg,
-    passportColor
+    passportColor,
+    onLogin
   } = _ref2;
   const {
     api,
@@ -90,6 +92,10 @@ function LostPassport(_ref2) {
     success: false,
     activeStep: 0
   });
+  const staticState = (0, _react.useRef)({
+    sessionToken: '',
+    refreshToken: ''
+  });
   const {
     setPassportId,
     clearPassportId
@@ -98,10 +104,10 @@ function LostPassport(_ref2) {
     t,
     locale
   } = (0, _react.useContext)(_context.LocaleContext);
-  const navigate = (0, _reactRouterDom.useNavigate)();
   const {
     wallet: isWalletWebview
   } = (0, _useBrowser.default)();
+  const [leftTime, setLeftTime] = (0, _react.useState)(0);
 
   // eslint-disable-next-line no-undef
   const {
@@ -116,37 +122,50 @@ function LostPassport(_ref2) {
   const onSelectPassport = () => {
     onNext();
   };
-  const onReceivePassport = result => {
+  const onReceivePassport = (result, decrypt) => {
     if (result !== null && result !== void 0 && result.passportId) {
       setPassportId(result.passportId);
     }
+    if (result !== null && result !== void 0 && result.sessionToken) {
+      staticState.current.sessionToken = decrypt(result.sessionToken);
+    }
+    if (result !== null && result !== void 0 && result.refreshToken) {
+      staticState.current.refreshToken = decrypt(result.refreshToken);
+    }
     pageState.success = true;
     onNext();
   };
-  const onUsePassport = () => {
-    var _window$env;
+  const safeLogout = () => {
+    return new Promise(resolve => {
+      try {
+        session.logout(() => {
+          resolve();
+        });
+      } catch (err) {
+        // Do nothing
+        resolve();
+      }
+    });
+  };
+  const onUsePassport = async () => {
     if (isWalletWebview && isFromWallet()) {
       Promise.resolve().then(() => _interopRequireWildcard(require('dsbridge'))).then(jsBridge => {
         jsBridge.call('arcClosePage');
       });
       return;
     }
-    try {
-      session.logout();
-    } catch (err) {
-      // Do nothing
+    await safeLogout();
+    if ((0, _isFunction.default)(onLogin)) {
+      onLogin({
+        sessionToken: staticState.current.sessionToken,
+        refreshToken: staticState.current.refreshToken
+      });
     }
     const redirect = searchParams.get('redirect');
     if (redirect) {
       window.location.replace(redirect);
       return;
     }
-    if ((((_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.apiPrefix) || '').startsWith(_constant.WELLKNOWN_SERVICE_PATH_PREFIX)) {
-      navigate("".concat(_constant.WELLKNOWN_SERVICE_PATH_PREFIX, "/connect"), {
-        replace: true
-      });
-      return;
-    }
 
     // HACK: 因为默认页面不会处理 passportId 的逻辑，所以需要清除存储的信息
     clearPassportId();
@@ -155,6 +174,12 @@ function LostPassport(_ref2) {
   const handleChangePassport = event => {
     pageState.passport = event.target.value;
   };
+  const [countdown] = (0, _ahooks.useCountDown)({
+    leftTime,
+    onEnd: () => {
+      onUsePassport();
+    }
+  });
   const steps = [{
     label: t('lostPassport.selectPassport'),
     content: () => {
@@ -277,31 +302,45 @@ function LostPassport(_ref2) {
     }
   }, {
     label: t('common.complete'),
-    content: () => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-      textAlign: "center",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        mb: 3,
-        color: "success.main",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CheckCircle.default, {
+    content: () => {
+      if (leftTime === 0) {
+        setLeftTime(3000);
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+        textAlign: "center",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          mb: 3,
+          color: "success.main",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CheckCircle.default, {
+            style: {
+              fontSize: 60
+            }
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+          component: "p",
+          variant: "body1",
+          className: "subheader",
+          children: t('issuePassport.dialog.success')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+          component: "p",
+          variant: "body2",
+          color: "gray",
+          children: isWalletWebview && isFromWallet() ? t('issuePassport.dialog.autoClose', {
+            seconds: Math.round(countdown / 1000)
+          }) : t('issuePassport.dialog.autoJump', {
+            seconds: Math.round(countdown / 1000)
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           style: {
-            fontSize: 60
-          }
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-        component: "p",
-        variant: "body1",
-        className: "subheader",
-        children: t('issuePassport.dialog.success')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-        style: {
-          marginTop: 40
-        },
-        variant: "contained",
-        color: "primary",
-        onClick: onUsePassport,
-        children: t('issuePassport.dialog.loginWithPassport')
-      })]
-    })
+            marginTop: 40
+          },
+          variant: "contained",
+          color: "primary",
+          onClick: onUsePassport,
+          children: t('issuePassport.dialog.loginWithPassport')
+        })]
+      });
+    }
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Div, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/team/members/index.js

@@ -560,7 +560,7 @@ function MemberList(_ref2) {
     })]
   });
 }
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .main {\n    .left {\n      width: 168px;\n      flex-shrink: 0;\n      margin-right: 65px;\n      .tabs {\n        padding-top: 16px;\n        .tab {\n          display: flex;\n          justify-content: space-between;\n          align-items: center;\n          padding: 8px 16px;\n          transition: background 0.4s;\n\n          width: 168px;\n          height: 36px;\n          border-radius: 8px;\n\n          cursor: pointer;\n          user-select: none;\n\n          &:nth-child(n + 2) {\n            margin-top: 24px;\n          }\n\n          &.active {\n            background: #f2f2f2;\n          }\n\n          &:hover {\n            background: #f2f2f2;\n          }\n\n          .text {\n            font-weight: 400;\n            font-size: 16px;\n            line-height: 19px;\n\n            color: #222222;\n          }\n\n          .badge {\n            display: flex;\n            justify-content: center;\n            align-items: center;\n            width: 20px;\n            height: 20px;\n            border-radius: 100%;\n            color: #fff;\n            background: #666666;\n            font-size: 10px;\n            font-weight: 400;\n            &.is-rect {\n              width: auto;\n              border-radius: 8px;\n              padding: 0 4px;\n            }\n          }\n        }\n      }\n      @media (max-width: ", "px) {\n        display: none;\n      }\n    }\n    .right {\n      flex-grow: 1;\n    }\n  }\n\n  .member-block {\n    display: flex;\n    justify-content: flex-start;\n    align-items: center;\n    .member-avatar {\n      position: relative;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n    .member-meta {\n      margin-left: 10px;\n      display: flex;\n      flex-direction: column;\n      justify-content: center;\n      align-items: flex-start;\n    }\n    .badge-block {\n      width: 14px;\n      height: 14px;\n      position: absolute;\n      right: -4px;\n      top: -4px;\n      background: #ff5757;\n      border-radius: 100%;\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      &::after {\n        content: '';\n        width: 6px;\n        height: 2px;\n        background: #fefefe;\n      }\n    }\n  }\n\n  .table-toolbar-left {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n    padding: 7px 0;\n  }\n"])), props => props.theme.breakpoints.values.md);
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .main {\n    .left {\n      width: 168px;\n      flex-shrink: 0;\n      margin-right: 65px;\n      .tabs {\n        padding-top: 16px;\n        .tab {\n          display: flex;\n          justify-content: space-between;\n          align-items: center;\n          padding: 8px 16px;\n          transition: background 0.4s;\n\n          width: 168px;\n          height: 36px;\n          border-radius: 8px;\n\n          cursor: pointer;\n          user-select: none;\n\n          &:nth-child(n + 2) {\n            margin-top: 24px;\n          }\n\n          &.active {\n            background: #f2f2f2;\n          }\n\n          &:hover {\n            background: #f2f2f2;\n          }\n\n          .text {\n            font-weight: 400;\n            font-size: 16px;\n            line-height: 19px;\n\n            color: #222222;\n          }\n\n          .badge {\n            display: flex;\n            flex-shrink: 0;\n            justify-content: center;\n            align-items: center;\n            width: 20px;\n            height: 20px;\n            border-radius: 100%;\n            color: #fff;\n            background: #666666;\n            font-size: 10px;\n            font-weight: 400;\n            &.is-rect {\n              width: auto;\n              border-radius: 8px;\n              padding: 0 4px;\n            }\n          }\n        }\n      }\n      @media (max-width: ", "px) {\n        display: none;\n      }\n    }\n    .right {\n      flex-grow: 1;\n    }\n  }\n\n  .member-block {\n    display: flex;\n    justify-content: flex-start;\n    align-items: center;\n    .member-avatar {\n      position: relative;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n    .member-meta {\n      margin-left: 10px;\n      display: flex;\n      flex-direction: column;\n      justify-content: center;\n      align-items: flex-start;\n    }\n    .badge-block {\n      width: 14px;\n      height: 14px;\n      position: absolute;\n      right: -4px;\n      top: -4px;\n      background: #ff5757;\n      border-radius: 100%;\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      &::after {\n        content: '';\n        width: 6px;\n        height: 2px;\n        background: #fefefe;\n      }\n    }\n  }\n\n  .table-toolbar-left {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n    padding: 7px 0;\n  }\n"])), props => props.theme.breakpoints.values.md);
 MemberList.propTypes = {
   type: _propTypes.default.oneOf(['server', 'blocklet']).isRequired,
   createPassportSvg: _propTypes.default.func.isRequired

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.24",
+  "version": "1.16.25-beta-fe54d1bc",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,6 @@
     "build:es": "babel --config-file ./babel.config.es.js src --out-dir es --copy-files",
     "autoexports": "node tools/auto-exports.js",
     "watch": "npm run build:es -- -w",
-    "turbo:client": "npm run watch",
     "coverage": "npm run test -- --coverage",
     "test": "node tools/jest.js"
   },
@@ -29,23 +28,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.24",
-    "@abtnode/constant": "1.16.24",
-    "@abtnode/util": "1.16.24",
+    "@abtnode/auth": "1.16.25-beta-fe54d1bc",
+    "@abtnode/constant": "1.16.25-beta-fe54d1bc",
+    "@abtnode/util": "1.16.25-beta-fe54d1bc",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.110",
-    "@arcblock/did-connect": "^2.9.41",
+    "@arcblock/did": "^1.18.113",
+    "@arcblock/did-connect": "^2.9.42",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.41",
-    "@arcblock/nft-display": "2.9.41",
-    "@arcblock/react-hooks": "^2.9.41",
-    "@arcblock/terminal": "^2.9.41",
-    "@arcblock/ux": "^2.9.41",
-    "@blocklet/constant": "1.16.24",
+    "@arcblock/icons": "^2.9.42",
+    "@arcblock/nft-display": "2.9.42",
+    "@arcblock/react-hooks": "^2.9.42",
+    "@arcblock/terminal": "^2.9.42",
+    "@arcblock/ux": "^2.9.42",
+    "@blocklet/constant": "1.16.25-beta-fe54d1bc",
     "@blocklet/launcher-layout": "2.2.54",
-    "@blocklet/list": "^0.12.72",
-    "@blocklet/meta": "1.16.24",
-    "@blocklet/ui-react": "^2.9.41",
+    "@blocklet/list": "^0.12.74",
+    "@blocklet/meta": "1.16.25-beta-fe54d1bc",
+    "@blocklet/ui-react": "^2.9.42",
     "@blocklet/uploader": "^0.0.74",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -57,7 +56,7 @@
     "@mui/styles": "^5.15.11",
     "@mui/x-date-pickers": "^6.19.0",
     "@mui/x-tree-view": "^6.17.0",
-    "@ocap/client": "1.18.110",
+    "@ocap/client": "1.18.113",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.8",
     "axios": "^0.27.2",
@@ -107,7 +106,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "6cd6669cb3569f96433e18b1dac346432741a1a7",
+  "gitHead": "e9411b6ee3c482554c76fe91796560abeb0e56ad",
   "exports": {
     ".": {
       "import": "./es/index.js",