remove create room parameters by reference and use coordinator flow instead

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenCoordinator.swift

@@ -18,14 +18,15 @@ import Combine
 import SwiftUI
 
 struct InviteUsersScreenCoordinatorParameters {
-    let navigationStackCoordinator: NavigationStackCoordinator?
     let userSession: UserSessionProtocol
     let userDiscoveryService: UserDiscoveryServiceProtocol
-    let createRoomParameters: CreateRoomVolatileParameters?
+    let selectedUsers: CurrentValuePublisher<[UserProfile], Never>
 }
 
 enum InviteUsersScreenCoordinatorAction {
     case close
+    case proceed
+    case toggleUser(UserProfile)
 }
 
 final class InviteUsersScreenCoordinator: CoordinatorProtocol {
@@ -41,7 +42,7 @@ final class InviteUsersScreenCoordinator: CoordinatorProtocol {
     init(parameters: InviteUsersScreenCoordinatorParameters) {
         self.parameters = parameters
         
-        viewModel = InviteUsersScreenViewModel(userSession: parameters.userSession, userDiscoveryService: parameters.userDiscoveryService)
+        viewModel = InviteUsersScreenViewModel(selectedUsers: parameters.selectedUsers, userSession: parameters.userSession, userDiscoveryService: parameters.userDiscoveryService)
     }
     
     func start() {
@@ -49,33 +50,17 @@ final class InviteUsersScreenCoordinator: CoordinatorProtocol {
             guard let self else { return }
             switch action {
             case .close:
-                
                 self.actionsSubject.send(.close)
-            case .proceed(let users):
-                self.openCreateRoomScreenWith(users)
+            case .proceed:
+                self.actionsSubject.send(.proceed)
+            case .toggleUser(let user):
+                self.actionsSubject.send(.toggleUser(user))
             }
         }
         .store(in: &cancellables)
     }
-        
+    
     func toPresentable() -> AnyView {
         AnyView(InviteUsersScreen(context: viewModel.context))
     }
-    
-    private func openCreateRoomScreenWith(_ users: [UserProfile]) {
-        guard let createRoomParameters = parameters.createRoomParameters else { return }
-        createRoomParameters.selectedUsers = users
-        let paramenters = CreateRoomCoordinatorParameters(userSession: parameters.userSession, createRoomParameters: createRoomParameters)
-        let coordinator = CreateRoomCoordinator(parameters: paramenters)
-        coordinator.actions.sink { [weak self] result in
-            switch result {
-            case .deselectUser(let user):
-                self?.viewModel.context.send(viewAction: .deselectUser(user))
-            default:
-                break
-            }
-        }
-        .store(in: &cancellables)
-        parameters.navigationStackCoordinator?.push(coordinator)
-    }
 }

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenModels.swift

@@ -22,13 +22,15 @@ enum InviteUsersScreenErrorType: Error {
 
 enum InviteUsersScreenViewModelAction {
     case close
-    case proceed(users: [UserProfile])
+    case proceed
+    case toggleUser(UserProfile)
 }
 
 struct InviteUsersScreenViewState: BindableState {
     var bindings = InviteUsersScreenViewStateBindings()
     
     var usersSection: UserDiscoverySection = .init(type: .suggestions, users: [])
+    
     var selectedUsers: [UserProfile] = []
     
     var isSearching: Bool {
@@ -56,6 +58,5 @@ struct InviteUsersScreenViewStateBindings {
 enum InviteUsersScreenViewAction {
     case close
     case proceed
-    case tapUser(UserProfile)
-    case deselectUser(UserProfile)
+    case toggleUser(UserProfile)
 }

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenViewModel.swift

@@ -28,10 +28,16 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
         actionsSubject.eraseToAnyPublisher()
     }
     
-    init(userSession: UserSessionProtocol, userDiscoveryService: UserDiscoveryServiceProtocol) {
+    init(selectedUsers: CurrentValuePublisher<[UserProfile], Never>, userSession: UserSessionProtocol, userDiscoveryService: UserDiscoveryServiceProtocol) {
         self.userSession = userSession
         self.userDiscoveryService = userDiscoveryService
-        super.init(initialViewState: InviteUsersScreenViewState(), imageProvider: userSession.mediaProvider)
+        super.init(initialViewState: InviteUsersScreenViewState(selectedUsers: selectedUsers.value), imageProvider: userSession.mediaProvider)
+        
+        selectedUsers
+            .sink { [weak self] users in
+                self?.state.selectedUsers = users
+            }
+            .store(in: &cancellables)
         
         setupSubscriptions()
     }
@@ -43,27 +49,11 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
         case .close:
             actionsSubject.send(.close)
         case .proceed:
-            actionsSubject.send(.proceed(users: state.selectedUsers))
-        case .tapUser(let user):
-            if state.isUserSelected(user) {
-                deselect(user)
-            } else {
-                select(user)
-            }
-        case .deselectUser(let user):
-            deselect(user)
+            actionsSubject.send(.proceed)
+        case .toggleUser(let user):
+            actionsSubject.send(.toggleUser(user))
         }
     }
-    
-    private func select(_ user: UserProfile) {
-        state.selectedUsers.append(user)
-        state.scrollToLastID = user.userID
-    }
-    
-    private func deselect(_ user: UserProfile) {
-        state.selectedUsers.removeAll(where: { $0.userID == user.userID })
-        state.scrollToLastID = nil
-    }
 
     // MARK: - Private
     

ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift

@@ -67,7 +67,7 @@ struct InviteUsersScreen: View {
     private var usersSection: some View {
         Section {
             ForEach(context.viewState.usersSection.users, id: \.userID) { user in
-                Button { context.send(viewAction: .tapUser(user)) } label: {
+                Button { context.send(viewAction: .toggleUser(user)) } label: {
                     UserProfileCell(user: user,
                                     imageProvider: context.imageProvider)
                 }
@@ -112,7 +112,7 @@ struct InviteUsersScreen: View {
     }
     
     private func deselect(_ user: UserProfile) {
-        context.send(viewAction: .deselectUser(user))
+        context.send(viewAction: .toggleUser(user))
     }
 }
 
@@ -125,7 +125,7 @@ struct InviteUsersScreen_Previews: PreviewProvider {
         let userDiscoveryService = UserDiscoveryServiceMock()
         userDiscoveryService.fetchSuggestionsReturnValue = .success([.mockAlice])
         userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
-        return InviteUsersScreenViewModel(userSession: userSession, userDiscoveryService: userDiscoveryService)
+        return InviteUsersScreenViewModel(selectedUsers: .init([]), userSession: userSession, userDiscoveryService: userDiscoveryService)
     }()
     
     static var previews: some View {