Fix/set wcerror (#5548)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: tomiir

.changeset/quiet-hands-raise.md

@@ -0,0 +1,6 @@
+---
+'@reown/appkit-controllers': patch
+'@reown/appkit': patch
+---
+
+Fixes issue where mobile connections failing would not set wcError

packages/controllers/src/controllers/ConnectionController.ts

@@ -230,30 +230,37 @@ const controller = {
     const isInTelegramOrSafariIos =
       CoreHelperUtil.isTelegram() || (CoreHelperUtil.isSafari() && CoreHelperUtil.isIos())
 
-    if (cache === 'always' || (cache === 'auto' && isInTelegramOrSafariIos)) {
-      if (wcConnectionPromise) {
-        await wcConnectionPromise
-        wcConnectionPromise = undefined
+    try {
+      if (cache === 'always' || (cache === 'auto' && isInTelegramOrSafariIos)) {
+        if (wcConnectionPromise) {
+          await wcConnectionPromise
+          wcConnectionPromise = undefined
 
-        return
-      }
+          return
+        }
+
+        if (!CoreHelperUtil.isPairingExpired(state?.wcPairingExpiry)) {
+          const link = state.wcUri
+          state.wcUri = link
 
-      if (!CoreHelperUtil.isPairingExpired(state?.wcPairingExpiry)) {
-        const link = state.wcUri
-        state.wcUri = link
+          return
+        }
 
-        return
+        wcConnectionPromise = ConnectionController._getClient()?.connectWalletConnect?.()
+        ConnectionController.state.status = 'connecting'
+        await wcConnectionPromise
+        wcConnectionPromise = undefined
+        state.wcPairingExpiry = undefined
+        ConnectionController.state.status = 'connected'
+      } else {
+        await ConnectionController._getClient()?.connectWalletConnect?.()
       }
-      wcConnectionPromise = ConnectionController._getClient()
-        ?.connectWalletConnect?.()
-        .catch(() => undefined)
-      ConnectionController.state.status = 'connecting'
-      await wcConnectionPromise
+    } catch (error) {
+      state.wcError = true
+      state.wcFetchingUri = false
+      state.status = 'disconnected'
       wcConnectionPromise = undefined
-      state.wcPairingExpiry = undefined
-      ConnectionController.state.status = 'connected'
-    } else {
-      await ConnectionController._getClient()?.connectWalletConnect?.()
+      throw error
     }
   },
 

packages/controllers/tests/controllers/ConnectionController.test.ts

@@ -304,6 +304,62 @@ describe('ConnectionController', () => {
     expect(ConnectionController.state.status).toEqual('connected')
   })
 
+  it('should set wcError and status to disconnected when connectWalletConnect rejects in cached mode on telegram', async () => {
+    client.connectWalletConnect = vi.fn().mockRejectedValueOnce(new Error('Connection failed'))
+    vi.spyOn(CoreHelperUtil, 'isPairingExpired').mockReturnValue(true)
+    vi.spyOn(CoreHelperUtil, 'isTelegram').mockReturnValue(true)
+
+    ConnectionController.state.wcError = false
+
+    await expect(ConnectionController.connectWalletConnect()).rejects.toThrow('Connection failed')
+
+    expect(ConnectionController.state.wcError).toEqual(true)
+    expect(ConnectionController.state.wcFetchingUri).toEqual(false)
+    expect(ConnectionController.state.status).toEqual('disconnected')
+  })
+
+  it('should set wcError and status to disconnected when connectWalletConnect rejects with cache "always"', async () => {
+    client.connectWalletConnect = vi.fn().mockRejectedValueOnce(new Error('Connection failed'))
+    vi.spyOn(CoreHelperUtil, 'isPairingExpired').mockReturnValue(true)
+
+    ConnectionController.state.wcError = false
+
+    await expect(ConnectionController.connectWalletConnect({ cache: 'always' })).rejects.toThrow(
+      'Connection failed'
+    )
+
+    expect(ConnectionController.state.wcError).toEqual(true)
+    expect(ConnectionController.state.wcFetchingUri).toEqual(false)
+    expect(ConnectionController.state.status).toEqual('disconnected')
+  })
+
+  it('should not set wcError when connectWalletConnect succeeds in cached mode', async () => {
+    client.connectWalletConnect = vi.fn().mockResolvedValueOnce(undefined)
+    vi.spyOn(CoreHelperUtil, 'isPairingExpired').mockReturnValue(true)
+    vi.spyOn(CoreHelperUtil, 'isTelegram').mockReturnValue(true)
+
+    ConnectionController.state.wcError = false
+
+    await ConnectionController.connectWalletConnect()
+
+    expect(ConnectionController.state.wcError).toEqual(false)
+    expect(ConnectionController.state.status).toEqual('connected')
+  })
+
+  it('should set wcError and rethrow when connectWalletConnect rejects in non-cached mode', async () => {
+    client.connectWalletConnect = vi.fn().mockRejectedValueOnce(new Error('Connection failed'))
+
+    ConnectionController.state.wcError = false
+
+    await expect(ConnectionController.connectWalletConnect({ cache: 'never' })).rejects.toThrow(
+      'Connection failed'
+    )
+
+    expect(ConnectionController.state.wcError).toEqual(true)
+    expect(ConnectionController.state.wcFetchingUri).toEqual(false)
+    expect(ConnectionController.state.status).toEqual('disconnected')
+  })
+
   it('should handle connectWalletConnect when cache argument is "never"', async () => {
     vi.spyOn(CoreHelperUtil, 'isTelegram').mockReturnValue(true)
     vi.spyOn(CoreHelperUtil, 'isSafari').mockReturnValue(true)