From 0f34d44785a9fc5a5c5a73e2e458a70dc0d2b2ef Mon Sep 17 00:00:00 2001
From: Martti Malmi <sirius@iki.fi>
Date: Thu, 3 Aug 2023 19:36:52 +0300
Subject: [PATCH] move search title to header

---
 src/js/components/Header.tsx |  4 ++++
 src/js/views/Feed.tsx        | 19 +++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/js/components/Header.tsx b/src/js/components/Header.tsx
index 161eea80..266d18f7 100644
--- a/src/js/components/Header.tsx
+++ b/src/js/components/Header.tsx
@@ -65,6 +65,10 @@ export default class Header extends Component {
       }
     }
 
+    if (activeRoute.indexOf('/search/') === 0) {
+      title = `${t('search')}: ${decodeURIComponent(activeRoute.replace('/search/', ''))}`
+    }
+
     this.setState({ title });
   }
 
diff --git a/src/js/views/Feed.tsx b/src/js/views/Feed.tsx
index c027b2ee..35502eee 100644
--- a/src/js/views/Feed.tsx
+++ b/src/js/views/Feed.tsx
@@ -1,4 +1,5 @@
 import FeedComponent from '../components/feed/Feed';
+import Show from '../components/helpers/Show';
 import OnboardingNotification from '../components/OnboardingNotification';
 import PublicMessageForm from '../components/PublicMessageForm';
 import { translate as t } from '../translations/Translation.mjs';
@@ -22,18 +23,12 @@ class Feed extends View {
     return (
       <div className="flex flex-row">
         <div className="flex flex-col w-full">
-          {this.props.keyword ? (
-            <h2 className="text-2xl mb-2">
-              {t('search')}: "{this.props.keyword}"
-            </h2>
-          ) : (
-            <>
-              <OnboardingNotification />
-              <div className="hidden md:block px-4">
-                <PublicMessageForm autofocus={false} placeholder={t('whats_on_your_mind')} />
-              </div>
-            </>
-          )}
+          <Show when={!this.props.keyword}>
+            <OnboardingNotification />
+            <div className="hidden md:block px-4">
+              <PublicMessageForm autofocus={false} placeholder={t('whats_on_your_mind')} />
+            </div>
+          </Show>
           <FeedComponent
             keyword={this.props.keyword}
             key={this.props.index || 'feed'}