Skip to content

Commit 0813ad4

Browse files
authored
fix: unread underlay display for own messages (#3150)
1 parent 109c7d3 commit 0813ad4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

package/src/components/MessageList/MessageList.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,13 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
535535

536536
const handleEvent = async (event: Event) => {
537537
const mainChannelUpdated = !event.message?.parent_id || event.message?.show_in_channel;
538+
const isMyOwnMessage = event.message?.user?.id === client.user?.id;
539+
538540
// When the scrollToBottomButtonVisible is true, we need to manually update the channelUnreadState.
539-
if (scrollToBottomButtonVisible || channelUnreadState?.first_unread_message_id) {
541+
if (
542+
(scrollToBottomButtonVisible || channelUnreadState?.first_unread_message_id) &&
543+
!isMyOwnMessage
544+
) {
540545
setChannelUnreadState((prev) => {
541546
const previousUnreadCount = prev?.unread_messages ?? 0;
542547
const previousLastMessage = getPreviousLastMessage(channel.state.messages, event.message);
@@ -749,12 +754,10 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
749754
const isLastReadMessage =
750755
channelUnreadState?.last_read_message_id === message.id ||
751756
(!channelUnreadState?.unread_messages && createdAtTimestamp === lastReadTimestamp);
752-
const isMyMessage = message.user?.id === client.userID;
753757

754758
const showUnreadSeparator =
755759
isLastReadMessage &&
756760
!isNewestMessage &&
757-
!isMyMessage &&
758761
// The `channelUnreadState?.first_unread_message_id` is here for sent messages unread label
759762
(!!channelUnreadState?.first_unread_message_id || !!channelUnreadState?.unread_messages);
760763

0 commit comments

Comments
 (0)