Fix Cancel WalletConnect

0xFirekeeper · 0xFirekeeper · commit e22d9b9d29c9 · 2023-06-16T19:27:53.000+03:00
diff --git a/Assets/Thirdweb/Core/Prefabs/WalletProvider_WalletConnectV1.prefab b/Assets/Thirdweb/Core/Prefabs/WalletProvider_WalletConnectV1.prefab
@@ -823,39 +823,9 @@ MonoBehaviour:
     - {fileID: 3040857394667834040}
     - {fileID: 3040857393425780322}
     - {fileID: 3040857394744893508}
+  walletConnectCanvas: {fileID: 3040857394524813045}
   DefaultWallet: 4
   connectSessionRetryCount: 3
-  walletConnectCanvas: {fileID: 3040857394524813045}
-  ConnectedEvent:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 3040857394524813045}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-  DisconnectedEvent:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 3040857394524813045}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!1 &9115890768078870282
 GameObject:
   m_ObjectHideFlags: 0
@@ -980,7 +950,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 3202619366221042884}
         m_TargetAssemblyTypeName: WalletConnectSharp.Unity.WalletConnect, Assembly-CSharp
-        m_MethodName: DisableWalletConnect
+        m_MethodName: OnCancel
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
diff --git a/Assets/Thirdweb/Plugins/WalletConnectSharp.Unity/WalletConnect.cs b/Assets/Thirdweb/Plugins/WalletConnectSharp.Unity/WalletConnect.cs
@@ -87,6 +87,11 @@ public async Task<WCSessionData> EnableWalletConnect()
             return sessionData;
         }
 
+        public async void OnCancel()
+        {
+            await DisableWalletConnect();
+        }
+
         public async Task DisableWalletConnect()
         {
             try

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,11 @@ public async Task<WCSessionData> EnableWalletConnect()`
`87`	`87`	`return sessionData;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ public async void OnCancel()`
	`91`	`+ {`
	`92`	`+ await DisableWalletConnect();`
	`93`	`+ }`
	`94`	`+`
`90`	`95`	`public async Task DisableWalletConnect()`
`91`	`96`	`{`
`92`	`97`	`try`