@arcblock/ux 2.6.5 → 2.6.7

package/lib/SessionManager/index.js

@@ -25,6 +25,7 @@ var _Disconnect = _interopRequireDefault(require("@arcblock/icons/lib/Disconnect
 var _Switch = _interopRequireDefault(require("@arcblock/icons/lib/Switch"));
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+var _noop = _interopRequireDefault(require("lodash/noop"));
 var _Avatar = _interopRequireDefault(require("../Avatar"));
 var _Address = _interopRequireDefault(require("../Address"));
 var _Util = require("../Util");
@@ -246,7 +247,7 @@ function SessionManager(_ref) {
       user,
       provider
     } = session;
-    if (provider === 'auth0') {
+    if (!isRawWalletAccount && provider !== 'federated') {
       switchOAuthPassport(user);
     } else {
       setUserOpen(false);
@@ -257,11 +258,9 @@ function SessionManager(_ref) {
     }
   }
   function _onBindWallet() {
-    const {
-      provider
-    } = session;
     setUserOpen(false);
-    if (provider === 'auth0') {
+    // FIXME: @zhanghan 暂时切换回 isRawWalletAccount 的方式来判断，在 did-connect 改版时，简化这里的关系判断
+    if (!isRawWalletAccount) {
       session.bindWallet(function () {
         setUserOpen(false);
         onBindWallet(...arguments);
@@ -412,7 +411,7 @@ function SessionManager(_ref) {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_SvgIcon.default, {
             component: _Link2.default,
             className: "session-manager-menu-icon"
-          }), session.provider === 'auth0' ? "".concat(translation.bind, "DID Wallet") : "".concat(translation.bind).concat(translation.thirdParty)]
+          }), !isRawWalletAccount ? "".concat(translation.bind, "DID Wallet") : "".concat(translation.bind).concat(translation.thirdParty)]
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
           className: "session-manager-menu-item",
           onClick: _onLogout,
@@ -476,7 +475,6 @@ SessionManager.propTypes = {
   dark: _propTypes.default.bool,
   size: _propTypes.default.number
 };
-const noop = () => {};
 SessionManager.defaultProps = {
   locale: 'en',
   showText: false,
@@ -486,13 +484,13 @@ SessionManager.defaultProps = {
   switchPassport: true,
   disableLogout: false,
   menu: [],
-  menuRender: noop,
-  onLogin: noop,
-  onLogout: noop,
-  onSwitchDid: noop,
-  onSwitchProfile: noop,
-  onSwitchPassport: noop,
-  onBindWallet: noop,
+  menuRender: _noop.default,
+  onLogin: _noop.default,
+  onLogout: _noop.default,
+  onSwitchDid: _noop.default,
+  onSwitchProfile: _noop.default,
+  onSwitchPassport: _noop.default,
+  onBindWallet: _noop.default,
   dark: false,
   size: 24
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.6.5",
+  "version": "2.6.7",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
   "peerDependencies": {
     "react": ">=18.1.0"
   },
-  "gitHead": "3456978c946fbf78d5476dc2447ab14877effc13",
+  "gitHead": "fd951940e58edd0fb3dbfaf0999fb0e0fac18a5f",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.6.5",
-    "@arcblock/react-hooks": "^2.6.5",
+    "@arcblock/icons": "^2.6.7",
+    "@arcblock/react-hooks": "^2.6.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/SessionManager/index.jsx

@@ -21,6 +21,7 @@ import DisconnectIcon from '@arcblock/icons/lib/Disconnect';
 import SwitchDidIcon from '@arcblock/icons/lib/Switch';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import isEmpty from 'lodash/isEmpty';
+import noop from 'lodash/noop';
 
 import DidAvatar from '../Avatar';
 import DidAddress from '../Address';
@@ -199,7 +200,7 @@ function SessionManager({
   }
   function _onSwitchPassport() {
     const { user, provider } = session;
-    if (provider === 'auth0') {
+    if (!isRawWalletAccount && provider !== 'federated') {
       switchOAuthPassport(user);
     } else {
       setUserOpen(false);
@@ -211,9 +212,9 @@ function SessionManager({
   }
 
   function _onBindWallet() {
-    const { provider } = session;
     setUserOpen(false);
-    if (provider === 'auth0') {
+    // FIXME: @zhanghan 暂时切换回 isRawWalletAccount 的方式来判断，在 did-connect 改版时，简化这里的关系判断
+    if (!isRawWalletAccount) {
       session.bindWallet((...args) => {
         setUserOpen(false);
         onBindWallet(...args);
@@ -347,9 +348,7 @@ function SessionManager({
               onClick={_onBindWallet}
               data-cy="sessionManager-bind-trigger">
               <SvgIcon component={BindWalletIcon} className="session-manager-menu-icon" />
-              {session.provider === 'auth0'
-                ? `${translation.bind}DID Wallet`
-                : `${translation.bind}${translation.thirdParty}`}
+              {!isRawWalletAccount ? `${translation.bind}DID Wallet` : `${translation.bind}${translation.thirdParty}`}
             </MenuItem>
           )}
 
@@ -421,8 +420,6 @@ SessionManager.propTypes = {
   size: PropTypes.number,
 };
 
-const noop = () => {};
-
 SessionManager.defaultProps = {
   locale: 'en',
   showText: false,