diff --git a/apps/evm/src/app/[lang]/(bridge)/hooks/tests/useGatewayForm.test.ts b/apps/evm/src/app/[lang]/(bridge)/hooks/tests/useGatewayForm.test.ts
index 2fac5d24..048817e5 100644
--- a/apps/evm/src/app/[lang]/(bridge)/hooks/tests/useGatewayForm.test.ts
+++ b/apps/evm/src/app/[lang]/(bridge)/hooks/tests/useGatewayForm.test.ts
@@ -22,7 +22,7 @@ vi.mock(import('@/hooks'), async (importOriginal) => {
 
   return {
     ...actual,
-    useAccount: vi.fn()
+    useBtcAccount: vi.fn()
   };
 });
 
diff --git a/apps/evm/src/components/AuthButton/index.tsx b/apps/evm/src/components/AuthButton/index.tsx
index 12a4605d..d9a49eae 100644
--- a/apps/evm/src/components/AuthButton/index.tsx
+++ b/apps/evm/src/components/AuthButton/index.tsx
@@ -1,2 +1 @@
-export type { AuthButtonProps } from './AuthButton';
 export { AuthButton } from './AuthButton';
diff --git a/apps/evm/src/components/ChainLogo/index.tsx b/apps/evm/src/components/ChainLogo/index.tsx
index 6dfa73b8..4ccf7e99 100644
--- a/apps/evm/src/components/ChainLogo/index.tsx
+++ b/apps/evm/src/components/ChainLogo/index.tsx
@@ -1,2 +1 @@
 export { ChainLogo } from './ChainLogo';
-export type { ChainLogoProps } from './ChainLogo';
diff --git a/apps/evm/src/hooks/btc/useFeeRate.tsx b/apps/evm/src/hooks/btc/useFeeRate.tsx
index 113ec647..515f3233 100644
--- a/apps/evm/src/hooks/btc/useFeeRate.tsx
+++ b/apps/evm/src/hooks/btc/useFeeRate.tsx
@@ -43,3 +43,4 @@ function useBtcFeeRate<TData = BtcFeeRateReturnType>({ query }: UseBtcFeeRatePro
 }
 
 export { useBtcFeeRate };
+export type { BtcFeeRateReturnType };
diff --git a/apps/evm/src/test-utils/wrapper.tsx b/apps/evm/src/test-utils/wrapper.tsx
index d733392f..2e0b231d 100644
--- a/apps/evm/src/test-utils/wrapper.tsx
+++ b/apps/evm/src/test-utils/wrapper.tsx
@@ -1,20 +1,35 @@
 import { QueryClient, QueryClientProvider } from '@gobob/react-query';
 import { BOBUIProvider } from '@gobob/ui';
-import { WagmiProvider } from '@gobob/wagmi';
+import { WagmiProvider } from 'wagmi';
 import { PropsWithChildren } from 'react';
+import { getConfig } from '@gobob/wagmi';
+import { DynamicWagmiConnector } from '@dynamic-labs/wagmi-connector';
+import { DynamicContextProvider } from '@dynamic-labs/sdk-react-core';
+import { BitcoinWalletConnectors } from '@dynamic-labs/bitcoin';
+import { EthereumWalletConnectors } from '@dynamic-labs/ethereum';
 
+import { isProd } from '@/constants';
 import { LinguiClientProvider } from '@/i18n/provider';
 
 export const wrapper = ({ children }: PropsWithChildren) => {
   const queryClient = new QueryClient();
 
   return (
-    <LinguiClientProvider initialLocale='en' initialMessages={{}}>
-      <QueryClientProvider client={queryClient}>
-        <WagmiProvider>
-          <BOBUIProvider>{children}</BOBUIProvider>
+    <DynamicContextProvider
+      settings={{
+        environmentId: process.env.NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID as string,
+        walletConnectors: [BitcoinWalletConnectors, EthereumWalletConnectors]
+      }}
+    >
+      <LinguiClientProvider initialLocale='en' initialMessages={{}}>
+        <WagmiProvider config={getConfig({ isProd, multiInjectedProviderDiscovery: false })}>
+          <QueryClientProvider client={queryClient}>
+            <DynamicWagmiConnector>
+              <BOBUIProvider>{children}</BOBUIProvider>
+            </DynamicWagmiConnector>
+          </QueryClientProvider>
         </WagmiProvider>
-      </QueryClientProvider>
-    </LinguiClientProvider>
+      </LinguiClientProvider>
+    </DynamicContextProvider>
   );
 };