Merge branch 'main' into chore/229-migrate-swmansion-bottom-sheet

Conflict in ChatScreen.tsx: main added `rootRef` next to the sheet ref,
this branch retyped that ref from @gorhom's `BottomSheetModal` to
`AppBottomSheetRef`. Kept both — main's new ref and this branch's type.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: kfaracik

__tests__/DrawerMenu.test.tsx

@@ -46,10 +46,12 @@ const mockChats = [
 
 const mockRenameChat = jest.fn();
 const mockDeleteChat = jest.fn();
+let mockPhantomChat: { id: number } | null = null;
 jest.mock('../store/chatStore', () => ({
   useChatStore: jest.fn(() => ({
     chats: mockChats,
-    phantomChat: null,
+    phantomChat: mockPhantomChat,
+    getChatById: (id: number) => mockChats.find((chat) => chat.id === id),
     renameChat: mockRenameChat,
     deleteChat: mockDeleteChat,
   })),
@@ -90,18 +92,19 @@ const renderMenu = (props: Partial<MenuProps> = {}) =>
 beforeEach(() => {
   jest.clearAllMocks();
   mockPathname = '/';
+  mockPhantomChat = null;
   setPlatform('ios');
 });
 
 afterEach(() => setPlatform(ORIGINAL_OS));
 
 describe('DrawerMenu — collapsed', () => {
-  it('keeps New chat, Models and App Info at the top', () => {
+  it('keeps New chat, Models and Settings at the top', () => {
     renderMenu();
 
     expect(screen.getByText('New chat')).toBeTruthy();
     expect(screen.getByText('Models')).toBeTruthy();
-    expect(screen.getByText('App Info')).toBeTruthy();
+    expect(screen.getByText('Settings')).toBeTruthy();
   });
 
   it('renders the app name and a search button instead of a search field', () => {
@@ -177,6 +180,28 @@ describe('DrawerMenu — collapsed', () => {
     expect(onNavigate).toHaveBeenCalled();
   });
 
+  it('only closes the drawer when already on the new chat screen', () => {
+    mockPhantomChat = { id: 4 };
+    mockPathname = '/chat/4';
+    const onNavigate = jest.fn();
+    renderMenu({ onNavigate });
+
+    fireEvent.press(screen.getByTestId('drawer-new-chat'));
+
+    expect(mockStartPhantomChat).not.toHaveBeenCalled();
+    expect(onNavigate).toHaveBeenCalled();
+  });
+
+  it('starts a phantom chat when a forked chat claimed the phantom id', () => {
+    mockPhantomChat = { id: 3 };
+    mockPathname = '/chat/3';
+    renderMenu();
+
+    fireEvent.press(screen.getByTestId('drawer-new-chat'));
+
+    expect(mockStartPhantomChat).toHaveBeenCalledWith({}, 'replace');
+  });
+
   it('navigates to the chat when an item is pressed', () => {
     renderMenu();
 
@@ -225,15 +250,15 @@ describe('DrawerMenu — searching', () => {
 
     expect(screen.getByText('New chat')).toBeTruthy();
     expect(screen.getByText('Models')).toBeTruthy();
-    expect(screen.getByText('App Info')).toBeTruthy();
+    expect(screen.getByText('Settings')).toBeTruthy();
   });
 
   it('hides the navigation items once a query is typed, leaving only results', () => {
     renderMenu({ searching: true, search: 'pizza' });
 
     expect(screen.queryByText('New chat')).toBeNull();
     expect(screen.queryByText('Models')).toBeNull();
-    expect(screen.queryByText('App Info')).toBeNull();
+    expect(screen.queryByText('Settings')).toBeNull();
     expect(screen.getByText('Pizza recipe')).toBeTruthy();
   });
 

__tests__/MessageItem.test.tsx

@@ -41,13 +41,32 @@ jest.mock('../components/chat-screen/AnimatedChatLoading', () => () => null);
 import MessageItem from '../components/chat-screen/MessageItem';
 import { useLLMStore } from '../store/llmStore';
 
-const mockUseLLMStore = useLLMStore as jest.Mock;
+const mockUseLLMStore = useLLMStore as unknown as jest.Mock;
+
+// The component reads the store via selectors; make the mock honor them.
+const mockLLMState = (state: {
+  isGenerating?: boolean;
+  isProcessingPrompt?: boolean;
+}) =>
+  mockUseLLMStore.mockImplementation(
+    (selector?: (s: typeof state) => unknown) =>
+      selector ? selector(state) : state
+  );
+
+const baseMessage = {
+  id: 1,
+  role: 'assistant',
+  content: 'Hello world',
+  chatId: 1,
+  timestamp: 0,
+} as React.ComponentProps<typeof MessageItem>['message'];
 
 const renderItem = (
   props: Partial<React.ComponentProps<typeof MessageItem>> = {}
 ) =>
   render(
     <MessageItem
+      message={baseMessage}
       content="Hello world"
       role="assistant"
       isLastMessage={false}
@@ -56,7 +75,7 @@ const renderItem = (
   );
 
 beforeEach(() => {
-  mockUseLLMStore.mockReturnValue({ isGenerating: false });
+  mockLLMState({ isGenerating: false });
   jest.spyOn(console, 'error').mockImplementation(() => {});
 });
 
@@ -248,14 +267,14 @@ describe('thinking block parsing', () => {
   });
 
   it('marks ThinkingBlock as inProgress when last message and isGenerating and thinking is incomplete', () => {
-    mockUseLLMStore.mockReturnValue({ isGenerating: true });
+    mockLLMState({ isGenerating: true });
     renderItem({ content: '<think>working...', isLastMessage: true });
     const block = screen.getByTestId('thinking-block');
     expect(block.props.accessibilityLabel).toContain('inProgress:true');
   });
 
   it('does not mark ThinkingBlock as inProgress when not isLastMessage', () => {
-    mockUseLLMStore.mockReturnValue({ isGenerating: true });
+    mockLLMState({ isGenerating: true });
     renderItem({ content: '<think>working...', isLastMessage: false });
     const block = screen.getByTestId('thinking-block');
     expect(block.props.accessibilityLabel).toContain('inProgress:false');