diff --git a/src/refactor/wallet-client/network.ts b/src/refactor/wallet-client/network.ts
new file mode 100644
index 00000000..61eed0d6
--- /dev/null
+++ b/src/refactor/wallet-client/network.ts
@@ -0,0 +1,9 @@
+import { useSwitchNetwork } from "wagmi"
+
+export const useNetwork = () => {
+    const { switchNetwork } = useSwitchNetwork();
+    
+    return {
+        switchNetwork
+    }
+}
\ No newline at end of file
diff --git a/src/refactor/wallet-client/wallet-client.ts b/src/refactor/wallet-client/wallet-client.ts
index 2cbfd42a..7c4bd2d6 100644
--- a/src/refactor/wallet-client/wallet-client.ts
+++ b/src/refactor/wallet-client/wallet-client.ts
@@ -3,17 +3,16 @@ import { useMemo } from 'react';
 
 import { useAccount, useDisconnect, useProvider, useSigner } from 'wagmi';
 
-export interface UseWalletClientReturn {}
 
 export const useWalletClient = () => {
   const { openConnectModal } = useConnectModal();
   const { isConnected, isConnecting, isDisconnected, connector, address } =
     useAccount();
   const provider = useProvider();
-  const signer = useSigner();
+  const { data: signer, isLoading: isLoadingSigner } = useSigner();
   const { disconnect, disconnectAsync } = useDisconnect();
 
-  const useWalletClientReturn: UseWalletClientReturn = useMemo(
+  const useWalletClientReturn = useMemo(
     () => ({
       address,
       provider,
@@ -25,6 +24,7 @@ export const useWalletClient = () => {
       openConnectModal,
       disconnect,
       disconnectAsync,
+      isLoadingSigner,
     }),
     [
       address,
@@ -37,8 +37,10 @@ export const useWalletClient = () => {
       openConnectModal,
       disconnect,
       disconnectAsync,
+      isLoadingSigner,
     ]
   );
 
   return useWalletClientReturn;
 };
+