From 2bdc4c60c2933c536bcb210c2985c3c3bb215f41 Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Mon, 7 Feb 2022 10:06:29 +0200
Subject: [PATCH 1/3] add keyboardShouldPersistTaps

---
 src/pages/settings/PasswordPage.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
index e1cace7e33f5..e9f6804423e4 100755
--- a/src/pages/settings/PasswordPage.js
+++ b/src/pages/settings/PasswordPage.js
@@ -156,7 +156,11 @@ class PasswordPage extends Component {
                         onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS_SECURITY)}
                         onCloseButtonPress={() => Navigation.dismissModal(true)}
                     />
-                    <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
+                    <ScrollView
+                        style={styles.flex1}
+                        contentContainerStyle={styles.p5}
+                        keyboardShouldPersistTaps
+                    >
                         <Text style={[styles.mb6]}>
                             {this.props.translate('passwordPage.changingYourPasswordPrompt')}
                         </Text>

From 5bccecb5d7f2712959d109963aa055c38a83de5c Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Mon, 7 Feb 2022 18:41:00 +0200
Subject: [PATCH 2/3] add keyboardShouldPersistTaps comment

---
 src/pages/settings/PasswordPage.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
index e9f6804423e4..3d691fd4e4bb 100755
--- a/src/pages/settings/PasswordPage.js
+++ b/src/pages/settings/PasswordPage.js
@@ -159,7 +159,10 @@ class PasswordPage extends Component {
                     <ScrollView
                         style={styles.flex1}
                         contentContainerStyle={styles.p5}
-                        keyboardShouldPersistTaps
+
+                        // to allow children of the scroll view to catch taps. when keyboard is opened.
+                        // eslint-disable-next-line react/jsx-props-no-multi-spaces
+                        keyboardShouldPersistTaps="always"
                     >
                         <Text style={[styles.mb6]}>
                             {this.props.translate('passwordPage.changingYourPasswordPrompt')}

From cc1d22e9efb48650f8804cd71102d21d7e4a7d64 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <a.s1171111@gmail.com>
Date: Tue, 8 Feb 2022 08:32:14 +0200
Subject: [PATCH 3/3] update keyboardShouldPersistTaps comment

---
 src/pages/settings/PasswordPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
index 3d691fd4e4bb..98138c194413 100755
--- a/src/pages/settings/PasswordPage.js
+++ b/src/pages/settings/PasswordPage.js
@@ -160,7 +160,7 @@ class PasswordPage extends Component {
                         style={styles.flex1}
                         contentContainerStyle={styles.p5}
 
-                        // to allow children of the scroll view to catch taps. when keyboard is opened.
+                        // Allow the user to click show password while password input is focused.
                         // eslint-disable-next-line react/jsx-props-no-multi-spaces
                         keyboardShouldPersistTaps="always"
                     >