:fix switch network improvements & wagmi to recognize wc session (#3299)

.changeset/hungry-frogs-rhyme.md

@@ -0,0 +1,24 @@
+---
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-scaffold-ui': patch
+'@apps/laboratory': patch
+'@reown/appkit': patch
+'@reown/appkit-core': patch
+'@reown/appkit-siwe': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+---
+
+Resolve cases where wagmi doesn't recognize wc session and unable to switch from unsupported network"

apps/laboratory/src/components/Siwe/SiweData.tsx

@@ -13,6 +13,7 @@ import type { SIWESession } from '@reown/appkit-siwe'
 
 export function SiweData() {
   const { data, status } = useSession()
+
   const session = data as unknown as SIWESession
 
   return (

packages/adapters/wagmi/src/connectors/UniversalConnector.ts

@@ -276,14 +276,14 @@ export function walletConnect(
       }
 
       try {
-        if (chainToSwitch?.caipNetworkId) {
-          provider.setDefaultChain(chainToSwitch?.caipNetworkId as string)
-        }
-
         await provider.request({
           method: 'wallet_switchEthereumChain',
           params: [{ chainId: numberToHex(chainId) }]
         })
+
+        if (chainToSwitch?.caipNetworkId) {
+          provider.setDefaultChain(chainToSwitch?.caipNetworkId as string)
+        }
         config.emitter.emit('change', { chainId: Number(chainId) })
 
         const requestedChains = await this.getRequestedChainsIds()
@@ -418,6 +418,7 @@ export function walletConnect(
       }
 
       const connectorChains = config.chains.map(x => x.id)
+
       const namespaceChains = this.getNamespaceChainsIds()
 
       if (namespaceChains.length && !namespaceChains.some(id => connectorChains.includes(id))) {

packages/appkit/src/client.ts

@@ -934,6 +934,7 @@ export class AppKit {
           >(ChainController.state.activeChain as ChainNamespace)
           const providerType =
             ProviderUtil.state.providerIds[ChainController.state.activeChain as ChainNamespace]
+
           await adapter?.switchNetwork({ caipNetwork, provider, providerType })
           this.setCaipNetwork(caipNetwork)
           await this.syncAccount({
@@ -1282,10 +1283,16 @@ export class AppKit {
               chainId: ChainController.state.activeCaipNetwork?.id as string | number
             })
           } catch (error) {
-            adapter?.switchNetwork({
-              provider: this.universalProvider,
-              caipNetwork: ChainController.state.activeCaipNetwork as CaipNetwork
-            })
+            /**
+             * Handle edge case where wagmi detects existing connection but lacks to complete UniversalProvider instance.
+             * Connection attempt fails due to already connected state - reconnect to restore provider state.
+             */
+            if (adapter?.reconnect) {
+              adapter?.reconnect({
+                id: 'walletConnect',
+                type: 'WALLET_CONNECT'
+              })
+            }
           }
         }
 

packages/core/src/utils/SIWXUtil.ts

@@ -27,6 +27,7 @@ export const SIWXUtil = {
 
     try {
       const sessions = await siwx.getSessions(`${network}:${chainId}` as CaipNetworkId, address)
+
       if (sessions.length) {
         return
       }

packages/scaffold-ui/src/modal/w3m-modal/index.ts

@@ -187,7 +187,12 @@ export class W3mModal extends LitElement {
     const prevCaipNetworkId = this.caipNetwork?.caipNetworkId?.toString()
     const nextNetworkId = nextCaipNetwork?.caipNetworkId?.toString()
 
-    if (prevCaipNetworkId && nextNetworkId && prevCaipNetworkId !== nextNetworkId) {
+    if (
+      prevCaipNetworkId &&
+      nextNetworkId &&
+      prevCaipNetworkId !== nextNetworkId &&
+      this.caipNetwork?.name !== 'Unknown Network'
+    ) {
       RouterController.goBack()
     }
     this.caipNetwork = nextCaipNetwork

packages/scaffold-ui/src/views/w3m-unsupported-chain-view/index.ts

@@ -132,14 +132,16 @@ export class W3mUnsupportedChainView extends LitElement {
       'supportsAllNetworks',
       network.chainNamespace
     )
-    const caipNetwork = ChainController.state.activeCaipNetwork
+
     const routerData = RouterController.state.data
 
-    if (caipAddress && caipNetwork?.caipNetworkId !== network.caipNetworkId) {
+    if (caipAddress) {
       if (approvedCaipNetworkIds?.includes(network.caipNetworkId)) {
         await ChainController.switchActiveNetwork(network)
       } else if (supportsAllNetworks) {
         RouterController.push('SwitchNetwork', { ...routerData, network })
+      } else {
+        RouterController.push('SwitchNetwork', { ...routerData, network })
       }
     } else if (!caipAddress) {
       ChainController.setActiveCaipNetwork(network)

packages/siwe/src/mapToSIWX.ts

@@ -40,8 +40,11 @@ export function mapToSIWX(siwe: AppKitSIWEClient): SIWXConfig {
     }
 
     const session = await getSession()
-    const isDifferentAddress =
-      session && session.address !== CoreHelperUtil.getPlainAddress(activeCaipAddress)
+
+    const compareSessionAddress = session?.address.toLowerCase()
+    const compareCaipAddress = CoreHelperUtil?.getPlainAddress(activeCaipAddress)?.toLowerCase()
+
+    const isDifferentAddress = session && compareSessionAddress !== compareCaipAddress
 
     if (isDifferentAddress) {
       await siwe.methods.signOut()
@@ -146,7 +149,15 @@ export function mapToSIWX(siwe: AppKitSIWEClient): SIWXConfig {
         const siweSession = await getSession()
 
         const siweCaipNetworkId = `eip155:${siweSession?.chainId}`
-        if (!siweSession || siweSession.address !== address || siweCaipNetworkId !== chainId) {
+
+        const compareSessionAddress = siweSession?.address.toLowerCase()
+        const compareCaipAddress = address?.toLowerCase()
+
+        if (
+          !siweSession ||
+          compareSessionAddress !== compareCaipAddress ||
+          siweCaipNetworkId !== chainId
+        ) {
           return []
         }