Merge pull request #799 from GetStream/fix/double-error-indicator-when-attachment-fails

Fix double error indicator when attachment fails + Fix message message sending state indicator

Author: nuno-vieira

CHANGELOG.md

@@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Allow pasting images to the composer [#797](https://github.com/GetStream/stream-chat-swiftui/pull/797)
 ### 🐞 Fixed
 - Fix allowing to send Polls when the current user does not have the capability [#798](https://github.com/GetStream/stream-chat-swiftui/pull/798)
+- Fix showing a double error indicator when sending attachments without any text [#799](https://github.com/GetStream/stream-chat-swiftui/pull/799)
+- Fix showing read indicator when message failed to be sent [#799](https://github.com/GetStream/stream-chat-swiftui/pull/799)
+- Fix not showing sending indicator when message is in sending state [#799](https://github.com/GetStream/stream-chat-swiftui/pull/799)
 
 # [4.76.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.76.0)
 _March 31, 2025_

DemoAppSwiftUI/PinChannelHelpers.swift

@@ -57,7 +57,8 @@ struct DemoAppChatChannelListItem: View {
                                         currentUserId: chatClient.currentUserId,
                                         message: channel.latestMessages.first
                                     ),
-                                    showReadCount: false
+                                    showReadCount: false,
+                                    localState: channel.latestMessages.first?.localState
                                 )
                             }
                             SubtitleText(text: injectedChannelInfo?.timestamp ?? channel.timestampText)

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -106,7 +106,8 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
                                 )
                                 : nil
 
-                            (message.localState == .sendingFailed || message.isBounced) ? SendFailureIndicator() : nil
+                            ((message.localState == .sendingFailed || message.isBounced) && !message.text.isEmpty) ?
+                                SendFailureIndicator() : nil
                         }
                     )
                     .background(

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListHelperViews.swift

@@ -124,6 +124,7 @@ public struct MessageReadIndicatorView: View {
             .customizable()
             .foregroundColor(!readUsers.isEmpty ? colors.tintColor : Color(colors.textLowEmphasis))
             .frame(height: 16)
+            .opacity(localState == .sendingFailed ? 0.0 : 1)
             .accessibilityLabel(
                 Text(
                     readUsers.isEmpty ? L10n.Message.ReadStatus.seenByNoOne : L10n.Message.ReadStatus.seenByOthers
@@ -136,7 +137,12 @@ public struct MessageReadIndicatorView: View {
     }
 
     private var image: UIImage {
-        !readUsers.isEmpty ? images.readByAll : (localState == .pendingSend ? images.messageReceiptSending : images.messageSent)
+        !readUsers.isEmpty ? images.readByAll : (isMessageSending ? images.messageReceiptSending : images.messageSent)
+    }
+
+    private var isMessageSending: Bool {
+        localState == .sending
+            || localState == .pendingSend
     }
 }
 

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelTestHelpers.swift

@@ -70,6 +70,27 @@ class ChatChannelTestHelpers {
         return imageAttachments
     }()
 
+    static func imageAttachment(state: LocalAttachmentState) -> AnyChatMessageAttachment {
+        let attachmentFile = AttachmentFile(type: .png, size: 0, mimeType: "image/png")
+        let uploadingState = AttachmentUploadingState(
+            localFileURL: testURL,
+            state: state,
+            file: attachmentFile
+        )
+        return ChatMessageImageAttachment(
+            id: .unique,
+            type: .image,
+            payload: ImageAttachmentPayload(
+                title: "test",
+                imageRemoteURL: testURL,
+                extraData: [:]
+            ),
+            downloadingState: nil,
+            uploadingState: uploadingState
+        )
+        .asAnyAttachment
+    }
+
     static var giphyAttachments: [AnyChatMessageAttachment] = {
         let attachmentFile = AttachmentFile(type: .gif, size: 0, mimeType: "image/gif")
         let uploadingState = AttachmentUploadingState(

StreamChatSwiftUITests/Tests/ChatChannel/MessageContainerView_Tests.swift

@@ -261,7 +261,43 @@ class MessageContainerView_Tests: StreamChatTestCase {
         // Then
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
-    
+
+    func test_imageAttachments_failed_snapshot() {
+        // Given
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "Test message",
+            author: .mock(id: .unique),
+            attachments: [ChatChannelTestHelpers.imageAttachment(state: .uploadingFailed)],
+            localState: .sendingFailed
+        )
+
+        // When
+        let view = testMessageViewContainer(message: message)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
+    func test_imageAttachments_failedWhenMessageTextIsEmpty_snapshot() {
+        // Given
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "",
+            author: .mock(id: .unique),
+            attachments: [ChatChannelTestHelpers.imageAttachment(state: .uploadingFailed)],
+            localState: .sendingFailed
+        )
+
+        // When
+        let view = testMessageViewContainer(message: message)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
     func test_translatedText_participant_snapshot() {
         // Given
         let message = ChatMessage.mock(

StreamChatSwiftUITests/Tests/ChatChannel/MessageReadIndicatorView_Tests.swift

@@ -58,4 +58,30 @@ class MessageReadIndicatorView_Tests: StreamChatTestCase {
         // Then
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
+
+    func test_messageReadIndicatorView_snapshotSending() {
+        // Given
+        let view = MessageReadIndicatorView(
+            readUsers: [],
+            showReadCount: false,
+            localState: .sending
+        )
+        .frame(width: 50, height: 16)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
+    func test_messageReadIndicatorView_snapshotMessageFailed() {
+        // Given
+        let view = MessageReadIndicatorView(
+            readUsers: [],
+            showReadCount: false,
+            localState: .sendingFailed
+        )
+        .frame(width: 50, height: 16)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
 }