From 74724b245e582b8a945f14f5245b8e0afccee30c Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:54:47 +0100
Subject: [PATCH] Search bar new room invite screen now always shows the nav
 bar on top (#2182)

---
 .../Screens/InviteUsersScreen/View/InviteUsersScreen.swift      | 2 +-
 .../MessageForwardingScreen/View/MessageForwardingScreen.swift  | 2 +-
 .../Sources/Screens/StartChatScreen/View/StartChatScreen.swift  | 1 +
 changelog.d/pr-2182.bugfix                                      | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/pr-2182.bugfix

diff --git a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift
index bb7011a56..570f24448 100644
--- a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift
+++ b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift
@@ -30,7 +30,7 @@ struct InviteUsersScreen: View {
             .disableInteractiveDismissOnSearch()
             .dismissSearchOnDisappear()
             .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: L10n.commonSearchForSomeone)
-            .searchableConfiguration(hidesNavigationBar: false)
+            .searchableConfiguration(hidesNavigationBar: false, showsCancelButton: false)
             .compoundSearchField()
             .alert(item: $context.alertInfo)
             .readFrame($frame)
diff --git a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift
index 0561f6091..b162fd040 100644
--- a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift
+++ b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift
@@ -55,7 +55,7 @@ struct MessageForwardingScreen: View {
             }
         }
         .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always))
-        .searchableConfiguration(hidesNavigationBar: false)
+        .searchableConfiguration(hidesNavigationBar: false, showsCancelButton: false)
         .compoundSearchField()
         .disableAutocorrection(true)
     }
diff --git a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
index cb0d5abdd..8294f8fe3 100644
--- a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
+++ b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
@@ -37,6 +37,7 @@ struct StartChatScreen: View {
         .disableInteractiveDismissOnSearch()
         .dismissSearchOnDisappear()
         .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: L10n.commonSearchForSomeone)
+        .searchableConfiguration(hidesNavigationBar: false, showsCancelButton: false)
         .compoundSearchField()
         .alert(item: $context.alertInfo)
     }
diff --git a/changelog.d/pr-2182.bugfix b/changelog.d/pr-2182.bugfix
new file mode 100644
index 000000000..2b035455c
--- /dev/null
+++ b/changelog.d/pr-2182.bugfix
@@ -0,0 +1 @@
+Fix for the search bar not appearing always in the invite to new room screen.
\ No newline at end of file