From 577278a14d017568968cdd0743229c27e87254b8 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 12 Oct 2023 14:22:53 +1100
Subject: [PATCH] feat: made datatestids mandatory on readablemessages

---
 .../message/message-content/MessageContentWithStatus.tsx   | 4 ++--
 .../message/message-item/DataExtractionNotification.tsx    | 1 +
 .../conversation/message/message-item/ReadableMessage.tsx  | 7 +++----
 .../message-item/notification-bubble/CallNotification.tsx  | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index da49c4267..020684990 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -29,7 +29,7 @@ type Props = {
   messageId: string;
   ctxMenuID: string;
   isDetailView?: boolean;
-  dataTestId?: string;
+  dataTestId: string;
   enableReactions: boolean;
 };
 
@@ -124,7 +124,7 @@ export const MessageContentWithStatuses = (props: Props) => {
         role={'button'}
         onClick={onClickOnMessageOuterContainer}
         onDoubleClickCapture={onDoubleClickReplyToMessage}
-        data-testid={dataTestId}
+        dataTestId={dataTestId}
       >
         <MessageAvatar
           messageId={messageId}
diff --git a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx
index 77858c7fc..1a5d86849 100644
--- a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx
+++ b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx
@@ -19,6 +19,7 @@ export const DataExtractionNotification = (props: PropsForDataExtractionNotifica
   return (
     <ExpirableReadableMessage
       messageId={messageId}
+      dataTestId="data-extraction-notification"
       key={`readable-message-${messageId}`}
       isCentered
     >
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index 78d793c39..d20c25259 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -26,8 +26,8 @@ import {
   getShowScrollButton,
   getYoungestMessageId,
 } from '../../../../state/selectors/conversations';
-import { useSelectedConversationKey } from '../../../../state/selectors/selectedConversation';
 import { getIsAppFocused } from '../../../../state/selectors/section';
+import { useSelectedConversationKey } from '../../../../state/selectors/selectedConversation';
 import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
 
 export type ReadableMessageProps = {
@@ -39,7 +39,7 @@ export type ReadableMessageProps = {
   onClick?: MouseEventHandler<HTMLElement>;
   onDoubleClickCapture?: MouseEventHandler<HTMLElement>;
   role?: AriaRole;
-  dataTestId?: string;
+  dataTestId: string;
   onContextMenu?: (e: React.MouseEvent<HTMLElement>) => void;
 };
 
@@ -207,8 +207,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
       onDoubleClickCapture={onDoubleClickCapture}
       role={role}
       key={`inview-msg-${messageId}`}
-      // TODO We will need to update the integration tests to use that new value, or update the values given in the `dataTestId` props to match what they expect
-      data-testid={dataTestId || 'readable-message'}
+      data-testid={dataTestId}
     >
       {props.children}
     </InView>
diff --git a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
index 12ad25916..646cf438a 100644
--- a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
+++ b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
@@ -62,6 +62,7 @@ export const CallNotification = (props: PropsForCallNotification) => {
     <ExpirableReadableMessage
       messageId={messageId}
       key={`readable-message-${messageId}`}
+      dataTestId={`call-notification-${notificationType}`}
       isCentered={true}
     >
       <NotificationBubble