SP3.1: Update room settings for Spaces #5231

- Update after review

RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeModels.swift

@@ -33,10 +33,6 @@ enum RoomUpgradeViewModelResult {
 // MARK: View
 
 struct RoomUpgradeViewState: BindableState {
-    var bindings: RoomUpgradeViewModelBindings
-}
-
-struct RoomUpgradeViewModelBindings {
     var waitingMessage: String?
     var isLoading: Bool
 }

RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModel.swift

@@ -47,15 +47,15 @@ class RoomUpgradeViewModel: RoomUpgradeViewModelType, RoomUpgradeViewModelProtoc
     }
 
     private static func defaultState(roomUpgradeService: RoomUpgradeServiceProtocol) -> RoomUpgradeViewState {
-        let bindings = RoomUpgradeViewModelBindings(waitingMessage: nil, isLoading: false)
-        return RoomUpgradeViewState(bindings: bindings)
+        return RoomUpgradeViewState(waitingMessage: nil, isLoading: false)
     }
     
     private func setupObservers() {
         roomUpgradeService
             .upgradingSubject
             .sink { [weak self] isUpgrading in
-                self?.state.bindings = RoomUpgradeViewModelBindings(waitingMessage: isUpgrading ? VectorL10n.roomAccessSettingsScreenUpgradeAlertUpgrading: nil, isLoading: isUpgrading)
+                self?.state.isLoading = isUpgrading
+                self?.state.waitingMessage = isUpgrading ? VectorL10n.roomAccessSettingsScreenUpgradeAlertUpgrading: nil
             }
             .store(in: &cancellables)
     }

RiotSwiftUI/Modules/Room/RoomUpgrade/View/RoomUpgrade.swift

@@ -37,7 +37,7 @@ struct RoomUpgrade: View {
         ZStack {
             Color.black.opacity(0.6)
             alertContent
-                .waitOverlay(show: viewModel.isLoading, message: viewModel.waitingMessage, allowUserInteraction: false)
+                .waitOverlay(show: viewModel.viewState.isLoading, message: viewModel.viewState.waitingMessage, allowUserInteraction: false)
         }
         .edgesIgnoringSafeArea(.all)
     }