Merge branch 'develop' into fix/ios-26-swipe-when-sheet

# Conflicts:
#	CHANGELOG.md

Author: laevandus

CHANGELOG.md

@@ -3,7 +3,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### ✅ Added
+- Open `ChatChannelInfoViewModel.leaveButtonTitle` and `ChatChannelInfoViewModel.leaveConversationDescription` [#1018](https://github.com/GetStream/stream-chat-swiftui/pull/1018)
 ### 🐞 Fixed
+- Use `muteChannel` capability for showing mute channel button in the `ChatChannelInfoView` [#1018](https://github.com/GetStream/stream-chat-swiftui/pull/1018)
+- Fix `PollOptionAllVotesViewModel` not loading more votes [#1067](https://github.com/GetStream/stream-chat-swiftui/pull/1067)
+- Fix `ViewFactory.makeMessageAvatarView()` not used in some views [#1068](https://github.com/GetStream/stream-chat-swiftui/pull/1068)
+  - `MessageRepliesView`
+  - `ReactionsUsersView`
+  - `MentionUsersView`
+  - `ParticipantInfoView`
+  - `ChatThreadListItem`
 - Fix scrolling in the message list when presented with a sheet on iOS 26 [#1065](https://github.com/GetStream/stream-chat-swiftui/pull/1065)
 
 # [4.94.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.94.0)

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoHelperViews.swift

@@ -76,13 +76,15 @@ public struct ChatInfoOptionsView<Factory: ViewFactory>: View {
 
             Divider()
 
-            ChannelInfoItemView(
-                icon: images.muted,
-                title: viewModel.mutedText,
-                verticalPadding: 12
-            ) {
-                Toggle(isOn: $viewModel.muted) {
-                    EmptyView()
+            if viewModel.shouldShowMuteChannelButton {
+                ChannelInfoItemView(
+                    icon: images.muted,
+                    title: viewModel.mutedText,
+                    verticalPadding: 12
+                ) {
+                    Toggle(isOn: $viewModel.muted) {
+                        EmptyView()
+                    }
                 }
             }
 

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift

@@ -132,6 +132,7 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
 
             if let selectedParticipant = viewModel.selectedParticipant {
                 ParticipantInfoView(
+                    factory: factory,
                     participant: selectedParticipant,
                     actions: viewModel.participantActions(for: selectedParticipant)
                 ) {

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoViewModel.swift

@@ -43,6 +43,10 @@ open class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDele
             channel.ownCapabilities.contains(.leaveChannel)
         }
     }
+    
+    open var shouldShowMuteChannelButton: Bool {
+        channel.ownCapabilities.contains(.muteChannel)
+    }
 
     open var canRenameChannel: Bool {
         channel.ownCapabilities.contains(.updateChannel)
@@ -87,15 +91,15 @@ open class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDele
         }
     }
 
-    public var leaveButtonTitle: String {
+    open var leaveButtonTitle: String {
         if channel.isDirectMessageChannel {
             L10n.Alert.Actions.deleteChannelTitle
         } else {
             L10n.Alert.Actions.leaveGroupTitle
         }
     }
 
-    public var leaveConversationDescription: String {
+    open var leaveConversationDescription: String {
         if channel.isDirectMessageChannel {
             L10n.Alert.Actions.deleteChannelMessage
         } else {

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ParticipantInfoView.swift

@@ -4,15 +4,28 @@
 
 import SwiftUI
 
-struct ParticipantInfoView: View {
+struct ParticipantInfoView<Factory: ViewFactory>: View {
     @Injected(\.fonts) var fonts
     @Injected(\.colors) var colors
 
+    var factory: Factory
     let participant: ParticipantInfo
     var actions: [ParticipantAction]
 
     var onDismiss: () -> Void
 
+    init(
+        factory: Factory = DefaultViewFactory.shared,
+        participant: ParticipantInfo,
+        actions: [ParticipantAction],
+        onDismiss: @escaping () -> Void
+    ) {
+        self.factory = factory
+        self.participant = participant
+        self.actions = actions
+        self.onDismiss = onDismiss
+    }
+    
     @State private var alertShown = false
     @State private var alertAction: ParticipantAction? {
         didSet {
@@ -31,13 +44,15 @@ struct ParticipantInfoView: View {
                     .font(fonts.footnote)
                     .foregroundColor(Color(colors.textLowEmphasis))
 
-                MessageAvatarView(
-                    avatarURL: participant.chatUser.imageURL,
-                    size: CGSize(width: 64, height: 64),
-                    showOnlineIndicator: participant.chatUser.isOnline
+                let displayInfo = UserDisplayInfo(
+                    id: participant.chatUser.id,
+                    name: participant.chatUser.name ?? participant.chatUser.id,
+                    imageURL: participant.chatUser.imageURL,
+                    size: CGSize(width: 64, height: 64)
                 )
-                .padding()
-                
+                factory.makeMessageAvatarView(for: displayInfo)
+                    .padding()
+
                 VStack {
                     ForEach(actions) { action in
                         Divider()

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/CommandsContainerView.swift

@@ -6,14 +6,26 @@ import StreamChat
 import SwiftUI
 
 /// Default implementation of the commands container.
-struct CommandsContainerView: View {
+struct CommandsContainerView<Factory: ViewFactory>: View {
+    var factory: Factory
     var suggestions: [String: Any]
     var handleCommand: ([String: Any]) -> Void
 
+    init(
+        factory: Factory = DefaultViewFactory.shared,
+        suggestions: [String: Any],
+        handleCommand: @escaping ([String: Any]) -> Void
+    ) {
+        self.factory = factory
+        self.suggestions = suggestions
+        self.handleCommand = handleCommand
+    }
+
     var body: some View {
         ZStack {
             if let suggestedUsers = suggestions["mentions"] as? [ChatUser] {
                 MentionUsersView(
+                    factory: factory,
                     users: suggestedUsers,
                     userSelected: { user in
                         handleCommand(["chatUser": user])

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/Mentions/MentionUsersView.swift

@@ -6,19 +6,31 @@ import StreamChat
 import SwiftUI
 
 /// View for the mentioned users.
-public struct MentionUsersView: View {
+public struct MentionUsersView<Factory: ViewFactory>: View {
     @Injected(\.colors) private var colors
 
+    var factory: Factory
     private let itemHeight: CGFloat = 60
 
     var users: [ChatUser]
     var userSelected: (ChatUser) -> Void
 
+    public init(
+        factory: Factory = DefaultViewFactory.shared,
+        users: [ChatUser],
+        userSelected: @escaping (ChatUser) -> Void
+    ) {
+        self.factory = factory
+        self.users = users
+        self.userSelected = userSelected
+    }
+
     public var body: some View {
         ScrollView {
             LazyVStack {
                 ForEach(users) { user in
                     MentionUserView(
+                        factory: factory,
                         user: user,
                         userSelected: userSelected
                     )
@@ -43,20 +55,33 @@ public struct MentionUsersView: View {
 }
 
 /// View for one user that can be mentioned.
-public struct MentionUserView: View {
+public struct MentionUserView<Factory: ViewFactory>: View {
     @Injected(\.fonts) private var fonts
     @Injected(\.colors) private var colors
     @Injected(\.utils) private var utils
 
+    var factory: Factory
     var user: ChatUser
     var userSelected: (ChatUser) -> Void
 
+    public init(
+        factory: Factory = DefaultViewFactory.shared,
+        user: ChatUser,
+        userSelected: @escaping (ChatUser) -> Void
+    ) {
+        self.factory = factory
+        self.user = user
+        self.userSelected = userSelected
+    }
+
     public var body: some View {
         HStack {
-            MessageAvatarView(
-                avatarURL: user.imageURL,
-                showOnlineIndicator: true
+            let displayInfo = UserDisplayInfo(
+                id: user.id,
+                name: user.name ?? user.id,
+                imageURL: user.imageURL
             )
+            factory.makeMessageAvatarView(for: displayInfo)
             Text(user.name ?? user.id)
                 .lineLimit(1)
                 .font(fonts.bodyBold)

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageRepliesView.swift

@@ -60,18 +60,12 @@ public struct MessageRepliesView<Factory: ViewFactory>: View {
         } label: {
             HStack {
                 if !isRightAligned {
-                    MessageAvatarView(
-                        avatarURL: message.threadParticipants.first?.imageURL,
-                        size: .init(width: 16, height: 16)
-                    )
+                    messageAvatarView
                 }
                 Text(title)
                     .font(fonts.footnoteBold)
                 if isRightAligned {
-                    MessageAvatarView(
-                        avatarURL: message.threadParticipants.first?.imageURL,
-                        size: .init(width: 16, height: 16)
-                    )
+                    messageAvatarView
                 }
             }
             .padding(.horizontal, 16)
@@ -122,6 +116,28 @@ public struct MessageRepliesView<Factory: ViewFactory>: View {
             return L10n.Message.Threads.replies
         }
     }
+
+    private var messageAvatarView: some View {
+        // This is just a fallback for backwards compatibility
+        // In practice thread participants will never be empty.
+        // So, the factory method will always run.
+        Group {
+            if let participant = message.threadParticipants.first {
+                let displayInfo = UserDisplayInfo(
+                    id: participant.id,
+                    name: participant.name ?? participant.id,
+                    imageURL: participant.imageURL,
+                    size: .init(width: 16, height: 16)
+                )
+                factory.makeMessageAvatarView(for: displayInfo)
+            } else {
+                MessageAvatarView(
+                    avatarURL: message.threadParticipants.first?.imageURL,
+                    size: .init(width: 16, height: 16)
+                )
+            }
+        }
+    }
 }
 
 /// Lazy view that uses the message controller to fetch the parent message before creating message replies view.

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollOptionAllVotesViewModel.swift

@@ -16,17 +16,18 @@ class PollOptionAllVotesViewModel: ObservableObject, PollVoteListControllerDeleg
 
     private var cancellables = Set<AnyCancellable>()
     private(set) var animateChanges = false
-    private var loadingVotes = false
-        
-    init(poll: Poll, option: PollOption) {
+    var loadingVotes = false
+
+    init(poll: Poll, option: PollOption, controller: PollVoteListController? = nil) {
         self.poll = poll
         self.option = option
         let query = PollVoteListQuery(
             pollId: poll.id,
-            optionId: option.id
+            optionId: option.id,
+            pagination: .init(pageSize: 25)
         )
-        controller = InjectedValues[\.chatClient].pollVoteListController(query: query)
-        controller.delegate = self
+        self.controller = controller ?? InjectedValues[\.chatClient].pollVoteListController(query: query)
+        self.controller.delegate = self
         refresh()
 
         // No animation for initial load
@@ -41,20 +42,21 @@ class PollOptionAllVotesViewModel: ObservableObject, PollVoteListControllerDeleg
         controller.synchronize { [weak self] error in
             guard let self else { return }
             self.pollVotes = Array(self.controller.votes)
-            if self.pollVotes.isEmpty {
-                self.loadVotes()
-            }
             if error != nil {
                 self.errorShown = true
             }
         }
     }
 
     func onAppear(vote: PollVote) {
-        guard !loadingVotes,
-              let index = pollVotes.firstIndex(where: { $0 == vote }),
-              index > pollVotes.count - 10 else { return }
-        
+        guard let index = pollVotes.firstIndex(where: { $0 == vote }) else {
+            return
+        }
+
+        guard index > pollVotes.count - 10 && pollVotes.count > 25 else {
+            return
+        }
+
         loadVotes()
     }
 
@@ -76,6 +78,10 @@ class PollOptionAllVotesViewModel: ObservableObject, PollVoteListControllerDeleg
     }
 
     private func loadVotes() {
+        if loadingVotes || controller.hasLoadedAllVotes {
+            return
+        }
+
         loadingVotes = true
 
         controller.loadMoreVotes { [weak self] error in