From e3e2456ecd54f1e66a0b87731b78cca50eb7ebe5 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 8 Jun 2018 14:15:56 -0400
Subject: [PATCH] Fix android share extension channel switching and searching

---
 .../search_bar/search_bar.android.js          | 15 ++++-----
 .../extension_channels/extension_channels.js  | 33 ++++++++++---------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/components/search_bar/search_bar.android.js b/app/components/search_bar/search_bar.android.js
index 17dac6e79..f0ecda7c2 100644
--- a/app/components/search_bar/search_bar.android.js
+++ b/app/components/search_bar/search_bar.android.js
@@ -70,11 +70,6 @@ export default class SearchBarAndroid extends PureComponent {
             isFocused: false,
         };
     }
-    componentWillReceiveProps(nextProps) {
-        if (this.state.value !== nextProps.value) {
-            this.setState({value: nextProps.value});
-        }
-    }
 
     cancel = () => {
         this.onCancelButtonPress();
@@ -153,10 +148,12 @@ export default class SearchBarAndroid extends PureComponent {
         } = this.props;
         const {isFocused} = this.state;
 
-        const inputNoBackground = {
-            ...inputStyle,
-        };
-        Reflect.deleteProperty(inputNoBackground, 'backgroundColor');
+        const {
+            backgroundColor: bgColor, //eslint-disable-line no-unused-vars
+            ...otherStyles
+        } = inputStyle;
+
+        const inputNoBackground = otherStyles;
 
         let inputColor = styles.searchBarInput.backgroundColor;
         if (inputStyle) {
diff --git a/share_extension/android/extension_channels/extension_channels.js b/share_extension/android/extension_channels/extension_channels.js
index 83014092c..940880a70 100644
--- a/share_extension/android/extension_channels/extension_channels.js
+++ b/share_extension/android/extension_channels/extension_channels.js
@@ -129,21 +129,23 @@ export default class ExtensionTeam extends PureComponent {
         }
 
         return (
-            <SectionList
-                sections={sections}
-                ListHeaderComponent={this.renderSearchBar(styles)}
-                ItemSeparatorComponent={this.renderItemSeparator}
-                renderItem={this.renderItem}
-                renderSectionHeader={this.renderSectionHeader}
-                keyExtractor={this.keyExtractor}
-                keyboardShouldPersistTaps='always'
-                keyboardDismissMode='on-drag'
-                initialNumToRender={10}
-                maxToRenderPerBatch={10}
-                stickySectionHeadersEnabled={true}
-                scrollEventThrottle={100}
-                windowSize={5}
-            />
+            <View>
+                {this.renderSearchBar(styles)}
+                <SectionList
+                    sections={sections}
+                    ItemSeparatorComponent={this.renderItemSeparator}
+                    renderItem={this.renderItem}
+                    renderSectionHeader={this.renderSectionHeader}
+                    keyExtractor={this.keyExtractor}
+                    keyboardShouldPersistTaps='always'
+                    keyboardDismissMode='on-drag'
+                    initialNumToRender={10}
+                    maxToRenderPerBatch={10}
+                    stickySectionHeadersEnabled={true}
+                    scrollEventThrottle={100}
+                    windowSize={5}
+                />
+            </View>
         );
     };
 
@@ -188,7 +190,6 @@ export default class ExtensionTeam extends PureComponent {
                     titleCancelColor={defaultTheme.centerChannelColor}
                     onChangeText={this.handleSearch}
                     autoCapitalize='none'
-                    value={this.state.term}
                 />
             </View>
         );