@arcblock/ux 2.6.5 → 2.6.6

package/lib/SessionManager/index.js

@@ -246,7 +246,7 @@ function SessionManager(_ref) {
       user,
       provider
     } = session;
-    if (provider === 'auth0') {
+    if (!isRawWalletAccount && provider !== 'federated') {
       switchOAuthPassport(user);
     } else {
       setUserOpen(false);
@@ -257,11 +257,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 +410,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,

package/package.json

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

package/src/SessionManager/index.jsx

@@ -199,7 +199,7 @@ function SessionManager({
   }
   function _onSwitchPassport() {
     const { user, provider } = session;
-    if (provider === 'auth0') {
+    if (!isRawWalletAccount && provider !== 'federated') {
       switchOAuthPassport(user);
     } else {
       setUserOpen(false);
@@ -211,9 +211,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 +347,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>
           )}