Fix composer not being locked after the channel was frozen (#1015)

testableapple · web-flow · commit 222f93dcf442 · 2025-10-17T11:38:14.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### 🐞 Fixed
+- Fix composer not being locked after the channel was frozen [#1015](https://github.com/GetStream/stream-chat-swiftui/pull/1015)
+
 ### 🔄 Changed
 
 # [4.90.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.90.0)
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerTypeView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerTypeView.swift
@@ -50,7 +50,7 @@ public struct AttachmentPickerTypeView: View {
         HStack(spacing: 16) {
             switch pickerTypeState {
             case let .expanded(attachmentPickerType):
-                if composerViewModel.channelController.channel?.canUploadFile == true {
+                if composerViewModel.channelController.channel?.canUploadFile == true && composerViewModel.isSendMessageEnabled {
                     PickerTypeButton(
                         pickerTypeState: $pickerTypeState,
                         pickerType: .media,
@@ -60,7 +60,7 @@ public struct AttachmentPickerTypeView: View {
                     .accessibilityIdentifier("PickerTypeButtonMedia")
                 }
 
-                if commandsAvailable {
+                if commandsAvailable && composerViewModel.isSendMessageEnabled {
                     PickerTypeButton(
                         pickerTypeState: $pickerTypeState,
                         pickerType: .instantCommands,
@@ -70,16 +70,18 @@ public struct AttachmentPickerTypeView: View {
                     .accessibilityIdentifier("PickerTypeButtonCommands")
                 }
             case .collapsed:
-                Button {
-                    withAnimation {
-                        pickerTypeState = .expanded(.none)
+                if composerViewModel.isSendMessageEnabled {
+                    Button {
+                        withAnimation {
+                            pickerTypeState = .expanded(.none)
+                        }
+                    } label: {
+                        Image(uiImage: images.shrinkInputArrow)
+                            .renderingMode(.template)
+                            .foregroundColor(Color(colors.highlightedAccentBackground))
                     }
-                } label: {
-                    Image(uiImage: images.shrinkInputArrow)
-                        .renderingMode(.template)
-                        .foregroundColor(Color(colors.highlightedAccentBackground))
+                    .accessibilityIdentifier("PickerTypeButtonCollapsed")
                 }
-                .accessibilityIdentifier("PickerTypeButtonCollapsed")
             }
         }
         .accessibilityElement(children: .contain)
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift
@@ -375,8 +375,8 @@ public struct ComposerInputView<Factory: ViewFactory>: View, KeyboardReadable {
                     text: $text,
                     height: $textHeight,
                     selectedRangeLocation: $selectedRangeLocation,
-                    placeholder: isInCooldown ? L10n.Composer.Placeholder.slowMode : L10n.Composer.Placeholder.message,
-                    editable: !isInCooldown,
+                    placeholder: isInCooldown ? L10n.Composer.Placeholder.slowMode : (isChannelFrozen ? L10n.Composer.Placeholder.messageDisabled : L10n.Composer.Placeholder.message),
+                    editable: !isInputDisabled,
                     maxMessageLength: maxMessageLength,
                     currentHeight: textFieldHeight
                 )
@@ -435,4 +435,12 @@ public struct ComposerInputView<Factory: ViewFactory>: View, KeyboardReadable {
     private var isInCooldown: Bool {
         cooldownDuration > 0
     }
+
+    private var isChannelFrozen: Bool {
+        !viewModel.isSendMessageEnabled
+    }
+
+    private var isInputDisabled: Bool {
+        isInCooldown || isChannelFrozen
+    }
 }
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift
@@ -444,6 +444,11 @@ open class MessageComposerViewModel: ObservableObject {
         }
     }
     
+    /// A Boolean value indicating whether sending message is enabled.
+    public var isSendMessageEnabled: Bool {
+        channelController.channel?.canSendMessage ?? true
+    }
+
     public var sendButtonEnabled: Bool {
         if let composerCommand = composerCommand,
            let handler = commandsHandler.commandHandler(for: composerCommand) {
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/TrailingComposerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/TrailingComposerView.swift
@@ -17,7 +17,7 @@ public struct TrailingComposerView: View {
     
     public var body: some View {
         Group {
-            if viewModel.cooldownDuration == 0 {
+            if viewModel.cooldownDuration == 0 && viewModel.isSendMessageEnabled {
                 HStack(spacing: 16) {
                     SendMessageButton(
                         enabled: viewModel.sendButtonEnabled,
@@ -28,7 +28,7 @@ public struct TrailingComposerView: View {
                     }
                 }
                 .padding(.bottom, 8)
-            } else {
+            } else if viewModel.cooldownDuration > 0 {
                 SlowModeView(
                     cooldownDuration: viewModel.cooldownDuration
                 )
diff --git a/Sources/StreamChatSwiftUI/Generated/L10n.swift b/Sources/StreamChatSwiftUI/Generated/L10n.swift
@@ -257,6 +257,8 @@ internal enum L10n {
       internal static var giphy: String { L10n.tr("Localizable", "composer.placeholder.giphy") }
       /// Send a message
       internal static var message: String { L10n.tr("Localizable", "composer.placeholder.message") }
+      /// You can't send messages in this channel
+      internal static var messageDisabled: String { L10n.tr("Localizable", "composer.placeholder.messageDisabled") }
       /// Slow mode ON
       internal static var slowMode: String { L10n.tr("Localizable", "composer.placeholder.slow-mode") }
     }
diff --git a/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings b/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 "composer.title.edit" = "Edit Message";
 "composer.title.reply" = "Reply to Message";
 "composer.placeholder.message" = "Send a message";
+"composer.placeholder.messageDisabled" = "You can't send messages in this channel";
 "composer.placeholder.slow-mode" = "Slow mode ON";
 "composer.placeholder.giphy" = "Search GIFs";
 "composer.checkmark.direct-message-reply" = "Also send as direct message";
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelTestHelpers.swift b/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelTestHelpers.swift
@@ -17,7 +17,7 @@ class ChatChannelTestHelpers {
         let config = ChannelConfig(commands: [Command(name: "giphy", description: "", set: "", args: "")])
         let channel = chatChannel ?? ChatChannel.mockDMChannel(
             config: config,
-            ownCapabilities: [.uploadFile],
+            ownCapabilities: [.sendMessage, .uploadFile],
             lastActiveWatchers: lastActiveWatchers
         )
         let channelQuery = ChannelQuery(cid: channel.cid)
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerView_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerView_Tests.swift
@@ -204,7 +204,7 @@ class MessageComposerView_Tests: StreamChatTestCase {
         // Given
         let factory = DefaultViewFactory.shared
         let mockChannelController = ChatChannelTestHelpers.makeChannelController(chatClient: chatClient)
-        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.uploadFile])
+        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.sendMessage, .uploadFile])
         let viewModel = MessageComposerViewModel(channelController: mockChannelController, messageController: nil)
 
         // When
@@ -234,6 +234,97 @@ class MessageComposerView_Tests: StreamChatTestCase {
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
 
+    // MARK: - Frozen Channel Tests
+
+    func test_messageComposerView_frozenChannel() {
+        // Given
+        let factory = DefaultViewFactory.shared
+        let mockChannelController = ChatChannelTestHelpers.makeChannelController(chatClient: chatClient)
+        // Create a channel without sendMessage capability (simulating frozen channel)
+        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.uploadFile, .readEvents])
+        let viewModel = MessageComposerViewModel(channelController: mockChannelController, messageController: nil)
+
+        // When
+        let view = MessageComposerView(
+            viewFactory: factory,
+            viewModel: viewModel,
+            channelController: mockChannelController,
+            messageController: nil,
+            quotedMessage: .constant(nil),
+            editedMessage: .constant(nil),
+            onMessageSent: {}
+        )
+        .frame(width: defaultScreenSize.width, height: 100)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
+    func test_composerInputView_frozenChannel() {
+        // Given
+        let factory = DefaultViewFactory.shared
+        let mockChannelController = ChatChannelTestHelpers.makeChannelController(chatClient: chatClient)
+        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.uploadFile, .readEvents])
+        let viewModel = MessageComposerViewModel(channelController: mockChannelController, messageController: nil)
+
+        // When
+        let view = ComposerInputView(
+            factory: factory,
+            text: .constant(""),
+            selectedRangeLocation: .constant(0),
+            command: .constant(nil),
+            addedAssets: [],
+            addedFileURLs: [],
+            addedCustomAttachments: [],
+            quotedMessage: .constant(nil),
+            cooldownDuration: 0,
+            onCustomAttachmentTap: { _ in },
+            removeAttachmentWithId: { _ in }
+        )
+        .environmentObject(viewModel)
+        .frame(width: defaultScreenSize.width, height: 100)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
+    func test_leadingComposerView_frozenChannel() {
+        // Given
+        let factory = DefaultViewFactory.shared
+        let mockChannelController = ChatChannelTestHelpers.makeChannelController(chatClient: chatClient)
+        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.uploadFile, .readEvents])
+        let viewModel = MessageComposerViewModel(channelController: mockChannelController, messageController: nil)
+
+        // When
+        let pickerTypeState: Binding<PickerTypeState> = .constant(.expanded(.none))
+        let view = factory.makeLeadingComposerView(state: pickerTypeState, channelConfig: nil)
+            .environmentObject(viewModel)
+            .frame(width: 36, height: 36)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
+    func test_trailingComposerView_frozenChannel() {
+        // Given
+        let factory = DefaultViewFactory.shared
+        let mockChannelController = ChatChannelTestHelpers.makeChannelController(chatClient: chatClient)
+        mockChannelController.channel_mock = .mockDMChannel(ownCapabilities: [.uploadFile, .readEvents])
+        let viewModel = MessageComposerViewModel(channelController: mockChannelController, messageController: nil)
+
+        // When
+        let view = factory.makeTrailingComposerView(
+            enabled: true,
+            cooldownDuration: 0,
+            onTap: {}
+        )
+        .environmentObject(viewModel)
+        .frame(width: 100, height: 40)
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+
     func test_composerInputView_inputTextView() {
         // Given
         let view = InputTextView(
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_composerInputView_frozenChannel.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_composerInputView_frozenChannel.1.png
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_leadingComposerView_frozenChannel.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_leadingComposerView_frozenChannel.1.png
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_messageComposerView_frozenChannel.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_messageComposerView_frozenChannel.1.png
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_trailingComposerView_frozenChannel.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageComposerView_Tests/test_trailingComposerView_frozenChannel.1.png

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,11 @@ open class MessageComposerViewModel: ObservableObject {`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
	`447`	`+ /// A Boolean value indicating whether sending message is enabled.`
	`448`	`+ public var isSendMessageEnabled: Bool {`
	`449`	`+ channelController.channel?.canSendMessage ?? true`
	`450`	`+ }`
	`451`	`+`
`447`	`452`	`public var sendButtonEnabled: Bool {`
`448`	`453`	`if let composerCommand = composerCommand,`
`449`	`454`	`let handler = commandsHandler.commandHandler(for: composerCommand) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public struct TrailingComposerView: View {`
`17`	`17`
`18`	`18`	`public var body: some View {`
`19`	`19`	`Group {`
`20`		`- if viewModel.cooldownDuration == 0 {`
	`20`	`+ if viewModel.cooldownDuration == 0 && viewModel.isSendMessageEnabled {`
`21`	`21`	`HStack(spacing: 16) {`
`22`	`22`	`SendMessageButton(`
`23`	`23`	`enabled: viewModel.sendButtonEnabled,`
`@@ -28,7 +28,7 @@ public struct TrailingComposerView: View {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`.padding(.bottom, 8)`
`31`		`- } else {`
	`31`	`+ } else if viewModel.cooldownDuration > 0 {`
`32`	`32`	`SlowModeView(`
`33`	`33`	`cooldownDuration: viewModel.cooldownDuration`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,8 @@ internal enum L10n {`
`257`	`257`	`internal static var giphy: String { L10n.tr("Localizable", "composer.placeholder.giphy") }`
`258`	`258`	`/// Send a message`
`259`	`259`	`internal static var message: String { L10n.tr("Localizable", "composer.placeholder.message") }`
	`260`	`+ /// You can't send messages in this channel`
	`261`	`+ internal static var messageDisabled: String { L10n.tr("Localizable", "composer.placeholder.messageDisabled") }`
`260`	`262`	`/// Slow mode ON`
`261`	`263`	`internal static var slowMode: String { L10n.tr("Localizable", "composer.placeholder.slow-mode") }`
`262`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class ChatChannelTestHelpers {`
`17`	`17`	`let config = ChannelConfig(commands: [Command(name: "giphy", description: "", set: "", args: "")])`
`18`	`18`	`let channel = chatChannel ?? ChatChannel.mockDMChannel(`
`19`	`19`	`config: config,`
`20`		`- ownCapabilities: [.uploadFile],`
	`20`	`+ ownCapabilities: [.sendMessage, .uploadFile],`
`21`	`21`	`lastActiveWatchers: lastActiveWatchers`
`22`	`22`	`)`
`23`	`23`	`let channelQuery = ChannelQuery(cid: channel.cid)`