fix: mobile request lost

airgap-it · Aug 8, 2024 · f89af23 · f89af23
1 parent 7ea9b71
commit f89af23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/beacon-dapp/src/dapp-client/DAppClient.ts b/packages/beacon-dapp/src/dapp-client/DAppClient.ts
@@ -1075,12 +1075,13 @@ export class DAppClient extends Client {
   }
 
   private async checkMakeRequest() {
+    const isResolved = this._transport.isResolved()
+    const isWCInstance = isResolved && (await this.transport) instanceof WalletConnectTransport
+    const isLeader = this.multiTabChannel.isLeader()
+    const isMobile = isMobileOS(window)
+
     return (
-      !this._transport.isResolved() ||
-      (this._transport.isResolved() &&
-        (!((await this.transport) instanceof WalletConnectTransport) ||
-          ((await this.transport) instanceof WalletConnectTransport &&
-            this.multiTabChannel.isLeader())))
+      !isResolved || (isResolved && (!isWCInstance || (isWCInstance && (isLeader || isMobile))))
     )
   }
 

diff --git a/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
@@ -674,7 +674,7 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
       })
       .then(async () => {
         const isLeader = await this.isLeader()
-        if (!isLeader) {
+        if (!isLeader && !this.isMobileOS()) {
           await this.closeSignClient()
         }
       })