Merge pull request #833 from airgap-it/fix/wc_pairing_issues

fix: pairing request lost
airgap-it · Nov 18, 2024 · fc696de · fc696de
2 parents e3d49c0 + 5880c81
commit fc696de
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 149 deletions.
diff --git a/packages/beacon-dapp/src/dapp-client/DAppClient.ts b/packages/beacon-dapp/src/dapp-client/DAppClient.ts
@@ -342,8 +342,8 @@ export class DAppClient extends Client {
           connectionInfo.origin === Origin.P2P
             ? this.p2pTransport
             : connectionInfo.origin === Origin.WALLETCONNECT
-            ? this.walletConnectTransport
-            : this.postMessageTransport ?? (await this.transport)
+              ? this.walletConnectTransport
+              : this.postMessageTransport ?? (await this.transport)
 
         if (relevantTransport) {
           const peers: ExtendedPeerInfo[] = await relevantTransport.getPeers()
@@ -440,8 +440,8 @@ export class DAppClient extends Client {
           res.status === 426
             ? console.error('Metrics are no longer supported for this version, please upgrade.')
             : console.warn(
-                'Network error encountered. Metrics sharing have been automatically disabled.'
-              )
+              'Network error encountered. Metrics sharing have been automatically disabled.'
+            )
         }
         this.enableMetrics = res.ok
         this.storage.set(StorageKey.ENABLE_METRICS, res.ok)
@@ -808,7 +808,7 @@ export class DAppClient extends Client {
                 this.postMessageTransport =
                   this.walletConnectTransport =
                   this.p2pTransport =
-                    undefined
+                  undefined
                 this._activeAccount.isResolved() && this.clearActiveAccount()
                 this._initPromise = undefined
               },
@@ -889,7 +889,7 @@ export class DAppClient extends Client {
         this.debounceSetActiveAccount = true
         this._initPromise = undefined
         this.postMessageTransport = this.p2pTransport = this.walletConnectTransport = undefined
-        if (this.multiTabChannel.isLeader()) {
+        if (this.multiTabChannel.isLeader() || isMobileOS(window)) {
           await transport.disconnect()
           this.openRequestsOtherTabs.clear()
         } else {
@@ -940,6 +940,7 @@ export class DAppClient extends Client {
         await this.setTransport(this.p2pTransport)
       } else if (origin === Origin.WALLETCONNECT) {
         await this.setTransport(this.walletConnectTransport)
+        this.walletConnectTransport?.forceUpdate('INIT')
       }
       if (this._transport.isResolved()) {
         const transport = await this.transport
@@ -1080,7 +1081,7 @@ export class DAppClient extends Client {
     const isWCInstance = isResolved && (await this.transport) instanceof WalletConnectTransport
     const isLeader = this.multiTabChannel.isLeader()
 
-    return !isResolved || (isResolved && (!isWCInstance || (isWCInstance && isLeader)))
+    return !isResolved || !isWCInstance || isLeader || isMobileOS(window)
   }
 
   /**
@@ -1373,9 +1374,9 @@ export class DAppClient extends Client {
     logger.time(true, logId)
     const res = (await this.checkMakeRequest())
       ? this.makeRequestV3<
-          BlockchainRequestV3<string>,
-          BeaconMessageWrapper<BlockchainResponseV3<string>>
-        >(request)
+        BlockchainRequestV3<string>,
+        BeaconMessageWrapper<BlockchainResponseV3<string>>
+      >(request)
       : this.makeRequestBC<any, any>(request)
 
     res.catch(async (requestError: ErrorResponse) => {
@@ -1587,13 +1588,13 @@ export class DAppClient extends Client {
 
     const res = (await this.checkMakeRequest())
       ? this.makeRequest<
-          SimulatedProofOfEventChallengeRequest,
-          SimulatedProofOfEventChallengeResponse
-        >(request)
+        SimulatedProofOfEventChallengeRequest,
+        SimulatedProofOfEventChallengeResponse
+      >(request)
       : this.makeRequestBC<
-          SimulatedProofOfEventChallengeRequest,
-          SimulatedProofOfEventChallengeResponse
-        >(request)
+        SimulatedProofOfEventChallengeRequest,
+        SimulatedProofOfEventChallengeResponse
+      >(request)
 
     res.catch(async (requestError: ErrorResponse) => {
       requestError.errorType === BeaconErrorType.ABORTED_ERROR
@@ -2057,50 +2058,50 @@ export class DAppClient extends Client {
     request: BeaconRequestInputMessage,
     response:
       | {
-          account: AccountInfo
-          output: PermissionResponseOutput
-          blockExplorer: BlockExplorer
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        account: AccountInfo
+        output: PermissionResponseOutput
+        blockExplorer: BlockExplorer
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
       | {
-          account: AccountInfo
-          output: ProofOfEventChallengeResponse
-          blockExplorer: BlockExplorer
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        account: AccountInfo
+        output: ProofOfEventChallengeResponse
+        blockExplorer: BlockExplorer
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
       | {
-          account: AccountInfo
-          output: SimulatedProofOfEventChallengeResponse
-          blockExplorer: BlockExplorer
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        account: AccountInfo
+        output: SimulatedProofOfEventChallengeResponse
+        blockExplorer: BlockExplorer
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
       | {
-          account: AccountInfo
-          output: OperationResponseOutput
-          blockExplorer: BlockExplorer
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        account: AccountInfo
+        output: OperationResponseOutput
+        blockExplorer: BlockExplorer
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
       | {
-          output: SignPayloadResponseOutput
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        output: SignPayloadResponseOutput
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
       // | {
       //     output: EncryptPayloadResponseOutput
       //     connectionContext: ConnectionContext
       //     walletInfo: WalletInfo
       // }
       | {
-          network: Network
-          output: BroadcastResponseOutput
-          blockExplorer: BlockExplorer
-          connectionContext: ConnectionContext
-          walletInfo: WalletInfo
-        }
+        network: Network
+        output: BroadcastResponseOutput
+        blockExplorer: BlockExplorer
+        connectionContext: ConnectionContext
+        walletInfo: WalletInfo
+      }
   ): Promise<void> {
     this.events
       .emit(messageEvents[request.type].success, response)
@@ -2341,7 +2342,7 @@ export class DAppClient extends Client {
 
     logger.log('makeRequest', 'sending message', request)
     try {
-      ;(await this.transport).send(payload, peer)
+      ; (await this.transport).send(payload, peer)
       if (
         request.type !== BeaconMessageType.PermissionRequest ||
         (this._activeAccount.isResolved() && (await this._activeAccount.promise))
@@ -2457,7 +2458,7 @@ export class DAppClient extends Client {
 
     logger.log('makeRequest', 'sending message', request)
     try {
-      ;(await this.transport).send(payload, peer)
+      ; (await this.transport).send(payload, peer)
       if (
         request.message.type !== BeaconMessageType.PermissionRequest ||
         (this._activeAccount.isResolved() && (await this._activeAccount.promise))
@@ -2504,9 +2505,9 @@ export class DAppClient extends Client {
     request: Optional<T, IgnoredRequestInputProperties>
   ): Promise<
     | {
-        message: U
-        connectionInfo: ConnectionContext
-      }
+      message: U
+      connectionInfo: ConnectionContext
+    }
     | undefined
   > {
     if (!this._transport.isResolved()) {