From 265beb65aa230bb303284cc77b5b36847c75d3d8 Mon Sep 17 00:00:00 2001
From: Jinwoo-H <jinwoo0825@gmail.com>
Date: Sat, 30 May 2026 03:32:22 -0700
Subject: [PATCH] Keep Claude usage fetch outside state updater

Co-authored-by: Orca <help@stably.ai>
---
 .../src/components/status-bar/StatusBar.tsx        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/components/status-bar/StatusBar.tsx b/src/renderer/src/components/status-bar/StatusBar.tsx
index b9a236458ca..52f743aaab6 100644
--- a/src/renderer/src/components/status-bar/StatusBar.tsx
+++ b/src/renderer/src/components/status-bar/StatusBar.tsx
@@ -160,14 +160,12 @@ function ClaudeSwitcherMenu({
   // Why: inactive-account usage is needed only for the explicit switcher
   // expansion, so fetch it on that event instead of one render later.
   const handleAccountsExpandedToggle = useCallback((): void => {
-    setAccountsExpanded((current) => {
-      const nextExpanded = !current
-      if (nextExpanded) {
-        void fetchInactiveClaudeAccountUsage()
-      }
-      return nextExpanded
-    })
-  }, [fetchInactiveClaudeAccountUsage])
+    const nextExpanded = !accountsExpanded
+    setAccountsExpanded(nextExpanded)
+    if (nextExpanded) {
+      void fetchInactiveClaudeAccountUsage()
+    }
+  }, [accountsExpanded, fetchInactiveClaudeAccountUsage])
 
   const handleSelectAccount = async (accountId: string | null): Promise<void> => {
     if (isSwitching) {