refactor: addressing pr comments made in #8556

Author: lmtr0

webview-ui/src/components/chat/ChatTextArea.tsx

@@ -11,6 +11,7 @@ import { ExtensionMessage } from "@roo/ExtensionMessage"
 import { vscode } from "@src/utils/vscode"
 import { useExtensionState } from "@src/context/ExtensionStateContext"
 import { useAppTranslation } from "@src/i18n/TranslationContext"
+import { getSendMessageKeyCombination } from "@src/utils/platform"
 import {
 	ContextMenuOptionType,
 	getContextMenuOptions,
@@ -1161,7 +1162,13 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 										</button>
 									</StandardTooltip>
 								)}
-								<StandardTooltip content={t("chat:sendMessage")}>
+								<StandardTooltip
+									content={
+										requireCtrlEnterToSend
+											? t("chat:sendMessage") +
+												` (${t("chat:pressToSend", { keyCombination: getSendMessageKeyCombination() })})`
+											: t("chat:sendMessage")
+									}>
 									<button
 										aria-label={t("chat:sendMessage")}
 										disabled={false}
@@ -1201,6 +1208,22 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 									{placeholderBottomText}
 								</div>
 							)}
+							{requireCtrlEnterToSend && (
+								<div
+									className={cn(
+										"absolute left-2 z-30 flex items-center h-8 font-vscode-font-family text-vscode-editor-font-size leading-vscode-editor-line-height",
+										isEditMode ? "pr-20" : "pr-9",
+									)}
+									style={{
+										bottom: "0.25rem",
+										color: "color-mix(in oklab, var(--vscode-descriptionForeground) 70%, transparent)",
+										userSelect: "none",
+										pointerEvents: "none",
+										fontSize: "0.75rem",
+									}}>
+									{t("chat:pressToSend", { keyCombination: getSendMessageKeyCombination() })}
+								</div>
+							)}
 						</div>
 					</div>
 				</div>

webview-ui/src/components/settings/UISettings.tsx

@@ -1,5 +1,6 @@
 import { HTMLAttributes } from "react"
 import { useAppTranslation } from "@/i18n/TranslationContext"
+import { getPrimaryModifierKey } from "@/utils/platform"
 import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
 import { Glasses } from "lucide-react"
 import { telemetryClient } from "@/utils/TelemetryClient"
@@ -71,10 +72,14 @@ export const UISettings = ({
 							checked={requireCtrlEnterToSend ?? false}
 							onChange={(e: any) => handleRequireCtrlEnterToSendChange(e.target.checked)}
 							data-testid="ctrl-enter-checkbox">
-							<span className="font-medium">{t("settings:ui.requireCtrlEnterToSend.label")}</span>
+							<span className="font-medium">
+								{t("settings:ui.requireCtrlEnterToSend.label", { primaryMod: getPrimaryModifierKey() })}
+							</span>
 						</VSCodeCheckbox>
 						<div className="text-vscode-descriptionForeground text-sm ml-5 mt-1">
-							{t("settings:ui.requireCtrlEnterToSend.description")}
+							{t("settings:ui.requireCtrlEnterToSend.description", {
+								primaryMod: getPrimaryModifierKey(),
+							})}
 						</div>
 					</div>
 				</div>

webview-ui/src/i18n/locales/ca/chat.json

@@ -130,6 +130,7 @@
 	"enhancePromptDescription": "The 'Enhance Prompt' button helps improve your prompt by providing additional context, clarification, or rephrasing. Try typing a prompt in here and clicking the button again to see how it works.",
 	"addImages": "Add images to message",
 	"sendMessage": "Send message",
+	"pressToSend": "Press {{keyCombination}} to send",
 	"stopTts": "Stop text-to-speech",
 	"typeMessage": "Type a message...",
 	"typeTask": "Type your task here...",

webview-ui/src/i18n/locales/ca/settings.json

@@ -44,8 +44,8 @@
 			"description": "When enabled, thinking blocks will be collapsed by default until you interact with them"
 		},
 		"requireCtrlEnterToSend": {
-			"label": "Require Ctrl/Cmd+Enter to send messages",
-			"description": "When enabled, you must press Ctrl or Cmd+Enter to send messages instead of just Enter"
+			"label": "Require {primaryMod}+Enter to send messages",
+			"description": "When enabled, you must press {primaryMod}+Enter to send messages instead of just Enter"
 		}
 	},
 	"prompts": {