prepending the first message in the reply thread

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -44,6 +44,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
                 isGroup: !viewModel.channel.isDirectMessageChannel,
                 unreadCount: viewModel.channel.unreadCount.messages,
                 listId: viewModel.listId,
+                isMessageThread: viewModel.isMessageThread,
                 onMessageAppear: viewModel.handleMessageAppear(index:),
                 onScrollToBottom: viewModel.scrollToLastMessage,
                 onLongPress: { displayInfo in

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -87,6 +87,10 @@ public class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     var channel: ChatChannel {
         channelController.channel!
     }
+    
+    var isMessageThread: Bool {
+        messageController != nil
+    }
 
     public init(
         channelController: ChatChannelController,
@@ -139,7 +143,13 @@ public class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         channelDataSource: ChannelDataSource,
         didUpdateMessages messages: LazyCachedMapCollection<ChatMessage>
     ) {
-        self.messages = messages
+        if let message = messageController?.message {
+            var array = Array(messages)
+            array.append(message)
+            self.messages = LazyCachedMapCollection(source: array, map: { $0 })
+        } else {
+            self.messages = messages
+        }
 
         let count = messages.count
         if count > lastRefreshThreshold {

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -18,6 +18,7 @@ struct MessageContainerView<Factory: ViewFactory>: View {
     let isInGroup: Bool
     var width: CGFloat?
     var showsAllInfo: Bool
+    var isInThread: Bool
     var onLongPress: (MessageDisplayInfo) -> Void
 
     @State private var frame: CGRect = .zero
@@ -79,7 +80,7 @@ struct MessageContainerView<Factory: ViewFactory>: View {
 
                     })
 
-                    if message.replyCount > 0 && !message.threadParticipants.isEmpty {
+                    if message.replyCount > 0 && !message.threadParticipants.isEmpty && !isInThread {
                         MessageRepliesView(
                             factory: factory,
                             channel: channel,

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -18,6 +18,7 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
     var isGroup: Bool
     var unreadCount: Int
     var listId: String
+    var isMessageThread: Bool
 
     var onMessageAppear: (Int) -> Void
     var onScrollToBottom: () -> Void
@@ -57,6 +58,7 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                                 isInGroup: isGroup,
                                 width: width,
                                 showsAllInfo: showsAllData(for: message),
+                                isInThread: isMessageThread,
                                 onLongPress: { messageDisplayInfo in
                                     if keyboardShown {
                                         resignFirstResponder()