From 1692637e2219c67d7b0a0a2c677cbcbe6482e568 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 27 Mar 2024 14:58:32 +0800
Subject: [PATCH] Possibly fix weird race conditions

No idea how this happen at all
---
 src/components/nav-menu.jsx | 7 ++++---
 src/utils/store-utils.js    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

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];
 }