From 2f88ae2f3ced7d151ba7258a323cd020f4cefe73 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 17 Sep 2018 05:04:24 -0300
Subject: [PATCH] Fix mention keywords setting (#2127)

---
 .../notification_settings_mentions.android.js              | 4 +++-
 .../notification_settings_mentions_keywords.js             | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/screens/settings/notification_settings_mentions/notification_settings_mentions.android.js b/app/screens/settings/notification_settings_mentions/notification_settings_mentions.android.js
index 9df65e0ac..bfbc4a47b 100644
--- a/app/screens/settings/notification_settings_mentions/notification_settings_mentions.android.js
+++ b/app/screens/settings/notification_settings_mentions/notification_settings_mentions.android.js
@@ -64,8 +64,9 @@ class NotificationSettingsMentionsAndroid extends NotificationSettingsMentionsBa
                             <TextInputWithLocalizedPlaceholder
                                 autoFocus={true}
                                 value={this.keywords}
-                                blurOnSubmit={false}
+                                blurOnSubmit={true}
                                 onChangeText={this.onKeywordsChangeText}
+                                onSubmitEditing={this.saveMentionKeys}
                                 multiline={false}
                                 style={style.input}
                                 autoCapitalize='none'
@@ -73,6 +74,7 @@ class NotificationSettingsMentionsAndroid extends NotificationSettingsMentionsBa
                                 placeholder={{id: 'mobile.notification_settings_mentions.keywordsDescription', defaultMessage: 'Other words that trigger a mention'}}
                                 placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.4)}
                                 returnKeyType='done'
+                                returnKeyLabel={this.props.intl.formatMessage({id: 'mobile.notification_settings.modal_save'})}
                                 underlineColorAndroid={theme.linkColor}
                             />
                             <FormattedText
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 1ee91598b..4e4f411a1 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
@@ -42,10 +42,6 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
     };
 
     onKeywordsChangeText = (keywords) => {
-        if (keywords.endsWith('\n')) {
-            return this.handleSubmit();
-        }
-
         return this.setState({keywords});
     };
 
@@ -77,8 +73,9 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
                             autoFocus={true}
                             ref={this.keywordsRef}
                             value={keywords}
-                            blurOnSubmit={false}
+                            blurOnSubmit={true}
                             onChangeText={this.onKeywordsChangeText}
+                            onSubmitEditing={this.handleSubmit}
                             multiline={true}
                             numberOfLines={1}
                             style={style.input}