From 3579731f8ca8b6c277c1d182ba21dd86951b6ded Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 9 Dec 2021 12:11:39 -0800
Subject: [PATCH 1/2] Merge pull request #6679 from
 Expensify/version-BUILD-9a27ef25fde65e72d5e28895e6affcac0aff135e

(cherry picked from commit 53966760b2a66a9289c96d0f4f9cbd11f9e671a0)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/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 ffaf8d5d7412..51cf44110b6f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011901
-        versionName "1.1.19-1"
+        versionCode 1001011902
+        versionName "1.1.19-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1ce350c45f03..622059fdcb51 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.19.1</string>
+	<string>1.1.19.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fab78e5c8deb..8ef35aec1bb0 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.19.1</string>
+	<string>1.1.19.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 49cf201d5778..eeeb44c289e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.19-1",
+  "version": "1.1.19-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cde02d34c651..47be4204db13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.19-1",
+  "version": "1.1.19-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 00a9b68591dfde1a5f7f9aabd0b53a7e097e0f98 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Thu, 9 Dec 2021 10:09:15 -1000
Subject: [PATCH 2/2] Merge pull request #6672 from
 Expensify/nmurray-cp-personal-bank-keyboard-avoid

[CP Stg] Wrap AddPersonalBankAccount with KeyboardAvoidingView

(cherry picked from commit 9a27ef25fde65e72d5e28895e6affcac0aff135e)
---
 src/pages/AddPersonalBankAccountPage.js | 33 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js
index 187b65ee696f..898aa1e29085 100644
--- a/src/pages/AddPersonalBankAccountPage.js
+++ b/src/pages/AddPersonalBankAccountPage.js
@@ -10,6 +10,7 @@ import AddPlaidBankAccount from '../components/AddPlaidBankAccount';
 import getPlaidOAuthReceivedRedirectURI from '../libs/getPlaidOAuthReceivedRedirectURI';
 import compose from '../libs/compose';
 import ONYXKEYS from '../ONYXKEYS';
+import KeyboardAvoidingView from '../components/KeyboardAvoidingView';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -24,21 +25,23 @@ const defaultProps = {
 
 const AddPersonalBankAccountPage = props => (
     <ScreenWrapper>
-        <HeaderWithCloseButton
-            title={props.translate('bankAccount.addBankAccount')}
-            onCloseButtonPress={Navigation.dismissModal}
-            shouldShowBackButton
-            onBackButtonPress={() => Navigation.goBack()}
-        />
-        <AddPlaidBankAccount
-            onSubmit={({account, password, plaidLinkToken}) => {
-                BankAccounts.addPersonalBankAccount(account, password, plaidLinkToken);
-            }}
-            onExitPlaid={Navigation.dismissModal}
-            receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
-            plaidLinkOAuthToken={props.plaidLinkToken}
-            isPasswordRequired
-        />
+        <KeyboardAvoidingView>
+            <HeaderWithCloseButton
+                title={props.translate('bankAccount.addBankAccount')}
+                onCloseButtonPress={Navigation.dismissModal}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <AddPlaidBankAccount
+                onSubmit={({account, password, plaidLinkToken}) => {
+                    BankAccounts.addPersonalBankAccount(account, password, plaidLinkToken);
+                }}
+                onExitPlaid={Navigation.dismissModal}
+                receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
+                plaidLinkOAuthToken={props.plaidLinkToken}
+                isPasswordRequired
+            />
+        </KeyboardAvoidingView>
     </ScreenWrapper>
 );