From d0eae9c991a66773e42d5796db0db327a893f401 Mon Sep 17 00:00:00 2001
From: Will Chen <willchen90@gmail.com>
Date: Fri, 11 Jul 2025 14:12:55 -0700
Subject: [PATCH] Select app in default chat selection (#632)

---
 src/pages/chat.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/chat.tsx b/src/pages/chat.tsx
index 22d6c23..a3f5149 100644
--- a/src/pages/chat.tsx
+++ b/src/pages/chat.tsx
@@ -9,7 +9,7 @@ import { ChatPanel } from "../components/ChatPanel";
 import { PreviewPanel } from "../components/preview_panel/PreviewPanel";
 import { useNavigate, useSearch } from "@tanstack/react-router";
 import { cn } from "@/lib/utils";
-import { useAtom, useAtomValue } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { isPreviewOpenAtom } from "@/atoms/viewAtoms";
 import { useChats } from "@/hooks/useChats";
 import { selectedAppIdAtom } from "@/atoms/appAtoms";
@@ -20,13 +20,15 @@ export default function ChatPage() {
   const [isPreviewOpen, setIsPreviewOpen] = useAtom(isPreviewOpenAtom);
   const [isResizing, setIsResizing] = useState(false);
   const selectedAppId = useAtomValue(selectedAppIdAtom);
+  const setSelectedAppId = useSetAtom(selectedAppIdAtom);
   const { chats, loading } = useChats(selectedAppId);
 
   useEffect(() => {
     if (!chatId && chats.length && !loading) {
       // Not a real navigation, just a redirect, when the user navigates to /chat
       // without a chatId, we redirect to the first chat
-      navigate({ to: "/chat", search: { id: chats[0]?.id }, replace: true });
+      setSelectedAppId(chats[0].appId);
+      navigate({ to: "/chat", search: { id: chats[0].id }, replace: true });
     }
   }, [chatId, chats, loading, navigate]);