fix: sessions and pairings check

airgap-it · Nov 22, 2023 · 13bf76e · 13bf76e
1 parent 6d600d3
commit 13bf76e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/examples/dapp.html b/examples/dapp.html
@@ -211,7 +211,7 @@
         },
         featuredWallets: ['kukai', 'metamask', 'airgap'],
         network: {
-          type: beacon.NetworkType.MAINNET
+          type: beacon.NetworkType.GHOSTNET
         }
         // matrixNodes: ['test.papers.tech', 'test2.papers.tech', 'matrix.papers.tech']
         // matrixNodes: ['beacon-node-0.papers.tech:8448']

diff --git a/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts b/packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts
@@ -65,19 +65,22 @@ export class WalletConnectTransport<
   }
 
   public async hasPairings() {
+    let hasPairings = false
+
     if (await LocalStorage.isSupported()) {
-      return ((await new LocalStorage().get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]') !== '[]'
-    } else {
-      return !!this.client.signClient?.pairing.getAll()?.length
+      hasPairings = ((await new LocalStorage().get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]') !== '[]'
     }
+
+    return hasPairings ? hasPairings : !!this.client.signClient?.pairing.getAll()?.length
   }
 
   public async hasSessions() {
+    let hasSessions = false
     if (await LocalStorage.isSupported()) {
-      return ((await new LocalStorage().get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]') !== '[]'
-    } else {
-      return !!this.client.signClient?.session.getAll()?.length
+      hasSessions =
+        ((await new LocalStorage().get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]') !== '[]'
     }
+    return hasSessions ? hasSessions : !!this.client.signClient?.session.getAll()?.length
   }
 
   public async closeActiveSession(account: AccountInfo) {