From b93be75dc4689c727d8fddbfc6b1b0f07d936e0a Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 7 Jun 2021 12:11:19 +0800
Subject: [PATCH 1/3] Add paypal name save confirmation

---
 package-lock.json                  | 3 ++-
 src/languages/en.js                | 1 +
 src/pages/settings/PaymentsPage.js | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 654b62486c5f..c17cdc4d101d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23126,7 +23126,8 @@
     "ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
     },
     "inline-style-parser": {
       "version": "0.1.1",
diff --git a/src/languages/en.js b/src/languages/en.js
index da87f117e21b..acb1a603eb12 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -199,6 +199,7 @@ export default {
         payPalMe: 'PayPal.me/',
         yourPayPalUsername: 'Your PayPal username',
         addPayPalAccount: 'Add PayPal Account',
+        growlMessageOnSave: 'Your PayPal username was successfully added',
     },
     preferencesPage: {
         mostRecent: 'Most Recent',
diff --git a/src/pages/settings/PaymentsPage.js b/src/pages/settings/PaymentsPage.js
index 9a9df206ce2b..f666e60a795e 100755
--- a/src/pages/settings/PaymentsPage.js
+++ b/src/pages/settings/PaymentsPage.js
@@ -15,6 +15,7 @@ import styles from '../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
 import Button from '../../components/Button';
+import Growl from '../../libs/Growl';
 
 const propTypes = {
     /** Username for PayPal.Me */
@@ -54,6 +55,7 @@ class PaymentsPage extends React.Component {
      */
     setPayPalMeUsername() {
         NameValuePair.set(CONST.NVP.PAYPAL_ME_ADDRESS, this.state.payPalMeUsername, ONYXKEYS.NVP_PAYPAL_ME_ADDRESS);
+        Growl.show(this.props.translate('paymentsPage.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000);
     }
 
     render() {
@@ -78,10 +80,12 @@ class PaymentsPage extends React.Component {
                             value={this.state.payPalMeUsername}
                             placeholder={this.props.translate('paymentsPage.yourPayPalUsername')}
                             onChangeText={text => this.setState({payPalMeUsername: text})}
+                            editable={!this.props.payPalMeUsername}
                         />
                     </View>
                     <Button
                         success
+                        isDisabled={this.props.payPalMeUsername}
                         onPress={this.setPayPalMeUsername}
                         style={[styles.mt3]}
                         text={this.props.translate('paymentsPage.addPayPalAccount')}

From 3ea3149526b42027f8e7bc912a614bef795efee3 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 7 Jun 2021 12:34:19 +0800
Subject: [PATCH 2/3] Get rid of autocomplete + autocorrect

---
 src/pages/settings/PaymentsPage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/settings/PaymentsPage.js b/src/pages/settings/PaymentsPage.js
index f666e60a795e..1f6427f667e8 100755
--- a/src/pages/settings/PaymentsPage.js
+++ b/src/pages/settings/PaymentsPage.js
@@ -76,6 +76,8 @@ class PaymentsPage extends React.Component {
                             {this.props.translate('paymentsPage.payPalMe')}
                         </Text>
                         <TextInput
+                            autoCompleteType="off"
+                            autoCorrect={false}
                             style={[styles.textInput]}
                             value={this.state.payPalMeUsername}
                             placeholder={this.props.translate('paymentsPage.yourPayPalUsername')}

From 782757aa54e59cabbaec10fc9cc17801bea9d79e Mon Sep 17 00:00:00 2001
From: OSBotify <runner@Mac-1623074141455.local>
Date: Mon, 7 Jun 2021 13:58:24 +0000
Subject: [PATCH 3/3] Update version to 1.0.63-2

---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/Info.plist | 2 +-
 package-lock.json                 | 2 +-
 package.json                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e82d8fc9f2b1..e5ebd2554c17 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006301
-        versionName "1.0.63-1"
+        versionCode 1001006302
+        versionName "1.0.63-2"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 2b219b6fa156..6464fb571ac9 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.63.1</string>
+	<string>1.0.63.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 2f74c0ae34f6..dbe46c7410e2 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.63.1</string>
+	<string>1.0.63.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 5029f11b72a5..5f69b6ce1313 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.63-1",
+  "version": "1.0.63-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 16eaff106e2b..b714e1373481 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.63-1",
+  "version": "1.0.63-2",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",