QA fixes

GetStream · Dec 7, 2023 · 0e4166a · 0e4166a
1 parent ea71f33
commit 0e4166a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift
@@ -396,7 +396,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
             updateScrolledIdToNewestMessage()
         }
 
-        if lastMessageRead != nil && firstUnreadMessageId == nil {
+        if lastReadMessageId != nil && firstUnreadMessageId == nil {
             firstUnreadMessageId = channelDataSource.firstUnreadMessageId
         }
     }
@@ -691,6 +691,9 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         if messageController == nil {
             utils.channelControllerFactory.clearCurrentController()
             ImageCache.shared.trim(toCost: utils.messageListConfig.cacheSizeOnChatDismiss)
+            if !channelDataSource.hasLoadedAllNextMessages {
+                channelDataSource.loadFirstPage { _ in }
+            }
         }
     }
 }

diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift
@@ -131,9 +131,10 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                         ForEach(messages, id: \.messageId) { message in
                             var index: Int? = messageListDateUtils.indexForMessageDate(message: message, in: messages)
                             let messageDate: Date? = messageListDateUtils.showMessageDate(for: index, in: messages)
-                            let messageIsFirstUnread = message.messageId == firstUnreadMessageId ||
-                                message.id == firstUnreadMessageId
-                            let showUnreadSeparator = messageListConfig.showNewMessagesSeparator && messageIsFirstUnread
+                            let messageIsFirstUnread = firstUnreadMessageId?.contains(message.id) == true
+                            let showUnreadSeparator = messageListConfig.showNewMessagesSeparator &&
+                                messageIsFirstUnread &&
+                                !isMessageThread
                             let showsLastInGroupInfo = showsLastInGroupInfo(for: message, channel: channel)
                             factory.makeMessageContainerView(
                                 channel: channel,
@@ -291,7 +292,7 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
             }
         })
         .overlay(
-            (channel.unreadCount.messages > 0 && !unreadMessagesBannerShown) ?
+            (channel.unreadCount.messages > 0 && !unreadMessagesBannerShown && !isMessageThread) ?
                 factory.makeJumpToUnreadButton(
                     channel: channel,
                     onJumpToMessage: {

diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/DefaultMessageActions.swift b/Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/DefaultMessageActions.swift
@@ -128,7 +128,7 @@ extension MessageAction {
 
             messageActions.append(deleteAction)
         } else {
-            if !message.isPartOfThread {
+            if !message.isPartOfThread || message.showReplyInChannel {
                 let markUnreadAction = markAsUnreadAction(
                     for: message,
                     channel: channel,

diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelList.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelList.swift
@@ -194,7 +194,7 @@ extension ChatChannel: Identifiable {
     }
 
     public var id: String {
-        "\(cid.id)-\(lastMessageAt ?? createdAt)-\(lastActiveMembersCount)-\(mutedString)-\(typingUsersString)-\(readUsersId)"
+        "\(cid.id)-\(lastMessageAt ?? createdAt)-\(lastActiveMembersCount)-\(mutedString)-\(typingUsersString)-\(readUsersId)-\(unreadCount.messages)"
     }
 
     private var readUsersId: String {

diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/MessageActions_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannel/MessageActions_Tests.swift
@@ -68,7 +68,7 @@ class MessageActions_Tests: StreamChatTestCase {
         XCTAssert(messageActions[1].title == "Thread Reply")
         XCTAssert(messageActions[2].title == "Pin to conversation")
         XCTAssert(messageActions[3].title == "Copy Message")
-        XCTAssert(messageActions[4].title == "Mark Unread")  
+        XCTAssert(messageActions[4].title == "Mark Unread")
         XCTAssert(messageActions[5].title == "Flag Message")
         XCTAssert(messageActions[6].title == "Mute User")
     }

diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/MessageListView_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannel/MessageListView_Tests.swift
@@ -99,7 +99,7 @@ class MessageListView_Tests: StreamChatTestCase {
         let reactions = [MessageReactionType(rawValue: "like"): 2]
         let channel = ChatChannel.mockDMChannel(
             config: channelConfig,
-            currentlyTypingUsers: currentlyTypingUsers, 
+            currentlyTypingUsers: currentlyTypingUsers,
             unreadCount: unreadCount
         )
         let temp = [ChatMessage.mock(