From cd4081848a849e9b9821509e86a21477057660d1 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Thu, 28 Jul 2022 18:28:23 -0600
Subject: [PATCH 01/15] Start using BeginSignIn command in place of
 GetAccountStatus

---
 README.md                             |  2 +-
 src/libs/Network/MainQueue.js         |  2 +-
 src/libs/Network/enhanceParameters.js |  2 +-
 src/libs/actions/Session/index.js     | 73 +++++++++++++--------------
 src/libs/deprecatedAPI.js             | 13 -----
 src/pages/signin/LoginForm.js         |  4 +-
 src/pages/signin/PasswordForm.js      |  7 +--
 src/pages/signin/SignInPage.js        | 21 ++------
 8 files changed, 45 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index 85cf05ac619e..7e315c640241 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11
 1. If you are having issues with **_Getting Started_**, please reference [React Native's Documentation](https://reactnative.dev/docs/environment-setup)
 2. If you are running into CORS errors like (in the browser dev console)
    ```sh
-   Access to fetch at 'https://www.expensify.com/api?command=GetAccountStatus' from origin 'http://localhost:8080' has been blocked by CORS policy
+   Access to fetch at 'https://www.expensify.com/api?command=BeginSignIn' from origin 'http://localhost:8080' has been blocked by CORS policy
    ```
    You probably have a misconfigured `.env` file - remove it (`rm .env`) and try again
 
diff --git a/src/libs/Network/MainQueue.js b/src/libs/Network/MainQueue.js
index 2143cee9d851..bb0804565893 100644
--- a/src/libs/Network/MainQueue.js
+++ b/src/libs/Network/MainQueue.js
@@ -19,7 +19,7 @@ let networkRequestQueue = [];
  * @return {Boolean}
  */
 function canMakeRequest(request) {
-    // Some requests are always made even when we are in the process of authenticating (typically because they require no authToken e.g. Log, GetAccountStatus)
+    // Some requests are always made even when we are in the process of authenticating (typically because they require no authToken e.g. Log, BeginSignIn)
     // However, if we are in the process of authenticating we always want to queue requests until we are no longer authenticating.
     return request.data.forceNetworkRequest === true || (!NetworkStore.isAuthenticating() && !SequentialQueue.isRunning());
 }
diff --git a/src/libs/Network/enhanceParameters.js b/src/libs/Network/enhanceParameters.js
index 093c0d96c087..1a014338d8c8 100644
--- a/src/libs/Network/enhanceParameters.js
+++ b/src/libs/Network/enhanceParameters.js
@@ -15,7 +15,7 @@ function isAuthTokenRequired(command) {
         'Log',
         'Graphite_Timer',
         'Authenticate',
-        'GetAccountStatus',
+        'BeginSignIn',
         'SetPassword',
         'User_SignUp',
         'ResendValidateCode',
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 5059a434ad43..6d8065631e42 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -18,12 +18,12 @@ import Timers from '../../Timers';
 import * as Pusher from '../../Pusher/pusher';
 import NetworkConnection from '../../NetworkConnection';
 import * as User from '../User';
-import * as ValidationUtils from '../../ValidationUtils';
 import * as Authentication from '../../Authentication';
 import * as ErrorUtils from '../../ErrorUtils';
 import * as Welcome from '../Welcome';
 import * as API from '../../API';
 import * as NetworkStore from '../../Network/NetworkStore';
+import DateUtils from '../../DateUtils';
 
 let credentials = {};
 Onyx.connect({
@@ -138,44 +138,41 @@ function resendValidationLink(login = credentials.login) {
  * @param {String} login
  */
 function fetchAccountDetails(login) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    const optimisticData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                ...CONST.DEFAULT_ACCOUNT_DATA,
+                isLoading: true,
+            },
+        },
+    ];
 
-    DeprecatedAPI.GetAccountStatus({email: login, forceNetworkRequest: true})
-        .then((response) => {
-            if (response.jsonCode === 200) {
-                Onyx.merge(ONYXKEYS.CREDENTIALS, {
-                    login: response.normalizedLogin,
-                });
-                Onyx.merge(ONYXKEYS.ACCOUNT, {
-                    accountExists: response.accountExists,
-                    validated: response.validated,
-                    closed: response.isClosed,
-                    forgotPassword: false,
-                    validateCodeExpired: false,
-                });
-
-                if (!response.accountExists) {
-                    createAccount(login);
-                } else if (response.isClosed) {
-                    reopenAccount(login);
-                } else if (!response.validated) {
-                    resendValidationLink(login);
-                }
-            } else if (response.jsonCode === 402) {
-                Onyx.merge(ONYXKEYS.ACCOUNT, {
-                    error: ValidationUtils.isNumericWithSpecialChars(login)
-                        ? Localize.translateLocal('common.error.phoneNumber')
-                        : Localize.translateLocal('loginForm.error.invalidFormatEmailLogin'),
-                });
-            } else if (response.jsonCode === CONST.JSON_CODE.UNABLE_TO_RETRY) {
-                Onyx.merge(ONYXKEYS.ACCOUNT, {error: Localize.translateLocal('session.offlineMessageRetry')});
-            } else {
-                Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
-            }
-        })
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
-        });
+    const successData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+                errors: {
+                    [DateUtils.getMicroseconds()]: 'Cannot get account details, please try again',
+                },
+            },
+        },
+    ];
+
+    API.read('BeginSignIn', {email: login}, {optimisticData, successData, failureData});
 }
 
 /**
diff --git a/src/libs/deprecatedAPI.js b/src/libs/deprecatedAPI.js
index 5042475d22b9..bfe6191f1853 100644
--- a/src/libs/deprecatedAPI.js
+++ b/src/libs/deprecatedAPI.js
@@ -134,18 +134,6 @@ function Get(parameters, shouldUseSecure = false) {
     return Network.post(commandName, parameters, CONST.NETWORK.METHOD.POST, shouldUseSecure);
 }
 
-/**
- * @param {Object} parameters
- * @param {String} parameters.email
- * @param {Boolean} parameters.forceNetworkRequest
- * @returns {Promise}
- */
-function GetAccountStatus(parameters) {
-    const commandName = 'GetAccountStatus';
-    requireParameters(['email'], parameters, commandName);
-    return Network.post(commandName, parameters);
-}
-
 /**
  * @param {Object} parameters
  * @param {String} parameters.debtorEmail
@@ -727,7 +715,6 @@ export {
     DeleteLogin,
     DeleteBankAccount,
     Get,
-    GetAccountStatus,
     GetStatementPDF,
     GetIOUReport,
     GetFullPolicy,
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 43e3b7b6e656..248d65ca5bcb 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -34,7 +34,7 @@ const propTypes = {
         success: PropTypes.string,
 
         /** Whether or not a sign on form is loading (being submitted) */
-        loading: PropTypes.bool,
+        isLoading: PropTypes.bool,
     }),
 
     ...windowDimensionsPropTypes,
@@ -174,7 +174,7 @@ class LoginForm extends React.Component {
                     <Button
                         success
                         text={this.props.translate('common.continue')}
-                        isLoading={this.props.account.loading}
+                        isLoading={this.props.account.isLoading}
                         onPress={this.validateAndSubmitForm}
                     />
                 </View>
diff --git a/src/pages/signin/PasswordForm.js b/src/pages/signin/PasswordForm.js
index 0801487c8803..7936e59f1c74 100755
--- a/src/pages/signin/PasswordForm.js
+++ b/src/pages/signin/PasswordForm.js
@@ -26,14 +26,11 @@ const propTypes = {
 
     /** The details about the account that the user is signing in with */
     account: PropTypes.shape({
-        /** Whether or not the account already exists */
-        accountExists: PropTypes.bool,
-
         /** Whether or not two factor authentication is required */
         requiresTwoFactorAuth: PropTypes.bool,
 
         /** Whether or not a sign on form is loading (being submitted) */
-        loading: PropTypes.bool,
+        isLoading: PropTypes.bool,
     }),
 
     ...withLocalizePropTypes,
@@ -183,7 +180,7 @@ class PasswordForm extends React.Component {
                         success
                         style={[styles.mv3]}
                         text={this.props.translate('common.signIn')}
-                        isLoading={this.props.account.loading}
+                        isLoading={this.props.account.isLoading}
                         onPress={this.validateAndSubmitForm}
                     />
                     <ChangeExpensifyLoginLink />
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index c0d7945e9945..4f7586b99250 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -4,7 +4,6 @@ import {
 } from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import styles from '../../styles/styles';
 import updateUnread from '../../libs/UnreadIndicatorUpdater/updateUnread/index';
@@ -20,17 +19,11 @@ const propTypes = {
 
     /** The details about the account that the user is signing in with */
     account: PropTypes.shape({
-        /** Whether or not the account already exists */
-        accountExists: PropTypes.bool,
-
         /** Error to display when there is an account error returned */
         error: PropTypes.string,
 
-        /** Whether or not the account is validated */
+        /** Whether the account is validated */
         validated: PropTypes.bool,
-
-        /** Whether or not the account is validated */
-        forgotPassword: PropTypes.bool,
     }),
 
     /** The credentials of the person signing in */
@@ -60,27 +53,19 @@ class SignInPage extends Component {
         // - A login has not been entered yet
         const showLoginForm = !this.props.credentials.login;
 
-        const validateCodeExpired = lodashGet(this.props.account, 'validateCodeExpired', false);
-
-        const validAccount = this.props.account.accountExists
-            && this.props.account.validated
-            && !this.props.account.forgotPassword
-            && !validateCodeExpired;
-
         // Show the password form if
         // - A login has been entered
-        // - AND a GitHub username has been entered OR they already have access to New Expensify
         // - AND an account exists and is validated for this login
         // - AND a password hasn't been entered yet
         const showPasswordForm = this.props.credentials.login
-            && validAccount
+            && this.props.account.validated
             && !this.props.credentials.password;
 
         // Show the resend validation link form if
         // - A login has been entered
         // - AND a GitHub username has been entered OR they already have access to this app
         // - AND an account did not exist or is not validated for that login
-        const shouldShowResendValidationLinkForm = this.props.credentials.login && !validAccount;
+        const shouldShowResendValidationLinkForm = this.props.credentials.login && !this.props.account.validated;
 
         const welcomeText = shouldShowResendValidationLinkForm
             ? ''

From 2166e1f68fb34ed8c841c15da9e6e1e121958813 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 13:23:37 -0700
Subject: [PATCH 02/15] Fix forgot password flow

---
 src/pages/signin/SignInPage.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 4f7586b99250..c19d8ba09fe9 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -57,15 +57,17 @@ class SignInPage extends Component {
         // - A login has been entered
         // - AND an account exists and is validated for this login
         // - AND a password hasn't been entered yet
+        // - AND haven't forgotten password
         const showPasswordForm = this.props.credentials.login
             && this.props.account.validated
-            && !this.props.credentials.password;
+            && !this.props.credentials.password
+            && !this.props.account.forgotPassword;
 
         // Show the resend validation link form if
         // - A login has been entered
-        // - AND a GitHub username has been entered OR they already have access to this app
-        // - AND an account did not exist or is not validated for that login
-        const shouldShowResendValidationLinkForm = this.props.credentials.login && !this.props.account.validated;
+        // - AND is not validated or password is forgotten
+        const shouldShowResendValidationLinkForm = this.props.credentials.login
+            && (!this.props.account.validated || this.props.account.forgotPassword);
 
         const welcomeText = shouldShowResendValidationLinkForm
             ? ''

From db643ff848ec5ed504e315edcf0a366a284599ee Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 15:09:35 -0700
Subject: [PATCH 03/15] Get rid of uneccessary onyx properties

---
 src/ONYXKEYS.js                          |  3 ---
 src/languages/en.js                      |  4 +--
 src/languages/es.js                      |  4 +--
 src/libs/actions/Session/index.js        | 31 ++++-----------------
 src/pages/SetPasswordPage.js             | 24 ++++-------------
 src/pages/signin/ResendValidationForm.js | 34 +++++-------------------
 tests/utils/TestHelper.js                |  1 -
 7 files changed, 18 insertions(+), 83 deletions(-)

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 17302ba46467..a6fe6476435f 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -186,9 +186,6 @@ export default {
     // The policyID of the last workspace whose settings were accessed by the user
     LAST_ACCESSED_WORKSPACE_POLICY_ID: 'lastAccessedWorkspacePolicyID',
 
-    // Validating Email?
-    USER_SIGN_UP: 'userSignUp',
-
     // List of Form ids
     FORMS: {
         ADD_DEBIT_CARD_FORM: 'addDebitCardForm',
diff --git a/src/languages/en.js b/src/languages/en.js
index 1783405fa1ec..d0f55e2aa3b4 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -492,11 +492,9 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        weSentYouMagicSignInLink: ({login}) => `We've sent a magic sign in link to ${login}. Check your Inbox and your Spam folder and wait 5-10 minutes before trying again.`,
+        weSentYouMagicSignInLink: ({login, loginType}) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
         resendLink: 'Resend link',
         validationCodeFailedMessage: 'It looks like there was an error with your validation link or it has expired.',
-        unvalidatedAccount: 'This account exists but isn\'t validated, please check your inbox for your magic link.',
-        newAccount: ({login, loginType}) => `Welcome ${login}, it's always great to see a new face around here! Please check your ${loginType} for a magic link to validate your account.`,
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index 2c33a70f95f8..932214911425 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -492,11 +492,9 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({login}) => `Hemos enviado un enlace mágico de inicio de sesión a ${login}. Verifica tu bandeja de entrada y tu carpeta de correo no deseado y espera de 5 a 10 minutos antes de intentarlo de nuevo.`,
+        weSentYouMagicSignInLink: ({login, loginType}) => `Hemos enviado un enlace mágico de inicio de sesión a ${login}. Verifica tu bandeja de entrada y tu carpeta de correo no deseado y espera de 5 a 10 minutos antes de intentarlo de nuevo.`,
         resendLink: 'Reenviar enlace',
         validationCodeFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
-        unvalidatedAccount: 'Esta cuenta existe pero no está validada, por favor busca el enlace mágico en tu bandeja de entrada',
-        newAccount: ({login, loginType}) => `¡Bienvenido ${login}, es genial ver una cara nueva por aquí! En tu ${loginType} encontrarás un enlace para validar tu cuenta, por favor, revísalo`,
     },
     detailsPage: {
         localTime: 'Hora local',
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 6d8065631e42..537d91984bf5 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -106,19 +106,6 @@ function signOutAndRedirectToSignIn() {
     Log.info('Redirecting to Sign In because signOut() was called');
 }
 
-/**
- * Reopen the account and send the user a link to set password
- *
- * @param {String} [login]
- */
-function reopenAccount(login = credentials.login) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
-    DeprecatedAPI.User_ReopenAccount({email: login})
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
-        });
-}
-
 /**
  * Resend the validation link to the user that is validating their account
  *
@@ -319,7 +306,6 @@ function resetPassword() {
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
-                    validateCodeExpired: false,
                 },
             },
         ],
@@ -329,7 +315,6 @@ function resetPassword() {
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
-                    validateCodeExpired: false,
                 },
             },
         ],
@@ -346,7 +331,7 @@ function resetPassword() {
  * @param {Number} accountID
  */
 function setPassword(password, validateCode, accountID) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true, validateCodeExpired: false});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
     DeprecatedAPI.SetPassword({
         password,
         validateCode,
@@ -416,7 +401,6 @@ function changePasswordAndSignIn(authToken, password) {
         password,
     })
         .then((responsePassword) => {
-            Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: null});
             if (responsePassword.jsonCode === 200) {
                 signIn(password);
                 return;
@@ -429,7 +413,7 @@ function changePasswordAndSignIn(authToken, password) {
             }
             if (responsePassword.jsonCode === CONST.JSON_CODE.NOT_AUTHENTICATED) {
                 // authToken has expired, and we have the account email, so we request a new magic link.
-                Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validateCodeExpired: true, error: null});
+                Onyx.merge(ONYXKEYS.ACCOUNT, {error: null});
                 resetPassword();
                 Navigation.navigate(ROUTES.HOME);
                 return;
@@ -445,7 +429,6 @@ function changePasswordAndSignIn(authToken, password) {
  * @param {String} authToken
  */
 function validateEmail(accountID, validateCode) {
-    Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: true});
     Onyx.merge(ONYXKEYS.SESSION, {error: ''});
     DeprecatedAPI.ValidateEmail({
         accountID,
@@ -453,19 +436,16 @@ function validateEmail(accountID, validateCode) {
     })
         .then((responseValidate) => {
             if (responseValidate.jsonCode === 200) {
-                Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: responseValidate.authToken});
-                Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
-                Onyx.merge(ONYXKEYS.CREDENTIALS, {login: responseValidate.email});
+                Onyx.merge(ONYXKEYS.CREDENTIALS, {login: responseValidate.email, authToken: responseValidate.authToken});
                 return;
             }
             if (responseValidate.jsonCode === 666) {
-                Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
+                Onyx.merge(ONYXKEYS.ACCOUNT, {validated: true});
             }
             if (responseValidate.jsonCode === 401) {
                 Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
             }
-        })
-        .finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: false}));
+        });
 }
 
 // It's necessary to throttle requests to reauthenticate since calling this multiple times will cause Pusher to
@@ -540,7 +520,6 @@ export {
     signInWithShortLivedToken,
     signOut,
     signOutAndRedirectToSignIn,
-    reopenAccount,
     resendValidationLink,
     resetPassword,
     clearSignInData,
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index ec5c3fb3599d..cc80e8f323e7 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -47,15 +47,6 @@ const propTypes = {
         error: PropTypes.string,
     }),
 
-    /** User signup object */
-    userSignUp: PropTypes.shape({
-        /** Is Validating Email */
-        isValidating: PropTypes.bool,
-
-        /** Auth token used to change password */
-        authToken: PropTypes.string,
-    }),
-
     /** The accountID and validateCode are passed via the URL */
     route: validateLinkPropTypes,
 
@@ -70,10 +61,6 @@ const defaultProps = {
         error: '',
         authToken: '',
     },
-    userSignUp: {
-        isValidating: false,
-        authToken: '',
-    },
 };
 
 class SetPasswordPage extends Component {
@@ -91,7 +78,7 @@ class SetPasswordPage extends Component {
     componentDidMount() {
         const accountID = lodashGet(this.props.route.params, 'accountID', '');
         const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
-        if (this.props.userSignUp.authToken) {
+        if (this.props.credentials.authToken) {
             return;
         }
         Session.validateEmail(accountID, validateCode);
@@ -104,15 +91,15 @@ class SetPasswordPage extends Component {
         const accountID = lodashGet(this.props.route.params, 'accountID', '');
         const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
 
-        if (this.props.userSignUp.authToken) {
-            Session.changePasswordAndSignIn(this.props.userSignUp.authToken, this.state.password);
+        if (this.props.credentials.authToken) {
+            Session.changePasswordAndSignIn(this.props.credentials.authToken, this.state.password);
         } else {
             Session.setPassword(this.state.password, validateCode, accountID);
         }
     }
 
     render() {
-        const buttonText = this.props.userSignUp.isValidating ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
+        const buttonText = !this.props.account.validated ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
         const sessionError = this.props.session.error && this.props.translate(this.props.session.error);
         const error = sessionError || this.props.account.error;
         return (
@@ -133,7 +120,7 @@ class SetPasswordPage extends Component {
                     <View>
                         <FormAlertWithSubmitButton
                             buttonText={buttonText}
-                            isLoading={this.props.account.loading || this.props.userSignUp.isValidatingEmail}
+                            isLoading={this.props.account.loading}
                             onSubmit={this.validateAndSubmitForm}
                             containerStyles={[styles.mb2, styles.mh0]}
                             message={error}
@@ -159,6 +146,5 @@ export default compose(
             key: ONYXKEYS.SESSION,
             initWithStoredValues: false,
         },
-        userSignUp: {key: ONYXKEYS.USER_SIGN_UP},
     }),
 )(SetPasswordPage);
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 95956cb7b933..77a58fc5335e 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -34,12 +34,6 @@ const propTypes = {
 
         /** Whether or not the account is validated */
         validated: PropTypes.bool,
-
-        /** Whether or not the account is closed */
-        closed: PropTypes.bool,
-
-        /** Whether or not the account already exists */
-        accountExists: PropTypes.bool,
     }),
 
     /** Information about the network */
@@ -79,9 +73,7 @@ class ResendValidationForm extends React.Component {
             formSuccess: this.props.translate('resendValidationForm.linkHasBeenResent'),
         });
 
-        if (this.props.account.closed) {
-            Session.reopenAccount();
-        } else if (!this.props.account.validated) {
+        if (!this.props.account.validated) {
             Session.resendValidationLink();
         } else {
             Session.resetPassword();
@@ -93,27 +85,10 @@ class ResendValidationForm extends React.Component {
     }
 
     render() {
-        const isNewAccount = !this.props.account.accountExists;
-        const isOldUnvalidatedAccount = this.props.account.accountExists && !this.props.account.validated;
         const isSMSLogin = Str.isSMSLogin(this.props.credentials.login);
         const login = isSMSLogin ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login;
         const loginType = (isSMSLogin ? this.props.translate('common.phone') : this.props.translate('common.email')).toLowerCase();
-        let message = '';
-
-        if (isNewAccount) {
-            message = this.props.translate('resendValidationForm.newAccount', {
-                login,
-                loginType,
-            });
-        } else if (this.props.account.validateCodeExpired) {
-            message = this.props.translate('resendValidationForm.validationCodeFailedMessage');
-        } else if (isOldUnvalidatedAccount) {
-            message = this.props.translate('resendValidationForm.unvalidatedAccount');
-        } else {
-            message = this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                login,
-            });
-        }
+
         return (
             <>
                 <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
@@ -129,7 +104,10 @@ class ResendValidationForm extends React.Component {
                 </View>
                 <View style={[styles.mv5]}>
                     <Text>
-                        {message}
+                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
+                            login,
+                            loginType,
+                        })}
                     </Text>
                 </View>
                 {!_.isEmpty(this.state.formSuccess) && (
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index d619e9d72ab2..2e359c5cdae5 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -21,7 +21,6 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
     HttpUtils.xhr = jest.fn();
     HttpUtils.xhr.mockImplementation(() => Promise.resolve({
         jsonCode: 200,
-        accountExists: true,
         requiresTwoFactorAuth: false,
         normalizedLogin: login,
     }));

From e9bc3091795a8529e1e51460d8f5dd5f73b1042c Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 15:14:53 -0700
Subject: [PATCH 04/15] Get rid of User_ReopenAccount

---
 src/libs/Network/enhanceParameters.js |  1 -
 src/libs/deprecatedAPI.js             | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/src/libs/Network/enhanceParameters.js b/src/libs/Network/enhanceParameters.js
index 1a014338d8c8..b7f82f47dda5 100644
--- a/src/libs/Network/enhanceParameters.js
+++ b/src/libs/Network/enhanceParameters.js
@@ -19,7 +19,6 @@ function isAuthTokenRequired(command) {
         'SetPassword',
         'User_SignUp',
         'ResendValidateCode',
-        'User_ReopenAccount',
         'ValidateEmail',
     ], command);
 }
diff --git a/src/libs/deprecatedAPI.js b/src/libs/deprecatedAPI.js
index a7fbeafa0b96..4ec69b3c60a6 100644
--- a/src/libs/deprecatedAPI.js
+++ b/src/libs/deprecatedAPI.js
@@ -329,17 +329,6 @@ function SetPassword(parameters) {
     return Network.post(commandName, parameters);
 }
 
-/**
- * @param {Object} parameters
- * @param {String} parameters.email
- * @returns {Promise}
- */
-function User_ReopenAccount(parameters) {
-    const commandName = 'User_ReopenAccount';
-    requireParameters(['email'], parameters, commandName);
-    return Network.post(commandName, parameters);
-}
-
 /**
  * @param {Object} parameters
  * @param {String} parameters.email
@@ -727,7 +716,6 @@ export {
     UpdatePolicy,
     User_SignUp,
     User_IsUsingExpensifyCard,
-    User_ReopenAccount,
     User_SecondaryLogin_Send,
     User_UploadAvatar,
     User_FixAccount,

From 886867afcd2deda2a4a0a91401fb19f7705a9640 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 16:00:48 -0700
Subject: [PATCH 05/15] isLoading for password page

---
 src/libs/actions/Session/index.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 537d91984bf5..929c1a98d1d6 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -112,10 +112,10 @@ function signOutAndRedirectToSignIn() {
  * @param {String} [login]
  */
 function resendValidationLink(login = credentials.login) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: true});
     DeprecatedAPI.ResendValidateCode({email: login})
         .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 
@@ -219,7 +219,7 @@ function createTemporaryLogin(authToken, email) {
             return createLoginResponse;
         })
         .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 
@@ -232,7 +232,7 @@ function createTemporaryLogin(authToken, email) {
  * @param {String} [twoFactorAuthCode]
  */
 function signIn(password, twoFactorAuthCode) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     Authentication.Authenticate({
         useExpensifyLogin: true,
@@ -247,10 +247,10 @@ function signIn(password, twoFactorAuthCode) {
             if (response.jsonCode !== 200) {
                 const errorMessage = ErrorUtils.getAuthenticateErrorMessage(response);
                 if (errorMessage === 'passwordForm.error.twoFactorAuthenticationEnabled') {
-                    Onyx.merge(ONYXKEYS.ACCOUNT, {requiresTwoFactorAuth: true, loading: false});
+                    Onyx.merge(ONYXKEYS.ACCOUNT, {requiresTwoFactorAuth: true, isLoading: false});
                     return;
                 }
-                Onyx.merge(ONYXKEYS.ACCOUNT, {error: Localize.translateLocal(errorMessage), loading: false});
+                Onyx.merge(ONYXKEYS.ACCOUNT, {error: Localize.translateLocal(errorMessage), isLoading: false});
                 return;
             }
 
@@ -267,7 +267,7 @@ function signIn(password, twoFactorAuthCode) {
  * @param {String} exitTo
  */
 function signInWithShortLivedToken(email, shortLivedToken) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     createTemporaryLogin(shortLivedToken, email)
         .then((response) => {
@@ -278,7 +278,7 @@ function signInWithShortLivedToken(email, shortLivedToken) {
             User.getUserDetails();
             Onyx.merge(ONYXKEYS.ACCOUNT, {success: true});
         }).finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 
@@ -331,7 +331,7 @@ function resetPassword() {
  * @param {Number} accountID
  */
 function setPassword(password, validateCode, accountID) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
     DeprecatedAPI.SetPassword({
         password,
         validateCode,
@@ -347,7 +347,7 @@ function setPassword(password, validateCode, accountID) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
         })
         .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 

From 7e37c2ab3018311544056642b6236a8137c215cb Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 16:22:34 -0700
Subject: [PATCH 06/15] Espanol

---
 src/languages/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index 932214911425..bb90d7901937 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -492,7 +492,7 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({login, loginType}) => `Hemos enviado un enlace mágico de inicio de sesión a ${login}. Verifica tu bandeja de entrada y tu carpeta de correo no deseado y espera de 5 a 10 minutos antes de intentarlo de nuevo.`,
+        weSentYouMagicSignInLink: ({login, loginType}) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor revisa tu ${loginType}`,
         resendLink: 'Reenviar enlace',
         validationCodeFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
     },

From 97115c8251092f9658d16415dfd57c895448c688 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 16:33:09 -0700
Subject: [PATCH 07/15] Remove CreateAccount

---
 src/libs/actions/Session/index.js | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 929c1a98d1d6..edb9b9f50b89 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -48,28 +48,6 @@ function setSuccessfulSignInData(data) {
     });
 }
 
-/**
- * Create an account for the user logging in.
- * This will send them a notification with a link to click on to validate the account and set a password
- *
- * @param {String} login
- */
-function createAccount(login) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {error: ''});
-
-    DeprecatedAPI.User_SignUp({
-        email: login,
-    }).then((response) => {
-        // A 405 means that the account needs to be validated. We should let the user proceed to the ResendValidationForm view.
-        if (response.jsonCode === 200 || response.jsonCode === 405) {
-            return;
-        }
-
-        Onyx.merge(ONYXKEYS.CREDENTIALS, {login: null});
-        Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message || `Unknown API Error: ${response.jsonCode}`});
-    });
-}
-
 /**
  * Clears the Onyx store and redirects user to the sign in page
  */

From fd76fc2bfffc533458487ba4dff1460c7ab32a5c Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 17:01:36 -0700
Subject: [PATCH 08/15] Update tests

---
 tests/utils/TestHelper.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index 2e359c5cdae5..83cfdbd8b7a5 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -20,9 +20,23 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
     const originalXhr = HttpUtils.xhr;
     HttpUtils.xhr = jest.fn();
     HttpUtils.xhr.mockImplementation(() => Promise.resolve({
+        onyxData: [
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: ONYXKEYS.CREDENTIALS,
+                value: {
+                    login: 'yuwen@expensify.com',
+                },
+            },
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    validated: true,
+                },
+            },
+        ],
         jsonCode: 200,
-        requiresTwoFactorAuth: false,
-        normalizedLogin: login,
     }));
 
     // Simulate user entering their login and populating the credentials.login

From 238465d109e6ddd6fea31644994db969563a2319 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 2 Aug 2022 17:15:55 -0700
Subject: [PATCH 09/15] Make sure login in test helper matches login in test

---
 tests/utils/TestHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index 83cfdbd8b7a5..44a616984277 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -25,7 +25,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.CREDENTIALS,
                 value: {
-                    login: 'yuwen@expensify.com',
+                    login,
                 },
             },
             {

From f72ce583738752bbe07bf44b44fbdff4e3924318 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 3 Aug 2022 11:39:18 -0700
Subject: [PATCH 10/15] PR comments

---
 README.md                                |  8 ++++----
 src/libs/actions/Session/index.js        |  4 ++--
 src/libs/actions/User.js                 | 14 +++++++-------
 src/pages/signin/LoginForm.js            |  2 +-
 src/pages/signin/ResendValidationForm.js |  5 +----
 tests/actions/ReportTest.js              |  1 -
 tests/unit/NetworkTest.js                |  2 +-
 tests/utils/TestHelper.js                |  2 +-
 8 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index ac1722a2a531..8881a1ab3a71 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ That action will then call `Onyx.merge()` to [set default data and a loading sta
 
 ```js
 function signIn(password, twoFactorAuthCode) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: true});
     Authentication.Authenticate({
         ...defaultParams,
         password,
@@ -177,7 +177,7 @@ function signIn(password, twoFactorAuthCode) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message});
         })
         .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 ```
@@ -188,7 +188,7 @@ Keeping our `Onyx.merge()` out of the view layer and in actions helps organize t
 // Bad
 validateAndSubmitForm() {
     // validate...
-    this.setState({loading: true});
+    this.setState({isLoading: true});
     signIn()
         .then((response) => {
             if (result.jsonCode === 200) {
@@ -198,7 +198,7 @@ validateAndSubmitForm() {
             this.setState({error: response.message});
         })
         .finally(() => {
-            this.setState({loading: false});
+            this.setState({isLoading: false});
         });
 }
 
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index edb9b9f50b89..d88d35bfe304 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -102,7 +102,7 @@ function resendValidationLink(login = credentials.login) {
  *
  * @param {String} login
  */
-function fetchAccountDetails(login) {
+function beginSignIn(login) {
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
@@ -492,7 +492,7 @@ function setShouldShowComposeInput(shouldShowComposeInput) {
 }
 
 export {
-    fetchAccountDetails,
+    beginSignIn,
     setPassword,
     signIn,
     signInWithShortLivedToken,
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index d41fcf3ef974..a7b71d9fd3b5 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -50,21 +50,21 @@ function updatePassword(oldPassword, password) {
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {...CONST.DEFAULT_ACCOUNT_DATA, loading: true},
+                value: {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true},
             },
         ],
         successData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {loading: false},
+                value: {isLoading: false},
             },
         ],
         failureData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {loading: false},
+                value: {isLoading: false},
             },
         ],
     });
@@ -177,7 +177,7 @@ function updateNewsletterSubscription(isSubscribed) {
  * @returns {Promise}
  */
 function setSecondaryLoginAndNavigate(login, password) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     return DeprecatedAPI.User_SecondaryLogin_Send({
         email: login,
@@ -202,7 +202,7 @@ function setSecondaryLoginAndNavigate(login, password) {
 
         Onyx.merge(ONYXKEYS.USER, {error});
     }).finally(() => {
-        Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
     });
 }
 
@@ -215,7 +215,7 @@ function setSecondaryLoginAndNavigate(login, password) {
 function validateLogin(accountID, validateCode) {
     const isLoggedIn = !_.isEmpty(sessionAuthToken);
     const redirectRoute = isLoggedIn ? ROUTES.getReportRoute(currentlyViewedReportID) : ROUTES.HOME;
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     DeprecatedAPI.ValidateEmail({
         accountID,
@@ -236,7 +236,7 @@ function validateLogin(accountID, validateCode) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error});
         }
     }).finally(() => {
-        Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         Navigation.navigate(redirectRoute);
     });
 }
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 248d65ca5bcb..f11b836c3327 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -132,7 +132,7 @@ class LoginForm extends React.Component {
         });
 
         // Check if this login has an account associated with it or not
-        Session.fetchAccountDetails(isValidPhoneLogin ? phoneLogin : login);
+        Session.beginSignIn(isValidPhoneLogin ? phoneLogin : login);
     }
 
     render() {
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 77a58fc5335e..e643e94eed73 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -104,10 +104,7 @@ class ResendValidationForm extends React.Component {
                 </View>
                 <View style={[styles.mv5]}>
                     <Text>
-                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                            login,
-                            loginType,
-                        })}
+                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {login, loginType})}
                     </Text>
                 </View>
                 {!_.isEmpty(this.state.formSuccess) && (
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
index da8c4de756fb..3955959b2d1f 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.js
@@ -204,7 +204,6 @@ describe('actions/Report', () => {
 
     it('should be updated correctly when new comments are added, deleted or marked as unread', () => {
         const REPORT_ID = 1;
-
         let report;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.js
index b09b23d49645..0b5ce51ba248 100644
--- a/tests/unit/NetworkTest.js
+++ b/tests/unit/NetworkTest.js
@@ -260,7 +260,7 @@ test('Request will not run until credentials are read from Onyx', () => {
     const spyHttpUtilsXhr = jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => Promise.resolve({}));
 
     // When we make a request
-    Session.fetchAccountDetails(TEST_USER_LOGIN);
+    Session.beginSignIn(TEST_USER_LOGIN);
 
     // Then we should expect that no requests have been made yet
     expect(spyHttpUtilsXhr).not.toHaveBeenCalled();
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index 44a616984277..26bca906195a 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -40,7 +40,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
     }));
 
     // Simulate user entering their login and populating the credentials.login
-    Session.fetchAccountDetails(login);
+    Session.beginSignIn(login);
     return waitForPromisesToResolve()
         .then(() => {
             // First call to Authenticate

From 5448b96d29cb22097a751e06893838082452997f Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 3 Aug 2022 13:22:57 -0700
Subject: [PATCH 11/15] verifying Account -> validating Account

---
 src/languages/en.js          | 2 +-
 src/languages/es.js          | 2 +-
 src/pages/SetPasswordPage.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index d0f55e2aa3b4..684c6c24b9ab 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -516,7 +516,7 @@ export default {
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
         passwordNotSet: 'We were unable to set your new password. We have sent you a new password link to try again.',
         setPasswordLinkInvalid: 'This set password link is invalid or has expired. A new one is waiting for you in your email inbox!',
-        verifyingAccount: 'Verifying account',
+        validatingAccount: 'Verifying account',
     },
     stepCounter: ({step, total}) => `Step ${step} of ${total}`,
     bankAccount: {
diff --git a/src/languages/es.js b/src/languages/es.js
index bb90d7901937..7f07e0522cce 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -516,7 +516,7 @@ export default {
         passwordFormTitle: '¡Bienvenido de vuelta al Nuevo Expensify! Por favor, elige una contraseña.',
         passwordNotSet: 'No pudimos cambiar tu clave. Te hemos enviado un nuevo enlace para que intentes cambiar la clave nuevamente.',
         setPasswordLinkInvalid: 'El enlace para configurar tu contraseña ha expirado. Te hemos enviado un nuevo enlace a tu correo.',
-        verifyingAccount: 'Verificando cuenta',
+        validatingAccount: 'Verificando cuenta',
     },
     stepCounter: ({step, total}) => `Paso ${step} de ${total}`,
     bankAccount: {
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index cc80e8f323e7..e6322bd3f951 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -99,7 +99,7 @@ class SetPasswordPage extends Component {
     }
 
     render() {
-        const buttonText = !this.props.account.validated ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
+        const buttonText = !this.props.account.validated ? this.props.translate('setPasswordPage.validatingAccount') : this.props.translate('setPasswordPage.setPassword');
         const sessionError = this.props.session.error && this.props.translate(this.props.session.error);
         const error = sessionError || this.props.account.error;
         return (

From cf3a61ac40bd58fdf4bb88e8ed1874eda232f8f2 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 3 Aug 2022 14:15:04 -0700
Subject: [PATCH 12/15] Fix test

---
 tests/utils/TestHelper.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index 26bca906195a..e6a7dc5b3e97 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -43,17 +43,9 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
     Session.beginSignIn(login);
     return waitForPromisesToResolve()
         .then(() => {
-            // First call to Authenticate
+            // Response is the same for calls to Authenticate and CreateLogin
             HttpUtils.xhr
-                .mockImplementationOnce(() => Promise.resolve({
-                    jsonCode: 200,
-                    accountID,
-                    authToken,
-                    email: login,
-                }))
-
-                // Next call to CreateLogin
-                .mockImplementationOnce(() => Promise.resolve({
+                .mockImplementation(() => Promise.resolve({
                     jsonCode: 200,
                     accountID,
                     authToken,

From f0c43b04b3e02e7ce581ee0b90c0f61a97be50f2 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 3 Aug 2022 16:27:28 -0700
Subject: [PATCH 13/15] make better usage of mockImplementation calls

---
 tests/actions/ReimbursementAccountTest.js | 42 +++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/tests/actions/ReimbursementAccountTest.js b/tests/actions/ReimbursementAccountTest.js
index 0c0b53c25f90..6eb34c80db44 100644
--- a/tests/actions/ReimbursementAccountTest.js
+++ b/tests/actions/ReimbursementAccountTest.js
@@ -259,25 +259,29 @@ describe('actions/BankAccounts', () => {
                 expect(reimbursementAccount.error).toBe('');
                 expect(reimbursementAccount.achData.currentStep).toBe(CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT);
 
-                // WHEN we mock a sucessful call to SetupWithdrawalAccount while on the ACHContractStep
-                HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve({
-                    jsonCode: 200,
-                    achData: {
-                        bankAccountID: TEST_BANK_ACCOUNT_ID,
-                    },
-                }));
-
-                // And mock SetNameValuePair response
-                HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve({jsonCode: 200}));
-
-                // And mock the response of Get&returnValueList=bankAccountList
-                HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve({
-                    jsonCode: 200,
-                    bankAccountList: [{
-                        bankAccountID: TEST_BANK_ACCOUNT_ID,
-                        state: BankAccount.STATE.PENDING,
-                    }],
-                }));
+                HttpUtils.xhr.mockImplementation((command) => {
+                    switch (command) {
+                        // WHEN we mock a sucessful call to SetupWithdrawalAccount while on the ACHContractStep
+                        case 'BankAccount_SetupWithdrawal':
+                            return Promise.resolve({
+                                jsonCode: 200,
+                                achData: {
+                                    bankAccountID: TEST_BANK_ACCOUNT_ID,
+                                },
+                            });
+                        // And mock the response of Get&returnValueList=bankAccountList
+                        case 'Get':
+                            return Promise.resolve({
+                                jsonCode: 200,
+                                bankAccountList: [{
+                                    bankAccountID: TEST_BANK_ACCOUNT_ID,
+                                    state: BankAccount.STATE.PENDING,
+                                }],
+                            });
+                        default:
+                            return Promise.resolve({jsonCode: 200});
+                    }
+                });
 
                 // WHEN we call setupWithdrawalAccount via the ACHContractStep
                 BankAccounts.setupWithdrawalAccount({

From 812363ff7d02f05d1eb9057c8d181c3b5dfedf42 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 3 Aug 2022 17:01:26 -0700
Subject: [PATCH 14/15] JS style

---
 tests/actions/ReimbursementAccountTest.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/actions/ReimbursementAccountTest.js b/tests/actions/ReimbursementAccountTest.js
index 6eb34c80db44..cd0ae97aeda6 100644
--- a/tests/actions/ReimbursementAccountTest.js
+++ b/tests/actions/ReimbursementAccountTest.js
@@ -260,8 +260,8 @@ describe('actions/BankAccounts', () => {
                 expect(reimbursementAccount.achData.currentStep).toBe(CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT);
 
                 HttpUtils.xhr.mockImplementation((command) => {
+                    // WHEN we mock a sucessful call to SetupWithdrawalAccount while on the ACHContractStep
                     switch (command) {
-                        // WHEN we mock a sucessful call to SetupWithdrawalAccount while on the ACHContractStep
                         case 'BankAccount_SetupWithdrawal':
                             return Promise.resolve({
                                 jsonCode: 200,
@@ -269,6 +269,7 @@ describe('actions/BankAccounts', () => {
                                     bankAccountID: TEST_BANK_ACCOUNT_ID,
                                 },
                             });
+
                         // And mock the response of Get&returnValueList=bankAccountList
                         case 'Get':
                             return Promise.resolve({

From 3141a4da6dd4af22360172585c9f74cd9c3c5a42 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Thu, 4 Aug 2022 10:27:10 -0700
Subject: [PATCH 15/15] loading -> isLoading

---
 src/pages/SetPasswordPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index e6322bd3f951..d3b14a6d3a7c 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -29,7 +29,7 @@ const propTypes = {
         error: PropTypes.string,
 
         /** Whether a sign on form is loading (being submitted) */
-        loading: PropTypes.bool,
+        isLoading: PropTypes.bool,
     }),
 
     /** The credentials of the logged in person */
@@ -120,7 +120,7 @@ class SetPasswordPage extends Component {
                     <View>
                         <FormAlertWithSubmitButton
                             buttonText={buttonText}
-                            isLoading={this.props.account.loading}
+                            isLoading={this.props.account.isLoading}
                             onSubmit={this.validateAndSubmitForm}
                             containerStyles={[styles.mb2, styles.mh0]}
                             message={error}