From 87a794338a082a070007eae36305a81aabc55110 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Mon, 26 Oct 2026 07:13:35 +0000
Subject: [PATCH] fix(mobile): terminal Paste stays visible beside dismiss
 keyboard

Fixes pingdotgg/t3code#24694

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/mobile/src/components/ui/AppSymbol.tsx   |  2 ++
 .../terminal/ThreadTerminalRouteScreen.tsx    | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/src/components/ui/AppSymbol.tsx b/apps/mobile/src/components/ui/AppSymbol.tsx
index 4b17bddd3c324..7dfe2ee43ad96 100644
--- a/apps/mobile/src/components/ui/AppSymbol.tsx
+++ b/apps/mobile/src/components/ui/AppSymbol.tsx
@@ -45,6 +45,7 @@ import IconMoodPlus from "@tabler/icons-react-native/IconMoodPlus";
 import IconTag from "@tabler/icons-react-native/IconTag";
 import IconTicket from "@tabler/icons-react-native/IconTicket";
 import IconClock from "@tabler/icons-react-native/IconClock";
+import IconClipboard from "@tabler/icons-react-native/IconClipboard";
 import IconCode from "@tabler/icons-react-native/IconCode";
 import IconCopy from "@tabler/icons-react-native/IconCopy";
 import IconDatabase from "@tabler/icons-react-native/IconDatabase";
@@ -306,6 +307,7 @@ const ANDROID_ICON_BY_MATERIAL_NAME = {
   close: IconX,
   construction: IconHammer,
   content_copy: IconCopy,
+  content_paste: IconClipboard,
   desktop_windows: IconDeviceDesktop,
   edit: IconEdit,
   error: IconAlertCircle,
diff --git a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
index de0c090f93994..7a641ad54a734 100644
--- a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
+++ b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
@@ -194,7 +194,6 @@ class TerminalClipboardReadError extends Schema.TaggedError<TerminalClipboardRea
 type TerminalToolbarAction =
   | { readonly kind: "send"; readonly key: string; readonly label: string; readonly data: string }
   | { readonly kind: "clear"; readonly key: string; readonly label: string }
-  | { readonly kind: "paste"; readonly key: string; readonly label: string }
   | {
       readonly kind: "modifier";
       readonly key: string;
@@ -582,7 +581,6 @@ function ThreadTerminal(props: {
       { kind: "send", key: "esc", label: "esc", data: "\u001b" },
       ...modifierActions,
       { kind: "send", key: "tab", label: "tab", data: "\t" },
-      { kind: "paste", key: "paste", label: "paste" },
       { kind: "clear", key: "clear", label: "clear" },
       { kind: "send", key: "tilde", label: "~", data: "~" },
       { kind: "send", key: "pipe", label: "|", data: "|" },
@@ -796,15 +794,14 @@ function ThreadTerminal(props: {
       return;
     }
 
-    if (action.kind === "paste") {
-      setPendingModifier(null);
-      void pasteFromClipboard();
-      return;
-    }
-
     writeModifiedInput(action.data);
   };
 
+  const handlePaste = () => {
+    setPendingModifier(null);
+    void pasteFromClipboard();
+  };
+
   const handleDismissKeyboard = () => {
     setAccessory((current) => ({ ...current, dismissed: true }));
     void KeyboardController.dismiss();
@@ -1044,6 +1041,12 @@ function ThreadTerminal(props: {
                           );
                         })}
                       </ComposerToolbarScroller>
+                      <ComposerToolbarButton
+                        accessibilityLabel="Paste"
+                        icon={{ ios: "doc.on.clipboard", android: "content_paste" }}
+                        onPress={handlePaste}
+                        showChevron={false}
+                      />
                       <ComposerToolbarButton
                         accessibilityLabel="Dismiss keyboard"
                         icon={{ ios: "keyboard.chevron.compact.down", android: "keyboard_hide" }}