Fixed message text appearing in multiple file attachments from the same message

Author: martinmitrevski

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Channel list item swipe gesture collision with native gesture
 - Attributes from `MessageActionInfo` are now public
 - Crash on older devices when adding multiple images quickly
+- Message text appearing in multiple file attachments from the same message
 
 # [4.24.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.24.0)
 _November 16, 2022_

Sources/StreamChatSwiftUI/ChatChannel/MessageList/FileAttachmentView.swift

@@ -40,29 +40,22 @@ public struct FileAttachmentsContainer<Factory: ViewFactory>: View {
                 )
             }
 
-            VStack(spacing: 4) {
-                ForEach(message.fileAttachments, id: \.self) { attachment in
-                    if message.text.isEmpty {
+            VStack(spacing: 0) {
+                VStack(spacing: 4) {
+                    ForEach(message.fileAttachments, id: \.self) { attachment in
                         FileAttachmentView(
                             attachment: attachment,
                             width: width,
                             isFirst: isFirst
                         )
-                    } else {
-                        VStack(spacing: 0) {
-                            FileAttachmentView(
-                                attachment: attachment,
-                                width: width,
-                                isFirst: isFirst
-                            )
-
-                            HStack {
-                                Text(message.adjustedText)
-                                    .foregroundColor(textColor(for: message))
-                                    .standardPadding()
-                                Spacer()
-                            }
-                        }
+                    }
+                }
+                if !message.text.isEmpty {
+                    HStack {
+                        Text(message.adjustedText)
+                            .foregroundColor(textColor(for: message))
+                            .standardPadding()
+                        Spacer()
                     }
                 }
             }

StreamChatSwiftUITests/Tests/ChatChannel/MessageView_Tests.swift

@@ -215,6 +215,30 @@ class MessageView_Tests: StreamChatTestCase {
         assertSnapshot(matching: view, as: .image)
     }
 
+    func test_messageViewFileText_snapshot() {
+        // Given
+        let fileMessage = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "Test message",
+            author: .mock(id: .unique),
+            attachments: ChatChannelTestHelpers.fileAttachments
+        )
+        
+        // When
+        let view = MessageView(
+            factory: DefaultViewFactory.shared,
+            message: fileMessage,
+            contentWidth: defaultScreenSize.width,
+            isFirst: true,
+            scrolledId: .constant(nil)
+        )
+        .applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image)
+    }
+    
     func test_messageViewJumboEmoji_snapshot() {
         // Given
         let emojiMessage = ChatMessage.mock(