From bc680a39f6de6a1d309222d186bc317d1f55afa0 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 17 Jan 2025 11:49:34 +1100
Subject: [PATCH] chore: cleanup message list component to render switch

---
 .../conversation/SessionMessagesList.tsx      | 55 +++++--------------
 ts/state/selectors/conversations.ts           |  3 +-
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx
index 491674e0a..889df5f46 100644
--- a/ts/components/conversation/SessionMessagesList.tsx
+++ b/ts/components/conversation/SessionMessagesList.tsx
@@ -6,6 +6,7 @@ import {
   getOldBottomMessageId,
   getOldTopMessageId,
   getSortedMessagesTypesOfSelectedConversation,
+  type MessagePropsType,
 } from '../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { MessageDateBreak } from './message/message-item/DateBreak';
@@ -20,7 +21,6 @@ import { SessionLastSeenIndicator } from './SessionLastSeenIndicator';
 import { TimerNotification } from './TimerNotification';
 import { DataExtractionNotification } from './message/message-item/DataExtractionNotification';
 import { InteractionNotification } from './message/message-item/InteractionNotification';
-import { assertUnreachable } from '../../types/sqlSharedTypes';
 import type { WithMessageId } from '../../session/types/with';
 
 function isNotTextboxEvent(e: KeyboardEvent) {
@@ -29,6 +29,17 @@ function isNotTextboxEvent(e: KeyboardEvent) {
 
 let previousRenderedConvo: string | undefined;
 
+const componentForMessageType: Record<MessagePropsType, React.FC<WithMessageId>> = {
+  'group-notification': GroupUpdateMessage,
+  'group-invitation': CommunityInvitation,
+  'message-request-response': MessageRequestResponse,
+  'data-extraction': DataExtractionNotification,
+  'timer-notification': TimerNotification,
+  'call-notification': CallNotification,
+  'interaction-notification': InteractionNotification,
+  'regular-message': Message,
+};
+
 export const SessionMessagesList = (props: {
   scrollAfterLoadMore: (
     messageIdToScrollTo: string,
@@ -92,47 +103,7 @@ export const SessionMessagesList = (props: {
       {messagesProps.map(messageProps => {
         const { messageId } = messageProps;
 
-        let ComponentToRender: React.FC<WithMessageId> | undefined;
-
-        switch (messageProps.message.messageType) {
-          case 'group-notification': {
-            ComponentToRender = GroupUpdateMessage;
-            break;
-          }
-          case 'group-invitation': {
-            ComponentToRender = CommunityInvitation;
-            break;
-          }
-          case 'message-request-response': {
-            ComponentToRender = MessageRequestResponse;
-            break;
-          }
-          case 'data-extraction': {
-            ComponentToRender = DataExtractionNotification;
-            break;
-          }
-          case 'timer-notification': {
-            ComponentToRender = TimerNotification;
-            break;
-          }
-          case 'call-notification': {
-            ComponentToRender = CallNotification;
-            break;
-          }
-          case 'interaction-notification': {
-            ComponentToRender = InteractionNotification;
-            break;
-          }
-          case 'regular-message': {
-            ComponentToRender = Message;
-            break;
-          }
-          default:
-            assertUnreachable(
-              messageProps.message.messageType,
-              `unhandled case with ${messageProps.message.messageType}`
-            );
-        }
+        const ComponentToRender = componentForMessageType[messageProps.message.messageType];
 
         const unreadIndicator = messageProps.showUnreadIndicator ? (
           <SessionLastSeenIndicator
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 9c7846bae..05177cc66 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -112,7 +112,6 @@ export type MessagePropsType =
   | 'message-request-response'
   | 'timer-notification'
   | 'regular-message'
-  | 'unread-indicator'
   | 'call-notification'
   | 'interaction-notification';
 
@@ -145,7 +144,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
         messageId: msg.propsForMessage.id,
       };
 
-      const messageType = msg.propsForDataExtractionNotification
+      const messageType: MessagePropsType = msg.propsForDataExtractionNotification
         ? ('data-extraction' as const)
         : msg.propsForMessageRequestResponse
           ? ('message-request-response' as const)