From 586511eeba4bfff1276f8ecb843c5fcecd00e49d Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Fri, 18 Oct 2024 12:07:43 +0200
Subject: [PATCH 1/3] Don't display search icon in Travel AddressPage

---
 src/pages/AddressPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/AddressPage.tsx b/src/pages/AddressPage.tsx
index fc9ae171ccf5..88e52409751b 100644
--- a/src/pages/AddressPage.tsx
+++ b/src/pages/AddressPage.tsx
@@ -85,7 +85,6 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true, backTo
                 title={title}
                 shouldShowBackButton
                 onBackButtonPress={() => Navigation.goBack(backTo)}
-                shouldDisplaySearchRouter
             />
             {isLoadingApp ? (
                 <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />

From 4f2da3a96f257b5391b4cdbc473899ebfc363abb Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Fri, 18 Oct 2024 13:01:54 +0200
Subject: [PATCH 2/3] Fix incorrect placement and spacing of SearchButton

---
 src/components/HeaderWithBackButton/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index e1843ee506d5..681d3a3d669d 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -263,8 +263,8 @@ function HeaderWithBackButton({
                             </PressableWithoutFeedback>
                         </Tooltip>
                     )}
-                    {shouldDisplaySearchRouter && <SearchButton />}
                 </View>
+                {shouldDisplaySearchRouter && <SearchButton />}
             </View>
         </View>
     );

From 2815eca33cf351e6468594de0be449a12e27a1f6 Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Mon, 21 Oct 2024 10:43:59 +0200
Subject: [PATCH 3/3] Fix spacing around SearchButton in Headers

---
 src/components/HeaderWithBackButton/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 891a68cb38c4..b71f4db246a8 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -263,8 +263,8 @@ function HeaderWithBackButton({
                             </PressableWithoutFeedback>
                         </Tooltip>
                     )}
-                    {shouldDisplaySearchRouter && <SearchButton style={styles.ml2} />}
                 </View>
+                {shouldDisplaySearchRouter && <SearchButton style={styles.mr5} />}
             </View>
         </View>
     );