Merge pull request #6678 from Expensify/OSBotify-cherry-pick-staging-6670

OSBotify · web-flow · commit 4b2f0c19201e · 2021-12-09T11:33:34.000-08:00
diff --git 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 1001011900
-        versionName "1.1.19-0"
+        versionCode 1001011901
+        versionName "1.1.19-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.19.0</string>
+	<string>1.1.19.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git 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.0</string>
+	<string>1.1.19.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.19-0",
+  "version": "1.1.19-1",
   "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.",
diff --git a/src/components/withWindowDimensions.js b/src/components/withWindowDimensions.js
@@ -71,7 +71,7 @@ export default function (WrappedComponent) {
         onDimensionChange(newDimensions) {
             const {window} = newDimensions;
             const isSmallScreenWidth = window.width <= variables.mobileResponsiveWidthBreakpoint;
-            const isMediumScreenWidth = !isSmallScreenWidth && window.width <= variables.mediumScreenResponsiveWidthBreakpoint;
+            const isMediumScreenWidth = !isSmallScreenWidth && window.width <= variables.tabletResponsiveWidthBreakpoint;
             this.setState({
                 windowHeight: window.height,
                 windowWidth: window.width,
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
@@ -85,7 +85,6 @@ class SignInPage extends Component {
                 <SignInPageLayout
                     welcomeText={welcomeText}
                     shouldShowWelcomeText={showLoginForm || showPasswordForm || !showResendValidationLinkForm}
-                    shouldShowWelcomeScreenshot={showLoginForm}
                 >
                     {/* LoginForm and PasswordForm must use the isVisible prop. This keeps them mounted, but visually hidden
                     so that password managers can access the values. Conditionally rendering these components will break this feature. */}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "new.expensify",`
`3`		`- "version": "1.1.19-0",`
	`3`	`+ "version": "1.1.19-1",`
`4`	`4`	`"author": "Expensify, Inc.",`
`5`	`5`	`"homepage": "https://new.expensify.com",`
`6`	`6`	`"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ class SignInPage extends Component {`
`85`	`85`	`<SignInPageLayout`
`86`	`86`	`welcomeText={welcomeText}`
`87`	`87`	`shouldShowWelcomeText={showLoginForm \|\| showPasswordForm \|\| !showResendValidationLinkForm}`
`88`		`- shouldShowWelcomeScreenshot={showLoginForm}`
`89`	`88`	`>`
`90`	`89`	`{/* LoginForm and PasswordForm must use the isVisible prop. This keeps them mounted, but visually hidden`
`91`	`90`	`so that password managers can access the values. Conditionally rendering these components will break this feature. */}`