From f3b1477ef0c4929ad2452569e511ccc4779204f5 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Thu, 14 Nov 2024 17:26:42 +0000
Subject: [PATCH] Fixup shortcuts

---
 public/locales/en-GB/app.json       |  6 +++---
 src/button/ReactionToggleButton.tsx | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/public/locales/en-GB/app.json b/public/locales/en-GB/app.json
index 7b11e36a..d18bc3a5 100644
--- a/public/locales/en-GB/app.json
+++ b/public/locales/en-GB/app.json
@@ -9,12 +9,12 @@
     "edit": "Edit",
     "go": "Go",
     "invite": "Invite",
-    "lower_hand": "Lower hand",
+    "lower_hand": "Lower hand ({{keyboardShortcut}})",
     "no": "No",
     "open_search": "Open search",
     "pick_reaction": "Pick reaction",
-    "raise_hand": "Raise hand",
-    "raise_hand_or_send_reaction": "Raise hand or send reaction ({{keyboardShortcut}})",
+    "raise_hand": "Raise hand ({{keyboardShortcut}})",
+    "raise_hand_or_send_reaction": "Raise hand or send reaction",
     "register": "Register",
     "remove": "Remove",
     "sign_in": "Sign in",
diff --git a/src/button/ReactionToggleButton.tsx b/src/button/ReactionToggleButton.tsx
index 305389b4..2c837ca2 100644
--- a/src/button/ReactionToggleButton.tsx
+++ b/src/button/ReactionToggleButton.tsx
@@ -47,17 +47,12 @@ const InnerButton: FC<InnerButtonProps> = ({ raised, open, ...props }) => {
   const { t } = useTranslation();
 
   return (
-    <Tooltip
-      label={t("action.raise_hand_or_send_reaction", { keyboardShortcut: "H" })}
-    >
+    <Tooltip label={t("action.raise_hand_or_send_reaction")}>
       <CpdButton
         className={classNames(raised && styles.raisedButton)}
         aria-expanded={open}
         aria-haspopup
-        aria-keyshortcuts="H"
-        aria-label={t("action.raise_hand_or_send_reaction", {
-          keyboardShortcut: "H",
-        })}
+        aria-label={t("action.raise_hand_or_send_reaction")}
         kind={raised || open ? "primary" : "secondary"}
         iconOnly
         Icon={raised ? RaisedHandSolidIcon : ReactionIcon}
@@ -119,7 +114,9 @@ export function ReactionPopupMenu({
     },
     [sendReaction, filteredReactionSet, canReact, setIsSearching],
   );
-  const label = isHandRaised ? t("action.lower_hand") : t("action.raise_hand");
+  const label = isHandRaised
+    ? t("action.lower_hand", { keyboardShortcut: "H" })
+    : t("action.raise_hand", { keyboardShortcut: "H" });
   return (
     <>
       {errorText && (
@@ -136,6 +133,7 @@ export function ReactionPopupMenu({
           <Tooltip label={label}>
             <CpdButton
               kind={isHandRaised ? "primary" : "secondary"}
+              aria-keyshortcuts="H"
               aria-pressed={isHandRaised}
               aria-label={label}
               onClick={() => toggleRaisedHand()}