From bd8a3f8226f4259411163cd82462bd3932a1cfc9 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Fri, 10 Mar 2023 10:43:45 +0100
Subject: [PATCH] Fix display of trailing icon in the search bar

---
 .../impl/root/CreateRoomRootView.kt           | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index f06623b3d8..43662511f1 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -154,18 +154,24 @@ fun CreateRoomSearchBar(
         leadingIcon = if (active) {
             { BackButton(onClick = { onActiveChanged(false) }) }
         } else null,
-        trailingIcon = {
-            if (active) {
-                IconButton(onClick = { onTextChanged("") }) {
-                    Icon(Icons.Default.Close, stringResource(StringR.string.a11y_clear))
+        trailingIcon = when {
+            active && text.isNotEmpty() -> {
+                {
+                    IconButton(onClick = { onTextChanged("") }) {
+                        Icon(Icons.Default.Close, stringResource(StringR.string.a11y_clear))
+                    }
+                }
+            }
+            !active -> {
+                {
+                    Icon(
+                        imageVector = Icons.Default.Search,
+                        contentDescription = stringResource(StringR.string.search),
+                        modifier = Modifier.alpha(0.4f), // FIXME align on Design system theme (removing alpha should be fine)
+                    )
                 }
-            } else {
-                Icon(
-                    imageVector = Icons.Default.Search,
-                    contentDescription = stringResource(StringR.string.search),
-                    modifier = Modifier.alpha(0.4f), // FIXME align on Design system theme (removing alpha should be fine)
-                )
             }
+            else -> null
         },
         shape = if (!active) SearchBarDefaults.dockedShape else SearchBarDefaults.fullScreenShape,
         colors = if (!active) SearchBarDefaults.colors() else SearchBarDefaults.colors(containerColor = Color.Transparent),