Remove FF CreateSpaces

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

@@ -84,7 +84,6 @@ class ConfigureRoomPresenter(
 
     @Composable
     override fun present(): ConfigureRoomState {
-        val canAddRoomToSpace by featureFlagService.isFeatureEnabledFlow(FeatureFlags.CreateSpaces).collectAsState(false)
         val cameraPermissionState = cameraPermissionPresenter.present()
         val createRoomConfig by dataStore.getCreateRoomConfigFlow().collectAsState()
         val homeserverName = remember { matrixClient.userIdServerName() }
@@ -113,12 +112,8 @@ class ConfigureRoomPresenter(
         }
 
         var spaces by remember { mutableStateOf<ImmutableList<SpaceRoom>>(persistentListOf()) }
-        LaunchedEffect(canAddRoomToSpace) {
+        LaunchedEffect(Unit) {
-            spaces = if (canAddRoomToSpace) {
+            spaces = matrixClient.spaceService.editableSpaces().getOrElse { emptyList() }.toImmutableList()
-                matrixClient.spaceService.editableSpaces().getOrElse { emptyList() }.toImmutableList()
-            } else {
-                persistentListOf()
-            }
             val parentSpace = spaces.find { it.roomId == initialParentSpaceId }
             parentSpace?.let {
                 dataStore.setParentSpace(parentSpace = parentSpace, updateVisibility = true)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt

@@ -94,12 +94,6 @@ class HomePresenter(
             }
         }
 
-        LaunchedEffect(homeSpacesState.canCreateSpaces, homeSpacesState.spaceRooms.isEmpty()) {
-            // If the flag to create spaces is disabled and the last space is left, ensure that the Chat view is rendered.
-            if (!homeSpacesState.canCreateSpaces && homeSpacesState.spaceRooms.isEmpty()) {
-                currentHomeNavigationBarItemOrdinal = HomeNavigationBarItem.Chats.ordinal
-            }
-        }
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
         return HomeState(
             currentUserAndNeighbors = currentUserAndNeighbors,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeState.kt

@@ -34,5 +34,4 @@ data class HomeState(
 ) {
     val isBackHandlerEnabled = currentHomeNavigationBarItem != HomeNavigationBarItem.Chats || roomListState.spaceFiltersState is SpaceFiltersState.Selected
     val displayRoomListFilters = currentHomeNavigationBarItem == HomeNavigationBarItem.Chats && roomListState.displayFilters
-    val showNavigationBar = homeSpacesState.canCreateSpaces || homeSpacesState.spaceRooms.isNotEmpty()
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt

@@ -199,50 +199,41 @@ private fun HomeScaffold(
             )
         },
         floatingActionButton = {
-            if (state.showNavigationBar) {
+            val coroutineScope = rememberCoroutineScope()
-                val coroutineScope = rememberCoroutineScope()
+            HomeBottomBar(
-                HomeBottomBar(
+                currentHomeNavigationBarItem = state.currentHomeNavigationBarItem,
-                    currentHomeNavigationBarItem = state.currentHomeNavigationBarItem,
+                onItemClick = { item ->
-                    onItemClick = { item ->
+                    // scroll to top if selecting the same item
-                        // scroll to top if selecting the same item
+                    if (item == state.currentHomeNavigationBarItem) {
-                        if (item == state.currentHomeNavigationBarItem) {
+                        val lazyListStateTarget = when (item) {
-                            val lazyListStateTarget = when (item) {
+                            HomeNavigationBarItem.Chats -> roomsLazyListState
-                                HomeNavigationBarItem.Chats -> roomsLazyListState
+                            HomeNavigationBarItem.Spaces -> spacesLazyListState
-                                HomeNavigationBarItem.Spaces -> spacesLazyListState
-                            }
-                            coroutineScope.launch {
-                                if (lazyListStateTarget.firstVisibleItemIndex > 10) {
-                                    lazyListStateTarget.scrollToItem(10)
-                                }
-                                // Also reset the scrollBehavior height offset as it's not triggered by programmatic scrolls
-                                scrollBehavior.state.heightOffset = 0f
-                                lazyListStateTarget.animateScrollToItem(0)
-                            }
-                        } else {
-                            state.eventSink(HomeEvent.SelectHomeNavigationBarItem(item))
                         }
-                    },
+                        coroutineScope.launch {
-                    floatingActionButton = when (state.currentHomeNavigationBarItem) {
+                            if (lazyListStateTarget.firstVisibleItemIndex > 10) {
+                                lazyListStateTarget.scrollToItem(10)
+                            }
+                            // Also reset the scrollBehavior height offset as it's not triggered by programmatic scrolls
+                            scrollBehavior.state.heightOffset = 0f
+                            lazyListStateTarget.animateScrollToItem(0)
+                        }
+                    } else {
+                        state.eventSink(HomeEvent.SelectHomeNavigationBarItem(item))
+                    }
+                },
+                floatingActionButton = {
+                    when (state.currentHomeNavigationBarItem) {
                         HomeNavigationBarItem.Chats -> {
-                            {
+                            HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
-                                HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
-                            }
                         }
-                        HomeNavigationBarItem.Spaces -> if (state.homeSpacesState.canCreateSpaces) {
+                        HomeNavigationBarItem.Spaces -> {
-                            {
+                            HomeFloatingActionButton(onCreateSpaceClick, CommonStrings.action_create_space)
-                                HomeFloatingActionButton(onCreateSpaceClick, CommonStrings.action_create_space)
-                            }
-                        } else {
-                            // No FAB for spaces if we cannot create spaces
-                            null
                         }
-                    },
+                    }
-                )
+                },
-            } else {
+            )
-                HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
-            }
         },
-        floatingActionButtonPosition = if (state.showNavigationBar) FabPosition.Center else FabPosition.End,
+        floatingActionButtonPosition = FabPosition.Center,
         content = { padding ->
             val contentPadding = PaddingValues(
                 bottom = 96.dp,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt

@@ -15,8 +15,6 @@ import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar
 import kotlinx.collections.immutable.persistentListOf
@@ -29,11 +27,9 @@ import kotlinx.coroutines.flow.map
 class HomeSpacesPresenter(
     private val client: MatrixClient,
     private val seenInvitesStore: SeenInvitesStore,
-    private val featureFlagsService: FeatureFlagService,
 ) : Presenter<HomeSpacesState> {
     @Composable
     override fun present(): HomeSpacesState {
-        val canCreateSpaces by featureFlagsService.isFeatureEnabledFlow(FeatureFlags.CreateSpaces).collectAsState(false)
         val hideInvitesAvatar by client.rememberHideInvitesAvatar()
         val spaceRooms by remember {
             client.spaceService.topLevelSpacesFlow.map { it.toImmutableList() }
@@ -52,7 +48,6 @@ class HomeSpacesPresenter(
             spaceRooms = spaceRooms,
             seenSpaceInvites = seenSpaceInvites,
             hideInvitesAvatar = hideInvitesAvatar,
-            canCreateSpaces = canCreateSpaces,
             // TODO enable once we can link to the screen to explore public spaces
             canExploreSpaces = false,
             eventSink = ::handleEvent,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt

@@ -18,7 +18,6 @@ data class HomeSpacesState(
     val spaceRooms: ImmutableList<SpaceRoom>,
     val seenSpaceInvites: ImmutableSet<RoomId>,
     val hideInvitesAvatar: Boolean,
-    val canCreateSpaces: Boolean,
     val canExploreSpaces: Boolean,
     val eventSink: (HomeSpacesEvents) -> Unit,
 )

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt

@@ -30,17 +30,9 @@ open class HomeSpacesStateProvider : PreviewParameterProvider<HomeSpacesState> {
                 ),
                 spaceRooms = aListOfSpaceRooms(),
             ),
-            aHomeSpacesState(
-                space = CurrentSpace.Space(
-                    spaceRoom = aSpaceRoom(roomId = RoomId("!mySpace:example.com"))
-                ),
-                spaceRooms = aListOfSpaceRooms(),
-                canCreateSpaces = false,
-            ),
             aHomeSpacesState(
                 space = CurrentSpace.Root,
                 spaceRooms = emptyList(),
-                canCreateSpaces = true,
             ),
         )
 }
@@ -50,7 +42,6 @@ internal fun aHomeSpacesState(
     spaceRooms: List<SpaceRoom> = aListOfSpaceRooms(),
     seenSpaceInvites: Set<RoomId> = emptySet(),
     hideInvitesAvatar: Boolean = false,
-    canCreateSpaces: Boolean = true,
     canExploreSpaces: Boolean = true,
     eventSink: (HomeSpacesEvents) -> Unit = {},
 ) = HomeSpacesState(
@@ -58,7 +49,6 @@ internal fun aHomeSpacesState(
     spaceRooms = spaceRooms.toImmutableList(),
     seenSpaceInvites = seenSpaceInvites.toImmutableSet(),
     hideInvitesAvatar = hideInvitesAvatar,
-    canCreateSpaces = canCreateSpaces,
     canExploreSpaces = canExploreSpaces,
     eventSink = eventSink,
 )

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt

@@ -55,7 +55,7 @@ fun HomeSpacesView(
     onExploreClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    if (state.canCreateSpaces && state.spaceRooms.isEmpty()) {
+    if (state.spaceRooms.isEmpty()) {
         EmptySpaceHomeView(
             modifier = modifier.padding(contentPadding),
             onCreateSpaceClick = onCreateSpaceClick,

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt

@@ -33,7 +33,6 @@ import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
-import io.element.android.tests.testutils.MutablePresenter
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -79,7 +78,6 @@ class HomePresenterTest {
                 MatrixUser(A_USER_ID, A_USER_NAME, AN_AVATAR_URL)
             )
             assertThat(withUserState.showAvatarIndicator).isFalse()
-            assertThat(withUserState.showNavigationBar).isTrue()
         }
     }
 
@@ -158,36 +156,6 @@ class HomePresenterTest {
                 .with(value(Announcement.Space))
         }
     }
-
-    @Test
-    fun `present - NavigationBar is hidden when the last space is left when the user can't create new spaces`() = runTest {
-        val homeSpacesPresenter = MutablePresenter(aHomeSpacesState())
-        val presenter = createHomePresenter(
-            sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
-            ),
-            homeSpacesPresenter = homeSpacesPresenter,
-            announcementService = FakeAnnouncementService(
-                showAnnouncementResult = {},
-            )
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Chats)
-            assertThat(initialState.showNavigationBar).isTrue()
-            // User navigate to Spaces
-            initialState.eventSink(HomeEvent.SelectHomeNavigationBarItem(HomeNavigationBarItem.Spaces))
-            val spaceState = awaitItem()
-            assertThat(spaceState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Spaces)
-            // The last space is left
-            homeSpacesPresenter.updateState(aHomeSpacesState(spaceRooms = emptyList(), canCreateSpaces = false))
-            skipItems(1)
-            val finalState = awaitItem()
-            // We are back to Chats
-            assertThat(finalState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Chats)
-            assertThat(finalState.showNavigationBar).isFalse()
-        }
-    }
 }
 
 internal fun createHomePresenter(

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenterTest.kt

@@ -11,9 +11,6 @@ package io.element.android.features.home.impl.spaces
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.tests.testutils.test
@@ -26,25 +23,18 @@ class HomeSpacesPresenterTest {
         val presenter = createPresenter()
         presenter.test {
             val state = awaitItem()
-            // canCreateSpaces is initially false
-            assertThat(state.canCreateSpaces).isFalse()
             assertThat(state.space).isEqualTo(CurrentSpace.Root)
             assertThat(state.spaceRooms).isEmpty()
             assertThat(state.hideInvitesAvatar).isFalse()
             assertThat(state.seenSpaceInvites).isEmpty()
-
-            // It'll eventually be true
-            assertThat(awaitItem().canCreateSpaces).isTrue()
         }
     }
 
     private fun createPresenter(
         client: MatrixClient = FakeMatrixClient(),
         seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
-        featureFlagsService: FeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.CreateSpaces.key to true)),
     ) = HomeSpacesPresenter(
         client = client,
         seenInvitesStore = seenInvitesStore,
-        featureFlagsService = featureFlagsService,
     )
 }

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -70,13 +70,6 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    CreateSpaces(
-        key = "feature.createSpaces",
-        title = "Create spaces",
-        description = "Allow creating spaces.",
-        defaultValue = { true },
-        isFinished = false,
-    ),
     RoomListSpaceFilters(
         key = "feature.roomListSpaceFilters",
         title = "Room list space filters",