From 2e5f7fd60c0ab08f0768bd80429c8103edff9e4b Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 9 Oct 2018 11:54:31 -0300
Subject: [PATCH] Fix KeyboardAvoidView for android (#2226)

---
 app/components/emoji_picker/emoji_picker.js |  6 +++++-
 app/screens/mfa/mfa.js                      | 10 +++++++++-
 app/screens/select_server/select_server.js  |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/components/emoji_picker/emoji_picker.js b/app/components/emoji_picker/emoji_picker.js
index 079bb1305..94aa3b407 100644
--- a/app/components/emoji_picker/emoji_picker.js
+++ b/app/components/emoji_picker/emoji_picker.js
@@ -457,8 +457,9 @@ export default class EmojiPicker extends PureComponent {
             <SafeAreaView excludeHeader={true}>
                 <KeyboardAvoidingView
                     behavior='padding'
-                    style={{flex: 1}}
+                    style={styles.flex}
                     keyboardVerticalOffset={keyboardOffset}
+                    enabled={Platform.OS === 'ios'}
                 >
                     <View style={styles.searchBar}>
                         <SearchBar
@@ -496,6 +497,9 @@ export default class EmojiPicker extends PureComponent {
 
 const getStyleSheetFromTheme = makeStyleSheetFromTheme((theme) => {
     return {
+        flex: {
+            flex: 1,
+        },
         bottomContent: {
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.1),
             borderTopColor: changeOpacity(theme.centerChannelColor, 0.3),
diff --git a/app/screens/mfa/mfa.js b/app/screens/mfa/mfa.js
index 3b5db6a60..be1f21f81 100644
--- a/app/screens/mfa/mfa.js
+++ b/app/screens/mfa/mfa.js
@@ -9,6 +9,7 @@ import {
     Keyboard,
     KeyboardAvoidingView,
     Platform,
+    StyleSheet,
     TouchableWithoutFeedback,
     View,
 } from 'react-native';
@@ -130,8 +131,9 @@ export default class Mfa extends PureComponent {
         return (
             <KeyboardAvoidingView
                 behavior='padding'
-                style={{flex: 1}}
+                style={style.flex}
                 keyboardVerticalOffset={5}
+                enabled={Platform.OS === 'ios'}
             >
                 <StatusBar/>
                 <TouchableWithoutFeedback onPress={this.blur}>
@@ -168,3 +170,9 @@ export default class Mfa extends PureComponent {
         );
     }
 }
+
+const style = StyleSheet.create({
+    flex: {
+        flex: 1,
+    },
+});
diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index 9d77532aa..ebee7407a 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -443,6 +443,7 @@ export default class SelectServer extends PureComponent {
                 behavior='padding'
                 style={style.container}
                 keyboardVerticalOffset={0}
+                enabled={Platform.OS === 'ios'}
             >
                 <StatusBar barStyle={statusStyle}/>
                 <TouchableWithoutFeedback onPress={this.blur}>