Catch wallet abort connection error (#551)

baking-bad · Aug 6, 2023 · 2652cfc · 2652cfc
1 parent 1025e67
commit 2652cfc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/store/index.js b/src/store/index.js
@@ -51,4 +51,4 @@ export default new Vuex.Store({
       commit('setWarning', null)
     }
   }
-});
+});
diff --git a/src/utils/wallet.js b/src/utils/wallet.js
@@ -62,6 +62,8 @@ export class Wallet {
 
     static getLastUsedAccount() {
         const accounts = localStorage.getItem('beacon:accounts');
+        if(!accounts) return null
+
         const communicationPeersDapp = localStorage.getItem('beacon:communication-peers-dapp');
         const postmessagePeersDapp =  localStorage.getItem('beacon:postmessage-peers-dapp');
         let peers = [];
@@ -74,7 +76,6 @@ export class Wallet {
             peers = [...peers, ...JSON.parse(postmessagePeersDapp)]
         }
 
-        if(!accounts) return null
         const parsedAccounts = JSON.parse(accounts);
         const connectionTimes = parsedAccounts.map(item => item.connectedAt);
         const recentConnectionTime = Math.max(...connectionTimes);
@@ -115,7 +116,13 @@ export class Wallet {
                 Wallet.isPermissionGiven = true;
                 resolve();
             })
-            .finally(() => reject())
+            .catch(e => {
+                if (e.title && e.title.toUpperCase() === 'ABORTED') {
+                    resolve();
+                } else {
+                    reject();
+                }
+            })
         })
     }