From 1486a55aeb33bb839b335067feeec6a81eec5a8e Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 9 Apr 2020 06:10:46 -0400
Subject: [PATCH] MM-22041 Fix Keyboard flashing when entering keyboards screen
 (#4132)

* MM-22041 Fix Keyboard flashing when entering keyboards screen

* Update snapshots
---
 ...cation_settings_mentions_keywords.test.js.snap |  1 -
 .../notification_settings_mentions_keywords.js    | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap b/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap
index 88e21ce3f..593d4000a 100644
--- a/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap
+++ b/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap
@@ -193,7 +193,6 @@ NotificationSettingsMentionsKeywords {
             <TextInputWithLocalizedPlaceholder
               autoCapitalize="none"
               autoCorrect={false}
-              autoFocus={true}
               blurOnSubmit={true}
               keyboardAppearance="light"
               multiline={true}
diff --git a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
index 9c0f958eb..10b174836 100644
--- a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
+++ b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
@@ -36,6 +36,16 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
         this.navigationEventListener = Navigation.events().bindComponent(this);
     }
 
+    componentDidAppear() {
+        if (this.keywordsInput) {
+            this.keywordsInput.focus();
+        }
+    }
+
+    componentDidDisappear() {
+        this.props.onBack(this.state.keywords);
+    }
+
     handleSubmit = () => {
         popTopScreen();
     };
@@ -48,10 +58,6 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
         return this.setState({keywords});
     };
 
-    componentDidDisappear() {
-        this.props.onBack(this.state.keywords);
-    }
-
     render() {
         const {theme, isLandscape} = this.props;
         const {keywords} = this.state;
@@ -66,7 +72,6 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
                 >
                     <View style={style.inputContainer}>
                         <TextInputWithLocalizedPlaceholder
-                            autoFocus={true}
                             ref={this.keywordsRef}
                             value={keywords}
                             blurOnSubmit={true}