From cf118c4d2e911624f7b75efa2173336a2884c1a5 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 9 Dec 2021 11:32:07 -0800
Subject: [PATCH 1/2] Merge pull request #6677 from
 Expensify/version-BUILD-77081558bd86ed42d87081bd3ae4203981836e46

(cherry picked from commit 387a9f024784e359d3e1d1a0c104675b1860f6b3)
---
 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 b040a2254350..ffaf8d5d7412 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 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
index 532018c9f9a9..1ce350c45f03 100644
--- 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
index ceca45b27e3e..fab78e5c8deb 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.0</string>
+	<string>1.1.19.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 46a88fbdaaed..49cf201d5778 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.19-0",
+  "version": "1.1.19-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 072bca0d33e6..cde02d34c651 100644
--- 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.",

From 7e1777e47eeef258a81976b6416053a749449425 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 9 Dec 2021 12:29:36 -0700
Subject: [PATCH 2/2] Merge pull request #6670 from
 Expensify/Rory-FixiPadProLayout

[CP Stg] Fix iPad pro SignInPageLayout

(cherry picked from commit 77081558bd86ed42d87081bd3ae4203981836e46)
---
 src/components/withWindowDimensions.js | 2 +-
 src/pages/signin/SignInPage.js         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/withWindowDimensions.js b/src/components/withWindowDimensions.js
index bb73f643d9a2..f156757394b6 100644
--- 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
index 538abbf79b2c..5d98a89d4ef0 100644
--- 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. */}