diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift index a67f88a69..631c5a41f 100644 --- a/ElementX/Sources/Application/AppCoordinator.swift +++ b/ElementX/Sources/Application/AppCoordinator.swift @@ -1421,7 +1421,7 @@ private extension AppCoordinator { } func scheduleSearchBackfill() { - guard let userSession, userSession.userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) else { + guard let userSession, userSession.userSettings.app.globalSearchEnabled else { return } diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift index e55ae1f45..587737a03 100644 --- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift @@ -99,7 +99,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol { spacesTabDetails = .init(tag: HomeTab.spaces, title: L10n.screenHomeTabSpaces, icon: \.space, selectedIcon: \.spaceSolid) spacesTabDetails.navigationSplitCoordinator = spacesSplitCoordinator - if flowParameters.userSession.userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) { + if flowParameters.userSession.userSettings.app.globalSearchEnabled { let searchCoordinator = SearchScreenCoordinator(parameters: .init(roomSummaryProvider: flowParameters.userSession.clientProxy.alternateRoomSummaryProvider, userSession: flowParameters.userSession, userIndicatorController: flowParameters.userIndicatorController)) @@ -171,7 +171,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol { navigationTabCoordinator.selectedTab = .chats } case .search: - // Switch to the dedicated search tab when it's available (iOS 26 + flag), otherwise ignore. + // Switch to the dedicated search tab when it's available (flag enabled), otherwise ignore. if searchTabNavigationStackCoordinator != nil { navigationTabCoordinator.selectedTab = .search } diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift index aa8002c7f..06d9c228c 100644 --- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift +++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift @@ -54,7 +54,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol bindings: .init(filtersState: .init(userSettings: userSession.userSettings))), mediaProvider: userSession.mediaProvider) - if userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) { + if userSettings.app.globalSearchEnabled { state.isRoomListSearchEnabled = false }