vector-im/element-meta/issues/2206 - Fix room avatars not showing up on the message forwarding screen

ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift

@@ -749,6 +749,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
         let messageForwardingNavigationStackCoordinator = NavigationStackCoordinator()
         
         let parameters = MessageForwardingScreenCoordinatorParameters(roomSummaryProvider: roomSummaryProvider,
+                                                                      mediaProvider: userSession.mediaProvider,
                                                                       sourceRoomID: roomProxy.id)
         let coordinator = MessageForwardingScreenCoordinator(parameters: parameters)
         

ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenCoordinator.swift

@@ -19,6 +19,7 @@ import SwiftUI
 
 struct MessageForwardingScreenCoordinatorParameters {
     let roomSummaryProvider: RoomSummaryProviderProtocol
+    let mediaProvider: MediaProviderProtocol
     let sourceRoomID: String
 }
 
@@ -41,6 +42,7 @@ final class MessageForwardingScreenCoordinator: CoordinatorProtocol {
         self.parameters = parameters
         
         viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: parameters.roomSummaryProvider,
+                                                     mediaProvider: parameters.mediaProvider,
                                                      sourceRoomID: parameters.sourceRoomID)
     }
     

ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift

@@ -30,11 +30,12 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me
     }
 
     init(roomSummaryProvider: RoomSummaryProviderProtocol,
+         mediaProvider: MediaProviderProtocol,
          sourceRoomID: String) {
         self.roomSummaryProvider = roomSummaryProvider
         self.sourceRoomID = sourceRoomID
         
-        super.init(initialViewState: MessageForwardingScreenViewState())
+        super.init(initialViewState: MessageForwardingScreenViewState(), imageProvider: mediaProvider)
         
         roomSummaryProvider.roomListPublisher
             .receive(on: DispatchQueue.main)

ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift

@@ -108,7 +108,9 @@ private struct MessageForwardingRoomCell: View {
 struct MessageForwardingScreen_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         let summaryProvider = MockRoomSummaryProvider(state: .loaded(.mockRooms))
-        let viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: summaryProvider, sourceRoomID: "")
+        let viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: summaryProvider,
+                                                         mediaProvider: MockMediaProvider(),
+                                                         sourceRoomID: "")
         
         NavigationStack {
             MessageForwardingScreen(context: viewModel.context)

UnitTests/Sources/MessageForwardingScreenViewModelTests.swift

@@ -27,7 +27,9 @@ class MessageForwardingScreenViewModelTests: XCTestCase {
     
     override func setUpWithError() throws {
         cancellables.removeAll()
-        viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: MockRoomSummaryProvider(state: .loaded(.mockRooms)), sourceRoomID: "1")
+        viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: MockRoomSummaryProvider(state: .loaded(.mockRooms)),
+                                                     mediaProvider: MockMediaProvider(),
+                                                     sourceRoomID: "1")
         context = viewModel.context
     }
     

UnitTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0df3d63b8e54f9d6bef4515a687e319e06324ead88e17ef0e9522a426f6fd7fe
-size 158624
+oid sha256:afbc0d42973b4360949b551b5e7d34543a262eef3ea29c3bc1219c06d2249f5a
+size 170537

changelog.d/pr-2168.bugfix

@@ -0,0 +1 @@
+Fix room avatars not showing up on the message forwarding screen