Skip to content

Commit 93cbc21

Browse files
committed
chore: improve unread message detection logic in GroupChannelMessageList
1 parent 206431a commit 93cbc21

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

packages/uikit-react-native/src/domain/groupChannel/component/GroupChannelMessageList.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,15 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {
115115
return true;
116116
}
117117

118-
let isFirstUnreadAfterReadMessages = false;
118+
let isFirstUnreadAfterReadMessages;
119119
if (index < props.messages.length - 1) {
120120
const prevMessage = props.messages[index + 1];
121121
const hasNoPreviousAndNoPrevMessage = !props.hasPrevious?.() && prevMessage == null;
122122
const prevMessageIsRead = prevMessage != null && prevMessage.createdAt <= props.channel.myLastRead;
123123
const isMessageUnread = props.channel.myLastRead < msg.createdAt;
124124
isFirstUnreadAfterReadMessages = (hasNoPreviousAndNoPrevMessage || prevMessageIsRead) && isMessageUnread;
125+
} else {
126+
isFirstUnreadAfterReadMessages = !props.hasPrevious?.();
125127
}
126128

127129
return isFirstUnreadAfterReadMessages;

0 commit comments

Comments
 (0)