From 5e5548aee7e238dff02be7a1b05c0ab6e68b13b2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 Oct 2025 11:06:08 +0200
Subject: [PATCH 1/2] Enable Spaces by default.

---
 .../element/android/libraries/featureflag/api/FeatureFlags.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 96c452a790..a7c4113b62 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -71,8 +71,7 @@ enum class FeatureFlags(
     Space(
         key = "feature.space",
         title = "Spaces",
-        description = "Spaces are under active development, only developers should enable this flag for now.",
-        defaultValue = { false },
+        defaultValue = { true },
         isFinished = false,
     ),
     PrintLogsToLogcat(

From 0606631f004747dfc290560adbfa4d7b90b6e94a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 Oct 2025 12:52:59 +0200
Subject: [PATCH 2/2] Fix tests.

---
 .../android/features/home/impl/HomePresenterTest.kt   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
index 8048564e2b..938e0720d7 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
@@ -34,6 +34,7 @@ import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 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
@@ -52,6 +53,8 @@ class HomePresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
+    private val isSpaceEnabled = FeatureFlags.Space.defaultValue(aBuildMeta())
+
     @Test
     fun `present - should start with no user and then load user with success`() = runTest {
         val matrixClient = FakeMatrixClient(
@@ -75,6 +78,7 @@ class HomePresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
+            if (isSpaceEnabled) skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.currentUserAndNeighbors.first()).isEqualTo(
                 MatrixUser(A_USER_ID, null, null)
@@ -86,8 +90,8 @@ class HomePresenterTest {
                 MatrixUser(A_USER_ID, A_USER_NAME, AN_AVATAR_URL)
             )
             assertThat(withUserState.showAvatarIndicator).isFalse()
-            assertThat(withUserState.isSpaceFeatureEnabled).isFalse()
-            assertThat(withUserState.showNavigationBar).isFalse()
+            assertThat(withUserState.isSpaceFeatureEnabled).isEqualTo(isSpaceEnabled)
+            assertThat(withUserState.showNavigationBar).isEqualTo(isSpaceEnabled)
         }
     }
 
@@ -138,6 +142,7 @@ class HomePresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
+            if (isSpaceEnabled) skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.showAvatarIndicator).isFalse()
             indicatorService.setShowRoomListTopBarIndicator(true)
@@ -162,6 +167,7 @@ class HomePresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
+            if (isSpaceEnabled) skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.currentUserAndNeighbors.first()).isEqualTo(MatrixUser(matrixClient.sessionId))
             // No new state is coming
@@ -182,6 +188,7 @@ class HomePresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
+            if (isSpaceEnabled) skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Chats)
             initialState.eventSink(HomeEvents.SelectHomeNavigationBarItem(HomeNavigationBarItem.Spaces))