Reduce FeatureFlags Knock effect on room creation and room edition form.

Closes #6701

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt

@@ -15,8 +15,6 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.api.knockRequestPermissions
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
 
@@ -25,14 +23,13 @@ import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
 object KnockRequestsModule {
     @Provides
     @SingleIn(RoomScope::class)
-    fun knockRequestsService(room: JoinedRoom, featureFlagService: FeatureFlagService): KnockRequestsService {
+    fun knockRequestsService(room: JoinedRoom): KnockRequestsService {
         return KnockRequestsService(
             knockRequestsFlow = room.knockRequestsFlow,
             permissionsFlow = room.permissionsFlow(KnockRequestPermissions.DEFAULT) { perms ->
                 perms.knockRequestPermissions()
             },
-            isKnockFeatureEnabledFlow = featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock),
-            coroutineScope = room.roomCoroutineScope
+            coroutineScope = room.roomCoroutineScope,
         )
     }
 }

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt

@@ -12,7 +12,6 @@ import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -28,26 +27,20 @@ import kotlinx.coroutines.supervisorScope
 class KnockRequestsService(
     knockRequestsFlow: Flow<List<KnockRequest>>,
     permissionsFlow: Flow<KnockRequestPermissions>,
-    isKnockFeatureEnabledFlow: Flow<Boolean>,
     coroutineScope: CoroutineScope,
 ) {
     // Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them.
     private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet())
 
     val knockRequestsFlow = combine(
-        isKnockFeatureEnabledFlow,
         knockRequestsFlow,
         handledKnockRequestIds,
-    ) { isKnockEnabled, knockRequests, handledKnockIds ->
-        if (!isKnockEnabled) {
-            AsyncData.Success(persistentListOf())
-        } else {
-            val presentableKnockRequests = knockRequests
-                .filter { it.eventId !in handledKnockIds }
-                .map { inner -> KnockRequestWrapper(inner) }
-                .toImmutableList()
-            AsyncData.Success(presentableKnockRequests)
-        }
+    ) { knockRequests, handledKnockIds ->
+        val presentableKnockRequests = knockRequests
+            .filter { it.eventId !in handledKnockIds }
+            .map { inner -> KnockRequestWrapper(inner) }
+            .toImmutableList()
+        AsyncData.Success(presentableKnockRequests)
     }.stateIn(coroutineScope, SharingStarted.Lazily, AsyncData.Loading())
 
     val permissionsFlow = permissionsFlow.stateIn(

features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt

@@ -28,18 +28,6 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class) class KnockRequestsBannerPresenterTest {
-    @Test
-    fun `present - when feature is disabled then the banner should be hidden`() = runTest {
-        val knockRequests = flowOf(listOf(FakeKnockRequest()))
-        val presenter = createKnockRequestsBannerPresenter(isFeatureEnabled = false, knockRequestsFlow = knockRequests)
-        presenter.test {
-            skipItems(1)
-            awaitItem().also { state ->
-                assertThat(state.isVisible).isFalse()
-            }
-        }
-    }
-
     @Test
     fun `present - when empty knock request list then the banner should be hidden`() = runTest {
         val knockRequests = flowOf(emptyList<KnockRequest>())
@@ -229,12 +217,10 @@ import org.junit.Test
 private fun TestScope.createKnockRequestsBannerPresenter(
     knockRequestsFlow: Flow<List<KnockRequest>> = flowOf(emptyList()),
     canAcceptKnockRequests: Boolean = true,
-    isFeatureEnabled: Boolean = true,
 ): KnockRequestsBannerPresenter {
     val knockRequestsService = KnockRequestsService(
         knockRequestsFlow = knockRequestsFlow,
         coroutineScope = backgroundScope,
-        isKnockFeatureEnabledFlow = flowOf(isFeatureEnabled),
         permissionsFlow = flowOf(KnockRequestPermissions(canAcceptKnockRequests, canAcceptKnockRequests, canAcceptKnockRequests)),
     )
     return KnockRequestsBannerPresenter(

features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenterTest.kt

@@ -298,7 +298,6 @@ internal fun TestScope.createKnockRequestsListPresenter(
     val knockRequestsService = KnockRequestsService(
         knockRequestsFlow = knockRequestsFlow,
         coroutineScope = backgroundScope,
-        isKnockFeatureEnabledFlow = flowOf(true),
         permissionsFlow = flowOf(KnockRequestPermissions(canAccept, canDecline, canBan)),
     )
     return KnockRequestsListPresenter(knockRequestsService = knockRequestsService)