From 813edd442b033c464aa4c1d86fd150cdfe2f3806 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Tue, 9 Apr 2019 16:33:50 +0200 Subject: [PATCH] exclude imported accounts when checking if the last account is empty --- .../LeftNavigation/components/AccountMenu/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js index c54342a3..a128a475 100644 --- a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js @@ -115,6 +115,9 @@ const AccountMenu = (props: Props) => { if (!selected || !network) return null; const deviceAccounts: Accounts = findDeviceAccounts(accounts, selected, location.state.network); + const discoveryAccounts: Accounts = deviceAccounts.filter( + account => account.imported === false + ); const selectedAccounts = deviceAccounts.map((account, i) => { // const url: string = `${baseUrl}/network/${location.state.network}/account/${i}`; @@ -187,7 +190,7 @@ const AccountMenu = (props: Props) => { ); if (discovery && discovery.completed) { - const lastAccount = deviceAccounts[deviceAccounts.length - 1]; + const lastAccount = discoveryAccounts[discoveryAccounts.length - 1]; if (!selected.connected) { discoveryStatus = (