diff --git a/src/components/nav-menu.jsx b/src/components/nav-menu.jsx index ba40dd94..447ecd18 100644 --- a/src/components/nav-menu.jsx +++ b/src/components/nav-menu.jsx @@ -27,9 +27,10 @@ function NavMenu(props) { const [currentAccount, moreThanOneAccount] = useMemo(() => { const accounts = store.local.getJSON('accounts') || []; - const acc = accounts.find( - (account) => account.info.id === store.session.get('currentAccount'), - ); + const acc = + accounts.find( + (account) => account.info.id === store.session.get('currentAccount'), + ) || accounts[0]; return [acc, accounts.length > 1]; }, []); diff --git a/src/utils/store-utils.js b/src/utils/store-utils.js index 7746a080..ed92b7d6 100644 --- a/src/utils/store-utils.js +++ b/src/utils/store-utils.js @@ -2,6 +2,7 @@ import store from './store'; export function getAccount(id) { const accounts = store.local.getJSON('accounts') || []; + if (!id) return accounts[0]; return accounts.find((a) => a.info.id === id) || accounts[0]; }