From 20766c4abab460ce03ad60179e4d376fb86220ff Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Tue, 23 Apr 2024 13:56:53 +1000
Subject: [PATCH] feat: added conversation id to debugmessageinfo

---
 _locales/en/messages.json                                    | 1 +
 .../overlay/message-info/components/MessageInfo.tsx          | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 66208029a..55bf6b1d0 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -104,6 +104,7 @@
   "contextMenuNoSuggestions": "No Suggestions",
   "continue": "Continue",
   "conversationsHeader": "Contacts and Groups: $count$",
+  "conversationId": "Conversation ID",
   "conversationsNone": "You don't have any conversations yet",
   "conversationsSettingsTitle": "Conversations",
   "copiedToClipboard": "Copied",
diff --git a/ts/components/conversation/right-panel/overlay/message-info/components/MessageInfo.tsx b/ts/components/conversation/right-panel/overlay/message-info/components/MessageInfo.tsx
index e165f63b3..746eeff76 100644
--- a/ts/components/conversation/right-panel/overlay/message-info/components/MessageInfo.tsx
+++ b/ts/components/conversation/right-panel/overlay/message-info/components/MessageInfo.tsx
@@ -20,6 +20,7 @@ import {
 } from '../../../../../../state/selectors';
 
 import { isDevProd } from '../../../../../../shared/env_vars';
+import { useSelectedConversationKey } from '../../../../../../state/selectors/selectedConversation';
 import { Flex } from '../../../../../basic/Flex';
 import { SpacerSM } from '../../../../../basic/Text';
 
@@ -66,6 +67,7 @@ const showDebugLog = () => {
 };
 
 const DebugMessageInfo = ({ messageId }: { messageId: string }) => {
+  const convoId = useSelectedConversationKey();
   const messageHash = useMessageHash(messageId);
   const serverId = useMessageServerId(messageId);
   const expirationType = useMessageExpirationType(messageId);
@@ -78,6 +80,9 @@ const DebugMessageInfo = ({ messageId }: { messageId: string }) => {
 
   return (
     <>
+      {convoId ? (
+        <LabelWithInfo label={`${window.i18n('conversationId')}:`} info={convoId} />
+      ) : null}
       {messageHash ? (
         <LabelWithInfo label={`${window.i18n('messageHash')}:`} info={messageHash} />
       ) : null}