From 45f23d537df73236f115e06eb2b71ccb2397ab84 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 21 Feb 2024 17:58:55 +0100
Subject: [PATCH] RoomListFilters: some minor adjustments

---
 .../element/android/features/roomlist/impl/RoomListView.kt  | 6 +++++-
 .../roomlist/impl/filters/RoomListFiltersPresenter.kt       | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
index 9cd6c261aa..f7b7f032aa 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@@ -275,7 +275,11 @@ private fun RoomListContent(
                 }
             }
             if (state.displayEmptyState) {
-                EmptyRoomListView(onCreateRoomClicked)
+                if (state.filtersState.hasAnyFilterSelected) {
+                    // TODO add empty state for filtered rooms
+                } else {
+                    EmptyRoomListView(onCreateRoomClicked)
+                }
             }
             MigrationScreenView(isMigrating = state.displayMigrationStatus)
         },
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt
index 297f4ffdbf..56cc72e1a3 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt
@@ -68,6 +68,12 @@ class RoomListFiltersPresenter @Inject constructor(
             }
         }
 
+        LaunchedEffect(isFeatureEnabled) {
+            if (!isFeatureEnabled) {
+                updateFilters(emptySet())
+            }
+        }
+
         LaunchedEffect(selectedFilters) {
             val allRoomsFilter = MatrixRoomListFilter.All(
                 selectedFilters.map { roomListFilter ->