From 9a8c4d4ae56fd5237602fd3293c0b48b990e70a7 Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:25:16 +0100
Subject: [PATCH] Revert "Search bar new room invite screen now always shows
 the nav bar on top" (#2189)

---
 .../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, 2 insertions(+), 4 deletions(-)
 delete 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 570f24448..bb7011a56 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, showsCancelButton: false)
+            .searchableConfiguration(hidesNavigationBar: 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 b162fd040..0561f6091 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, showsCancelButton: false)
+        .searchableConfiguration(hidesNavigationBar: false)
         .compoundSearchField()
         .disableAutocorrection(true)
     }
diff --git a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
index 8294f8fe3..cb0d5abdd 100644
--- a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
+++ b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
@@ -37,7 +37,6 @@ 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
deleted file mode 100644
index 2b035455c..000000000
--- a/changelog.d/pr-2182.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix for the search bar not appearing always in the invite to new room screen.
\ No newline at end of file