diff --git a/src/components/schema/Schema.vue b/src/components/schema/Schema.vue index 53939c23..2bccf495 100644 --- a/src/components/schema/Schema.vue +++ b/src/components/schema/Schema.vue @@ -297,7 +297,8 @@ export default { async checkWalletNetwork() { const account = Wallet.getLastUsedAccount(); - const isNetwork = !isCustom(account.network.type) && + const isNetwork = account && + !isCustom(account.network.type) && account.network.type !== this.selectedNetwork if(account && isNetwork) { diff --git a/src/utils/wallet.js b/src/utils/wallet.js index 9a2b39b5..af6897cc 100644 --- a/src/utils/wallet.js +++ b/src/utils/wallet.js @@ -74,7 +74,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);