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

…5398

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010001
-        versionName "1.1.0-1"
+        versionCode 1001010002
+        versionName "1.1.0-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.0.1</string>
+	<string>1.1.0.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.0-1",
+  "version": "1.1.0-2",
   "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.",

src/CONST.js

@@ -244,6 +244,13 @@ const CONST = {
     // at least 8 characters, 1 capital letter, 1 lowercase number, 1 number
     PASSWORD_COMPLEXITY_REGEX_STRING: '^(?=.*[A-Z])(?=.*[0-9])(?=.*[a-z]).{8,}$',
 
+    PASSWORD_PAGE: {
+        ERROR: {
+            ALREADY_VALIDATED: 'Account already validated',
+            VALIDATE_CODE_FAILED: 'Validate code failed',
+        },
+    },
+
     EMOJI_SPACER: 'SPACER',
 
     LOGIN_TYPE: {

src/libs/actions/Session.js

@@ -271,6 +271,11 @@ function setPassword(password, validateCode, accountID) {
             // This request can fail if the password is not complex enough
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
         })
+        .catch((response) => {
+            if (response.message === CONST.PASSWORD_PAGE.ERROR.VALIDATE_CODE_FAILED) {
+                Onyx.merge(ONYXKEYS.ACCOUNT, {error: translateLocal('setPasswordPage.accountNotValidated')});
+            }
+        })
         .finally(() => {
             Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
         });

src/pages/SetPasswordPage.js

@@ -9,7 +9,7 @@ import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import validateLinkPropTypes from './validateLinkPropTypes';
 import styles from '../styles/styles';
-import {signIn} from '../libs/actions/Session';
+import {setPassword, signIn} from '../libs/actions/Session';
 import ONYXKEYS from '../ONYXKEYS';
 import Button from '../components/Button';
 import SignInPageLayout from './signin/SignInPageLayout';
@@ -18,6 +18,7 @@ import compose from '../libs/compose';
 import NewPasswordForm from './settings/NewPasswordForm';
 import Text from '../components/Text';
 import * as API from '../libs/API';
+import CONST from '../CONST';
 
 const propTypes = {
     /* Onyx Props */
@@ -93,6 +94,13 @@ class SetPasswordPage extends Component {
                         });
                     }
                 });
+            } else if (responseValidate.title === CONST.PASSWORD_PAGE.ERROR.ALREADY_VALIDATED) {
+                // If the email is already validated, set the password using the validate code
+                setPassword(
+                    this.state.password,
+                    lodashGet(this.props.route, 'params.validateCode', ''),
+                    lodashGet(this.props.route, 'params.accountID', ''),
+                );
             } else {
                 this.setState({
                     error: this.props.translate('setPasswordPage.accountNotValidated'),
@@ -124,7 +132,6 @@ class SetPasswordPage extends Component {
                             isDisabled={!this.state.isFormValid}
                         />
                     </View>
-
                     {!_.isEmpty(error) && (
                         <Text style={[styles.formError]}>
                             {error}