Fix ViewFactory.makeMessageAvatarView() not used in some views (#1068)

* Use `ViewFactory` avatar view in remaining common views

* Add default view factory to avoid breaking changes

* Add ChatThreadListItem too

* Update CHANGELOG.md

* Fix ThreadListItem Tests

* Fix MessageRepliesView Tests

* Fix E2E Tests

Author: nuno-vieira

CHANGELOG.md

@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### 🐞 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`
 
 # [4.94.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.94.0)
 _December 02, 2025_

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/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/Reactions/ReactionUserView.swift

@@ -6,13 +6,24 @@ import StreamChat
 import SwiftUI
 
 /// View displaying single user reaction.
-struct ReactionUserView: View {
+struct ReactionUserView<Factory: ViewFactory>: View {
     @Injected(\.chatClient) private var chatClient
     @Injected(\.fonts) private var fonts
 
+    var factory: Factory
     var reaction: ChatMessageReaction
     var imageSize: CGFloat
 
+    init(
+        factory: Factory = DefaultViewFactory.shared,
+        reaction: ChatMessageReaction,
+        imageSize: CGFloat
+    ) {
+        self.factory = factory
+        self.reaction = reaction
+        self.imageSize = imageSize
+    }
+
     private var isCurrentUser: Bool {
         chatClient.currentUserId == reaction.author.id
     }
@@ -27,18 +38,20 @@ struct ReactionUserView: View {
 
     var body: some View {
         VStack {
-            MessageAvatarView(
-                avatarURL: reaction.author.imageURL,
-                size: CGSize(width: imageSize, height: imageSize),
-                showOnlineIndicator: false
-            )
-            .overlay(
-                VStack {
-                    Spacer()
-                    SingleReactionView(reaction: reaction)
-                        .frame(height: imageSize / 2)
-                }
+            let displayInfo = UserDisplayInfo(
+                id: reaction.author.id,
+                name: reaction.author.name ?? reaction.author.id,
+                imageURL: reaction.author.imageURL,
+                size: CGSize(width: imageSize, height: imageSize)
             )
+            factory.makeMessageAvatarView(for: displayInfo)
+                .overlay(
+                    VStack {
+                        Spacer()
+                        SingleReactionView(reaction: reaction)
+                            .frame(height: imageSize / 2)
+                    }
+                )
 
             Text(authorName)
                 .multilineTextAlignment(.center)

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsUsersView.swift

@@ -6,30 +6,46 @@ import StreamChat
 import SwiftUI
 
 /// View displaying users who have reacted to a message.
-struct ReactionsUsersView: View {
+struct ReactionsUsersView<Factory: ViewFactory>: View {
     @StateObject private var viewModel: ReactionsUsersViewModel
 
     @Injected(\.fonts) private var fonts
     @Injected(\.colors) private var colors
 
+    var factory: Factory
     var maxHeight: CGFloat
 
-    private static let columnCount = 4
-    private static let itemSize: CGFloat = 64
+    let columnCount = 4
+    let itemSize: CGFloat = 64
 
-    private let columns = Array(
-        repeating: GridItem(.adaptive(minimum: itemSize), alignment: .top),
-        count: columnCount
-    )
-    
-    init(message: ChatMessage, maxHeight: CGFloat) {
+    private let columns: [GridItem]
+
+    init(
+        factory: Factory = DefaultViewFactory.shared,
+        message: ChatMessage,
+        maxHeight: CGFloat
+    ) {
+        self.factory = factory
         self.maxHeight = maxHeight
         _viewModel = StateObject(wrappedValue: ReactionsUsersViewModel(message: message))
+        self.columns = Array(
+            repeating: GridItem(.adaptive(minimum: itemSize), alignment: .top),
+            count: columnCount
+        )
     }
 
-    init(viewModel: ReactionsUsersViewModel, maxHeight: CGFloat) {
+    init(
+        factory: Factory = DefaultViewFactory.shared,
+        viewModel: ReactionsUsersViewModel,
+        maxHeight: CGFloat
+    ) {
+        self.factory = factory
         self.maxHeight = maxHeight
         _viewModel = StateObject(wrappedValue: viewModel)
+        self.columns = Array(
+            repeating: GridItem(.adaptive(minimum: itemSize), alignment: .top),
+            count: columnCount
+        )
     }
 
     var body: some View {
@@ -45,13 +61,14 @@ struct ReactionsUsersView: View {
                     .fontWeight(.bold)
                     .padding()
 
-                if viewModel.reactions.count > Self.columnCount {
+                if viewModel.reactions.count > columnCount {
                     ScrollView {
                         LazyVGrid(columns: columns, alignment: .center, spacing: 8) {
                             ForEach(viewModel.reactions) { reaction in
                                 ReactionUserView(
+                                    factory: factory,
                                     reaction: reaction,
-                                    imageSize: Self.itemSize
+                                    imageSize: itemSize
                                 )
                             }
                         }
@@ -61,8 +78,9 @@ struct ReactionsUsersView: View {
                     HStack(alignment: .top, spacing: 0) {
                         ForEach(viewModel.reactions) { reaction in
                             ReactionUserView(
+                                factory: factory,
                                 reaction: reaction,
-                                imageSize: Self.itemSize
+                                imageSize: itemSize
                             )
                         }
                     }