WalletConnect Connectivity Improvements

Fixed Android issues, still allowing a callback for switch network. Improved and cleaned up general behavior of WalletConnect.cs

Also fixed a thrown Event Trigger from internal Wallet Connect Core scripts.

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -68,18 +68,27 @@ public async Task<string> Connect(WalletConnection? walletConnection = null)
                             oldSession.siweSession
                         );
 
-                        // Add chain
+                        // Switch to chain
                         try
                         {
-                            await WalletConnect.Instance.WalletAddEthChain(ThirdwebManager.Instance.SDK.currentChainData);
+                            await WalletConnect.Instance.WalletSwitchEthChain(new EthChain() { chainId = ThirdwebManager.Instance.SDK.currentChainData.chainId });
                         }
                         catch (System.Exception e)
                         {
-                            Debug.Log("Adding chain error: " + e.Message);
-                        }
+                            Debug.LogWarning("Switching chain error, attempting to add chain: " + e.Message);
 
-                        // Switch to chain
-                        await WalletConnect.Instance.WalletSwitchEthChain(new EthChain() { chainId = ThirdwebManager.Instance.SDK.currentChainData.chainId });
+                            // Add chain
+                            try
+                            {
+                                await WalletConnect.Instance.WalletAddEthChain(ThirdwebManager.Instance.SDK.currentChainData);
+                                await WalletConnect.Instance.WalletSwitchEthChain(new EthChain() { chainId = ThirdwebManager.Instance.SDK.currentChainData.chainId });
+                            }
+                            catch (System.Exception f)
+                            {
+                                Debug.LogWarning("Adding chain error: " + f.Message);
+                                return Nethereum.Util.AddressUtil.Current.ConvertToChecksumAddress(WalletConnect.Instance.Session.Accounts[0]);
+                            }
+                        }
 
                         return Nethereum.Util.AddressUtil.Current.ConvertToChecksumAddress(WalletConnect.Instance.Session.Accounts[0]);
                     }

Assets/Thirdweb/Examples/Prefabs/Prefab_ConnectWalletNative.prefab

@@ -3053,7 +3053,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Mobile Wallet
+  m_text: Wallet Connect
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

Assets/Thirdweb/Plugins/WalletConnectSharp.Core/WalletConnectProtocol.cs

@@ -188,11 +188,24 @@ protected async void TransportOnMessageReceived(object sender, MessageReceivedEv
 
             var json = await Cipher.DecryptWithKey(_keyRaw, encryptedPayload);
 
-            var payload = JsonConvert.DeserializeObject<JsonRpcResponse>(json); // Edited from JsonRpcPayload
-
-            if (payload != null)
+            try
+            {
+                JsonRpcResponse payload = JsonConvert.DeserializeObject<JsonRpcResponse>(json); // Edited from JsonRpcPayload
+                if (payload != null)
+                    Events.Trigger(payload.Event, json);
+            }
+            catch
             {
-                Events.Trigger(payload.Event, json);
+                try
+                {
+                    JsonRpcPayload payload = JsonConvert.DeserializeObject<JsonRpcPayload>(json);
+                    if (payload != null)
+                        Events.Trigger(payload.Event, json);
+                }
+                catch
+                {
+                    return;
+                }
             }
         }
 

Assets/Thirdweb/Plugins/WalletConnectSharp.Unity/UI/ChooseWalletScreen.cs

@@ -36,12 +36,8 @@ private IEnumerator BuildWalletButtons()
 
                 walletImage.sprite = walletData.medimumIcon;
 
-                walletButton.onClick.AddListener(
-                    delegate
-                    {
-                        WalletConnect.OpenDeepLink(walletData);
-                    }
-                );
+                walletButton.onClick.RemoveAllListeners();
+                walletButton.onClick.AddListener(() => WalletConnect.OpenDeepLink(walletData));
             }
 
             Destroy(loadingText.gameObject);