From c40b6bc92dd996c40d7009e392b3db270485d21c Mon Sep 17 00:00:00 2001
From: uinstinct <61635505+uinstinct@users.noreply.github.com>
Date: Fri, 26 Sep 2025 17:05:21 +0530
Subject: [PATCH 1/2] fix: config loading set to false before being fetched

---
 .../AssistantAndOrgListbox/SelectedAssistantButton.tsx   | 8 +++++---
 gui/src/hooks/ParallelListeners.tsx                      | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx b/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
index b842cda770f..fb9fba804b8 100644
--- a/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
+++ b/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
@@ -23,6 +23,8 @@ export function SelectedAssistantButton({
   const buttonPadding = isSidebar ? "px-2 py-1.5" : "px-0 py-0.5";
   const buttonStyle = isSidebar ? {} : { fontSize: fontSize(-3) };
 
+  console.log("debug1 config loading", configLoading);
+
   return (
     <ListboxButton
       data-testid="assistant-select-button"
@@ -33,9 +35,7 @@ export function SelectedAssistantButton({
         className={`flex flex-row items-center ${isSidebar ? "w-full justify-between" : "gap-1.5"}`}
       >
         <div className="flex min-w-0 flex-1 flex-row items-center gap-2">
-          {selectedProfile === null ? (
-            "Create your first agent"
-          ) : configLoading ? (
+          {configLoading ? (
             <span className="text-description flex flex-row items-center">
               <ArrowPathIcon
                 className={cn(
@@ -45,6 +45,8 @@ export function SelectedAssistantButton({
               />
               Loading
             </span>
+          ) : selectedProfile === null ? (
+            "Create your first agent"
           ) : (
             <>
               <AssistantIcon assistant={selectedProfile} size={iconSize} />
diff --git a/gui/src/hooks/ParallelListeners.tsx b/gui/src/hooks/ParallelListeners.tsx
index 510733da93f..3fb330c7fdb 100644
--- a/gui/src/hooks/ParallelListeners.tsx
+++ b/gui/src/hooks/ParallelListeners.tsx
@@ -102,6 +102,15 @@ function ParallelListeners() {
       );
       if (result.status === "success") {
         await handleConfigUpdate(true, result.content);
+
+        // (hub) config has not yet loaded - will be updated via configUpdate
+        if (
+          result.content.profileId === null &&
+          result.content.result.configLoadInterrupted
+        ) {
+          dispatch(setConfigLoading(true));
+          return;
+        }
       }
       dispatch(setConfigLoading(false));
     }

From 027a95cdc1ffa2d1c69bf44f3eb5abd91035e7e2 Mon Sep 17 00:00:00 2001
From: Ting-Wai To <40179554+tingwai@users.noreply.github.com>
Date: Fri, 26 Sep 2025 10:11:37 -0700
Subject: [PATCH 2/2] remove console log

---
 .../AssistantAndOrgListbox/SelectedAssistantButton.tsx          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx b/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
index fb9fba804b8..b9c3da949c8 100644
--- a/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
+++ b/gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx
@@ -23,8 +23,6 @@ export function SelectedAssistantButton({
   const buttonPadding = isSidebar ? "px-2 py-1.5" : "px-0 py-0.5";
   const buttonStyle = isSidebar ? {} : { fontSize: fontSize(-3) };
 
-  console.log("debug1 config loading", configLoading);
-
   return (
     <ListboxButton
       data-testid="assistant-select-button"