From 3c8be8d1b0f7faaedc0255b2092683216317d0ce Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:40:37 -0400
Subject: [PATCH 1/2] Merge pull request #10569 from
 Expensify/version-BUILD-6CDA6BFC-17DA-46C2-998B-7B4318327D79

Update version to 1.1.89-4 on main

(cherry picked from commit 9ff97fc2c75e06f33896f09609f36fec23a23fd4)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5cd025655760..9c36ee9d77b4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018903
-        versionName "1.1.89-3"
+        versionCode 1001018904
+        versionName "1.1.89-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index e0b1cc04247c..fbb119200eb2 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.89.3</string>
+	<string>1.1.89.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6b1f5764b8cb..4d63a5cf6200 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.89.3</string>
+	<string>1.1.89.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 25ff4aa9c448..f7113c3f4654 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.1.89-3",
+  "version": "1.1.89-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.1.89-3",
+      "version": "1.1.89-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index fe172a31c014..c349b6456c66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.89-3",
+  "version": "1.1.89-4",
   "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 100394543a292f472bfdc3e0be717190d30f5f2b Mon Sep 17 00:00:00 2001
From: Luke Donahue <49007721+Luke9389@users.noreply.github.com>
Date: Thu, 25 Aug 2022 17:35:45 +0200
Subject: [PATCH 2/2] Merge pull request #10567 from
 Expensify/Rory-ScreenWrapperBehavior

Use defaultProps instead of hardcoded value

(cherry picked from commit 44b66379b8b1792fb852cb3ef8e5509fd3677c91)
---
 src/components/ScreenWrapper/index.android.js | 4 +++-
 src/pages/home/ReportScreen.js                | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/ScreenWrapper/index.android.js b/src/components/ScreenWrapper/index.android.js
index 55067bd50923..aee674422f6b 100644
--- a/src/components/ScreenWrapper/index.android.js
+++ b/src/components/ScreenWrapper/index.android.js
@@ -6,11 +6,13 @@ const ScreenWrapper = props => (
     <BaseScreenWrapper
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
-        keyboardAvoidingViewBehavior="height"
     >
         {props.children}
     </BaseScreenWrapper>
 );
+
+defaultProps.keyboardAvoidingViewBehavior = 'height';
+
 ScreenWrapper.propTypes = propTypes;
 ScreenWrapper.defaultProps = defaultProps;
 
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index f353210de918..d2c114335e53 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import {Keyboard, View} from 'react-native';
+import {Keyboard, Platform, View} from 'react-native';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
 import lodashFindLast from 'lodash/findLast';
@@ -227,7 +227,10 @@ class ReportScreen extends React.Component {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
         return (
-            <ScreenWrapper style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}>
+            <ScreenWrapper
+                style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}
+                keyboardAvoidingViewBehavior={Platform.OS === 'android' ? '' : 'padding'}
+            >
                 <HeaderView
                     reportID={reportID}
                     onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}