Merge pull request #836 from airgap-it/fix/requests_block_secondary_tab

fix: requests blocked
airgap-it · Nov 19, 2024 · d76425a · d76425a
2 parents 826d926 + 01e8e61
commit d76425a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/beacon-dapp/src/transports/DappWalletConnectTransport.ts b/packages/beacon-dapp/src/transports/DappWalletConnectTransport.ts
@@ -39,9 +39,13 @@ export class DappWalletConnectTransport extends WalletConnectTransport<
     )
     this.client.listenForChannelOpening(async (peer: ExtendedWalletConnectPairingResponse) => {
       await this.addPeer(peer)
+
       this._isConnected = isMobileOS(window) || (await isLeader())
         ? TransportStatus.CONNECTED
         : TransportStatus.SECONDARY_TAB_CONNECTED
+
+      this.isReady.isPending() && this.isReady.resolve(true)
+
       if (this.newPeerListener) {
         this.newPeerListener(peer)
         this.newPeerListener = undefined // TODO: Remove this once we use the id

diff --git a/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts b/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts
@@ -27,7 +27,7 @@ export class WalletConnectTransport<
 > extends Transport<T, K, WalletConnectCommunicationClient> {
   public readonly type: TransportType = TransportType.WALLETCONNECT
 
-  private isReady = new ExposedPromise<boolean>()
+  protected isReady = new ExposedPromise<boolean>()
 
   constructor(
     name: string,

diff --git a/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
@@ -970,8 +970,8 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
         )
       ))
     await this.closeSignClient()
-    await this.storage.resetState()
-    this.storage.notify('RESET')
+    this.isMobileOS() && await this.storage.resetState()
+    this.isMobileOS() && this.storage.notify('RESET')
 
   }