diff --git a/src/refactor/helpers/ethers.ts b/src/refactor/helpers/ethers.ts
index 7510dde4..5c577749 100644
--- a/src/refactor/helpers/ethers.ts
+++ b/src/refactor/helpers/ethers.ts
@@ -14,16 +14,16 @@ export const useEthersProvider = (): Provider | undefined => {
   return provider;
 };
 
-export const useEthersSigner = (): {
-  data: Signer | undefined;
-  isLoading: boolean;
-  error: Error | null;
-} => {
+export const useEthersSigner = () => {
   const { data: walletClient, isLoading, error } = useWalletClient();
   const signer = useMemo(() => {
     if (walletClient) walletClientToSigner(walletClient);
     return undefined;
   }, [walletClient]);
 
-  return { data: signer, isLoading, error };
+  return { data: signer, isLoading, error } as {
+    data?: Signer;
+    isLoading?: boolean;
+    error?: Error | null;
+  };
 };
diff --git a/src/refactor/helpers/wagmi.ts b/src/refactor/helpers/wagmi.ts
index c6406e86..c087b9db 100644
--- a/src/refactor/helpers/wagmi.ts
+++ b/src/refactor/helpers/wagmi.ts
@@ -3,7 +3,7 @@ import { type PublicClient, type WalletClient } from 'wagmi';
 import { providers } from 'ethers';
 import { type HttpTransport } from 'viem';
 
-export function publicClientToProvider(publicClient: PublicClient) {
+export const publicClientToProvider = (publicClient: PublicClient) => {
   const { chain, transport } = publicClient;
   const network = {
     chainId: chain.id,
@@ -17,9 +17,9 @@ export function publicClientToProvider(publicClient: PublicClient) {
       )
     );
   return new providers.JsonRpcProvider(transport.url as string, network);
-}
+};
 
-export function walletClientToSigner(walletClient: WalletClient) {
+export const walletClientToSigner = (walletClient: WalletClient) => {
   const { account, chain, transport } = walletClient;
   const network = {
     chainId: chain.id,
diff --git a/src/refactor/wallet-client/wallet/use-wallet.ts b/src/refactor/wallet-client/wallet/use-wallet.ts
index 3027f733..89d481c0 100644
--- a/src/refactor/wallet-client/wallet/use-wallet.ts
+++ b/src/refactor/wallet-client/wallet/use-wallet.ts
@@ -10,7 +10,7 @@ import {
   useAccount,
   useBalance,
   useDisconnect,
-  useWalletClient,
+  useWalletClient as useWalletClientWagmi,
   usePublicClient,
   PublicClient,
   WalletClient,
@@ -28,8 +28,8 @@ export interface UseWalletReturn {
   shortAddress?: `0x${string}`;
   publicClient?: PublicClient;
   walletClient?: WalletClient;
-  signer: Signer;
-  provider: Provider;
+  signer?: Signer;
+  provider?: Provider;
   connector?: Connector;
   isConnected?: boolean;
   isConnecting?: boolean;
@@ -62,7 +62,7 @@ const useWallet = (): UseWalletReturn => {
   // * NOTE: internal state to compare addresses
   const [compareAddress, setCompareAddress] = useState(address);
   const { data: walletClient, isLoading: isLoadingWalletClient } =
-    useWalletClient();
+    useWalletClientWagmi();
 
   const { data: signer, isLoading: isLoadingSigner } = useEthersSigner();