persisting create room parameter in volatile memory

ElementX/Sources/Screens/CreateRoom/CreateRoomCoordinator.swift

@@ -19,11 +19,12 @@ import SwiftUI
 
 struct CreateRoomCoordinatorParameters {
     let userSession: UserSessionProtocol
-    let selectedUsers: [UserProfile]
+    let createRoomParameters: CreateRoomVolatileParameters
 }
 
 enum CreateRoomCoordinatorAction {
     case createRoom
+    case deselectUser(UserProfile)
 }
 
 final class CreateRoomCoordinator: CoordinatorProtocol {
@@ -38,15 +39,15 @@ final class CreateRoomCoordinator: CoordinatorProtocol {
     
     init(parameters: CreateRoomCoordinatorParameters) {
         self.parameters = parameters
-        // TODO: Check if any stored data are present and restore them
-        viewModel = CreateRoomViewModel(userSession: parameters.userSession, selectedUsers: parameters.selectedUsers)
+        viewModel = CreateRoomViewModel(userSession: parameters.userSession, createRoomParameters: parameters.createRoomParameters)
     }
     
     func start() {
         viewModel.actions.sink { [weak self] action in
             guard let self else { return }
             switch action {
-            // TODO: Store data for previous screen
+            case .deselectUser(let user):
+                self.actionsSubject.send(.deselectUser(user))
             case .createRoom:
                 self.actionsSubject.send(.createRoom)
             }

ElementX/Sources/Screens/CreateRoom/CreateRoomModels.swift

@@ -18,11 +18,12 @@ import Foundation
 
 enum CreateRoomViewModelAction {
     case createRoom
+    case deselectUser(UserProfile)
 }
 
 struct CreateRoomViewState: BindableState {
     var selectedUsers: [UserProfile]
-    var bindings = CreateRoomViewStateBindings()
+    var bindings: CreateRoomViewStateBindings
     
     var canCreateRoom: Bool {
         !bindings.roomName.isEmpty
@@ -30,9 +31,9 @@ struct CreateRoomViewState: BindableState {
 }
 
 struct CreateRoomViewStateBindings {
-    var roomName = ""
-    var roomTopic = ""
-    var isRoomPrivate = true
+    var roomName: String
+    var roomTopic: String
+    var isRoomPrivate: Bool
 }
 
 enum CreateRoomViewAction {

ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift

@@ -21,13 +21,17 @@ typealias CreateRoomViewModelType = StateStoreViewModel<CreateRoomViewState, Cre
 
 class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol {
     private var actionsSubject: PassthroughSubject<CreateRoomViewModelAction, Never> = .init()
-    
+    private let createRoomParameters: CreateRoomVolatileParameters
     var actions: AnyPublisher<CreateRoomViewModelAction, Never> {
         actionsSubject.eraseToAnyPublisher()
     }
 
-    init(userSession: UserSessionProtocol, selectedUsers: [UserProfile]) {
-        super.init(initialViewState: CreateRoomViewState(selectedUsers: selectedUsers), imageProvider: userSession.mediaProvider)
+    init(userSession: UserSessionProtocol, createRoomParameters: CreateRoomVolatileParameters) {
+        let bindings = CreateRoomViewStateBindings(roomName: createRoomParameters.name, roomTopic: createRoomParameters.topic, isRoomPrivate: createRoomParameters.isRoomPrivate)
+        self.createRoomParameters = createRoomParameters
+        super.init(initialViewState: CreateRoomViewState(selectedUsers: createRoomParameters.selectedUsers, bindings: bindings), imageProvider: userSession.mediaProvider)
+        
+        setupBindings()
     }
     
     // MARK: - Public
@@ -38,10 +42,24 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
             actionsSubject.send(.createRoom)
         case .deselectUser(let user):
             state.selectedUsers.removeAll(where: { $0.userID == user.userID })
+            actionsSubject.send(.deselectUser(user))
         case .selectPrivateRoom:
             state.bindings.isRoomPrivate = true
         case .selectPublicRoom:
             state.bindings.isRoomPrivate = false
         }
     }
+    
+    // MARK: - Private
+
+    private func setupBindings() {
+        context.$viewState
+            .map(\.bindings)
+            .sink { [weak self] bindings in
+                self?.createRoomParameters.name = bindings.roomName
+                self?.createRoomParameters.topic = bindings.roomTopic
+                self?.createRoomParameters.isRoomPrivate = bindings.isRoomPrivate
+            }
+            .store(in: &cancellables)
+    }
 }

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenCoordinator.swift

@@ -21,6 +21,7 @@ struct InviteUsersScreenCoordinatorParameters {
     let navigationStackCoordinator: NavigationStackCoordinator?
     let userSession: UserSessionProtocol
     let userDiscoveryService: UserDiscoveryServiceProtocol
+    let createRoomParameters: CreateRoomVolatileParameters?
 }
 
 enum InviteUsersScreenCoordinatorAction {
@@ -62,8 +63,19 @@ final class InviteUsersScreenCoordinator: CoordinatorProtocol {
     }
     
     private func openCreateRoomScreenWith(_ users: [UserProfile]) {
-        let paramenters = CreateRoomCoordinatorParameters(userSession: parameters.userSession, selectedUsers: users)
-        let createRoomCoordinator = CreateRoomCoordinator(parameters: paramenters)
-        parameters.navigationStackCoordinator?.push(createRoomCoordinator)
+        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/StartChatScreen/StartChatScreenCoordinator.swift

@@ -35,6 +35,9 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
     private let actionsSubject: PassthroughSubject<StartChatScreenCoordinatorAction, Never> = .init()
     private var cancellables: Set<AnyCancellable> = .init()
     
+    // this is needed to persist some data in this flow and then destroy them when the flow is eneded
+    private var createRoomParameters = CreateRoomVolatileParameters()
+    
     var actions: AnyPublisher<StartChatScreenCoordinatorAction, Never> {
         actionsSubject.eraseToAnyPublisher()
     }
@@ -70,7 +73,11 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
     // MARK: - Private
     
     private func presentInviteUsersScreen() {
-        let inviteParameters = InviteUsersScreenCoordinatorParameters(navigationStackCoordinator: parameters.navigationStackCoordinator, userSession: parameters.userSession, userDiscoveryService: parameters.userDiscoveryService)
+        createRoomParameters = .init()
+        let inviteParameters = InviteUsersScreenCoordinatorParameters(navigationStackCoordinator: parameters.navigationStackCoordinator,
+                                                                      userSession: parameters.userSession,
+                                                                      userDiscoveryService: parameters.userDiscoveryService,
+                                                                      createRoomParameters: createRoomParameters)
         let coordinator = InviteUsersScreenCoordinator(parameters: inviteParameters)
         coordinator.actions.sink { [weak self] result in
             switch result {
@@ -82,3 +89,10 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
         parameters.navigationStackCoordinator?.push(coordinator)
     }
 }
+
+class CreateRoomVolatileParameters {
+    var name = ""
+    var topic = ""
+    var selectedUsers: [UserProfile] = []
+    var isRoomPrivate = true
+}

ElementX/Sources/UITests/UITestsAppCoordinator.swift

@@ -409,14 +409,16 @@ class MockScreen: Identifiable {
             userDiscoveryMock.fetchSuggestionsReturnValue = .success([.mockAlice, .mockBob, .mockCharlie])
             userDiscoveryMock.searchProfilesWithReturnValue = .success([])
             let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@mock:client.com"), mediaProvider: MockMediaProvider())
-            let coordinator = InviteUsersScreenCoordinator(parameters: .init(navigationStackCoordinator: navigationStackCoordinator, userSession: userSession, userDiscoveryService: userDiscoveryMock))
+            let coordinator = InviteUsersScreenCoordinator(parameters: .init(navigationStackCoordinator: navigationStackCoordinator, userSession: userSession, userDiscoveryService: userDiscoveryMock, createRoomParameters: nil))
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator
         case .createRoom:
             let navigationStackCoordinator = NavigationStackCoordinator()
             let clientProxy = MockClientProxy(userID: "@mock:client.com")
             let mockUserSession = MockUserSession(clientProxy: clientProxy, mediaProvider: MockMediaProvider())
-            let parameters = CreateRoomCoordinatorParameters(userSession: mockUserSession, selectedUsers: [.mockAlice, .mockBob, .mockCharlie])
+            let createRoomParameters = CreateRoomVolatileParameters()
+            createRoomParameters.selectedUsers = [.mockAlice, .mockBob, .mockCharlie]
+            let parameters = CreateRoomCoordinatorParameters(userSession: mockUserSession, createRoomParameters: createRoomParameters)
             let coordinator = CreateRoomCoordinator(parameters: parameters)
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator