@arcblock/ux 2.5.31 → 2.5.32

package/lib/SessionManager/index.js

@@ -31,6 +31,8 @@ var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useB
 
 var _OAuth = require("@arcblock/did-connect/lib/OAuth");
 
+var _User = require("@arcblock/did-connect/lib/User");
+
 var _Theme = require("../Theme");
 
 var _Avatar = _interopRequireDefault(require("../Avatar"));
@@ -131,16 +133,25 @@ function SessionManager(_ref) {
     return (_session$user2 = session.user) === null || _session$user2 === void 0 ? void 0 : (_session$user2$passpo = _session$user2.passports) === null || _session$user2$passpo === void 0 ? void 0 : _session$user2$passpo.find(item => item.name === session.user.role);
   }, [session.user]);
   const browser = (0, _useBrowser.default)();
+  const {
+    walletDid
+  } = (0, _User.useDid)({
+    session
+  });
   const isRawWalletAccount = !((_session$user3 = session.user) !== null && _session$user3 !== void 0 && (_session$user3$extraC = _session$user3.extraConfigs) !== null && _session$user3$extraC !== void 0 && _session$user3$extraC.sourceProvider) || ((_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : (_session$user4$extraC = _session$user4.extraConfigs) === null || _session$user4$extraC === void 0 ? void 0 : _session$user4$extraC.sourceProvider) === 'wallet';
   const connectedAccounts = ((_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : (_session$user5$extraC = _session$user5.extraConfigs) === null || _session$user5$extraC === void 0 ? void 0 : _session$user5$extraC.connectedAccounts) || [];
+  let hasBindWallet = false;
   let hasBindAccount = false;
 
   if (isRawWalletAccount) {
     if (connectedAccounts.some(item => item.provider !== 'wallet')) {
       hasBindAccount = true;
     }
+
+    hasBindWallet = true;
   } else if (connectedAccounts.some(item => item.provider === 'wallet')) {
     hasBindAccount = true;
+    hasBindWallet = true;
   }
 
   const oauthConfigList = Object.entries(oauthConfigs).map(_ref2 => {
@@ -334,7 +345,7 @@ function SessionManager(_ref) {
                 })]
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
                 responsive: false,
-                children: session.user.did
+                children: walletDid || session.user.email
               })]
             }), Array.isArray(menu) && menu.map((menuItem, index) => {
               const {
@@ -376,7 +387,7 @@ function SessionManager(_ref) {
                 component: _Switch.default,
                 className: "session-manager-menu-icon"
               }), message.switchDid]
-            }), !!switchProfile && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+            }), !!switchProfile && hasBindWallet && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
               className: "session-manager-menu-item",
               onClick: _onSwitchProfile,
               "data-cy": "sessionManager-switch-profile-trigger",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.5.31",
+  "version": "2.5.32",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "166b4343ec439bfd132f120ff51d070b5324db54",
+  "gitHead": "6b74d4e51188eecfedfd34f70871af90d4ed68e4",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.31",
-    "@arcblock/react-hooks": "^2.5.31",
+    "@arcblock/icons": "^2.5.32",
+    "@arcblock/react-hooks": "^2.5.32",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/SessionManager/index.jsx

@@ -13,6 +13,7 @@ import BindWalletIcon from '@mui/icons-material/Link';
 import SwitchPassportIcon from '@mui/icons-material/VpnKeyOutlined';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import { useOAuth } from '@arcblock/did-connect/lib/OAuth';
+import { useDid } from '@arcblock/did-connect/lib/User';
 
 import { styled } from '../Theme';
 import DidAvatar from '../Avatar';
@@ -82,17 +83,21 @@ function SessionManager({
     [session.user]
   );
   const browser = useBrowser();
+  const { walletDid } = useDid({ session });
 
   const isRawWalletAccount =
     !session.user?.extraConfigs?.sourceProvider || session.user?.extraConfigs?.sourceProvider === 'wallet';
   const connectedAccounts = session.user?.extraConfigs?.connectedAccounts || [];
+  let hasBindWallet = false;
   let hasBindAccount = false;
   if (isRawWalletAccount) {
     if (connectedAccounts.some((item) => item.provider !== 'wallet')) {
       hasBindAccount = true;
     }
+    hasBindWallet = true;
   } else if (connectedAccounts.some((item) => item.provider === 'wallet')) {
     hasBindAccount = true;
+    hasBindWallet = true;
   }
 
   const oauthConfigList = Object.entries(oauthConfigs)
@@ -248,7 +253,7 @@ function SessionManager({
                       />
                     )}
                   </div>
-                  <DidAddress responsive={false}>{session.user.did}</DidAddress>
+                  <DidAddress responsive={false}>{walletDid || session.user.email}</DidAddress>
                 </div>
                 {Array.isArray(menu) &&
                   menu.map((menuItem, index) => {
@@ -295,7 +300,7 @@ function SessionManager({
                     {message.switchDid}
                   </MenuItem>
                 )}
-                {!!switchProfile && (
+                {!!switchProfile && hasBindWallet && (
                   <MenuItem
                     className="session-manager-menu-item"
                     onClick={_onSwitchProfile}