From 425e63a4ce3573fa930b41eb83b10560c75db315 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 3 Apr 2024 14:05:30 +1100
Subject: [PATCH] fix: message sent status displayed for last outgoing message

---
 .../message/message-content/MessageStatus.tsx | 19 +++++++++----------
 ts/state/selectors/conversations.ts           | 10 +++++++++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageStatus.tsx b/ts/components/conversation/message/message-content/MessageStatus.tsx
index 41bcdb42c..96f059c89 100644
--- a/ts/components/conversation/message/message-content/MessageStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageStatus.tsx
@@ -6,7 +6,7 @@ import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelecto
 import { useMessageStatus } from '../../../../state/selectors';
 
 import { useIsDetailMessageView } from '../../../../contexts/isDetailViewContext';
-import { getMostRecentMessageId } from '../../../../state/selectors/conversations';
+import { getMostRecentOutgoingMessageId } from '../../../../state/selectors/conversations';
 import { useSelectedIsGroupOrCommunity } from '../../../../state/selectors/selectedConversation';
 import { SpacerXS } from '../../../basic/Text';
 import { SessionIcon, SessionIconType } from '../../../icon';
@@ -122,10 +122,9 @@ function useIsExpiring(messageId: string) {
   );
 }
 
-function useIsMostRecentMessage(messageId: string) {
-  const mostRecentMessageId = useSelector(getMostRecentMessageId);
-  const isMostRecentMessage = mostRecentMessageId === messageId;
-  return isMostRecentMessage;
+function useIsMostRecentOutgoingMessage(messageId: string) {
+  const mostRecentOutgoingMessageId = useSelector(getMostRecentOutgoingMessageId);
+  return mostRecentOutgoingMessageId === messageId;
 }
 
 function MessageStatusExpireTimer(props: Pick<Props, 'messageId'>) {
@@ -180,11 +179,11 @@ function IconForExpiringMessageId({
 
 const MessageStatusSent = ({ dataTestId, messageId }: Omit<Props, 'isDetailView'>) => {
   const isExpiring = useIsExpiring(messageId);
-  const isMostRecentMessage = useIsMostRecentMessage(messageId);
+  const isMostRecentOutgoingMessage = useIsMostRecentOutgoingMessage(messageId);
   const isGroup = useSelectedIsGroupOrCommunity();
 
-  // we hide a "sent" message status which is not expiring except for the most recent message
-  if (!isExpiring && !isMostRecentMessage) {
+  // we hide the "sent" message status for a non-expiring message unless if it's the most recent outgoing message
+  if (!isExpiring && !isMostRecentOutgoingMessage) {
     return null;
   }
   return (
@@ -208,10 +207,10 @@ const MessageStatusRead = ({
   const isExpiring = useIsExpiring(messageId);
   const isGroup = useSelectedIsGroupOrCommunity();
 
-  const isMostRecentMessage = useIsMostRecentMessage(messageId);
+  const isMostRecentOutgoingMessage = useIsMostRecentOutgoingMessage(messageId);
 
   // we hide an outgoing "read" message status which is not expiring except for the most recent message
-  if (!isIncoming && !isExpiring && !isMostRecentMessage) {
+  if (!isIncoming && !isExpiring && !isMostRecentOutgoingMessage) {
     return null;
   }
 
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 5babd3893..563ec03f0 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 import { createSelector } from '@reduxjs/toolkit';
-import { filter, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash';
+import { filter, first, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash';
 
 import {
   ConversationLookupType,
@@ -593,6 +593,14 @@ export const getMostRecentMessageId = (state: StateType): string | null => {
   return state.conversations.mostRecentMessageId;
 };
 
+export const getMostRecentOutgoingMessageId = createSelector(
+  getSortedMessagesOfSelectedConversation,
+  (messages: Array<MessageModelPropsWithoutConvoProps>): string | undefined => {
+    return first(messages.filter(m => m.propsForMessage.direction === 'outgoing'))?.propsForMessage
+      .id;
+  }
+);
+
 export const getOldestMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
   (messages: Array<MessageModelPropsWithoutConvoProps>): string | undefined => {