Fixed unread new messages separator wrong value when date overlay used

Author: martinmitrevski

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### 🐞 Fixed
 - Reaction overlay display in a modal chat view
 - Warning about UITextView switching to TextKit 1 compatibility mode
+- Unread new messages separator wrong value when date overlay used
 
 # [4.30.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.30.0)
 _March 30, 2023_

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -170,7 +170,7 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                                         showUnreadSeparator ?
                                             factory.makeNewMessagesIndicatorView(
                                                 newMessagesStartId: $newMessagesStartId,
-                                                count: newMessagesCount(for: index)
+                                                count: newMessagesCount(for: index, message: message)
                                             )
                                             : nil
 
@@ -288,9 +288,11 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
         return offset
     }
 
-    private func newMessagesCount(for index: Int?) -> Int {
+    private func newMessagesCount(for index: Int?, message: ChatMessage) -> Int {
         if let index = index {
             return index + 1
+        } else if let index = messageListDateUtils.index(for: message, in: messages) {
+            return index + 1
         } else {
             return channel.unreadCount.messages
         }