en: disconnect调整

decert-me · Jan 4, 2024 · 5fcfe4c · 5fcfe4c
1 parent d4bc3ea
commit 5fcfe4c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/src/containers/AppHeader.js b/src/containers/AppHeader.js
@@ -34,7 +34,7 @@ export default function AppHeader({ isMobile, user }) {
             console.log(err);
         }
     })
-    const { disconnect } = useDisconnect();
+    const { disconnectAsync } = useDisconnect();
     const navigateTo = useNavigate();
     const location = useLocation();
     let [isOpenM, setIsOpenM] = useState(false);
@@ -127,16 +127,13 @@ export default function AppHeader({ isMobile, user }) {
 
     }
 
-    function goDisconnect() {
+    async function goDisconnect() {
         if (walletType === "evm") {
-            disconnect();
-            ClearStorage();
+            await disconnectAsync();
         }else{
-            wallet.adapter.disconnect()
-            .then(res => {
-                ClearStorage();
-            })
+            await wallet.adapter.disconnect()
         }
+        ClearStorage();
 
         // 判断是否是claim页
         const path = location.pathname;
@@ -247,7 +244,7 @@ export default function AppHeader({ isMobile, user }) {
 
                                 {
                                     isConnected ?
-                                    <Button danger type="primary" onClick={() => disconnect()}>{t("header.disconnect")}</Button>
+                                    <Button danger type="primary" onClick={() => goDisconnect()}>{t("header.disconnect")}</Button>
                                     :
                                     <Button onClick={() => openModal()}>{t("header.connect")}</Button>
                                 }

diff --git a/src/containers/DefaultLayout.js b/src/containers/DefaultLayout.js
@@ -13,7 +13,7 @@ import MyContext from "@/provider/context";
 import store, { hideCustomSigner, showCustomSigner } from "@/redux/store";
 import { useAddress } from "@/hooks/useAddress";
 import { useWallet } from "@solana/wallet-adapter-react";
-import { useAccount, useDisconnect } from "wagmi";
+import { useDisconnect } from "wagmi";
 import { getUnreadMessage, readMessage } from "@/request/api/public";
 import { useTranslation } from "react-i18next";
 import CustomDisconnect from "@/redux/CustomDisconnect";
@@ -35,7 +35,7 @@ export default function DefaultLayout(params) {
 
     const { address, isConnected, walletType } = useAddress();
     const { wallet, connected } = useWallet();
-    const { disconnect } = useDisconnect()
+    const { disconnectAsync } = useDisconnect()
 
     // 获取当前账号未读信息
     const { runAsync, cancel } = useRequest(getUnreadMessage, {
@@ -186,14 +186,11 @@ export default function DefaultLayout(params) {
                 await sign()
             }else{
                 if (walletType === "evm") {
-                    disconnect();
-                    ClearStorage();
+                    await disconnectAsync();
                 }else{
-                    wallet.adapter.disconnect()
-                    .then(res => {
-                        ClearStorage();
-                    })
+                    await wallet.adapter.disconnect()
                 }
+                ClearStorage();
             }
         }
     }

diff --git a/src/redux/CustomDisconnect.js b/src/redux/CustomDisconnect.js
@@ -9,20 +9,17 @@ function CustomDisconnect(props) {
 
     const { wallet } = useWallet();
     const { walletType, isConnected } = useAddress();
-    const { disconnect } = useDisconnect();
+    const { disconnectAsync } = useDisconnect();
 
 
-    function goDisconnect() {
+    async function goDisconnect() {
         props.setDisConnect(false);
         if (walletType === "evm") {
-            disconnect();
-            ClearStorage();
+            await disconnectAsync();
         }else{
-            wallet.adapter.disconnect()
-            .then(res => {
-                ClearStorage();
-            })
+            await wallet.adapter.disconnect()
         }
+        ClearStorage();
     }
 
     useEffect(() => {