diff --git a/src/store/index.js b/src/store/index.js index b29fb9bd..9ee7900a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -51,4 +51,4 @@ export default new Vuex.Store({ commit('setWarning', null) } } -}); +}); \ No newline at end of file diff --git a/src/utils/wallet.js b/src/utils/wallet.js index af6897cc..03c25860 100644 --- 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(); + } + }) }) }