From 67a3372d2acbede76dfad9cf4941b20e380a86c4 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 May 2022 12:02:13 -0700
Subject: [PATCH 1/2] Merge pull request #8973 from
 Expensify/version-BUILD-f390e2767f28dbb832696f39aac8a4e23460786c

Update version to 1.1.57-17 on main

(cherry picked from commit d9586542ff538acf6a91231850df676d1171c819)
---
 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 cebcb61eb63e..830469c593a6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015716
-        versionName "1.1.57-16"
+        versionCode 1001015717
+        versionName "1.1.57-17"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index e0217722884a..fc38c9344a1c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.16</string>
+	<string>1.1.57.17</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 860e356753f6..1f13cb24aea1 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.57.16</string>
+	<string>1.1.57.17</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6898d16f2876..2b279bfa8cce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-16",
+  "version": "1.1.57-17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 157c6f7e414a..f5d8bdfc5a78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-16",
+  "version": "1.1.57-17",
   "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 eb624debac1fbbfadf47940c8f18496a10539200 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 12 May 2022 19:35:42 +0200
Subject: [PATCH 2/2] Merge pull request #8970 from
 Expensify/chirag-password-btn-fix

Password btn fix

(cherry picked from commit d5dbe5e518c5d8ab59c93fa7ccae64044d23ae35)
---
 src/pages/SetPasswordPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 2b6a36a9c6f5..7871e04850f4 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -137,6 +137,7 @@ class SetPasswordPage extends Component {
                             containerStyles={[styles.mb2, styles.mh0]}
                             message={error}
                             isAlertVisible={!_.isEmpty(error)}
+                            isDisabled={!this.state.isFormValid}
                         />
                     </View>
                 </SignInPageLayout>