remove space FFs

ElementX/Sources/Application/Navigation/NavigationTabCoordinator.swift

@@ -25,7 +25,6 @@ import SwiftUI
         let icon: KeyPath<CompoundIcons, Image>
         let selectedIcon: KeyPath<CompoundIcons, Image>
         var badgeCount = 0
-        var barVisibilityOverride: Visibility?
         
         /// Provide the tab's split coordinator in here to have the tab bar automatically hidden
         /// when pushing a child into the split view's details on iPhone/compact iPad.
@@ -39,9 +38,7 @@ import SwiftUI
         }
         
         func barVisibility(in horizontalSizeClass: UserInterfaceSizeClass?) -> Visibility {
-            if let barVisibilityOverride {
+            if horizontalSizeClass == .compact, navigationSplitCoordinator?.detailCoordinator != nil {
-                barVisibilityOverride
-            } else if horizontalSizeClass == .compact, navigationSplitCoordinator?.detailCoordinator != nil {
                 // Whilst we support pushing screens on the stack in the sidebarCoordinator, in practice
                 // we never do that, so simply checking that the detailCoordinator exists is enough.
                 .hidden

ElementX/Sources/Application/Settings/AppSettings.swift

@@ -77,11 +77,6 @@ final class AppSettings {
         case focusEventOnNotificationTap
         case linkNewDeviceEnabled
         
-        // Spaces
-        case spaceFiltersEnabled
-        case spaceSettingsEnabled
-        case createSpaceEnabled
-        
         case voiceMessagePlaybackSpeed
 
         // Doug's tweaks 🔧
@@ -404,16 +399,6 @@ final class AppSettings {
     
     // MARK: - Feature Flags
     
-    /// Spaces
-    @UserPreference(key: UserDefaultsKeys.spaceSettingsEnabled, defaultValue: true, storageType: .volatile)
-    var spaceSettingsEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.createSpaceEnabled, defaultValue: true, storageType: .volatile)
-    var createSpaceEnabled
-    
-    @UserPreference(key: UserDefaultsKeys.spaceFiltersEnabled, defaultValue: true, storageType: .volatile)
-    var spaceFiltersEnabled
-    
     /// Others
     @UserPreference(key: UserDefaultsKeys.publicSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
     var publicSearchEnabled

ElementX/Sources/FlowCoordinators/StartChatFlowCoordinator.swift

@@ -150,7 +150,7 @@ class StartChatFlowCoordinator: FlowCoordinatorProtocol {
         stateMachine.addRoutes(event: .createRoom(isSpace: false), transitions: [.startChat => .createRoom]) { [weak self] context in
             guard let self, context.fromState == .startChat else { return } // Required check because the event is used in another route.
             presentCreateRoomScreen(isSpace: false,
-                                    spaceSelectionMode: flowParameters.appSettings.createSpaceEnabled ? .editableSpacesList(preSelectedSpace: nil) : .none,
+                                    spaceSelectionMode: .editableSpacesList(preSelectedSpace: nil),
                                     isRoot: false)
         }
         stateMachine.addRoutes(event: .dismissedCreateRoom, transitions: [.createRoom => .startChat]) { [weak self] _ in

ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift

@@ -288,14 +288,6 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
                 }
             }
             .store(in: &cancellables)
-        
-        userSession.clientProxy.spaceService.topLevelSpacesPublisher
-            .combineLatest(flowParameters.appSettings.$createSpaceEnabled)
-            .map { topLevelSpaces, isCreateSpaceEnabled in
-                !isCreateSpaceEnabled && topLevelSpaces.isEmpty ? .hidden : nil
-            }
-            .weakAssign(to: \.chatsTabDetails.barVisibilityOverride, on: self)
-            .store(in: &cancellables)
     }
     
     // MARK: - Onboarding

ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift

@@ -109,9 +109,7 @@ struct HomeScreenViewState: BindableState {
     var hideInviteAvatars = false
     
     var reportRoomEnabled = false
-    
+        
-    var spaceFiltersEnabled = false
-    
     var shouldShowSpaceFilters = false
     var selectedSpaceFilter: SpaceServiceFilter?
     

ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift

@@ -46,7 +46,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
         roomSummaryProvider = userSession.clientProxy.roomSummaryProvider
         
         super.init(initialViewState: .init(userID: userSession.clientProxy.userID,
-                                           spaceFiltersEnabled: appSettings.spaceFiltersEnabled,
                                            bindings: .init(filtersState: .init(appSettings: appSettings))),
                    mediaProvider: userSession.mediaProvider)
         
@@ -132,11 +131,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             }
             .store(in: &cancellables)
         
-        appSettings.$spaceFiltersEnabled
-            .receive(on: DispatchQueue.main)
-            .weakAssign(to: \.state.spaceFiltersEnabled, on: self)
-            .store(in: &cancellables)
-        
         userSession.clientProxy.hideInviteAvatarsPublisher
             .removeDuplicates()
             .receive(on: DispatchQueue.main)

ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift

@@ -66,7 +66,7 @@ struct HomeScreen: View {
             }
         }
         
-        if context.viewState.spaceFiltersEnabled, context.viewState.shouldShowSpaceFilters {
+        if context.viewState.shouldShowSpaceFilters {
             if #available(iOS 26, *) {
                 ToolbarSpacer(.fixed, placement: .primaryAction)
             }

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenModels.swift

@@ -23,7 +23,6 @@ struct SecurityAndPrivacyScreenViewState: BindableState {
     
     var canonicalAlias: String?
     var isKnockingEnabled: Bool
-    var isSpaceSettingsEnabled: Bool
     var isSpace: Bool
     
     var canEditAddress = false
@@ -65,7 +64,7 @@ struct SecurityAndPrivacyScreenViewState: BindableState {
     }
     
     var isSpaceMembersOptionSelectable: Bool {
-        isSpaceSettingsEnabled && selectableSpacesCount > 0
+        selectableSpacesCount > 0
     }
     
     var isAskToJoinWithSpaceMembersOptionAvailable: Bool {
@@ -160,12 +159,10 @@ struct SecurityAndPrivacyScreenViewState: BindableState {
          historyVisibility: SecurityAndPrivacyHistoryVisibility,
          isSpace: Bool,
          isKnockingEnabled: Bool,
-         isSpaceSettingsEnabled: Bool,
          historySharingDetailsURL: URL) {
         self.serverName = serverName
         self.isKnockingEnabled = isKnockingEnabled
         self.isSpace = isSpace
-        self.isSpaceSettingsEnabled = isSpaceSettingsEnabled
         
         let settings = SecurityAndPrivacySettings(accessType: accessType,
                                                   isEncryptionEnabled: isEncryptionEnabled,

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift

@@ -38,7 +38,6 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
                                                                        historyVisibility: roomProxy.infoPublisher.value.historyVisibility.toSecurityAndPrivacyHistoryVisibility,
                                                                        isSpace: roomProxy.infoPublisher.value.isSpace,
                                                                        isKnockingEnabled: appSettings.knockingEnabled,
-                                                                       isSpaceSettingsEnabled: appSettings.spaceSettingsEnabled,
                                                                        historySharingDetailsURL: appSettings.historySharingDetailsURL))
         
         if let powerLevels = roomProxy.infoPublisher.value.powerLevels {
@@ -153,10 +152,6 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
         appSettings.$knockingEnabled
             .weakAssign(to: \.state.isKnockingEnabled, on: self)
             .store(in: &cancellables)
-        
-        appSettings.$spaceSettingsEnabled
-            .weakAssign(to: \.state.isSpaceSettingsEnabled, on: self)
-            .store(in: &cancellables)
     }
     
     private func setupPermissions(powerLevels: RoomPowerLevelsProxyProtocol) {

ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift

@@ -263,7 +263,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
     static let singleSpaceMembersViewModel = {
         AppSettings.resetAllSettings()
         let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
+        
         let space = [SpaceServiceRoom].mockSingleRoom[0]
         
         return SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,
@@ -280,7 +280,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
     static let multipleSpacesMembersViewModel = {
         AppSettings.resetAllSettings()
         let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
+        
         let spaces = [SpaceServiceRoom].mockJoinedSpaces
         
         return SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,
@@ -312,8 +312,8 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
     static let singleAskToJoinSpaceMembersViewModel = {
         AppSettings.resetAllSettings()
         let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
         appSettings.knockingEnabled = true
+        
         let space = [SpaceServiceRoom].mockSingleRoom[0]
         
         return SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,
@@ -330,8 +330,8 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
     static let multipleAskToJoinSpacesMembersViewModel = {
         AppSettings.resetAllSettings()
         let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
         appSettings.knockingEnabled = true
+        
         let spaces = [SpaceServiceRoom].mockJoinedSpaces
         
         return SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,

ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenModels.swift

@@ -36,7 +36,6 @@ struct SpaceScreenViewState: BindableState {
     var canEditRolesAndPermissions = false
     var canEditSecurityAndPrivacy = false
     var canEditChildren = false
-    var canCreateRoom = false
     
     var editMode: EditMode = .inactive
     var editModeSelectedIDs: Set<String> = []

ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenViewModel.swift

@@ -75,10 +75,6 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
             .weakAssign(to: \.state.selectedSpaceRoomID, on: self)
             .store(in: &cancellables)
         
-        appSettings.$createSpaceEnabled
-            .weakAssign(to: \.state.canCreateRoom, on: self)
-            .store(in: &cancellables)
-        
         Task {
             if case let .joined(roomProxy) = await userSession.clientProxy.roomForIdentifier(spaceRoomListProxy.id) {
                 // Required to listen for membership updates in the members flow
@@ -88,11 +84,10 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
                     state.permalink = permalinkURL
                 }
                 
-                appSettings.$spaceSettingsEnabled
+                roomProxy.infoPublisher
-                    .combineLatest(roomProxy.infoPublisher)
+                    .sink { [weak self] roomInfo in
-                    .sink { [weak self] isEnabled, roomInfo in
                         guard let self else { return }
-                        guard isEnabled, let powerLevels = roomInfo.powerLevels else {
+                        guard let powerLevels = roomInfo.powerLevels else {
                             state.canEditBaseInfo = false
                             state.canEditRolesAndPermissions = false
                             state.canEditSecurityAndPrivacy = false
@@ -247,7 +242,7 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
         }
         
         let leaveSpaceViewModel = LeaveSpaceViewModel(spaceName: state.space.name,
-                                                      canEditRolesAndPermissions: appSettings.spaceSettingsEnabled && state.canEditRolesAndPermissions,
+                                                      canEditRolesAndPermissions: state.canEditRolesAndPermissions,
                                                       leaveHandle: leaveHandle,
                                                       userIndicatorController: userIndicatorController,
                                                       mediaProvider: mediaProvider)

ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift

@@ -78,12 +78,10 @@ struct SpaceScreen: View {
                 }
                 .buttonStyle(.compound(.primary))
                 
-                if context.viewState.canCreateRoom {
+                Button(L10n.actionCreateRoom) {
-                    Button(L10n.actionCreateRoom) {
+                    context.send(viewAction: .createChildRoom)
-                        context.send(viewAction: .createChildRoom)
-                    }
-                    .buttonStyle(.compound(.secondary))
                 }
+                .buttonStyle(.compound(.secondary))
             }
             .padding(.horizontal, 16)
         }
@@ -128,11 +126,9 @@ struct SpaceScreen: View {
                 Menu {
                     if context.viewState.canEditChildren {
                         Section {
-                            if context.viewState.canCreateRoom {
+                            Button { context.send(viewAction: .createChildRoom) } label: {
-                                Button { context.send(viewAction: .createChildRoom) } label: {
+                                Label(L10n.actionCreateRoom, icon: \.plus)
-                                    Label(L10n.actionCreateRoom, icon: \.plus)
+                                    .accessibilityIdentifier(A11yIdentifiers.spaceScreen.createRoom)
-                                }
-                                .accessibilityIdentifier(A11yIdentifiers.spaceScreen.createRoom)
                             }
                             
                             Button { context.send(viewAction: .addExistingRooms) } label: {
@@ -207,16 +203,10 @@ struct SpaceScreen_Previews: PreviewProvider, TestablePreview {
             SpaceScreen(context: newSpaceViewModel.context)
         }
         .previewDisplayName("New Space")
-        .snapshotPreferences(expect: newSpaceViewModel.context.observe(\.viewState).map {
+        .snapshotPreferences(expect: newSpaceViewModel.context.observe(\.viewState).map(\.canEditChildren))
-            $0.canCreateRoom && $0.canEditChildren
-        })
     }
     
     static func makeViewModel(isManagingRooms: Bool = false, isNewSpace: Bool = false) -> SpaceScreenViewModel {
-        let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
-        appSettings.createSpaceEnabled = true
-        
         let spaceServiceRoom = SpaceServiceRoom.mock(id: "!eng-space:matrix.org",
                                                      name: "Engineering Team",
                                                      isSpace: true,
@@ -239,7 +229,7 @@ struct SpaceScreen_Previews: PreviewProvider, TestablePreview {
                                              spaceServiceProxy: SpaceServiceProxyMock(.init()),
                                              selectedSpaceRoomPublisher: .init(nil),
                                              userSession: userSession,
-                                             appSettings: appSettings,
+                                             appSettings: AppSettings(),
                                              userIndicatorController: UserIndicatorControllerMock())
         
         if isManagingRooms {

ElementX/Sources/Screens/Spaces/SpacesScreen/SpacesScreenModels.swift

@@ -21,9 +21,7 @@ struct SpacesScreenViewState: BindableState {
     
     var topLevelSpaces: [SpaceServiceRoom]
     var selectedSpaceID: String?
-    
+        
-    var isCreateSpaceEnabled: Bool
-    
     var bindings: SpacesScreenViewStateBindings
 }
 

ElementX/Sources/Screens/Spaces/SpacesScreen/SpacesScreenViewModel.swift

@@ -31,7 +31,6 @@ class SpacesScreenViewModel: SpacesScreenViewModelType, SpacesScreenViewModelPro
         
         super.init(initialViewState: SpacesScreenViewState(userID: userSession.clientProxy.userID,
                                                            topLevelSpaces: spaceServiceProxy.topLevelSpacesPublisher.value,
-                                                           isCreateSpaceEnabled: appSettings.createSpaceEnabled,
                                                            bindings: .init()),
                    mediaProvider: userSession.mediaProvider)
         
@@ -53,10 +52,6 @@ class SpacesScreenViewModel: SpacesScreenViewModelType, SpacesScreenViewModelPro
             .receive(on: DispatchQueue.main)
             .weakAssign(to: \.state.userDisplayName, on: self)
             .store(in: &cancellables)
-        
-        appSettings.$createSpaceEnabled
-            .weakAssign(to: \.state.isCreateSpaceEnabled, on: self)
-            .store(in: &cancellables)
     }
     
     // MARK: - Public

ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift

@@ -27,7 +27,7 @@ struct SpacesScreen: View {
     
     @ViewBuilder
     private var mainContent: some View {
-        if context.viewState.isCreateSpaceEnabled, context.viewState.topLevelSpaces.isEmpty {
+        if context.viewState.topLevelSpaces.isEmpty {
             emptyState
         } else {
             ScrollView {
@@ -118,16 +118,14 @@ struct SpacesScreen: View {
         }
         .backportSharedBackgroundVisibility(.hidden)
         
-        if context.viewState.isCreateSpaceEnabled {
+        ToolbarItem(placement: .navigationBarTrailing) {
-            ToolbarItem(placement: .navigationBarTrailing) {
+            Button {
-                Button {
+                context.send(viewAction: .createSpace)
-                    context.send(viewAction: .createSpace)
+            } label: {
-                } label: {
+                CompoundIcon(\.plus)
-                    CompoundIcon(\.plus)
+                    .accessibilityHidden(true)
-                        .accessibilityHidden(true)
-                }
-                .accessibilityLabel(L10n.actionCreateSpace)
             }
+            .accessibilityLabel(L10n.actionCreateSpace)
         }
     }
 }
@@ -152,7 +150,6 @@ struct SpacesScreen_Previews: PreviewProvider, TestablePreview {
     static func makeViewModel(isEmpty: Bool = false) -> SpacesScreenViewModel {
         AppSettings.resetAllSettings()
         let appSettings = AppSettings()
-        appSettings.createSpaceEnabled = true
         appSettings.hasSeenSpacesAnnouncement = true
         
         let clientProxy = ClientProxyMock(.init())

ElementX/Sources/UITests/UITestsAppCoordinator.swift

@@ -588,7 +588,6 @@ class MockScreen: Identifiable {
             appSettings.hasRunNotificationPermissionsOnboarding = true
             appSettings.analyticsConsentState = .optedOut
             appSettings.hasSeenSpacesAnnouncement = true
-            appSettings.spaceSettingsEnabled = true
             
             let roomSummaries: [RoomSummary] = if id == .userSessionSpacesFlow {
                 [[RoomSummary].mockSpaceInvites[0]] + .mockRooms

UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift

@@ -446,7 +446,6 @@ final class SecurityAndPrivacyScreenViewModelTests {
                                 topLevelSpaces: [SpaceServiceRoom] = [],
                                 joinRule: ElementX.JoinRule) {
         let appSettings = AppSettings()
-        appSettings.spaceSettingsEnabled = true
         appSettings.knockingEnabled = true
         roomProxy = JoinedRoomProxyMock(.init(isEncrypted: false,
                                               canonicalAlias: "#room:matrix.org",