From bb92ae5ae5aa5e3f179326de4070cb1054b4ce30 Mon Sep 17 00:00:00 2001
From: Lily Delalande <ldelalande@squareup.com>
Date: Mon, 24 Mar 2025 10:34:54 -0400
Subject: [PATCH 1/5] move more menu into sub-component dir

---
 ui/desktop/src/components/ChatView.tsx        |  7 +++----
 .../components/{ => more_menu}/MoreMenu.tsx   |  4 ++--
 .../components/more_menu/MoreMenuLayout.tsx   | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 rename ui/desktop/src/components/{ => more_menu}/MoreMenu.tsx (98%)
 create mode 100644 ui/desktop/src/components/more_menu/MoreMenuLayout.tsx

diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index 961b4af046e3..3156e5588ad8 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -6,7 +6,7 @@ import GooseMessage from './GooseMessage';
 import Input from './Input';
 import { type View } from '../App';
 import LoadingGoose from './LoadingGoose';
-import MoreMenu from './MoreMenu';
+import MoreMenu from './more_menu/MoreMenu';
 import { Card } from './ui/card';
 import { ScrollArea, ScrollAreaHandle } from './ui/scroll-area';
 import UserMessage from './UserMessage';
@@ -14,6 +14,7 @@ import Splash from './Splash';
 import { DeepLinkModal } from './ui/DeepLinkModal';
 import 'react-toastify/dist/ReactToastify.css';
 import { useMessageStream } from '../hooks/useMessageStream';
+import MoreMenuLayout from './more_menu/MoreMenuLayout';
 import { BotConfig } from '../botConfig';
 import {
   Message,
@@ -369,9 +370,7 @@ export default function ChatView({
 
   return (
     <div className="flex flex-col w-full h-screen items-center justify-center">
-      <div className="relative flex items-center h-[36px] w-full">
-        <MoreMenu setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
-      </div>
+      <MoreMenuLayout setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
       <Card className="flex flex-col flex-1 rounded-none h-[calc(100vh-95px)] w-full bg-bgApp mt-0 border-none relative">
         {messages.length === 0 ? (
           <Splash
diff --git a/ui/desktop/src/components/MoreMenu.tsx b/ui/desktop/src/components/more_menu/MoreMenu.tsx
similarity index 98%
rename from ui/desktop/src/components/MoreMenu.tsx
rename to ui/desktop/src/components/more_menu/MoreMenu.tsx
index b378e2a194f7..42dd6d285744 100644
--- a/ui/desktop/src/components/MoreMenu.tsx
+++ b/ui/desktop/src/components/more_menu/MoreMenu.tsx
@@ -1,8 +1,8 @@
 import { Popover, PopoverContent, PopoverPortal, PopoverTrigger } from '../components/ui/popover';
 import React, { useEffect, useState } from 'react';
-import { ChatSmart, Idea, More, Refresh, Time, Send } from './icons';
+import { ChatSmart, Idea, More, Refresh, Time, Send } from '../icons';
 import { FolderOpen, Moon, Sliders, Sun } from 'lucide-react';
-import { View } from '../App';
+import { View } from '../../App';
 
 interface VersionInfo {
   current_version: string;
diff --git a/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
new file mode 100644
index 000000000000..1d3371799c7a
--- /dev/null
+++ b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
@@ -0,0 +1,19 @@
+import { Settings } from 'lucide-react';
+import MoreMenu from './MoreMenu';
+import React from 'react';
+
+export default function MoreMenuLayout(setView, setIsGoosehintsModalOpen) {
+  return (
+    <div className="relative flex items-center h-[36px] w-full bg-bgSubtle border-b border-borderSubtle">
+      <div className="flex-1"></div>
+      <div className="flex items-center h-full">
+        {/*<div className="flex items-center justify-center h-full px-4 mr-4">*/}
+        {/*    <Settings />*/}
+        {/*</div>*/}
+        <div className="flex items-center justify-center h-full px-2 mr-2">
+          <MoreMenu setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
+        </div>
+      </div>
+    </div>
+  );
+}

From 35c0fc2d487e19d67dc556e29d8d9cc122bb4920 Mon Sep 17 00:00:00 2001
From: Lily Delalande <ldelalande@squareup.com>
Date: Mon, 24 Mar 2025 10:42:42 -0400
Subject: [PATCH 2/5] add annotations, removed unused imports

---
 ui/desktop/src/components/ChatView.tsx                 | 4 ----
 ui/desktop/src/components/more_menu/MoreMenuLayout.tsx | 9 ++++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index 3156e5588ad8..69a77e831642 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -6,7 +6,6 @@ import GooseMessage from './GooseMessage';
 import Input from './Input';
 import { type View } from '../App';
 import LoadingGoose from './LoadingGoose';
-import MoreMenu from './more_menu/MoreMenu';
 import { Card } from './ui/card';
 import { ScrollArea, ScrollAreaHandle } from './ui/scroll-area';
 import UserMessage from './UserMessage';
@@ -22,11 +21,8 @@ import {
   ToolCall,
   ToolCallResult,
   ToolRequestMessageContent,
-  ToolResponse,
   ToolResponseMessageContent,
   ToolConfirmationRequestMessageContent,
-  getTextContent,
-  createAssistantMessage,
 } from '../types/message';
 
 export interface ChatType {
diff --git a/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
index 1d3371799c7a..fbdff6df5ce5 100644
--- a/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
+++ b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
@@ -1,8 +1,15 @@
 import { Settings } from 'lucide-react';
 import MoreMenu from './MoreMenu';
 import React from 'react';
+import type { View } from '../../App';
 
-export default function MoreMenuLayout(setView, setIsGoosehintsModalOpen) {
+export default function MoreMenuLayout({
+  setView,
+  setIsGoosehintsModalOpen,
+}: {
+  setView: (view: View, viewOptions?: Record<any, any>) => void;
+  setIsGoosehintsModalOpen: (isOpen: boolean) => void;
+}) {
   return (
     <div className="relative flex items-center h-[36px] w-full bg-bgSubtle border-b border-borderSubtle">
       <div className="flex-1"></div>

From a12f8c40fd7c053e1525053012c9161005495d05 Mon Sep 17 00:00:00 2001
From: Lily Delalande <ldelalande@squareup.com>
Date: Mon, 24 Mar 2025 10:47:59 -0400
Subject: [PATCH 3/5] get rid of placeholder

---
 ui/desktop/src/components/more_menu/MoreMenuLayout.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
index fbdff6df5ce5..91f5a485b1d7 100644
--- a/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
+++ b/ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
@@ -1,4 +1,3 @@
-import { Settings } from 'lucide-react';
 import MoreMenu from './MoreMenu';
 import React from 'react';
 import type { View } from '../../App';
@@ -14,9 +13,6 @@ export default function MoreMenuLayout({
     <div className="relative flex items-center h-[36px] w-full bg-bgSubtle border-b border-borderSubtle">
       <div className="flex-1"></div>
       <div className="flex items-center h-full">
-        {/*<div className="flex items-center justify-center h-full px-4 mr-4">*/}
-        {/*    <Settings />*/}
-        {/*</div>*/}
         <div className="flex items-center justify-center h-full px-2 mr-2">
           <MoreMenu setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
         </div>

From 9cc025b5f14e296ca90de4484a8f5f5610a775d8 Mon Sep 17 00:00:00 2001
From: Lily Delalande <ldelalande@squareup.com>
Date: Mon, 24 Mar 2025 11:07:27 -0400
Subject: [PATCH 4/5] fix imports

---
 ui/desktop/src/components/ChatView.tsx           | 1 +
 ui/desktop/src/components/more_menu/MoreMenu.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index 69a77e831642..d06e6f7966c8 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -18,6 +18,7 @@ import { BotConfig } from '../botConfig';
 import {
   Message,
   createUserMessage,
+  getTextContent,
   ToolCall,
   ToolCallResult,
   ToolRequestMessageContent,
diff --git a/ui/desktop/src/components/more_menu/MoreMenu.tsx b/ui/desktop/src/components/more_menu/MoreMenu.tsx
index 42dd6d285744..185dbbc5aef8 100644
--- a/ui/desktop/src/components/more_menu/MoreMenu.tsx
+++ b/ui/desktop/src/components/more_menu/MoreMenu.tsx
@@ -1,4 +1,9 @@
-import { Popover, PopoverContent, PopoverPortal, PopoverTrigger } from '../components/ui/popover';
+import {
+  Popover,
+  PopoverContent,
+  PopoverPortal,
+  PopoverTrigger,
+} from '../../components/ui/popover';
 import React, { useEffect, useState } from 'react';
 import { ChatSmart, Idea, More, Refresh, Time, Send } from '../icons';
 import { FolderOpen, Moon, Sliders, Sun } from 'lucide-react';

From cee00e0390e2b2a40ac94c36440f7791cabc797e Mon Sep 17 00:00:00 2001
From: Lily Delalande <ldelalande@squareup.com>
Date: Mon, 24 Mar 2025 11:11:09 -0400
Subject: [PATCH 5/5] match main

---
 ui/desktop/src/components/ChatView.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index d06e6f7966c8..db7c5e74078e 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -6,6 +6,7 @@ import GooseMessage from './GooseMessage';
 import Input from './Input';
 import { type View } from '../App';
 import LoadingGoose from './LoadingGoose';
+import MoreMenuLayout from './more_menu/MoreMenuLayout';
 import { Card } from './ui/card';
 import { ScrollArea, ScrollAreaHandle } from './ui/scroll-area';
 import UserMessage from './UserMessage';
@@ -13,17 +14,18 @@ import Splash from './Splash';
 import { DeepLinkModal } from './ui/DeepLinkModal';
 import 'react-toastify/dist/ReactToastify.css';
 import { useMessageStream } from '../hooks/useMessageStream';
-import MoreMenuLayout from './more_menu/MoreMenuLayout';
 import { BotConfig } from '../botConfig';
 import {
   Message,
   createUserMessage,
-  getTextContent,
   ToolCall,
   ToolCallResult,
   ToolRequestMessageContent,
+  ToolResponse,
   ToolResponseMessageContent,
   ToolConfirmationRequestMessageContent,
+  getTextContent,
+  createAssistantMessage,
 } from '../types/message';
 
 export interface ChatType {
@@ -367,7 +369,9 @@ export default function ChatView({
 
   return (
     <div className="flex flex-col w-full h-screen items-center justify-center">
-      <MoreMenuLayout setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
+      <div className="relative flex items-center h-[36px] w-full">
+        <MoreMenuLayout setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
+      </div>
       <Card className="flex flex-col flex-1 rounded-none h-[calc(100vh-95px)] w-full bg-bgApp mt-0 border-none relative">
         {messages.length === 0 ? (
           <Splash