Fix hydration issues, update caching logic

Author: MananTank

.gitignore

@@ -31,3 +31,4 @@ storybook-static
 .aider*
 
 tsconfig.tsbuildinfo
+

apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx

@@ -24,6 +24,8 @@ import { type ChatMessage, Chats } from "./Chats";
 import ContextFiltersButton, { ContextFiltersForm } from "./ContextFilters";
 import { EmptyStateChatPageContent } from "./EmptyStateChatPageContent";
 
+const NEBULA_LAST_USED_CHAIN_IDS_KEY = "nebula-last-used-chain-ids";
+
 export function ChatPageContent(props: {
   session: SessionInfo | undefined;
   authToken: string;
@@ -85,32 +87,33 @@ export function ChatPageContent(props: {
     NebulaContext | undefined
   >(() => {
     const contextRes = props.session?.context;
-    
+
     // If we have context from an existing session, use that
     if (contextRes) {
       return {
-        chainIds: contextRes.chain_ids || null,
-        walletAddress: contextRes.wallet_address || null,
+        chainIds: contextRes.chain_ids,
+        walletAddress: contextRes.wallet_address,
       };
     }
-    
-    // For new sessions, try to get cached chains from localStorage
-    const cachedChains = localStorage.getItem('nebula-cached-chains');
-    const parsedCachedChains = cachedChains ? JSON.parse(cachedChains) : null;
-    
+
     return {
-      chainIds: parsedCachedChains || ['1'], // Default to Ethereum if no cache
+      chainIds: null,
       walletAddress: null,
     };
   });
 
   const setContextFilters = useCallback((v: NebulaContext | undefined) => {
     _setContextFilters(v);
     setHasUserUpdatedContextFilters(true);
-    
+
     // Cache the chains when context is updated
     if (v?.chainIds) {
-      localStorage.setItem('nebula-cached-chains', JSON.stringify(v.chainIds));
+      localStorage.setItem(
+        NEBULA_LAST_USED_CHAIN_IDS_KEY,
+        JSON.stringify(v.chainIds),
+      );
+    } else {
+      localStorage.removeItem(NEBULA_LAST_USED_CHAIN_IDS_KEY);
     }
   }, []);
 
@@ -136,12 +139,30 @@ export function ChatPageContent(props: {
 
       // Only set wallet address from connected wallet
       updatedContextFilters.walletAddress = address || null;
-      
-      // Only set chain if we don't already have chains (either from cache or session)
-      if (!updatedContextFilters.chainIds?.length) {
-        updatedContextFilters.chainIds = activeChain ? [activeChain.id.toString()] : ['1'];
+
+      // if we have cached chains, use that
+      try {
+        const lastUsedChainIdsStr = localStorage.getItem(
+          NEBULA_LAST_USED_CHAIN_IDS_KEY,
+        );
+
+        if (lastUsedChainIdsStr) {
+          const lastUsedChainIds = lastUsedChainIdsStr
+            ? JSON.parse(lastUsedChainIdsStr)
+            : null;
+
+          updatedContextFilters.chainIds = lastUsedChainIds;
+          return updatedContextFilters;
+        }
+      } catch {
+        // ignore
       }
 
+      // if we don't have chains, use the active chain
+      updatedContextFilters.chainIds = activeChain
+        ? [activeChain.id.toString()]
+        : [];
+
       return updatedContextFilters;
     });
   }, [address, isNewSession, hasUserUpdatedContextFilters, activeChain]);