From 28fe56ddf38b0c99191b3dc13879306cebb63b2f Mon Sep 17 00:00:00 2001
From: reece <consolelogreece@gmail.com>
Date: Fri, 18 Oct 2019 18:28:43 +0100
Subject: [PATCH] fixed issue where search bar was being rendered outside of
 channel content tab

---
 src/ui/page/channel/view.jsx | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/ui/page/channel/view.jsx b/src/ui/page/channel/view.jsx
index 3b3c8b7fb..a333f6dad 100644
--- a/src/ui/page/channel/view.jsx
+++ b/src/ui/page/channel/view.jsx
@@ -206,16 +206,21 @@ function ChannelPage(props: Props) {
             <Tab disabled={editing}>{__('Content')}</Tab>
             <Tab>{editing ? __('Editing Your Channel') : __('About')}</Tab>
             <Tab disabled={editing}>{__('Discussion')}</Tab>
-            <Form onSubmit={handleSearch} className="wunderbar--channel">
-              <Icon icon={ICONS.SEARCH} />
-              <FormField
-                className="wunderbar__input"
-                value={searchQuery}
-                onChange={handleInputChange}
-                type="text"
-                placeholder={__('Search')}
-              />
-            </Form>
+            {/* only render searchbar on content page (tab index 0 === content page) */}
+            {tabIndex === 0 ? (
+              <Form onSubmit={handleSearch} className="wunderbar--channel">
+                <Icon icon={ICONS.SEARCH} />
+                <FormField
+                  className="wunderbar__input"
+                  value={searchQuery}
+                  onChange={handleInputChange}
+                  type="text"
+                  placeholder={__('Search')}
+                />
+              </Form>
+            ) : (
+              <div />
+            )}
           </TabList>
 
           <TabPanels>