From b5718748523d7db07bb8b8e6ca2a09d73babab38 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 29 Jun 2026 23:25:05 +0200
Subject: [PATCH] Update fork menu tooltip and icons

- Change tooltip label from "Fork message" to "Fork chat"

- Use Split icon for both "Fork in a new tab" and "Fork in a new workspace" menu items
---
 .../app/src/components/assistant-fork-menu.tsx | 18 +++++-------------
 packages/app/src/i18n/resources/en.ts          |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/app/src/components/assistant-fork-menu.tsx b/packages/app/src/components/assistant-fork-menu.tsx
index 59c052197..7fdf971ba 100644
--- a/packages/app/src/components/assistant-fork-menu.tsx
+++ b/packages/app/src/components/assistant-fork-menu.tsx
@@ -1,7 +1,7 @@
 import { memo, useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
-import { FolderPlus, Split } from "lucide-react-native";
+import { Split } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   DropdownMenu,
@@ -19,21 +19,11 @@ interface AssistantForkMenuProps {
   testID?: string;
 }
 
-const ThemedFolderPlus = withUnistyles(FolderPlus);
 const ThemedSplit = withUnistyles(Split);
 
 const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-function getIcon(target: AssistantForkTarget) {
-  switch (target) {
-    case "tab":
-      return <ThemedSplit size={16} uniProps={foregroundColorMapping} />;
-    case "workspace":
-      return <ThemedFolderPlus size={16} uniProps={foregroundColorMapping} />;
-  }
-}
-
 export const AssistantForkMenu = memo(function AssistantForkMenu({
   onFork,
   testID = "assistant-fork-menu",
@@ -79,6 +69,8 @@ export const AssistantForkMenu = memo(function AssistantForkMenu({
     [t],
   );
 
+  const forkIcon = useMemo(() => <ThemedSplit size={16} uniProps={foregroundColorMapping} />, []);
+
   return (
     <DropdownMenu open={isOpen} onOpenChange={handleOpenChange}>
       <Tooltip delayDuration={250} enabledOnDesktop enabledOnMobile={false}>
@@ -106,7 +98,7 @@ export const AssistantForkMenu = memo(function AssistantForkMenu({
         <DropdownMenuItem
           closeOnSelect={false}
           disabled={isLocked && pendingTarget !== "tab"}
-          leading={getIcon("tab")}
+          leading={forkIcon}
           onSelect={handleSelect("tab")}
           status={pendingTarget === "tab" ? "pending" : undefined}
           testID={`${testID}-new-tab`}
@@ -116,7 +108,7 @@ export const AssistantForkMenu = memo(function AssistantForkMenu({
         <DropdownMenuItem
           closeOnSelect={false}
           disabled={isLocked && pendingTarget !== "workspace"}
-          leading={getIcon("workspace")}
+          leading={forkIcon}
           onSelect={handleSelect("workspace")}
           status={pendingTarget === "workspace" ? "pending" : undefined}
           testID={`${testID}-new-workspace`}
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 65058edb5..7eebe4d06 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -244,7 +244,7 @@ export const en = {
       copyCode: "Copy code",
       copyTurn: "Copy turn",
       copyMessage: "Copy message",
-      forkMenu: "Fork message",
+      forkMenu: "Fork chat",
       forkInNewTab: "Fork in a new tab",
       forkInNewWorkspace: "Fork in a new workspace",
       forkUnavailable: "Update the host to use this.",