Merge pull request #6680 from Expensify/OSBotify-cherry-pick-staging-6672

Author: OSBotify

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 {

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>

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>

package-lock.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.",

package.json

@@ -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>
 );