Merge pull request #816 from airgap-it/fix/race_condition_transport

fix: race condition

packages/beacon-dapp/src/dapp-client/DAppClient.ts

@@ -515,7 +515,8 @@ export class DAppClient extends Client {
     }
 
     // block until the transport is ready
-    await this._transport.promise
+    const transport = (await this._transport.promise) as DappWalletConnectTransport
+    await transport.waitForResolution()
 
     this.openRequestsOtherTabs.add(message.id)
     isV3

packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts

@@ -13,6 +13,7 @@ import {
 } from '@airgap/beacon-types'
 import { Transport, PeerManager } from '@airgap/beacon-core'
 import { SignClientTypes } from '@walletconnect/types'
+import { ExposedPromise } from '@airgap/beacon-utils'
 
 /**
  * @internalapi
@@ -26,6 +27,8 @@ export class WalletConnectTransport<
 > extends Transport<T, K, WalletConnectCommunicationClient> {
   public readonly type: TransportType = TransportType.WALLETCONNECT
 
+  private isReady = new ExposedPromise<boolean>()
+
   constructor(
     name: string,
     _keyPair: KeyPair,
@@ -45,6 +48,13 @@ export class WalletConnectTransport<
     return Promise.resolve(true)
   }
 
+  /**
+   * Returns a promise that blocks the execution flow when awaited if the transport hasn't resolved yet; otherwise, it returns true.
+   */
+  waitForResolution(): Promise<boolean> {
+    return this.isReady.promise
+  }
+
   public async connect(): Promise<void> {
     if ([TransportStatus.CONNECTED, TransportStatus.CONNECTING].includes(this._isConnected)) {
       return
@@ -70,6 +80,8 @@ export class WalletConnectTransport<
     if (!isLeader) {
       this._isConnected = TransportStatus.SECONDARY_TAB_CONNECTED
     }
+
+    this.isReady.resolve(true)
   }
 
   wasDisconnectedByWallet() {
@@ -114,7 +126,9 @@ export class WalletConnectTransport<
   public async disconnect(): Promise<void> {
     await this.client.close()
 
-    return super.disconnect()
+    await super.disconnect()
+
+    this.isReady = new ExposedPromise()
   }
 
   public async startOpenChannelListener(): Promise<void> {