From 1f69e3b792a8db759c957ea9b3697f7f2244ca06 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Tue, 3 Sep 2024 13:48:22 +1000
Subject: [PATCH] fix: add copy msgbody on right panel when msg has a body

---
 .../overlay/message-info/OverlayMessageInfo.tsx    | 14 ++++++++++++++
 ts/state/selectors/messages.ts                     |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx b/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx
index dcf6baf91..59d75bc2b 100644
--- a/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx
+++ b/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx
@@ -20,6 +20,7 @@ import {
 import { deleteMessagesById } from '../../../../../interactions/conversations/unsendingInteractions';
 import {
   useMessageAttachments,
+  useMessageBody,
   useMessageDirection,
   useMessageIsDeletable,
   useMessageQuote,
@@ -42,6 +43,8 @@ import { PanelButtonGroup, PanelIconButton } from '../../../../buttons';
 import { Message } from '../../../message/message-item/Message';
 import { AttachmentInfo, MessageInfo } from './components';
 import { AttachmentCarousel } from './components/AttachmentCarousel';
+import { clipboard } from 'electron';
+import { isEmpty } from 'lodash';
 
 // NOTE we override the default max-widths when in the detail isDetailView
 const StyledMessageBody = styled.div`
@@ -188,6 +191,7 @@ export const OverlayMessageInfo = () => {
   const rightOverlayMode = useRightOverlayMode();
   const messageId = useSelector(getMessageInfoId);
   const messageInfo = useMessageInfo(messageId);
+  const messageBody = useMessageBody(messageId);
   const isDeletable = useMessageIsDeletable(messageId);
   const direction = useMessageDirection(messageId);
   const timestamp = useMessageTimestamp(messageId);
@@ -285,6 +289,16 @@ export const OverlayMessageInfo = () => {
           <MessageInfo messageId={messageId} errors={messageInfo.errors} />
           <SpacerLG />
           <PanelButtonGroup style={{ margin: '0' }}>
+            {messageBody && !isEmpty(messageBody) ? (
+              <PanelIconButton
+                text={window.i18n('copy')}
+                iconType="copy"
+                onClick={() => {
+                  clipboard.writeText(messageBody);
+                }}
+                dataTestId="copy-msg-from-details"
+              />
+            ) : null}
             <PanelIconButton
               text={window.i18n('reply')}
               iconType="reply"
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
index f2c413051..97c5f649d 100644
--- a/ts/state/selectors/messages.ts
+++ b/ts/state/selectors/messages.ts
@@ -131,7 +131,7 @@ export function useMessageTimestamp(messageId: string | undefined) {
   return useMessagePropsByMessageId(messageId)?.propsForMessage.timestamp;
 }
 
-export function useMessageBody(messageId: string) {
+export function useMessageBody(messageId?: string) {
   return useMessagePropsByMessageId(messageId)?.propsForMessage.text;
 }