Avoid enforcing network if chain id = initial wc

thirdweb-dev · Oct 10, 2024 · b62acc9 · b62acc9
1 parent 0d7d412
commit b62acc9
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/Assets/Thirdweb/Runtime/Unity/Wallets/Core/WalletConnectWallet.cs b/Assets/Thirdweb/Runtime/Unity/Wallets/Core/WalletConnectWallet.cs
@@ -72,16 +72,20 @@ public async static Task<WalletConnectWallet> Create(ThirdwebClient client, BigI
             }
             else
             {
-                try
-                {
-                    var data = new WalletSwitchEthereumChain(new HexBigInteger(initialChainId).HexValue);
-                    await WalletConnect.Instance.RequestAsync<WalletSwitchEthereumChain, string>(data);
-                    await Task.Delay(5000); // wait for chain switch to take effect
-                    await WalletConnect.Instance.SignClient.AddressProvider.SetDefaultChainIdAsync($"eip155:{initialChainId}");
-                }
-                catch (Exception e)
+                var currentChainId = WalletConnect.Instance.ActiveChainId;
+                if (currentChainId != $"eip155:{initialChainId}")
                 {
-                    ThirdwebDebug.LogWarning($"Failed to ensure wallet is on active chain: {e.Message}");
+                    try
+                    {
+                        var data = new WalletSwitchEthereumChain(new HexBigInteger(initialChainId).HexValue);
+                        await WalletConnect.Instance.RequestAsync<WalletSwitchEthereumChain, string>(data);
+                        await Task.Delay(5000); // wait for chain switch to take effect
+                        await WalletConnect.Instance.SignClient.AddressProvider.SetDefaultChainIdAsync($"eip155:{initialChainId}");
+                    }
+                    catch (Exception e)
+                    {
+                        ThirdwebDebug.LogWarning($"Failed to ensure wallet is on active chain: {e.Message}");
+                    }
                 }
                 _walletConnectService = new WalletConnectServiceCore(WalletConnect.Instance.SignClient);
             }
@@ -91,6 +95,11 @@ public async static Task<WalletConnectWallet> Create(ThirdwebClient client, BigI
 
         public async Task EnsureCorrectNetwork(BigInteger chainId)
         {
+            var currentChainId = WalletConnect.Instance.ActiveChainId;
+            if (currentChainId == $"eip155:{chainId}")
+            {
+                return;
+            }
             var chainInfo = await Utils.GetChainMetadata(_client, chainId);
             var wcChainInfo = new EthereumChain()
             {