Merge pull request #2291 from Web3Auth/feat/wc-chainid-fix

fix chainId format

Author: chaitanyapotti

packages/no-modal/src/connectors/wallet-connect-v2-connector/WalletConnectV2Provider.ts

@@ -11,6 +11,7 @@ import {
   IEthChainSwitchHandlers,
 } from "../../providers/ethereum-provider";
 import { createSolanaJsonRpcClient as createSolJsonRpcClient, createSolanaMiddleware } from "../../providers/solana-provider";
+import { formatChainId } from "./utils";
 import { getAccounts, getEthProviderHandlers, getSolProviderHandlers, switchChain } from "./walletConnectV2Utils";
 
 export type WalletConnectV2ProviderConfig = BaseProviderConfig;
@@ -181,14 +182,13 @@ export class WalletConnectV2Provider extends BaseProvider<BaseProviderConfig, Wa
 
       if (event.name === "chainChanged") {
         if (!data) return;
-        const connectedChainId = data as number;
-        const connectedHexChainId = `0x${connectedChainId.toString(16)}`;
-
+        const connectedChainId = data as number | string;
+        const formattedChainId = formatChainId(connectedChainId);
         // Check if chainId changed and trigger event
         const { currentChain } = this;
-        if (connectedHexChainId && currentChain.chainId !== connectedHexChainId) {
+        if (formattedChainId && currentChain.chainId !== formattedChainId) {
           // Handle rpcUrl update
-          await this.setupEngine(connector, connectedHexChainId);
+          await this.setupEngine(connector, formattedChainId);
         }
       }
     });

packages/no-modal/src/connectors/wallet-connect-v2-connector/utils.ts

@@ -12,3 +12,12 @@ export const isChainIdSupported = (chainNamespace: ChainNamespaceType, chainID:
   const isSupported = supportedNamespaces[chainNamespace].chains?.includes(wcChainNamespace);
   return !!isSupported;
 };
+
+export const formatChainId = (chainId: number | string) => {
+  if (typeof chainId === "number") {
+    return `0x${chainId.toString(16)}`;
+  } else if (typeof chainId === "string") {
+    return chainId.startsWith("0x") ? chainId : `0x${parseInt(chainId, 10).toString(16)}`;
+  }
+  throw new Error(`Invalid chainId: ${chainId}`);
+};