Wallet.Disconnect - option to not end session when available

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs

@@ -124,11 +124,11 @@ await Connect(
             return addy;
         }
 
-        internal async Task Disconnect()
+        internal async Task Disconnect(bool endSession = true)
         {
             if (ActiveWallet != null)
             {
-                await ActiveWallet.Disconnect();
+                await ActiveWallet.Disconnect(endSession);
             }
             else
             {

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -44,15 +44,15 @@ public async Task<string> Connect(WalletConnection walletConnection)
         /// Disconnects the user's wallet.
         /// </summary>
         /// <returns>A task representing the disconnection process.</returns>
-        public async Task Disconnect()
+        public async Task Disconnect(bool endSession = false)
         {
             if (Utils.IsWebGLBuild())
             {
                 await Bridge.Disconnect();
             }
             else
             {
-                await ThirdwebManager.Instance.SDK.session.Disconnect();
+                await ThirdwebManager.Instance.SDK.session.Disconnect(endSession);
             }
         }
 

Assets/Thirdweb/Core/Scripts/Wallets/IThirdwebWallet.cs

@@ -21,7 +21,7 @@ public interface IThirdwebWallet
         /// <summary>
         /// Main Disconnect call - should fully disconnect from the wallet and reset any variables.
         /// </summary>
-        Task Disconnect();
+        Task Disconnect(bool endSession = true);
 
         /// <summary>
         /// Get the local account if any, return null otherwise.

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebEmbeddedWallet.cs

@@ -41,9 +41,10 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
             return await GetAddress();
         }
 
-        public async Task Disconnect()
+        public async Task Disconnect(bool endSession = true)
         {
-            await _embeddedWallet.SignOutAsync();
+            if (endSession)
+                await _embeddedWallet.SignOutAsync();
             _account = null;
             _web3 = null;
         }

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebHyperplay.cs

@@ -28,7 +28,7 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
             return _hyperPlay.Accounts[0];
         }
 
-        public Task Disconnect()
+        public Task Disconnect(bool endSession = true)
         {
             _web3 = null;
             return Task.CompletedTask;

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebLocalWallet.cs

@@ -27,7 +27,7 @@ public Task<string> Connect(WalletConnection walletConnection, string rpc)
             return Task.FromResult(_account.Address);
         }
 
-        public Task Disconnect()
+        public Task Disconnect(bool endSession = true)
         {
             _account = null;
             _web3 = null;

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebMetamask.cs

@@ -30,7 +30,7 @@ public void UpdateConfig(string appName, string appUrl)
                 this.appUrl = appUrl;
             }
         }
-        
+
         private Web3 _web3;
         private readonly WalletProvider _provider;
         private readonly WalletProvider _signerProvider;
@@ -65,13 +65,13 @@ private void SetupMetaMask()
             var appName = ThirdwebManager.Instance.SDK.session.Options.wallet?.appName;
             var appUrl = ThirdwebManager.Instance.SDK.session.Options.wallet?.appUrl;
             config.UpdateConfig(appName, appUrl);
-            
+
             MetaMaskUnity.Instance.Initialize(config);
         }
 
-        public Task Disconnect()
+        public Task Disconnect(bool endSession = true)
         {
-            MetaMaskUnity.Instance.Disconnect(true);
+            MetaMaskUnity.Instance.Disconnect(endSession);
             _web3 = null;
             return Task.CompletedTask;
         }

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebSmartWallet.cs

@@ -37,11 +37,10 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
             return await GetAddress();
         }
 
-        public Task Disconnect()
+        public async Task Disconnect(bool endSession = true)
         {
             _web3 = null;
-            _personalWallet.Disconnect();
-            return Task.CompletedTask;
+            await _personalWallet.Disconnect(endSession);
         }
 
         public Account GetLocalAccount()

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebWalletConnect.cs

@@ -45,15 +45,18 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
             return await GetAddress();
         }
 
-        public async Task Disconnect()
+        public async Task Disconnect(bool endSession = true)
         {
-            try
+            if (endSession)
             {
-                await WalletConnect.Instance.DisconnectAsync();
-            }
-            catch (Exception e)
-            {
-                Debug.Log("Error disconnecting sign client: " + e.Message);
+                try
+                {
+                    await WalletConnect.Instance.DisconnectAsync();
+                }
+                catch (Exception e)
+                {
+                    ThirdwebDebug.LogWarning($"Error disconnecting WalletConnect: {e.Message}");
+                }
             }
 
             _web3 = null;