Add accountID to the set password link

src/ROUTES.js

@@ -17,7 +17,7 @@ export default {
     IOU_BILL: 'iou/split',
     SEARCH: 'search',
     SIGNIN: 'signin',
-    SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:validateCode',
+    SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:email/:validateCode',
     PROFILE: 'profile',
     PROFILE_WITH_LOGIN: 'profile/:login',
     getProfileRoute: login => `profile/${login}`,

src/libs/actions/Session.js

@@ -208,19 +208,20 @@ function restartSignin() {
  *
  * @param {String} password
  * @param {String} validateCode
+ * @param {String} email
  */
-function setPassword(password, validateCode) {
+function setPassword(password, validateCode, email = '') {
     Onyx.merge(ONYXKEYS.ACCOUNT, {error: '', loading: true});
 
     API.SetPassword({
-        email: credentials.login,
+        email: email || credentials.login,
         password,
         validateCode,
     })
         .then((response) => {
             if (response.jsonCode === 200) {
-                const {authToken, email} = response;
-                createTemporaryLogin(authToken, email);
+                const {authToken, login} = response;
+                createTemporaryLogin(authToken, login);
                 return;
             }
 

src/pages/SetPasswordPage.js

@@ -39,6 +39,7 @@ const propTypes = {
 
     route: PropTypes.shape({
         params: PropTypes.shape({
+            email: PropTypes.string,
             validateCode: PropTypes.string,
         }),
     }),
@@ -78,7 +79,11 @@ class SetPasswordPage extends Component {
         this.setState({
             formError: null,
         });
-        setPassword(this.state.password, lodashGet(this.props.route, 'params.validateCode', ''));
+        setPassword(
+            this.state.password,
+            lodashGet(this.props.route, 'params.validateCode', ''),
+            lodashGet(this.props.route, 'params.email', ''),
+        );
     }
 
     render() {