Support for other injected wallets when using MetaMaskWallet

0xFirekeeper · 0xFirekeeper · commit a2e8c8f12cc9 · 2025-03-26T23:04:15.000+07:00
Tested with Rabby + WalletProvider.MetaMaskWallet
diff --git a/Assets/Thirdweb/Runtime/Unity/Wallets/Core/MetaMaskWallet.cs b/Assets/Thirdweb/Runtime/Unity/Wallets/Core/MetaMaskWallet.cs
@@ -45,7 +45,7 @@ public static async Task<MetaMaskWallet> Create(ThirdwebClient client, BigIntege
                 if (metaMaskInstance.IsMetaMaskAvailable())
                 {
                     ThirdwebDebug.Log("MetaMask is available. Enabling Ethereum...");
-                    var isEnabled = await metaMaskInstance.EnableEthereumAsync();
+                    var isEnabled = await metaMaskInstance.EnableEthereumAsync(activeChainId);
                     ThirdwebDebug.Log($"Ethereum enabled: {isEnabled}");
                     if (isEnabled && !string.IsNullOrEmpty(metaMaskInstance.GetAddress()))
                     {
diff --git a/Assets/Thirdweb/Runtime/Unity/Wallets/Core/WebGLMetaMask.cs b/Assets/Thirdweb/Runtime/Unity/Wallets/Core/WebGLMetaMask.cs
@@ -67,8 +67,9 @@ private void Awake()
             }
         }
 
-        public async Task<bool> EnableEthereumAsync()
+        public async Task<bool> EnableEthereumAsync(BigInteger chainId)
         {
+            _activeChainId = chainId;
             _enableEthereumTaskCompletionSource = new TaskCompletionSource<bool>();
 
 #if UNITY_WEBGL && !UNITY_EDITOR

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static async Task<MetaMaskWallet> Create(ThirdwebClient client, BigIntege`
`45`	`45`	`if (metaMaskInstance.IsMetaMaskAvailable())`
`46`	`46`	`{`
`47`	`47`	`ThirdwebDebug.Log("MetaMask is available. Enabling Ethereum...");`
`48`		`- var isEnabled = await metaMaskInstance.EnableEthereumAsync();`
	`48`	`+ var isEnabled = await metaMaskInstance.EnableEthereumAsync(activeChainId);`
`49`	`49`	`ThirdwebDebug.Log($"Ethereum enabled: {isEnabled}");`
`50`	`50`	`if (isEnabled && !string.IsNullOrEmpty(metaMaskInstance.GetAddress()))`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,9 @@ private void Awake()`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- public async Task<bool> EnableEthereumAsync()`
	`70`	`+ public async Task<bool> EnableEthereumAsync(BigInteger chainId)`
`71`	`71`	`{`
	`72`	`+ _activeChainId = chainId;`
`72`	`73`	`_enableEthereumTaskCompletionSource = new TaskCompletionSource<bool>();`
`73`	`74`
`74`	`75`	`#if UNITY_WEBGL && !UNITY_EDITOR`