Merge pull request #10562 from hassnian/issue-10559

fix: Got into infinite loop with EVM

components/common/ConnectWallet/ConnectEvm.vue

@@ -28,8 +28,9 @@ const { urlPrefix, setUrlPrefix } = usePrefix()
 const { modal } = useWeb3Modal()
 
 watch([address, isConnected, chainId], ([address, isConnected, chainId]) => {
-  if (address && isConnected && chainId) {
-    const chainPrefix = CHAIN_ID_TO_PREFIX[chainId]
+  const chainPrefix = CHAIN_ID_TO_PREFIX?.[chainId ?? '']
+
+  if (address && isConnected && chainId && chainPrefix) {
     const isCorrectChainConnected = chainPrefix === urlPrefix.value
 
     if (!isCorrectChainConnected) {

composables/useWagmi.ts

@@ -1,6 +1,6 @@
 import { defaultWagmiConfig } from '@web3modal/wagmi/vue'
 import { base, immutableZkEvm } from 'viem/chains'
-import { reconnect } from '@wagmi/core'
+import { reconnect as reconnectWagmi } from '@wagmi/core'
 import { useAccount, useDisconnect } from 'use-wagmi'
 import { DisconnectMutateAsync } from 'use-wagmi/query'
 
@@ -23,8 +23,12 @@ const buildWagmiConfig = () => {
 
 const config = buildWagmiConfig() as any
 
-export default () => {
-  reconnect(config)
+export default (
+  { reconnect }: { reconnect: boolean } = { reconnect: false },
+) => {
+  if (reconnect) {
+    reconnectWagmi(config)
+  }
 
   const { isConnected, address, isConnecting, chainId } = useAccount({
     config,
@@ -34,5 +38,12 @@ export default () => {
     () => useDisconnect({ config }).disconnectAsync,
   ) as Promise<DisconnectMutateAsync>
 
-  return { config, isConnected, isConnecting, address, disconnect, chainId }
+  return {
+    config,
+    isConnected,
+    isConnecting,
+    address,
+    disconnect,
+    chainId,
+  }
 }

composables/useWeb3Modal.ts

@@ -4,10 +4,12 @@ const modal = ref()
 
 export default () => {
   const { config } = useWagmi()
+  const { urlPrefix } = usePrefix()
 
   createWeb3Modal({
     wagmiConfig: config,
     projectId: useRuntimeConfig().public.walletConnectProjectId,
+    defaultChain: PREFIX_TO_CHAIN[urlPrefix.value],
   })
 
   if (!modal.value) {

utils/wagmi.ts

@@ -1,6 +1,13 @@
 import { Prefix } from '@kodadot1/static'
+import { base, immutableZkEvm } from 'viem/chains'
+import { type Chain } from 'viem'
 
 export const CHAIN_ID_TO_PREFIX: Record<number, Prefix> = {
   8453: 'base',
   13371: 'imx',
 }
+
+export const PREFIX_TO_CHAIN: Partial<Record<Prefix, Chain>> = {
+  base: base,
+  imx: immutableZkEvm,
+}