Merge pull request #8974 from Expensify/OSBotify-cherry-pick-staging-…

…8970 🍒 Cherry pick PR #8970 to staging 🍒
Expensify · May 12, 2022 · c569a27 · c569a27
2 parents 5490822 + eb624de
commit c569a27
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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.",

diff --git 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>