Adds keyboard shortcut for editing last message sent

ts/components/CompositionArea.stories.tsx

@@ -59,6 +59,7 @@ const useProps = (overrideProps: Partial<Props> = {}): Props => ({
   removeAttachment: action('removeAttachment'),
   theme: React.useContext(StorybookThemeContext),
   setComposerFocus: action('setComposerFocus'),
+  setMessageToEdit: action('setMessageToEdit'),
   setQuoteByMessageId: action('setQuoteByMessageId'),
   showToast: action('showToast'),
 

ts/components/CompositionArea.tsx

@@ -53,6 +53,7 @@ import { Quote } from './conversation/Quote';
 import { countStickers } from './stickers/lib';
 import {
   useAttachFileShortcut,
+  useEditLastMessageSent,
   useKeyboardShortcuts,
 } from '../hooks/useKeyboardShortcuts';
 import { MediaEditor } from './MediaEditor';
@@ -103,6 +104,7 @@ export type OwnProps = Readonly<{
   isGroupV1AndDisabled?: boolean;
   isMissingMandatoryProfileSharing?: boolean;
   isSignalConversation?: boolean;
+  lastEditableMessageId?: string;
   recordingState: RecordingState;
   messageCompositionId: string;
   shouldHidePopovers?: boolean;
@@ -157,6 +159,7 @@ export type OwnProps = Readonly<{
   removeAttachment: (conversationId: string, filePath: string) => unknown;
   scrollToMessage: (conversationId: string, messageId: string) => unknown;
   setComposerFocus: (conversationId: string) => unknown;
+  setMessageToEdit(conversationId: string, messageId: string): unknown;
   setQuoteByMessageId(
     conversationId: string,
     messageId: string | undefined
@@ -225,6 +228,7 @@ export function CompositionArea({
   imageToBlurHash,
   isDisabled,
   isSignalConversation,
+  lastEditableMessageId,
   messageCompositionId,
   pushPanelForConversation,
   platform,
@@ -233,6 +237,7 @@ export function CompositionArea({
   sendEditedMessage,
   sendMultiMediaMessage,
   setComposerFocus,
+  setMessageToEdit,
   setQuoteByMessageId,
   shouldHidePopovers,
   showToast,
@@ -394,8 +399,26 @@ export function CompositionArea({
     setAttachmentToEdit(attachment);
   }
 
+  const isComposerEmpty =
+    !draftAttachments.length && !draftText && !draftEditMessage;
+
+  const maybeEditMessage = useCallback(() => {
+    if (!isComposerEmpty || !lastEditableMessageId) {
+      return false;
+    }
+
+    setMessageToEdit(conversationId, lastEditableMessageId);
+    return true;
+  }, [
+    conversationId,
+    isComposerEmpty,
+    lastEditableMessageId,
+    setMessageToEdit,
+  ]);
+
   const attachFileShortcut = useAttachFileShortcut(launchAttachmentPicker);
-  useKeyboardShortcuts(attachFileShortcut);
+  const editLastMessageSent = useEditLastMessageSent(maybeEditMessage);
+  useKeyboardShortcuts(attachFileShortcut, editLastMessageSent);
 
   // Focus input on first mount
   const previousFocusCounter = usePrevious<number | undefined>(
@@ -495,8 +518,7 @@ export function CompositionArea({
     setLarge(l => !l);
   }, [setLarge]);
 
-  const shouldShowMicrophone =
-    !large && !draftAttachments.length && !draftText && !draftEditMessage;
+  const shouldShowMicrophone = !large && isComposerEmpty;
 
   const showMediaQualitySelector = draftAttachments.some(isImageAttachment);
 

ts/components/ShortcutGuide.tsx

@@ -256,6 +256,11 @@ function getComposerShortcuts(
       description: i18n('icu:Keyboard--remove-draft-attachments'),
       keys: [['commandOrCtrl', 'shift', 'P']],
     },
+    {
+      id: 'Keyboard--edit-last-message',
+      description: i18n('icu:Keyboard--edit-last-message'),
+      keys: [['↑']],
+    },
   ];
 
   if (isFormattingFlagEnabled) {