Refactor wallet disconnect and improve Reown connection flow

Introduces a DisconnectWallet method in ThirdwebManagerBase to centralize wallet disconnection logic and updates the editor to use this method. Refactors ReownWallet connection logic to separate session resumption and interactive connection with improved timeout handling and cleanup, enhancing reliability and maintainability.

Author: 0xFirekeeper

Assets/Thirdweb/Editor/ThirdwebManagerEditor.cs

@@ -133,27 +133,11 @@ protected virtual void DrawDebugTab()
 
                     if (this.target is ThirdwebManagerBase manager)
                     {
-                        var wallet = manager.ActiveWallet;
-                        if (wallet != null)
-                        {
-                            EditorApplication.delayCall += async () =>
-                            {
-                                try
-                                {
-                                    await wallet.Disconnect();
-                                    manager.ActiveWallet = null;
-                                    Debug.Log("Active wallet disconnected.");
-                                }
-                                catch (Exception ex)
-                                {
-                                    Debug.LogError($"Failed to disconnect active wallet: {ex.Message}");
-                                }
-                            };
-                        }
-                        else
+                        EditorApplication.delayCall += async () =>
                         {
-                            Debug.LogWarning("No active wallet to disconnect.");
-                        }
+                            await manager.DisconnectWallet();
+                            Debug.Log("Active wallet disconnected.");
+                        };
                     }
                     else
                     {

Assets/Thirdweb/Runtime/Unity/ThirdwebManagerBase.cs

@@ -562,6 +562,22 @@ public virtual async Task<IThirdwebWallet> ConnectWallet(WalletOptions walletOpt
             }
         }
 
+        public virtual async Task DisconnectWallet()
+        {
+            if (this.ActiveWallet != null)
+            {
+                try
+                {
+                    await this.ActiveWallet.Disconnect();
+                }
+                finally
+                {
+                    this.ActiveWallet = null;
+                }
+            }
+            PlayerPrefs.DeleteKey(THIRDWEB_AUTO_CONNECT_OPTIONS_KEY);
+        }
+
         public virtual async Task<SmartWallet> UpgradeToSmartWallet(IThirdwebWallet personalWallet, BigInteger chainId, SmartWalletOptions smartWalletOptions)
         {
             if (personalWallet.AccountType == ThirdwebAccountType.SmartAccount)

Assets/Thirdweb/Runtime/Unity/Wallets/Reown/ReownWallet.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Nethereum.ABI.EIP712;
 using Reown.AppKit.Unity;
+using AccountConnectedEventArgs = Reown.AppKit.Unity.Connector.AccountConnectedEventArgs;
 
 namespace Thirdweb.Unity
 {
@@ -70,40 +71,22 @@ string[] excludedWalletIds
 
             ThirdwebDebug.Log("Reown AppKit initialized.");
 
-            var connected = false;
-
-            try
-            {
-                connected = await AppKit.ConnectorController.TryResumeSessionAsync();
-            }
-            catch (Exception e)
-            {
-                ThirdwebDebug.LogWarning($"Failed to resume Reown session: {e.Message}");
-                connected = false;
-            }
+            var connectionTimeout = TimeSpan.FromSeconds(120);
+            var connected = await TryResumeExistingSessionAsync();
 
             if (connected)
             {
                 ThirdwebDebug.Log("Resumed previous Reown session.");
             }
             else
             {
-                ThirdwebDebug.Log("Opening Reown modal... Timeout in 120 seconds.");
-                AppKit.AccountConnected += (_, e) => connected = true;
-                AppKit.OpenModal();
-
-                var timeoutMs = 120000; // 120 seconds
-                var intervalMs = 250; // 0.25 second
-                while (!connected && timeoutMs > 0)
-                {
-                    await ThirdwebTask.Delay(intervalMs);
-                    timeoutMs -= intervalMs;
-                }
+                ThirdwebDebug.Log($"Awaiting Reown connection (timeout {connectionTimeout.TotalSeconds} seconds)...");
+                connected = await WaitForInteractiveConnectionAsync(connectionTimeout);
             }
 
             if (!connected)
             {
-                throw new Exception("Reown connection timed out.");
+                throw new TimeoutException($"Reown connection timed out after {connectionTimeout.TotalSeconds} seconds.");
             }
 
             ThirdwebDebug.Log("Reown wallet connected.");
@@ -262,7 +245,83 @@ public async Task SwitchNetwork(BigInteger chainId)
             ThirdwebDebug.Log($"Switched Reown to chain ID {chainId}.");
         }
 
-        internal static Chain ToWcChain(ThirdwebClient client, BigInteger chainId)
+        private static async Task<bool> TryResumeExistingSessionAsync()
+        {
+            try
+            {
+                return await AppKit.ConnectorController.TryResumeSessionAsync();
+            }
+            catch (Exception e)
+            {
+                ThirdwebDebug.LogWarning($"Failed to resume Reown session: {e.Message}");
+                try
+                {
+                    await AppKit.ConnectorController.DisconnectAsync();
+                }
+                catch (Exception disconnectException)
+                {
+                    ThirdwebDebug.LogWarning($"Failed to clean up Reown session after resume error: {disconnectException.Message}");
+                }
+
+                await ThirdwebTask.Delay(1000);
+                return false;
+            }
+        }
+
+        private static async Task<bool> WaitForInteractiveConnectionAsync(TimeSpan timeout)
+        {
+            if (AppKit.ConnectorController.IsAccountConnected)
+            {
+                return true;
+            }
+
+            var connectionEstablished = false;
+            var connectedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            void OnAccountConnected(object sender, AccountConnectedEventArgs args)
+            {
+                connectionEstablished = true;
+                if (!connectedTcs.Task.IsCompleted)
+                {
+                    connectedTcs.SetResult(true);
+                }
+            }
+
+            AppKit.AccountConnected += OnAccountConnected;
+
+            try
+            {
+                await ThirdwebTask.Delay(250);
+
+                if (!AppKit.ConnectorController.IsAccountConnected)
+                {
+                    AppKit.OpenModal();
+                }
+
+                var timeoutMilliseconds = (int)Math.Max(0, timeout.TotalMilliseconds);
+                var timeoutTask = ThirdwebTask.Delay(timeoutMilliseconds);
+                var completedTask = await Task.WhenAny(connectedTcs.Task, timeoutTask);
+
+                if (completedTask == connectedTcs.Task)
+                {
+                    return await connectedTcs.Task;
+                }
+
+                ThirdwebDebug.LogWarning($"Reown connection timed out after {timeout.TotalSeconds} seconds.");
+                await AppKit.ConnectorController.DisconnectAsync();
+                return false;
+            }
+            finally
+            {
+                AppKit.AccountConnected -= OnAccountConnected;
+                if (!connectionEstablished)
+                {
+                    AppKit.CloseModal();
+                }
+            }
+        }
+
+        private static Chain ToWcChain(ThirdwebClient client, BigInteger chainId)
         {
             var wcChain = ChainConstants.Chains.All.FirstOrDefault(c => c.ChainReference == chainId.ToString());