fix: init No matching key

airgap-it · Jun 19, 2024 · 007d333 · 007d333
1 parent ce0adfb
commit 007d333
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts b/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts
@@ -36,7 +36,7 @@ export class WalletConnectTransport<
   ) {
     super(
       name,
-      WalletConnectCommunicationClient.getInstance(wcOptions),
+      WalletConnectCommunicationClient.getInstance(wcOptions, isLeader),
       new PeerManager<K>(storage, storageKey)
     )
   }
@@ -93,7 +93,7 @@ export class WalletConnectTransport<
   }
 
   public async getPeers(): Promise<T[]> {
-    const client = WalletConnectCommunicationClient.getInstance(this.wcOptions)
+    const client = WalletConnectCommunicationClient.getInstance(this.wcOptions, this.isLeader)
     const session = client.currentSession()
     if (!session) {
       return []

diff --git a/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
@@ -111,16 +111,22 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
    */
   private messageIds: string[] = []
 
-  constructor(private wcOptions: { network: NetworkType; opts: SignClientTypes.Options }) {
+  constructor(
+    private wcOptions: { network: NetworkType; opts: SignClientTypes.Options },
+    private isLeader: Function
+  ) {
     super()
   }
 
-  static getInstance(wcOptions: {
-    network: NetworkType
-    opts: SignClientTypes.Options
-  }): WalletConnectCommunicationClient {
+  static getInstance(
+    wcOptions: {
+      network: NetworkType
+      opts: SignClientTypes.Options
+    },
+    isLeader: Function
+  ): WalletConnectCommunicationClient {
     if (!this.instance) {
-      this.instance = new WalletConnectCommunicationClient(wcOptions)
+      this.instance = new WalletConnectCommunicationClient(wcOptions, isLeader)
     }
     return WalletConnectCommunicationClient.instance
   }
@@ -675,6 +681,12 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
           this.notifyListeners(_pairingTopic, errorResponse)
         }
       })
+      .then(async () => {
+        const isLeader = await this.isLeader()
+        if (!isLeader) {
+          await this.closeSignClient()
+        }
+      })
 
     logger.warn('return uri and topic')