fix: wagmi wc connections default network mismatch (#3868)

reown-com · Feb 14, 2025 · 8e11300 · 8e11300
1 parent faf3f25
commit 8e11300
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/.changeset/swift-coins-hang.md b/.changeset/swift-coins-hang.md
@@ -0,0 +1,23 @@
+---
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-cli': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-wallet-button': patch
+---
+
+Sets default chain to current appkit chain on WC connections
diff --git a/packages/adapters/wagmi/src/connectors/UniversalConnector.ts b/packages/adapters/wagmi/src/connectors/UniversalConnector.ts
@@ -108,11 +108,9 @@ export function walletConnect(
         if (provider.session && isChainsStale) {
           await provider.disconnect()
         }
-
         // If there isn't an active session or chains are stale, connect.
         if (!provider.session || isChainsStale) {
           const namespaces = WcHelpersUtil.createNamespaces(caipNetworks)
-
           await provider.connect({
             optionalNamespaces: namespaces,
             ...('pairingTopic' in rest ? { pairingTopic: rest.pairingTopic } : {})
@@ -150,6 +148,8 @@ export function walletConnect(
           provider.on('session_delete', sessionDelete)
         }
 
+        provider.setDefaultChain(`eip155:${currentChainId}`)
+
         return { accounts, chainId: currentChainId }
       } catch (error) {
         if (
@@ -232,7 +232,6 @@ export function walletConnect(
     },
     async getChainId() {
       const chainId = appKit.getCaipNetwork()?.id
-
       if (chainId) {
         return chainId as number
       }

diff --git a/packages/adapters/wagmi/src/tests/UniversalConnector.test.ts b/packages/adapters/wagmi/src/tests/UniversalConnector.test.ts
@@ -75,6 +75,7 @@ describe('UniversalConnector', () => {
       })
       expect(mockProvider.on).toHaveBeenCalled()
       expect(mockProvider.session.namespaces.eip155.accounts).toEqual([mockCaipAddress])
+      expect(mockProvider.setDefaultChain).toHaveBeenCalledWith(`eip155:${expectedChainId}`)
     })
 
     it('should handle user rejection', async () => {

diff --git a/packages/adapters/wagmi/src/tests/mocks/AppKit.ts b/packages/adapters/wagmi/src/tests/mocks/AppKit.ts
@@ -27,7 +27,8 @@ export const mockProvider = {
   events: {
     setMaxListeners: vi.fn()
   },
-  session: mockSession
+  session: mockSession,
+  setDefaultChain: vi.fn()
 }
 
 export const mockAppKit = {