Merge pull request #4450 from Expensify/update-staging-from-main

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008208
-        versionName "1.0.82-8"
+        versionCode 1001008209
+        versionName "1.0.82-9"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.82.8</string>
+	<string>1.0.82.9</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.82.8</string>
+	<string>1.0.82.9</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.82-8",
+  "version": "1.0.82-9",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js

@@ -7,8 +7,6 @@ import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo';
 import Text from '../../../components/Text';
 import TermsAndLicenses from '../TermsAndLicenses';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import compose from '../../../libs/compose';
-import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 
 const propTypes = {
     /** The children to show inside the layout */
@@ -18,7 +16,6 @@ const propTypes = {
      * on form type (set password, sign in, etc.) */
     welcomeText: PropTypes.string.isRequired,
 
-    ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
 
@@ -28,10 +25,10 @@ const SignInPageLayoutNarrow = props => (
         showsVerticalScrollIndicator={false}
         style={[
             styles.flexGrow1,
-            styles.mh5,
             styles.signInPageNarrowContentContainer,
             styles.alignSelfCenter,
         ]}
+        contentContainerStyle={styles.ph5}
     >
         <KeyboardAvoidingView behavior="position">
             <View style={[styles.flexGrow1]}>
@@ -41,7 +38,7 @@ const SignInPageLayoutNarrow = props => (
                         styles.flex1,
                         styles.dFlex,
                         styles.flexColumn,
-                        props.windowHeight > props.windowWidth ? styles.mt40Percentage : null,
+                        styles.mt40Percentage,
                     ]}
                 >
                     <View style={[styles.signInPageLogoNative, styles.mb2]}>
@@ -66,7 +63,4 @@ const SignInPageLayoutNarrow = props => (
 SignInPageLayoutNarrow.propTypes = propTypes;
 SignInPageLayoutNarrow.displayName = 'SignInPageLayoutNarrow';
 
-export default compose(
-    withWindowDimensions,
-    withLocalize,
-)(SignInPageLayoutNarrow);
+export default withLocalize(SignInPageLayoutNarrow);

src/styles/styles.js

@@ -604,7 +604,7 @@ const styles = {
     },
 
     signInPageNarrowContentContainer: {
-        maxWidth: 295,
+        maxWidth: 335,
     },
 
     signInPageWideLeftContainer: {