From f3f5cef8d1506115097149edcb947ffdfd5491c1 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 1 Dec 2022 17:00:12 +0200
Subject: [PATCH] Fix Android edit profile keyboard aware scroll view (#6811)

---
 app/screens/edit_profile/edit_profile.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/screens/edit_profile/edit_profile.tsx b/app/screens/edit_profile/edit_profile.tsx
index 5aeb55cfb6..d03ac2c98c 100644
--- a/app/screens/edit_profile/edit_profile.tsx
+++ b/app/screens/edit_profile/edit_profile.tsx
@@ -49,7 +49,6 @@ const EditProfile = ({
     const intl = useIntl();
     const serverUrl = useServerUrl();
     const theme = useTheme();
-    const keyboardAwareRef = useRef<KeyboardAwareScrollView>(null);
     const changedProfilePicture = useRef<NewProfileImage | undefined>(undefined);
     const scrollViewRef = useRef<KeyboardAwareScrollView>();
     const hasUpdateUserInfo = useRef<boolean>(false);
@@ -204,14 +203,13 @@ const EditProfile = ({
             >
                 <KeyboardAwareScrollView
                     bounces={false}
-                    enableAutomaticScroll={true}
+                    enableAutomaticScroll={Platform.select({ios: true, default: false})}
                     enableOnAndroid={true}
                     enableResetScrollToCoords={true}
                     extraScrollHeight={Platform.select({ios: 45})}
                     keyboardOpeningTime={0}
-                    keyboardDismissMode='on-drag'
+                    keyboardDismissMode='none'
                     keyboardShouldPersistTaps='handled'
-                    ref={keyboardAwareRef}
                     scrollToOverflowEnabled={true}
                     testID='edit_profile.scroll_view'
                     style={styles.flex}