1 files changed, 27 insertions, 6 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/static/app.js b/packages/meshbay-hub/src/meshbay_hub/static/app.js
index 6b20a63..3101be7 100644
--- a/packages/meshbay-hub/src/meshbay_hub/static/app.js
+++ b/packages/meshbay-hub/src/meshbay_hub/static/app.js
@@ -924,8 +924,31 @@ function App() {
       .catch(() => {});
   }, [user, notifDisabled]);
 
+  // Whether this account has a node linked, which is what shows the sidebar's
+  // Node section. Asked again whenever a node may just have been linked (the
+  // Create Group wizard), not only when the session changes -- the section
+  // stayed hidden until a reload after the first group -- and retried rather
+  // than left false by one failed request after a session blip.
+  const nodeKeyAskedForRef = useRef(null);
+  const refreshNodeKey = useCallback(() => {
+    nodeKeyAskedForRef.current = user;
+    if (!user || !platform.capabilities.nodeAdmin) return;
+    // A late answer, or a retry, must not land on a session that has changed.
+    const current = () => nodeKeyAskedForRef.current === user;
+    const ask = (attempt) => hubFetch(`/v1/users/${user.username}/pubkeys`, { token: user.token })
+      .then(data => { if (current()) setHasNodeKey(Boolean(data.pk_node_ed25519)); })
+      .catch(() => {
+        if (attempt < 3 && current()) setTimeout(() => ask(attempt + 1), 2000 * attempt);
+      });
+    ask(1);
+  }, [user]);
+
   useEffect(() => {
-    if (!user) { setGroups([]); setNotifications([]); setUnreadCount(0); setHasNodeKey(false); return; }
+    if (!user) {
+      nodeKeyAskedForRef.current = null;
+      setGroups([]); setNotifications([]); setUnreadCount(0); setHasNodeKey(false);
+      return;
+    }
     hubFetch('/v1/groups/mine', { token: user.token })
       .then(data => setGroups(data.groups || []))
       .catch(() => setGroups([]));
@@ -935,11 +958,7 @@ function App() {
         if (prefs.notifications_disabled === 'true') setNotifDisabled(true);
       })
       .catch(() => {});
-    if (platform.capabilities.nodeAdmin) {
-      hubFetch(`/v1/users/${user.username}/pubkeys`, { token: user.token })
-        .then(data => setHasNodeKey(Boolean(data.pk_node_ed25519)))
-        .catch(() => {});
-    }
+    refreshNodeKey();
     fetchNotifications();
   }, [user]);
 
@@ -1176,10 +1195,12 @@ function App() {
   } else if (route === '/create-group') {
     page = html`<${LazyCreateGroupPage} token=${user.token} username=${user.username}
       allowPublicGroups=${allowPublicGroups}
+      onNodeLinked=${refreshNodeKey}
       onCreated=${() => {
         hubFetch('/v1/groups/mine', { token: user.token })
           .then(data => setGroups(data.groups || []))
           .catch(() => {});
+        refreshNodeKey();
       }} />`;
   } else if (route === '/node' && platform.capabilities.nodeAdmin && hasNodeKey) {
     page = html`<${LazyNodePage} groups=${groups} token=${user.token} username=${user.username} />`;