From e8de936ad591000d817ce43d15b304fe01b0b909 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Sun, 5 Dec 2021 21:08:59 +0000
Subject: [PATCH 01/96] replacing Set Password form with error

---
 src/languages/en.js          |  2 +-
 src/pages/SetPasswordPage.js | 45 ++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index e12cde9a95ab..0c3e3c42d5a7 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -449,7 +449,7 @@ export default {
         newPasswordPrompt: 'Your password must have at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
         passwordNotSet: 'We were unable to set your new password correctly.',
-        accountNotValidated: 'We were unable to validate your account. The validation code may have expired.',
+        accountNotValidated: 'This set password link is invalid or has expired. A new one is waiting for you in your email inbox!',
     },
     stepCounter: ({step, total}) => `Step ${step} of ${total}`,
     bankAccount: {
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 67a3828c1b32..43c9bb1c912b 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -97,29 +97,28 @@ class SetPasswordPage extends Component {
                     shouldShowWelcomeText
                     welcomeText={this.props.translate('setPasswordPage.passwordFormTitle')}
                 >
-                    <View style={[styles.mb4]}>
-                        <NewPasswordForm
-                            password={this.state.password}
-                            updatePassword={password => this.setState({password})}
-                            updateIsFormValid={isValid => this.setState({isFormValid: isValid})}
-                            onSubmitEditing={this.validateAndSubmitForm}
-                        />
-                    </View>
-                    <View>
-                        <Button
-                            success
-                            style={[styles.mb2]}
-                            text={this.props.translate('setPasswordPage.setPassword')}
-                            isLoading={this.props.account.loading}
-                            onPress={this.validateAndSubmitForm}
-                            isDisabled={!this.state.isFormValid}
-                        />
-                    </View>
-                    {!_.isEmpty(error) && (
-                        <Text style={[styles.formError]}>
-                            {error}
-                        </Text>
-                    )}
+                    {_.isEmpty(error) ? (
+                        <>
+                            <View style={[styles.mb4]}>
+                                <NewPasswordForm
+                                    password={this.state.password}
+                                    updatePassword={password => this.setState({password})}
+                                    updateIsFormValid={isValid => this.setState({isFormValid: isValid})}
+                                    onSubmitEditing={this.validateAndSubmitForm}
+                                />
+                            </View>
+                            <View>
+                                <Button
+                                    success
+                                    style={[styles.mb2]}
+                                    text={this.props.translate('setPasswordPage.setPassword')}
+                                    isLoading={this.props.account.loading}
+                                    onPress={this.validateAndSubmitForm}
+                                    isDisabled={!this.state.isFormValid}
+                                />
+                            </View>
+                        </>
+                    ) : <ExpensifyText>{error}</ExpensifyText>}
                 </SignInPageLayout>
             </SafeAreaView>
         );

From 26819f849c4aba1496114faef2f9c21e992e6d09 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Thu, 23 Dec 2021 19:01:51 +0000
Subject: [PATCH 02/96] implement new flow

---
 src/ONYXKEYS.js                   |  3 +++
 src/languages/en.js               |  5 ++--
 src/languages/es.js               |  2 +-
 src/libs/actions/Session/index.js | 36 ++++++++++++++--------------
 src/pages/SetPasswordPage.js      | 40 +++++++++++++++++++++++++------
 5 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 4c7ea591f3ff..f6d3bfbf2c16 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -172,4 +172,7 @@ export default {
     // Stores information about active wallet transfer amount, selectedAccountID, status, etc
     WALLET_TRANSFER: 'walletTransfer',
 
+
+    // Validating Email?
+    USER_SIGN_UP: 'userSignUp',
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index 0c3e3c42d5a7..db1582dfaba9 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -448,8 +448,9 @@ export default {
         setPassword: 'Set password',
         newPasswordPrompt: 'Your password must have at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
-        passwordNotSet: 'We were unable to set your new password correctly.',
-        accountNotValidated: 'This set password link is invalid or has expired. A new one is waiting for you in your email inbox!',
+        passwordNotSet: 'We were unable to set your new password correctly. 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',
     },
     stepCounter: ({step, total}) => `Step ${step} of ${total}`,
     bankAccount: {
diff --git a/src/languages/es.js b/src/languages/es.js
index cac271540c24..b11ad5e861c4 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -449,7 +449,7 @@ export default {
         newPasswordPrompt: 'La contraseña debe tener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
         passwordFormTitle: '¡Bienvenido de vuelta al Nuevo Expensify! Por favor, elige una contraseña.',
         passwordNotSet: 'No pudimos establecer to contaseña correctamente.',
-        accountNotValidated: 'No pudimos validar tu cuenta. Es posible que el enlace de validación haya caducado.',
+        setPasswordLinkInvalid: 'No pudimos validar tu cuenta. Es posible que el enlace de validación haya caducado.',
     },
     stepCounter: ({step, total}) => `Paso ${step} de ${total}`,
     bankAccount: {
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 245ba1c37395..9d4edf95847d 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -293,7 +293,7 @@ function resetPassword() {
  *
  * @param {String} password
  * @param {String} validateCode
- * @param {String} accountID
+ * @param {Number} accountID
  */
 function setPassword(password, validateCode, accountID) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true, validateCodeExpired: false});
@@ -386,50 +386,49 @@ function clearAccountMessages() {
 /**
  * @param {String} authToken
  * @param {String} password
+ * @param {String} login
  */
-function changePasswordAndSignIn(authToken, password) {
+function changePasswordAndSignIn(authToken, password, login) {
     API.ChangePassword({
         authToken,
         password,
     })
         .then((responsePassword) => {
+            Onyx.merge(ONYXKEYS.SESSION, {authToken: undefined});
             if (responsePassword.jsonCode === 200) {
                 signIn(password);
                 return;
             }
-
+            API.ResendValidateCode(login);
             Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.passwordNotSet'});
         });
 }
 
 /**
- * @param {String} accountID
+ * @param {Number} accountID
  * @param {String} validateCode
- * @param {String} password
+ * @param {String} login
+ * @param {String} authToken
  */
-function validateEmail(accountID, validateCode, password) {
+function validateEmail(accountID, validateCode, login, authToken) {
+    Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidatingEmail: true});
     API.ValidateEmail({
         accountID,
         validateCode,
     })
         .then((responseValidate) => {
             if (responseValidate.jsonCode === 200) {
-                changePasswordAndSignIn(responseValidate.authToken, password);
+                Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: responseValidate.authToken});
                 return;
             }
-
-            if (responseValidate.title === CONST.PASSWORD_PAGE.ERROR.ALREADY_VALIDATED) {
-                // If the email is already validated, set the password using the validate code
-                setPassword(
-                    password,
-                    validateCode,
-                    accountID,
-                );
+            if (responseValidate.jsonCode === 666 && authToken) {
                 return;
             }
-
-            Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.accountNotValidated'});
-        });
+            if (responseValidate.jsonCode === 666) {
+                API.ResendValidateCode(login);
+            }
+            Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
+        }).finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidatingEmail: false}));
 }
 
 // It's necessary to throttle requests to reauthenticate since calling this multiple times will cause Pusher to
@@ -507,4 +506,5 @@ export {
     authenticatePusher,
     reauthenticatePusher,
     setShouldShowComposeInput,
+    changePasswordAndSignIn,
 };
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 43c9bb1c912b..3c3b5cd46ddf 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -48,6 +48,15 @@ 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,
 
@@ -60,6 +69,11 @@ const defaultProps = {
     route: validateLinkDefaultProps,
     session: {
         error: '',
+        authToken: '',
+    },
+    userSignUp: {
+        isValidating: false,
+        authToken: '',
     },
 };
 
@@ -68,6 +82,7 @@ class SetPasswordPage extends Component {
         super(props);
 
         this.validateAndSubmitForm = this.validateAndSubmitForm.bind(this);
+        this.buttonText = this.buttonText.bind(this);
 
         this.state = {
             password: '',
@@ -75,17 +90,26 @@ class SetPasswordPage extends Component {
         };
     }
 
+    componentDidMount() {
+        const accountID = lodashGet(this.props.route.params, 'accountID', '');
+        const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
+
+        Session.validateEmail(accountID, validateCode, this.props.credentials.login, this.props.userSignUp.authToken);
+    }
+
     /**
      * Validate the form and then submit it
      */
     validateAndSubmitForm() {
-        const accountID = lodashGet(this.props.route.params, 'accountID', '');
-        const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
         if (!this.state.isFormValid) {
             return;
         }
 
-        Session.validateEmail(accountID, validateCode, this.state.password);
+        Session.changePasswordAndSignIn(this.props.userSignUp.authToken, this.state.password, this.props.credentials.login);
+    }
+
+    buttonText() {
+        return this.props.userSignUp.isValidatingEmail ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
     }
 
     render() {
@@ -97,7 +121,7 @@ class SetPasswordPage extends Component {
                     shouldShowWelcomeText
                     welcomeText={this.props.translate('setPasswordPage.passwordFormTitle')}
                 >
-                    {_.isEmpty(error) ? (
+                    {_.isEmpty(error) && (
                         <>
                             <View style={[styles.mb4]}>
                                 <NewPasswordForm
@@ -111,14 +135,15 @@ class SetPasswordPage extends Component {
                                 <Button
                                     success
                                     style={[styles.mb2]}
-                                    text={this.props.translate('setPasswordPage.setPassword')}
-                                    isLoading={this.props.account.loading}
+                                    text={this.buttonText()}
+                                    isLoading={this.props.account.loading || this.props.userSignUp.isValidatingEmail}
                                     onPress={this.validateAndSubmitForm}
                                     isDisabled={!this.state.isFormValid}
                                 />
                             </View>
                         </>
-                    ) : <ExpensifyText>{error}</ExpensifyText>}
+                    )}
+                    {!_.isEmpty(error) && <ExpensifyText>{error}</ExpensifyText>}
                 </SignInPageLayout>
             </SafeAreaView>
         );
@@ -137,5 +162,6 @@ export default compose(
             key: ONYXKEYS.SESSION,
             initWithStoredValues: false,
         },
+        userSignUp: {key: ONYXKEYS.USER_SIGN_UP},
     }),
 )(SetPasswordPage);

From bf957da6717d22ac84d90d8332e1e28a5504d5ba Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Thu, 23 Dec 2021 20:45:51 +0000
Subject: [PATCH 03/96] correct params passed to resendValidateCode

---
 src/languages/es.js               | 2 +-
 src/libs/actions/Session/index.js | 4 ++--
 src/pages/SetPasswordPage.js      | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index b11ad5e861c4..69969eff88be 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -449,7 +449,7 @@ export default {
         newPasswordPrompt: 'La contraseña debe tener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
         passwordFormTitle: '¡Bienvenido de vuelta al Nuevo Expensify! Por favor, elige una contraseña.',
         passwordNotSet: 'No pudimos establecer to contaseña correctamente.',
-        setPasswordLinkInvalid: 'No pudimos validar tu cuenta. Es posible que el enlace de validación haya caducado.',
+        setPasswordLinkInvalid: 'El enlace para configurar tu contraseña ha expirado. Te hemos enviado un nuevo enlace a tu correo.',
     },
     stepCounter: ({step, total}) => `Paso ${step} de ${total}`,
     bankAccount: {
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 9d4edf95847d..56f5c6768174 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -399,7 +399,7 @@ function changePasswordAndSignIn(authToken, password, login) {
                 signIn(password);
                 return;
             }
-            API.ResendValidateCode(login);
+            API.ResendValidateCode({email: login});
             Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.passwordNotSet'});
         });
 }
@@ -425,7 +425,7 @@ function validateEmail(accountID, validateCode, login, authToken) {
                 return;
             }
             if (responseValidate.jsonCode === 666) {
-                API.ResendValidateCode(login);
+                API.ResendValidateCode({email: login});
             }
             Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
         }).finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidatingEmail: false}));
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 3c3b5cd46ddf..5cc02735a0c0 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -93,7 +93,6 @@ class SetPasswordPage extends Component {
     componentDidMount() {
         const accountID = lodashGet(this.props.route.params, 'accountID', '');
         const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
-
         Session.validateEmail(accountID, validateCode, this.props.credentials.login, this.props.userSignUp.authToken);
     }
 

From b5be7d67ec39a6deeb7b12b008fc4c3a1226298d Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Sun, 9 Jan 2022 16:37:49 +0000
Subject: [PATCH 04/96] moved business logic to action skip validating email
 call if we already have a token we try to use ChangePassword if we have an
 authToken set We otherwise try to use SetPassword

---
 src/languages/en.js               |  1 +
 src/libs/API.js                   |  8 ++--
 src/libs/actions/Session/index.js | 72 +++++++++++++++++++++++++------
 src/pages/SetPasswordPage.js      | 17 ++++++--
 4 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index db1582dfaba9..078773c0ff4f 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -450,6 +450,7 @@ export default {
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
         passwordNotSet: 'We were unable to set your new password correctly. 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!',
+        sessionExpired: 'Your session has expired. A new magic link is waiting for you in your emails.',
         verifyingAccount: 'Verifying account',
     },
     stepCounter: ({step, total}) => `Step ${step} of ${total}`,
diff --git a/src/libs/API.js b/src/libs/API.js
index e8f3309b64c8..c2b1c4ec12de 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -359,8 +359,8 @@ function AddBillingCard(parameters) {
 
 
 /**
- * @param {Object} parameters
- * @param {String} parameters.oldPassword
+ * @param {{password: String, oldPassword: String}} parameters
+ * @param {String} parameters.authToken
  * @param {String} parameters.password
  * @returns {Promise}
  */
@@ -717,7 +717,7 @@ function SetNameValuePair(parameters) {
 
 /**
  * @param {Object} parameters
- * @param {Number} parameters.email
+ * @param {string} parameters.email
  * @returns {Promise}
  */
 function ResetPassword(parameters) {
@@ -730,7 +730,7 @@ function ResetPassword(parameters) {
  * @param {Object} parameters
  * @param {String} parameters.password
  * @param {String} parameters.validateCode
- * @param {String} parameters.accountID
+ * @param {Number} parameters.accountID
  * @returns {Promise}
  */
 function SetPassword(parameters) {
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 56f5c6768174..904cd06f5f10 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -297,7 +297,7 @@ function resetPassword() {
  */
 function setPassword(password, validateCode, accountID) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true, validateCodeExpired: false});
-
+    console.log('set password');
     API.SetPassword({
         password,
         validateCode,
@@ -324,6 +324,7 @@ function setPassword(password, validateCode, accountID) {
             if (login) {
                 Onyx.merge(ONYXKEYS.CREDENTIALS, {login});
             }
+            console.log('nav home via set password');
             Navigation.navigate(ROUTES.HOME);
         })
         .finally(() => {
@@ -386,49 +387,93 @@ function clearAccountMessages() {
 /**
  * @param {String} authToken
  * @param {String} password
- * @param {String} login
  */
-function changePasswordAndSignIn(authToken, password, login) {
+function changePasswordAndSignIn(authToken, password) {
+    console.log('change password and sign in');
+    Onyx.merge(ONYXKEYS.ACCOUNT, {validateSessionExpired: false});
     API.ChangePassword({
         authToken,
         password,
     })
         .then((responsePassword) => {
             Onyx.merge(ONYXKEYS.SESSION, {authToken: undefined});
+            Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: undefined});
             if (responsePassword.jsonCode === 200) {
                 signIn(password);
                 return;
             }
-            API.ResendValidateCode({email: login});
+            if (responsePassword.jsonCode === 407 && !credentials.login) {
+                // authToken has expired and we don't have the email set to request a new magic link. send user to login page to enter email.
+                Navigation.navigate(ROUTES.HOME);
+                return;
+            }
+            if (responsePassword.jsonCode === 407) {
+                // 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});
+                resetPassword();
+                Navigation.navigate(ROUTES.HOME);
+                return;
+            }
             Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.passwordNotSet'});
         });
 }
 
+/**
+ * Call set or change password based on if we have an auth token
+ * @param {Number} accountID
+ * @param {String} validateCode
+ * @param {String} password
+ * @param {String} authToken
+ */
+
+function setOrChangePassword(accountID, validateCode, password, authToken) {
+    if (authToken) {
+        changePasswordAndSignIn(authToken, password);
+        return;
+    }
+    setPassword(password, validateCode, accountID);
+}
+
 /**
  * @param {Number} accountID
  * @param {String} validateCode
  * @param {String} login
  * @param {String} authToken
  */
-function validateEmail(accountID, validateCode, login, authToken) {
-    Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidatingEmail: true});
+function validateEmail(accountID, validateCode) {
+    Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: true});
+    Onyx.merge(ONYXKEYS.SESSION, {error: ''});
     API.ValidateEmail({
         accountID,
         validateCode,
     })
         .then((responseValidate) => {
             if (responseValidate.jsonCode === 200) {
+                console.log('email validated ');
                 Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: responseValidate.authToken});
+                Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
+                Onyx.merge(ONYXKEYS.CREDENTIALS, {login: responseValidate.email});
                 return;
             }
-            if (responseValidate.jsonCode === 666 && authToken) {
-                return;
+            if (responseValidate.jsonCode === 401) {
+                Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
             }
-            if (responseValidate.jsonCode === 666) {
-                API.ResendValidateCode({email: login});
-            }
-            Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
-        }).finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidatingEmail: false}));
+
+            // if (responseValidate.jsonCode === 666 && !authToken) {
+            //     Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
+            //     resetPassword({email: login});
+            //     Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
+            //     return;
+            // }
+            // if (responseValidate.jsonCode === 666 && !login) {
+            //     console.log('no email and invalid link');
+            //     Navigation.navigate(ROUTES.HOME);
+            //     return;
+            // }
+            // console.log('invalid link - new link requested');
+            // API.ResendValidateCode({email: login});
+            // 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
@@ -492,6 +537,7 @@ function setShouldShowComposeInput(shouldShowComposeInput) {
 export {
     continueSessionFromECom,
     fetchAccountDetails,
+    setOrChangePassword,
     setPassword,
     signIn,
     signInWithShortLivedToken,
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 5cc02735a0c0..759a99af1864 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -29,7 +29,7 @@ const propTypes = {
         /** An error message to display to the user */
         error: PropTypes.string,
 
-        /** Whether or not a sign on form is loading (being submitted) */
+        /** Whether a sign on form is loading (being submitted) */
         loading: PropTypes.bool,
     }),
 
@@ -93,6 +93,9 @@ 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) {
+            return;
+        }
         Session.validateEmail(accountID, validateCode, this.props.credentials.login, this.props.userSignUp.authToken);
     }
 
@@ -103,12 +106,20 @@ class SetPasswordPage extends Component {
         if (!this.state.isFormValid) {
             return;
         }
+        const accountID = lodashGet(this.props.route.params, 'accountID', '');
+        const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
 
-        Session.changePasswordAndSignIn(this.props.userSignUp.authToken, this.state.password, this.props.credentials.login);
+        // do I need to move this business logic out of here like so?
+        // if (this.props.userSignUp.authToken) {
+        //     Session.changePasswordAndSignIn(this.props.userSignUp.authToken, this.state.password);
+        //     return;
+        // }
+        // Session.setPassword(this.state.password, validateCode, accountID);
+        Session.setOrChangePassword(accountID, validateCode, this.state.password, this.props.userSignUp.authToken);
     }
 
     buttonText() {
-        return this.props.userSignUp.isValidatingEmail ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
+        return this.props.userSignUp.isValidating ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
     }
 
     render() {

From 6c66e758bd168e2774c67e6d87f6534ccaea8956 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Sun, 9 Jan 2022 17:13:12 +0000
Subject: [PATCH 05/96] clean up comments and logs

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 904cd06f5f10..7a46d622b4c8 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -297,7 +297,6 @@ function resetPassword() {
  */
 function setPassword(password, validateCode, accountID) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true, validateCodeExpired: false});
-    console.log('set password');
     API.SetPassword({
         password,
         validateCode,
@@ -324,7 +323,6 @@ function setPassword(password, validateCode, accountID) {
             if (login) {
                 Onyx.merge(ONYXKEYS.CREDENTIALS, {login});
             }
-            console.log('nav home via set password');
             Navigation.navigate(ROUTES.HOME);
         })
         .finally(() => {
@@ -389,7 +387,6 @@ function clearAccountMessages() {
  * @param {String} password
  */
 function changePasswordAndSignIn(authToken, password) {
-    console.log('change password and sign in');
     Onyx.merge(ONYXKEYS.ACCOUNT, {validateSessionExpired: false});
     API.ChangePassword({
         authToken,
@@ -449,7 +446,6 @@ function validateEmail(accountID, validateCode) {
     })
         .then((responseValidate) => {
             if (responseValidate.jsonCode === 200) {
-                console.log('email validated ');
                 Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: responseValidate.authToken});
                 Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
                 Onyx.merge(ONYXKEYS.CREDENTIALS, {login: responseValidate.email});
@@ -458,21 +454,6 @@ function validateEmail(accountID, validateCode) {
             if (responseValidate.jsonCode === 401) {
                 Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
             }
-
-            // if (responseValidate.jsonCode === 666 && !authToken) {
-            //     Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
-            //     resetPassword({email: login});
-            //     Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
-            //     return;
-            // }
-            // if (responseValidate.jsonCode === 666 && !login) {
-            //     console.log('no email and invalid link');
-            //     Navigation.navigate(ROUTES.HOME);
-            //     return;
-            // }
-            // console.log('invalid link - new link requested');
-            // API.ResendValidateCode({email: login});
-            // Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
         }).finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: false}));
 }
 

From 400c2f2ab65cbaf6e4ecd412527d6597d8f6fa34 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Sun, 9 Jan 2022 17:46:18 +0000
Subject: [PATCH 06/96] remove pointless comment fix Text comp name from rebase

---
 src/languages/en.js          |  1 -
 src/pages/SetPasswordPage.js | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 078773c0ff4f..db1582dfaba9 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -450,7 +450,6 @@ export default {
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
         passwordNotSet: 'We were unable to set your new password correctly. 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!',
-        sessionExpired: 'Your session has expired. A new magic link is waiting for you in your emails.',
         verifyingAccount: 'Verifying account',
     },
     stepCounter: ({step, total}) => `Step ${step} of ${total}`,
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 759a99af1864..ab5dd50eb1b8 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -99,22 +99,12 @@ class SetPasswordPage extends Component {
         Session.validateEmail(accountID, validateCode, this.props.credentials.login, this.props.userSignUp.authToken);
     }
 
-    /**
-     * Validate the form and then submit it
-     */
     validateAndSubmitForm() {
         if (!this.state.isFormValid) {
             return;
         }
         const accountID = lodashGet(this.props.route.params, 'accountID', '');
         const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
-
-        // do I need to move this business logic out of here like so?
-        // if (this.props.userSignUp.authToken) {
-        //     Session.changePasswordAndSignIn(this.props.userSignUp.authToken, this.state.password);
-        //     return;
-        // }
-        // Session.setPassword(this.state.password, validateCode, accountID);
         Session.setOrChangePassword(accountID, validateCode, this.state.password, this.props.userSignUp.authToken);
     }
 
@@ -153,7 +143,7 @@ class SetPasswordPage extends Component {
                             </View>
                         </>
                     )}
-                    {!_.isEmpty(error) && <ExpensifyText>{error}</ExpensifyText>}
+                    {!_.isEmpty(error) && <Text>{error}</Text>}
                 </SignInPageLayout>
             </SafeAreaView>
         );

From 42a9518275a936673b73e6b2272a90faaa3785b8 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Wed, 12 Jan 2022 21:06:26 +0000
Subject: [PATCH 07/96] fix now wiping out authToken properly

---
 src/libs/actions/Session/index.js | 13 +++++++++----
 src/pages/SetPasswordPage.js      |  7 ++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 7a46d622b4c8..1439ba3f845c 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -383,6 +383,8 @@ function clearAccountMessages() {
 }
 
 /**
+ * Calls change password and signs if if successful. Otherwise, we request a new magic link
+ * if we know the account email. Otherwise or finally we redirect to the root of the nav.
  * @param {String} authToken
  * @param {String} password
  */
@@ -393,19 +395,19 @@ function changePasswordAndSignIn(authToken, password) {
         password,
     })
         .then((responsePassword) => {
-            Onyx.merge(ONYXKEYS.SESSION, {authToken: undefined});
-            Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: undefined});
+            Onyx.merge(ONYXKEYS.USER_SIGN_UP, {authToken: null});
             if (responsePassword.jsonCode === 200) {
                 signIn(password);
                 return;
             }
             if (responsePassword.jsonCode === 407 && !credentials.login) {
-                // authToken has expired and we don't have the email set to request a new magic link. send user to login page to enter email.
+                // authToken has expired, and we don't have the email set to request a new magic link.
+                // send user to login page to enter email.
                 Navigation.navigate(ROUTES.HOME);
                 return;
             }
             if (responsePassword.jsonCode === 407) {
-                // authToken has expired and we have the account email so we request  a new magic link.
+                // 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});
                 resetPassword();
                 Navigation.navigate(ROUTES.HOME);
@@ -451,6 +453,9 @@ function validateEmail(accountID, validateCode) {
                 Onyx.merge(ONYXKEYS.CREDENTIALS, {login: responseValidate.email});
                 return;
             }
+            if (responseValidate.jsonCode === 666) {
+                Onyx.merge(ONYXKEYS.ACCOUNT, {accountExists: true, validated: true});
+            }
             if (responseValidate.jsonCode === 401) {
                 Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
             }
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index ab5dd50eb1b8..4de294e79f94 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -82,7 +82,6 @@ class SetPasswordPage extends Component {
         super(props);
 
         this.validateAndSubmitForm = this.validateAndSubmitForm.bind(this);
-        this.buttonText = this.buttonText.bind(this);
 
         this.state = {
             password: '',
@@ -108,11 +107,9 @@ class SetPasswordPage extends Component {
         Session.setOrChangePassword(accountID, validateCode, this.state.password, this.props.userSignUp.authToken);
     }
 
-    buttonText() {
-        return this.props.userSignUp.isValidating ? this.props.translate('setPasswordPage.verifyingAccount') : this.props.translate('setPasswordPage.setPassword');
-    }
 
     render() {
+        const buttonText = this.props.userSignUp.isValidating ? 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 (
@@ -135,7 +132,7 @@ class SetPasswordPage extends Component {
                                 <Button
                                     success
                                     style={[styles.mb2]}
-                                    text={this.buttonText()}
+                                    text={buttonText}
                                     isLoading={this.props.account.loading || this.props.userSignUp.isValidatingEmail}
                                     onPress={this.validateAndSubmitForm}
                                     isDisabled={!this.state.isFormValid}

From 97c8e99a67086ee3c580fd83740aa7d82e4aa37a Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:36:52 +0530
Subject: [PATCH 08/96] Allow hiding the Add payment method button on Payment
 Method list

---
 src/pages/settings/Payments/PaymentMethodList.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 1e2c3b12424b..b25d8171dfd4 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -45,6 +45,9 @@ const propTypes = {
         cardID: PropTypes.number,
     })),
 
+    /** Whether the add Payment button be shown on the list */
+    shouldShowAddPaymentMethodButton: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
@@ -54,6 +57,7 @@ const defaultProps = {
     cardList: [],
     isLoadingPayments: false,
     isAddPaymentMenuActive: false,
+    shouldShowAddPaymentMethodButton: true,
 };
 
 class PaymentMethodList extends Component {
@@ -83,6 +87,10 @@ class PaymentMethodList extends Component {
             });
         }
 
+        if (!this.props.shouldShowAddPaymentMethodButton) {
+            return combinedPaymentMethods;
+        }
+
         combinedPaymentMethods.push({
             type: MENU_ITEM,
             title: this.props.translate('paymentMethodList.addPaymentMethod'),
@@ -119,6 +127,8 @@ class PaymentMethodList extends Component {
                     iconHeight={item.iconSize}
                     iconWidth={item.iconSize}
                     wrapperStyle={item.wrapperStyle}
+                    shouldShowSelectedState={this.props.shouldShowSelectedState}
+                    isSelected={this.props.selectedMethodID === item.methodID}
                 />
             );
         }

From 8660d642f4668ae580b49755d6bf791656fb9b8a Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:07:11 +0530
Subject: [PATCH 09/96] Added ChooseTransferAccontpage

---
 .../Payments/ChooseTransferAccountPage.js     | 102 +++++++++++++++---
 .../settings/Payments/PaymentMethodList.js    |   8 ++
 2 files changed, 97 insertions(+), 13 deletions(-)

diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index eb3fec894eca..8bfccf9f1fe8 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -1,27 +1,103 @@
 import React from 'react';
+import {withOnyx} from 'react-native-onyx';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
 import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import Navigation from '../../../libs/Navigation/Navigation';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import KeyboardAvoidingView from '../../../components/KeyboardAvoidingView';
+import CONST from '../../../CONST';
+import PaymentMethodList from './PaymentMethodList';
+import * as PaymentMethods from '../../../libs/actions/PaymentMethods';
+import ROUTES from '../../../ROUTES';
+import MenuItem from '../../../components/MenuItem';
+import * as Expensicons from '../../../components/Icon/Expensicons';
+import compose from '../../../libs/compose';
+import ONYXKEYS from '../../../ONYXKEYS';
+import walletTransferPropTypes from './walletTransferPropTypes';
+import styles from '../../../styles/styles';
 
 const propTypes = {
+    /** Wallet transfer propTypes */
+    walletTransfer: walletTransferPropTypes,
+
+    /** Are we loading payment methods? */
+    isLoadingPaymentMethods: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
-const ChooseTransferAccountPage = props => (
-    <ScreenWrapper>
-        <KeyboardAvoidingView>
-            <HeaderWithCloseButton
-                title={props.translate('chooseTransferAccountPage.chooseAccount')}
-                shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack()}
-                onCloseButtonPress={() => Navigation.dismissModal()}
-            />
-        </KeyboardAvoidingView>
-    </ScreenWrapper>
-);
+const defaultProps = {
+    walletTransfer: {},
+    isLoadingPaymentMethods: false,
+};
+
+const ChooseTransferAccountPage = (props) => {
+    /**
+     * Go back to TransferPage with the selected bank account
+     * @param {String} accountID of the selected account.
+     */
+    const selectAccountAndNavigateBack = (accountID) => {
+        PaymentMethods.updateWalletTransferData({selectedAccountID: accountID});
+        Navigation.navigate(ROUTES.SETTINGS_TRANSFER_BALANCE);
+    };
+
+    /**
+     * @param {String} paymentType
+     */
+    const navigateToAddPaymentMethodPage = () => {
+        if (props.filterType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
+            Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD);
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT);
+    };
+
+    return (
+        <ScreenWrapper>
+            <KeyboardAvoidingView>
+                <HeaderWithCloseButton
+                    title={props.translate('chooseTransferAccountPage.chooseAccount')}
+                    shouldShowBackButton
+                    onBackButtonPress={() => Navigation.goBack()}
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                />
+                <View style={[styles.flexShrink1, styles.flexBasisAuto]}>
+                    <PaymentMethodList
+                        onPress={selectAccountAndNavigateBack}
+                        shouldShowSelectedState
+                        filterType={props.walletTransfer.filterPaymentMethodType}
+                        selectedMethodID={props.walletTransfer.selectedAccountID}
+                        shouldShowAddPaymentMethodButton={false}
+                    />
+                </View>
+                <MenuItem
+                    onPress={navigateToAddPaymentMethodPage}
+                    title={props.filterType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
+                        ? props.translate('paymentMethodList.addBankAccount')
+                        : props.translate('paymentMethodList.addDebitCard')}
+                    icon={Expensicons.Plus}
+                    disabled={props.isLoadingPaymentMethods}
+                />
+            </KeyboardAvoidingView>
+        </ScreenWrapper>
+    );
+};
 
 ChooseTransferAccountPage.propTypes = propTypes;
+ChooseTransferAccountPage.defaultProps = defaultProps;
+ChooseTransferAccountPage.displayName = 'ChooseTransferAccountPage';
 
-export default withLocalize(ChooseTransferAccountPage);
+export default compose(
+    withLocalize,
+    withOnyx({
+        walletTransfer: {
+            key: ONYXKEYS.WALLET_TRANSFER,
+        },
+        isLoadingPaymentMethods: {
+            key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
+            initWithStoredValues: false,
+        },
+    }),
+)(ChooseTransferAccountPage);
diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index b25d8171dfd4..6b3dae2d319f 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -48,6 +48,9 @@ const propTypes = {
     /** Whether the add Payment button be shown on the list */
     shouldShowAddPaymentMethodButton: PropTypes.bool,
 
+    /** Type to filter the payment Method list */
+    filterType: PropTypes.oneOf([CONST.PAYMENT_METHODS.DEBIT_CARD, CONST.PAYMENT_METHODS.BANK_ACCOUNT]).isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -74,6 +77,11 @@ class PaymentMethodList extends Component {
      */
     createPaymentMethodList() {
         let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList, this.props.payPalMeUsername);
+
+        if (!_.isEmpty(this.props.filterType)) {
+            combinedPaymentMethods = _.filter(combinedPaymentMethods, paymentMethod => paymentMethod.type === this.props.filterType);
+        }
+
         combinedPaymentMethods = _.map(combinedPaymentMethods, paymentMethod => ({
             ...paymentMethod,
             type: MENU_ITEM,

From 05f8a7c688d89a73bd7e96a5058bb662ee341236 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:16:53 +0530
Subject: [PATCH 10/96] set navigation between choose account and transfer page

---
 .../settings/Payments/ChooseTransferAccountPage.js    |  6 +++---
 src/pages/settings/Payments/TransferBalancePage.js    | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index 8bfccf9f1fe8..26d1101cd62a 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -39,7 +39,7 @@ const ChooseTransferAccountPage = (props) => {
      * @param {String} accountID of the selected account.
      */
     const selectAccountAndNavigateBack = (accountID) => {
-        PaymentMethods.updateWalletTransferData({selectedAccountID: accountID});
+        PaymentMethods.saveWalletTransferAccount({selectedAccountID: accountID});
         Navigation.navigate(ROUTES.SETTINGS_TRANSFER_BALANCE);
     };
 
@@ -63,7 +63,7 @@ const ChooseTransferAccountPage = (props) => {
                     onBackButtonPress={() => Navigation.goBack()}
                     onCloseButtonPress={() => Navigation.dismissModal()}
                 />
-                <View style={[styles.flexShrink1, styles.flexBasisAuto]}>
+                <View style={[styles.mt4, styles.flexShrink1, styles.flexBasisAuto]}>
                     <PaymentMethodList
                         onPress={selectAccountAndNavigateBack}
                         shouldShowSelectedState
@@ -74,7 +74,7 @@ const ChooseTransferAccountPage = (props) => {
                 </View>
                 <MenuItem
                     onPress={navigateToAddPaymentMethodPage}
-                    title={props.filterType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
+                    title={props.walletTransfer.filterPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
                         ? props.translate('paymentMethodList.addBankAccount')
                         : props.translate('paymentMethodList.addDebitCard')}
                     icon={Expensicons.Plus}
diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index 25ff4366b292..c07e5d3b6067 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -24,6 +24,7 @@ import walletTransferPropTypes from './walletTransferPropTypes';
 import * as PaymentMethods from '../../../libs/actions/PaymentMethods';
 import * as PaymentUtils from '../../../libs/PaymentUtils';
 import userWalletPropTypes from '../../EnablePayments/userWalletPropTypes';
+import ROUTES from '../../../ROUTES';
 
 const propTypes = {
     /** User's wallet information */
@@ -124,6 +125,14 @@ class TransferBalancePage extends React.Component {
         PaymentMethods.transferWalletBalance(selectedAccount);
     }
 
+    /**
+     * @param {String} filterPaymentMethodType
+     */
+    navigateToChooseTransferAccount(filterPaymentMethodType) {
+        PaymentMethods.saveWalletTransferMethodType(filterPaymentMethodType);
+        Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_CHOOSE_TRANSFER_ACCOUNT);
+    }
+
     render() {
         const selectedAccount = this.getSelectedPaymentMethodAccount();
         const selectedPaymentType = selectedAccount && selectedAccount.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT
@@ -164,6 +173,7 @@ class TransferBalancePage extends React.Component {
                                     ...(selectedPaymentType === paymentType.key
                                         && styles.transferBalanceSelectedPayment),
                                 }}
+                                onPress={() => this.navigateToChooseTransferAccount(paymentType.type)}
                             />
                         ))}
                         <Text
@@ -184,6 +194,7 @@ class TransferBalancePage extends React.Component {
                                         ...styles.mrn5,
                                         ...styles.ph0,
                                     }}
+                                    onPress={() => this.navigateToChooseTransferAccount(selectedAccount.type)}
                                 />
                             )}
                         <Text

From ff85915b1f41f9a42781556dd144962582b9b6cd Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:18:14 +0530
Subject: [PATCH 11/96] add methods

---
 src/libs/actions/PaymentMethods.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 38735599f882..4db6e78ead50 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -164,6 +164,20 @@ function saveWalletTransferAmount(transferAmount) {
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {transferAmount});
 }
 
+/**
+ * @param {String} selectedAccountID
+ */
+function saveWalletTransferAccount(selectedAccountID) {
+    Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {selectedAccountID});
+}
+
+/**
+ * @param {String} filterPaymentMethodType
+ */
+function saveWalletTransferMethodType(filterPaymentMethodType) {
+    Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {filterPaymentMethodType});
+}
+
 function dismissWalletConfirmModal() {
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {shouldShowConfirmModal: false});
 }
@@ -177,5 +191,7 @@ export {
     transferWalletBalance,
     saveWalletTransferAccountAndResetData,
     saveWalletTransferAmount,
+    saveWalletTransferAccount,
+    saveWalletTransferMethodType,
     dismissWalletConfirmModal,
 };

From 00f410600b006199f27caf629c0293c24ecc9be8 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:30:02 +0530
Subject: [PATCH 12/96] Apply filters correctly

---
 src/libs/PaymentUtils.js                                 | 3 +++
 src/pages/settings/Payments/ChooseTransferAccountPage.js | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libs/PaymentUtils.js b/src/libs/PaymentUtils.js
index 3950a6a3214b..eacc9c9e3885 100644
--- a/src/libs/PaymentUtils.js
+++ b/src/libs/PaymentUtils.js
@@ -48,6 +48,7 @@ function formatPaymentMethods(bankAccountList, cardList, payPalMeUsername = '')
             icon,
             iconSize,
             key: `bankAccount-${bankAccount.bankAccountID}`,
+            type: CONST.PAYMENT_METHODS.BANK_ACCOUNT,
         });
     });
 
@@ -63,6 +64,7 @@ function formatPaymentMethods(bankAccountList, cardList, payPalMeUsername = '')
             icon,
             iconSize,
             key: `card-${card.cardNumber}`,
+            type: CONST.PAYMENT_METHODS.DEBIT_CARD,
         });
     });
 
@@ -73,6 +75,7 @@ function formatPaymentMethods(bankAccountList, cardList, payPalMeUsername = '')
             description: payPalMeUsername,
             icon: Expensicons.PayPal,
             key: 'payPalMePaymentMethod',
+            type: CONST.PAYMENT_METHODS.PAYPAL,
         });
     }
 
diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index 26d1101cd62a..f568d6ae6076 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -36,11 +36,12 @@ const defaultProps = {
 const ChooseTransferAccountPage = (props) => {
     /**
      * Go back to TransferPage with the selected bank account
+     * @param {Object} event Click event object
      * @param {String} accountID of the selected account.
      */
-    const selectAccountAndNavigateBack = (accountID) => {
-        PaymentMethods.saveWalletTransferAccount({selectedAccountID: accountID});
-        Navigation.navigate(ROUTES.SETTINGS_TRANSFER_BALANCE);
+    const selectAccountAndNavigateBack = (event, accountID) => {
+        PaymentMethods.saveWalletTransferAccount(accountID);
+        Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE);
     };
 
     /**

From 93fdbb63c523864df5d29ce1aad2d469b865d308 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:32:25 +0530
Subject: [PATCH 13/96] Reset data on every transfer

---
 src/libs/actions/PaymentMethods.js                 | 10 +++-------
 src/pages/settings/Payments/TransferBalancePage.js |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 4db6e78ead50..f00dd6248fe9 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -144,13 +144,9 @@ function transferWalletBalance(paymentMethod) {
         });
 }
 
-/**
- * Set the transfer account and reset the transfer data for Wallet balance transfer
- * @param {String} selectedAccountID
- */
-function saveWalletTransferAccountAndResetData(selectedAccountID) {
+function resetWalletTransferData() {
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {
-        selectedAccountID,
+        selectedAccountID: null,
         filterPaymentMethodType: null,
         loading: false,
         shouldShowConfirmModal: false,
@@ -189,7 +185,7 @@ export {
     continueSetup,
     clearDebitCardFormErrorAndSubmit,
     transferWalletBalance,
-    saveWalletTransferAccountAndResetData,
+    resetWalletTransferData,
     saveWalletTransferAmount,
     saveWalletTransferAccount,
     saveWalletTransferMethodType,
diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index c07e5d3b6067..e7b77f0be6cc 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -98,8 +98,7 @@ class TransferBalancePage extends React.Component {
         ];
 
         this.saveTransferAmountAndBalance = this.saveTransferAmountAndBalance.bind(this);
-        const selectedAccount = this.getSelectedPaymentMethodAccount();
-        PaymentMethods.saveWalletTransferAccountAndResetData(selectedAccount ? selectedAccount.id : '');
+        PaymentMethods.resetWalletTransferData();
     }
 
     /**

From 12c62e0e0c40449ee1edbc6027a0260603952e1c Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:33:46 +0530
Subject: [PATCH 14/96] make filtering optional for PaymentMethodList

---
 src/pages/settings/Payments/PaymentMethodList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 6b3dae2d319f..a5b535d25910 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -49,7 +49,7 @@ const propTypes = {
     shouldShowAddPaymentMethodButton: PropTypes.bool,
 
     /** Type to filter the payment Method list */
-    filterType: PropTypes.oneOf([CONST.PAYMENT_METHODS.DEBIT_CARD, CONST.PAYMENT_METHODS.BANK_ACCOUNT]).isRequired,
+    filterType: PropTypes.oneOf([CONST.PAYMENT_METHODS.DEBIT_CARD, CONST.PAYMENT_METHODS.BANK_ACCOUNT, '']),
 
     ...withLocalizePropTypes,
 };
@@ -61,6 +61,7 @@ const defaultProps = {
     isLoadingPayments: false,
     isAddPaymentMenuActive: false,
     shouldShowAddPaymentMethodButton: true,
+    filterType: '',
 };
 
 class PaymentMethodList extends Component {

From e3f1b4f68b8f9b841d161fe75cd2ab8589b507bb Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:45:26 +0530
Subject: [PATCH 15/96] UI tweaks

---
 src/pages/settings/Payments/ChooseTransferAccountPage.js | 2 +-
 src/pages/settings/Payments/PaymentsPage.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index f568d6ae6076..ef3a540d504a 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -64,7 +64,7 @@ const ChooseTransferAccountPage = (props) => {
                     onBackButtonPress={() => Navigation.goBack()}
                     onCloseButtonPress={() => Navigation.dismissModal()}
                 />
-                <View style={[styles.mt4, styles.flexShrink1, styles.flexBasisAuto]}>
+                <View style={[styles.mt6, styles.flexShrink1, styles.flexBasisAuto]}>
                     <PaymentMethodList
                         onPress={selectAccountAndNavigateBack}
                         shouldShowSelectedState
diff --git a/src/pages/settings/Payments/PaymentsPage.js b/src/pages/settings/Payments/PaymentsPage.js
index 3279ce0adb72..9cf5e5f5cc2f 100644
--- a/src/pages/settings/Payments/PaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage.js
@@ -150,7 +150,7 @@ class PaymentsPage extends React.Component {
                             </>
                         )}
                         <Text
-                            style={[styles.ph5, styles.formLabel]}
+                            style={[styles.ph5, styles.mt6, styles.formLabel]}
                         >
                             {this.props.translate('paymentsPage.paymentMethodsTitle')}
                         </Text>

From b4803794c8922d594ac47736bb5e532816ef1e57 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:54:35 +0530
Subject: [PATCH 16/96] rename method names

---
 src/libs/actions/PaymentMethods.js                 | 2 +-
 src/pages/settings/Payments/TransferBalancePage.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index f00dd6248fe9..ae7dde2e24d2 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -130,7 +130,7 @@ function transferWalletBalance(paymentMethod) {
     };
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {loading: true});
 
-    API.TransferWalletBalance(parameters)
+    API.Wallet_TransferBalance(parameters)
         .then((response) => {
             if (response.jsonCode !== 200) {
                 throw new Error(response.message);
diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index e7b77f0be6cc..3343c2023f23 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -97,7 +97,6 @@ class TransferBalancePage extends React.Component {
             },
         ];
 
-        this.saveTransferAmountAndBalance = this.saveTransferAmountAndBalance.bind(this);
         PaymentMethods.resetWalletTransferData();
     }
 
@@ -119,7 +118,7 @@ class TransferBalancePage extends React.Component {
      * @param {Number} transferAmount
      * @param {Object} selectedAccount
      */
-    saveTransferAmountAndBalance(transferAmount, selectedAccount) {
+    saveTransferAmountAndStartTransfer(transferAmount, selectedAccount) {
         PaymentMethods.saveWalletTransferAmount(transferAmount);
         PaymentMethods.transferWalletBalance(selectedAccount);
     }
@@ -133,6 +132,7 @@ class TransferBalancePage extends React.Component {
     }
 
     render() {
+        this.props.userWallet.currentBalance = 125;
         const selectedAccount = this.getSelectedPaymentMethodAccount();
         const selectedPaymentType = selectedAccount && selectedAccount.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT
             ? CONST.WALLET.TRANSFER_METHOD_TYPE.ACH
@@ -222,7 +222,7 @@ class TransferBalancePage extends React.Component {
                             pressOnEnter
                             isLoading={this.props.walletTransfer.loading}
                             isDisabled={isButtonDisabled}
-                            onPress={() => this.saveTransferAmountAndBalance(transferAmount, selectedAccount)}
+                            onPress={() => this.saveTransferAmountAndStartTransfer(transferAmount, selectedAccount)}
                             text={this.props.translate(
                                 'transferAmountPage.transfer',
                                 {

From ec1782c0d5d055706b6f77b6e0e003294a4ea094 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:00:26 +0530
Subject: [PATCH 17/96] translations fixed

---
 src/languages/en.js                                      | 4 ++--
 src/languages/es.js                                      | 4 ++--
 src/pages/settings/Payments/ChooseTransferAccountPage.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index e95934194aa6..e599e3161dbe 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -368,8 +368,8 @@ export default {
     },
     paymentMethodList: {
         addPaymentMethod: 'Add payment method',
-        addDebitCard: 'Add debit card',
-        addBankAccount: 'Add bank account',
+        addNewDebitCard: 'Add new debit card',
+        addNewBankAccount: 'Add new bank account',
         accountLastFour: 'Account ending in',
         cardLastFour: 'Card ending in',
         addFirstPaymentMethod: 'Add a payment method to send and receive payments directly in the app.',
diff --git a/src/languages/es.js b/src/languages/es.js
index df211fbb7892..0e88f03dc20c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -368,8 +368,8 @@ export default {
     },
     paymentMethodList: {
         addPaymentMethod: 'Agrega método de pago',
-        addDebitCard: 'Agregar tarjeta de débito',
-        addBankAccount: 'Agregar cuenta de banco',
+        addNewDebitCard: 'Agregar nueva tarjeta de débito',
+        addNewBankAccount: 'Agregar nueva cuenta de banco',
         accountLastFour: 'Cuenta con terminación',
         cardLastFour: 'Tarjeta con terminacíon',
         addFirstPaymentMethod: 'Añade un método de pago para enviar y recibir pagos directamente desde la aplicación.',
diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index ef3a540d504a..7bca746941b4 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -76,8 +76,8 @@ const ChooseTransferAccountPage = (props) => {
                 <MenuItem
                     onPress={navigateToAddPaymentMethodPage}
                     title={props.walletTransfer.filterPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
-                        ? props.translate('paymentMethodList.addBankAccount')
-                        : props.translate('paymentMethodList.addDebitCard')}
+                        ? props.translate('paymentMethodList.addNewBankAccount')
+                        : props.translate('paymentMethodList.addNewDebitCard')}
                     icon={Expensicons.Plus}
                     disabled={props.isLoadingPaymentMethods}
                 />

From cc5e4a59619f52b316cb58bb8260345fe2421a06 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 23:07:56 +0530
Subject: [PATCH 18/96] Refactored names, clean up and  comments

---
 src/libs/actions/PaymentMethods.js                  |  5 +++--
 .../settings/Payments/ChooseTransferAccountPage.js  | 13 ++-----------
 src/pages/settings/Payments/TransferBalancePage.js  |  1 -
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index ae7dde2e24d2..07ed01811b14 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -163,11 +163,12 @@ function saveWalletTransferAmount(transferAmount) {
 /**
  * @param {String} selectedAccountID
  */
-function saveWalletTransferAccount(selectedAccountID) {
+function saveWalletTransferAccountID(selectedAccountID) {
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {selectedAccountID});
 }
 
 /**
+ * Toggles the user's selected type of payment method (bank account or debit card) on the wallet transfer balance screen.
  * @param {String} filterPaymentMethodType
  */
 function saveWalletTransferMethodType(filterPaymentMethodType) {
@@ -187,7 +188,7 @@ export {
     transferWalletBalance,
     resetWalletTransferData,
     saveWalletTransferAmount,
-    saveWalletTransferAccount,
+    saveWalletTransferAccountID,
     saveWalletTransferMethodType,
     dismissWalletConfirmModal,
 };
diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index 7bca746941b4..8f373da72dbc 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -22,25 +22,21 @@ const propTypes = {
     /** Wallet transfer propTypes */
     walletTransfer: walletTransferPropTypes,
 
-    /** Are we loading payment methods? */
-    isLoadingPaymentMethods: PropTypes.bool,
-
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     walletTransfer: {},
-    isLoadingPaymentMethods: false,
 };
 
 const ChooseTransferAccountPage = (props) => {
     /**
-     * Go back to TransferPage with the selected bank account
+     * Go back to transfer balance screen with the selected bank account set
      * @param {Object} event Click event object
      * @param {String} accountID of the selected account.
      */
     const selectAccountAndNavigateBack = (event, accountID) => {
-        PaymentMethods.saveWalletTransferAccount(accountID);
+        PaymentMethods.saveWalletTransferAccountID(accountID);
         Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE);
     };
 
@@ -79,7 +75,6 @@ const ChooseTransferAccountPage = (props) => {
                         ? props.translate('paymentMethodList.addNewBankAccount')
                         : props.translate('paymentMethodList.addNewDebitCard')}
                     icon={Expensicons.Plus}
-                    disabled={props.isLoadingPaymentMethods}
                 />
             </KeyboardAvoidingView>
         </ScreenWrapper>
@@ -96,9 +91,5 @@ export default compose(
         walletTransfer: {
             key: ONYXKEYS.WALLET_TRANSFER,
         },
-        isLoadingPaymentMethods: {
-            key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
-            initWithStoredValues: false,
-        },
     }),
 )(ChooseTransferAccountPage);
diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index 3343c2023f23..881270b8b00b 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -132,7 +132,6 @@ class TransferBalancePage extends React.Component {
     }
 
     render() {
-        this.props.userWallet.currentBalance = 125;
         const selectedAccount = this.getSelectedPaymentMethodAccount();
         const selectedPaymentType = selectedAccount && selectedAccount.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT
             ? CONST.WALLET.TRANSFER_METHOD_TYPE.ACH

From c43bd3aa075c814c0978636422a3e65e2b5c7f72 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Thu, 13 Jan 2022 23:32:56 +0530
Subject: [PATCH 19/96] remove unused imports

---
 src/pages/settings/Payments/ChooseTransferAccountPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index 8f373da72dbc..fe6f22449be2 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
-import PropTypes from 'prop-types';
 import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import Navigation from '../../../libs/Navigation/Navigation';

From cd842f2e0cb4e2f51ab75516aa1898f0716c1fad Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:28:21 -0700
Subject: [PATCH 20/96] add RenameReport API function

---
 src/libs/API.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/libs/API.js b/src/libs/API.js
index b1fb0288644a..b91b953511da 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1144,6 +1144,18 @@ function CreatePolicyRoom(parameters) {
     return Network.post(commandName, parameters);
 }
 
+/**
+ * @param {Object} parameters
+ * @param {String} parameters.policyID
+ * @param {String} parameters.reportName
+ * @return {Promise}
+ */
+ function RenameReport(parameters) {
+    const commandName = 'RenameReport';
+    requireParameters(['policyID', 'reportName'], parameters, commandName);
+    return Network.post(commandName, parameters);
+}
+
 /**
  * Transfer Wallet balance and takes either the bankAccoundID or fundID
  * @param {Object} parameters

From 4c5ffa044c035f4e85125d586282e291384b6a2e Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:30:33 -0700
Subject: [PATCH 21/96] export function and add comment

---
 src/libs/API.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/API.js b/src/libs/API.js
index b91b953511da..9c7f9c559987 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1145,6 +1145,7 @@ function CreatePolicyRoom(parameters) {
 }
 
 /**
+ * Renames a user create policy room
  * @param {Object} parameters
  * @param {String} parameters.policyID
  * @param {String} parameters.reportName
@@ -1183,6 +1184,7 @@ export {
     CreateChatReport,
     CreateLogin,
     CreatePolicyRoom,
+    RenameReport,
     DeleteLogin,
     DeleteBankAccount,
     Get,

From c0911ef6a36d457b34ee1f548a259c759a732ba3 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:39:14 -0700
Subject: [PATCH 22/96] add renameReport action

---
 src/languages/en.js        |  2 ++
 src/languages/es.js        |  2 ++
 src/libs/actions/Report.js | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/languages/en.js b/src/languages/en.js
index e95934194aa6..39b208a8bdbf 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -872,9 +872,11 @@ export default {
         privateDescription: 'Only people invited to this room are able to find it',
         createRoom: 'Create Room',
         roomAlreadyExists: 'A room with this name already exists',
+        roomSuccessfullyRenamed: 'Policy room was successfully renamed!',
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnError: 'Unable to create policy room, please check your connection and try again.',
+        growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
         visibilityOptions: {
             restricted: 'Restricted',
             private: 'Private',
diff --git a/src/languages/es.js b/src/languages/es.js
index df211fbb7892..11e770c21c1b 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -874,9 +874,11 @@ export default {
         privateDescription: 'Sólo las personas que están invitadas a esta sala pueden encontrarla',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExists: 'Ya existe una sala con este nombre',
+        roomSuccessfullyRenamed: 'Your room was successfully renamed!',
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
+        growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
         visibilityOptions: {
             restricted: 'Restringida',
             private: 'Privada',
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 0b079060d158..fbd367ed7fef 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1530,6 +1530,26 @@ function createPolicyRoom(policyID, reportName, visibility) {
         .finally(() => Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, false));
 }
 
+/**
+ * Renames a user created Policy Room.
+ * @param {String} policyID
+ * @param {String} reportName
+ */
+ function renameReport(policyID, reportName) {
+    Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, true);
+    return API.RenameReport({policyID, reportName})
+        .then((response) => {
+            if (response.jsonCode !== 200) {
+                Growl.error(response.message);
+                return;
+            }
+            Growl.success(Localize.translateLocal('newRoomPage.roomSuccessfullyRenamed'))
+        })
+        .catch(() => {
+            Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError'));
+        })
+}
+
 export {
     fetchAllReports,
     fetchActions,
@@ -1559,5 +1579,6 @@ export {
     setReportWithDraft,
     fetchActionsWithLoadingState,
     createPolicyRoom,
+    renameReport,
     getLastReadSequenceNumber,
 };

From 232836e5f3a972b37265811ae733ff685bbd88b0 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:43:27 -0700
Subject: [PATCH 23/96] add event handler to ReportSettingsPage

---
 src/pages/ReportSettingsPage.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js
index 602c23a890d4..38c2a38a10af 100644
--- a/src/pages/ReportSettingsPage.js
+++ b/src/pages/ReportSettingsPage.js
@@ -91,6 +91,7 @@ class ReportSettingsPage extends Component {
     render() {
         const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report);
         const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID);
+        const policyID = linkedWorkspace && linkedWorkspace.id;
 
         return (
             <ScreenWrapper>
@@ -135,15 +136,13 @@ class ReportSettingsPage extends Component {
                                     onChangeError={error => this.setState({error})}
                                     initialValue={this.state.newRoomName}
                                     disabled={shouldDisableRename}
-                                    policyID={linkedWorkspace && linkedWorkspace.id}
+                                    policyID={policyID}
                                 />
                             </View>
                             <Button
                                 success={!shouldDisableRename}
                                 text={this.props.translate('common.save')}
-                                onPress={() => {
-                                    // When renaming is built, this will use that API command
-                                }}
+                                onPress={() => Report.renameReport(policyID, this.state.newRoomName)}
                                 style={[styles.ml2]}
                                 textStyles={[styles.label]}
                                 innerStyles={[styles.reportSettingsChangeNameButton]}

From 18fdd5c5c2984d14ade007ed922253975fab1545 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:54:23 -0700
Subject: [PATCH 24/96] update spanish copy

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

diff --git a/src/languages/es.js b/src/languages/es.js
index 11e770c21c1b..63059bebbbd6 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -874,11 +874,11 @@ export default {
         privateDescription: 'Sólo las personas que están invitadas a esta sala pueden encontrarla',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExists: 'Ya existe una sala con este nombre',
-        roomSuccessfullyRenamed: 'Your room was successfully renamed!',
+        roomSuccessfullyRenamed: '¡Espacio de trabajo renombrado con éxito!',
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
-        growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
+        growlMessageOnRenameError: 'No ha sido posible cambiar el nomdre del espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
         visibilityOptions: {
             restricted: 'Restringida',
             private: 'Privada',

From ed540928af69d7694724da94abaafa64554eedf7 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:57:30 -0700
Subject: [PATCH 25/96] fix style

---
 src/libs/API.js            | 2 +-
 src/libs/actions/Report.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libs/API.js b/src/libs/API.js
index 9c7f9c559987..5dc1d71ee660 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1151,7 +1151,7 @@ function CreatePolicyRoom(parameters) {
  * @param {String} parameters.reportName
  * @return {Promise}
  */
- function RenameReport(parameters) {
+function RenameReport(parameters) {
     const commandName = 'RenameReport';
     requireParameters(['policyID', 'reportName'], parameters, commandName);
     return Network.post(commandName, parameters);
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index fbd367ed7fef..9605a12063d1 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1535,19 +1535,19 @@ function createPolicyRoom(policyID, reportName, visibility) {
  * @param {String} policyID
  * @param {String} reportName
  */
- function renameReport(policyID, reportName) {
+function renameReport(policyID, reportName) {
     Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, true);
-    return API.RenameReport({policyID, reportName})
+    API.RenameReport({policyID, reportName})
         .then((response) => {
             if (response.jsonCode !== 200) {
                 Growl.error(response.message);
                 return;
             }
-            Growl.success(Localize.translateLocal('newRoomPage.roomSuccessfullyRenamed'))
+            Growl.success(Localize.translateLocal('newRoomPage.roomSuccessfullyRenamed'));
         })
         .catch(() => {
             Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError'));
-        })
+        });
 }
 
 export {

From 570eba1845218ac9e460d8dd4ca2866cdc3b54eb Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 15:58:14 -0700
Subject: [PATCH 26/96] remove loading state

---
 src/libs/actions/Report.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 9605a12063d1..38d96a491d3f 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1536,7 +1536,6 @@ function createPolicyRoom(policyID, reportName, visibility) {
  * @param {String} reportName
  */
 function renameReport(policyID, reportName) {
-    Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, true);
     API.RenameReport({policyID, reportName})
         .then((response) => {
             if (response.jsonCode !== 200) {

From 5caf463799a7926b47a48f65fac3a938667017a8 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 16:05:33 -0700
Subject: [PATCH 27/96] replace policyID with reportID in all function calls

---
 src/libs/API.js                 | 4 ++--
 src/libs/actions/Report.js      | 6 +++---
 src/pages/ReportSettingsPage.js | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/libs/API.js b/src/libs/API.js
index 5dc1d71ee660..df39c431f08c 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1147,13 +1147,13 @@ function CreatePolicyRoom(parameters) {
 /**
  * Renames a user create policy room
  * @param {Object} parameters
- * @param {String} parameters.policyID
+ * @param {String} parameters.reportID
  * @param {String} parameters.reportName
  * @return {Promise}
  */
 function RenameReport(parameters) {
     const commandName = 'RenameReport';
-    requireParameters(['policyID', 'reportName'], parameters, commandName);
+    requireParameters(['reportID', 'reportName'], parameters, commandName);
     return Network.post(commandName, parameters);
 }
 
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 38d96a491d3f..0b85133b2f8c 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1532,11 +1532,11 @@ function createPolicyRoom(policyID, reportName, visibility) {
 
 /**
  * Renames a user created Policy Room.
- * @param {String} policyID
+ * @param {String} reportID
  * @param {String} reportName
  */
-function renameReport(policyID, reportName) {
-    API.RenameReport({policyID, reportName})
+function renameReport(reportID, reportName) {
+    API.RenameReport({reportID, reportName})
         .then((response) => {
             if (response.jsonCode !== 200) {
                 Growl.error(response.message);
diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js
index 38c2a38a10af..3135df868e0e 100644
--- a/src/pages/ReportSettingsPage.js
+++ b/src/pages/ReportSettingsPage.js
@@ -91,7 +91,6 @@ class ReportSettingsPage extends Component {
     render() {
         const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report);
         const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID);
-        const policyID = linkedWorkspace && linkedWorkspace.id;
 
         return (
             <ScreenWrapper>
@@ -136,13 +135,13 @@ class ReportSettingsPage extends Component {
                                     onChangeError={error => this.setState({error})}
                                     initialValue={this.state.newRoomName}
                                     disabled={shouldDisableRename}
-                                    policyID={policyID}
+                                    policyID={linkedWorkspace && linkedWorkspace.id}
                                 />
                             </View>
                             <Button
                                 success={!shouldDisableRename}
                                 text={this.props.translate('common.save')}
-                                onPress={() => Report.renameReport(policyID, this.state.newRoomName)}
+                                onPress={() => Report.renameReport(this.props.report.reportID, this.state.newRoomName)}
                                 style={[styles.ml2]}
                                 textStyles={[styles.label]}
                                 innerStyles={[styles.reportSettingsChangeNameButton]}

From edc04f24c0992abcc8e0cf2010f7ad21735b3966 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 13 Jan 2022 16:18:07 -0700
Subject: [PATCH 28/96] update copy

---
 src/languages/en.js        | 2 +-
 src/languages/es.js        | 2 +-
 src/libs/actions/Report.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 39b208a8bdbf..21573a86f824 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -872,7 +872,7 @@ export default {
         privateDescription: 'Only people invited to this room are able to find it',
         createRoom: 'Create Room',
         roomAlreadyExists: 'A room with this name already exists',
-        roomSuccessfullyRenamed: 'Policy room was successfully renamed!',
+        roomRenamed: 'Policy room renamed!',
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnError: 'Unable to create policy room, please check your connection and try again.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 63059bebbbd6..0c95ac2bb385 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -874,7 +874,7 @@ export default {
         privateDescription: 'Sólo las personas que están invitadas a esta sala pueden encontrarla',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExists: 'Ya existe una sala con este nombre',
-        roomSuccessfullyRenamed: '¡Espacio de trabajo renombrado con éxito!',
+        roomRenamed: '¡Espacio de trabajo renombrado!',
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 0b85133b2f8c..c485b16e89a3 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1542,7 +1542,7 @@ function renameReport(reportID, reportName) {
                 Growl.error(response.message);
                 return;
             }
-            Growl.success(Localize.translateLocal('newRoomPage.roomSuccessfullyRenamed'));
+            Growl.success(Localize.translateLocal('newRoomPage.roomRenamed'));
         })
         .catch(() => {
             Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError'));

From 0136230534129b25da4aebc440ea93c151eb3a28 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Fri, 14 Jan 2022 07:12:13 +0530
Subject: [PATCH 29/96] rename and props correction

---
 src/libs/API.js                                          | 4 ++--
 src/libs/actions/PaymentMethods.js                       | 2 +-
 src/pages/settings/Payments/ChooseTransferAccountPage.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/API.js b/src/libs/API.js
index b1fb0288644a..7e7f21c9f2fa 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1151,7 +1151,7 @@ function CreatePolicyRoom(parameters) {
  * @param {String} [parameters.fundID]
  * @returns {Promise}
  */
-function Wallet_TransferBalance(parameters) {
+function TransferWalletBalance(parameters) {
     const commandName = 'TransferWalletBalance';
     if (!parameters.bankAccountID && !parameters.fundID) {
         throw new Error('Must pass either bankAccountID or fundID to TransferWalletBalance');
@@ -1218,7 +1218,7 @@ export {
     ValidateEmail,
     Wallet_Activate,
     Wallet_GetOnfidoSDKToken,
-    Wallet_TransferBalance,
+    TransferWalletBalance,
     GetLocalCurrency,
     GetCurrencyList,
     Policy_Create,
diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 07ed01811b14..6abd9ab576ce 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -130,7 +130,7 @@ function transferWalletBalance(paymentMethod) {
     };
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {loading: true});
 
-    API.Wallet_TransferBalance(parameters)
+    API.TransferWalletBalance(parameters)
         .then((response) => {
             if (response.jsonCode !== 200) {
                 throw new Error(response.message);
diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index fe6f22449be2..aa5ef065e321 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -43,7 +43,7 @@ const ChooseTransferAccountPage = (props) => {
      * @param {String} paymentType
      */
     const navigateToAddPaymentMethodPage = () => {
-        if (props.filterType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
+        if (props.walletTransfer.filterPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD);
             return;
         }

From e9ba9380a6d18e341e0470c55bcfbcbe7e2c4a10 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Fri, 14 Jan 2022 10:32:02 +0000
Subject: [PATCH 30/96] remove extra arguments clean up code style

---
 src/libs/actions/Session/index.js | 3 ++-
 src/pages/SetPasswordPage.js      | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 1439ba3f845c..490a7951648a 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -459,7 +459,8 @@ function validateEmail(accountID, validateCode) {
             if (responseValidate.jsonCode === 401) {
                 Onyx.merge(ONYXKEYS.SESSION, {error: 'setPasswordPage.setPasswordLinkInvalid'});
             }
-        }).finally(Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: false}));
+        })
+        .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
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 4de294e79f94..c9d97e39e19d 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -95,7 +95,7 @@ class SetPasswordPage extends Component {
         if (this.props.userSignUp.authToken) {
             return;
         }
-        Session.validateEmail(accountID, validateCode, this.props.credentials.login, this.props.userSignUp.authToken);
+        Session.validateEmail(accountID, validateCode);
     }
 
     validateAndSubmitForm() {
@@ -118,7 +118,7 @@ class SetPasswordPage extends Component {
                     shouldShowWelcomeText
                     welcomeText={this.props.translate('setPasswordPage.passwordFormTitle')}
                 >
-                    {_.isEmpty(error) && (
+                    {_.isEmpty(error) ? (
                         <>
                             <View style={[styles.mb4]}>
                                 <NewPasswordForm
@@ -139,8 +139,8 @@ class SetPasswordPage extends Component {
                                 />
                             </View>
                         </>
-                    )}
-                    {!_.isEmpty(error) && <Text>{error}</Text>}
+                    )
+                        : (<Text>{error}</Text>)}
                 </SignInPageLayout>
             </SafeAreaView>
         );

From 7ec90d46f20af4b81b6fa9e9978842e9db80c63d Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Fri, 14 Jan 2022 10:58:14 +0000
Subject: [PATCH 31/96] add verifyingAccount trans key to es.js

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

diff --git a/src/languages/es.js b/src/languages/es.js
index 49d6c9a63bc1..fddc2ea91cf9 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -466,6 +466,7 @@ export default {
         passwordFormTitle: '¡Bienvenido de vuelta al Nuevo Expensify! Por favor, elige una contraseña.',
         passwordNotSet: 'No pudimos establecer to contaseña correctamente.',
         setPasswordLinkInvalid: 'El enlace para configurar tu contraseña ha expirado. Te hemos enviado un nuevo enlace a tu correo.',
+        verifyingAccount: 'Verificando cuenta',
     },
     stepCounter: ({step, total}) => `Paso ${step} de ${total}`,
     bankAccount: {

From 699ebfa53debad98078b3fa496de2988b8073058 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 14 Jan 2022 12:30:23 -0700
Subject: [PATCH 32/96] add renamed const and include renamed action in report
 action filter

---
 src/CONST.js                               | 1 +
 src/pages/home/report/ReportActionsView.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index d5646a57fca2..0d9d643fafc5 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -213,6 +213,7 @@ const CONST = {
             TYPE: {
                 IOU: 'IOU',
                 ADDCOMMENT: 'ADDCOMMENT',
+                RENAMED: 'RENAMED',
             },
         },
         ERROR: {
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 32832c920762..bfebeb49aef5 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -339,7 +339,8 @@ class ReportActionsView extends React.Component {
         this.sortedReportActions = _.chain(reportActions)
             .sortBy('sequenceNumber')
             .filter(action => action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU
-                    || action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT)
+                    || action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT
+                    || action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED)
             .map((item, index) => ({action: item, index}))
             .value()
             .reverse();

From 60e05eaeb8c01573f964c91d79f31cd2e7394682 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 14 Jan 2022 14:08:51 -0700
Subject: [PATCH 33/96] update reportName on LHN and header

---
 src/libs/actions/Report.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index c485b16e89a3..073edee7864e 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1543,6 +1543,7 @@ function renameReport(reportID, reportName) {
                 return;
             }
             Growl.success(Localize.translateLocal('newRoomPage.roomRenamed'));
+            Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {reportName});
         })
         .catch(() => {
             Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError'));

From 7751d73d13c17a9743c89ccada76780c28f522f3 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Sat, 15 Jan 2022 10:29:06 +0530
Subject: [PATCH 34/96] select default account

---
 src/pages/settings/Payments/TransferBalancePage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index 881270b8b00b..d32675553641 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -98,6 +98,8 @@ class TransferBalancePage extends React.Component {
         ];
 
         PaymentMethods.resetWalletTransferData();
+        const selectedAccount = this.getSelectedPaymentMethodAccount();
+        PaymentMethods.saveWalletTransferAccountID(selectedAccount ? selectedAccount.methodID : '');
     }
 
     /**

From 1eb91c43a654463b7d15f2725f2fbb32a8986be0 Mon Sep 17 00:00:00 2001
From: Anthony Hull <hey@anthonyhull.me>
Date: Mon, 17 Jan 2022 09:51:09 +0000
Subject: [PATCH 35/96] copy update

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 02f0d3089743..af79eee911a3 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -464,7 +464,7 @@ export default {
         setPassword: 'Set password',
         newPasswordPrompt: 'Your password must have at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
         passwordFormTitle: 'Welcome back to the New Expensify! Please set your password.',
-        passwordNotSet: 'We were unable to set your new password correctly. We have sent you a new password link to try again.',
+        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',
     },
diff --git a/src/languages/es.js b/src/languages/es.js
index fddc2ea91cf9..19c2a4d978f0 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -464,7 +464,7 @@ export default {
         setPassword: 'Configura tu contraseña',
         newPasswordPrompt: 'La contraseña debe tener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
         passwordFormTitle: '¡Bienvenido de vuelta al Nuevo Expensify! Por favor, elige una contraseña.',
-        passwordNotSet: 'No pudimos establecer to contaseña correctamente.',
+        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',
     },

From cd1ddbaad2b81e8f98700815bf13d54cfda5fc49 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:10:28 +0530
Subject: [PATCH 36/96] Adopt changes from latest changes

---
 src/libs/PaymentUtils.js                      |  2 +-
 src/libs/actions/PaymentMethods.js            |  8 ++++---
 .../Payments/ChooseTransferAccountPage.js     | 12 ++++++++---
 .../settings/Payments/TransferBalancePage.js  | 21 +++++++++++++------
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/libs/PaymentUtils.js b/src/libs/PaymentUtils.js
index f80ae10a13be..b0eb4cafd6d1 100644
--- a/src/libs/PaymentUtils.js
+++ b/src/libs/PaymentUtils.js
@@ -65,7 +65,7 @@ function formatPaymentMethods(bankAccountList, cardList, payPalMeUsername = '',
         combinedPaymentMethods.push({
             title: card.addressName,
             description: formattedCardNumber,
-            methodID: card.cardNumber,
+            methodID: card.fundID,
             icon,
             iconSize,
             key: `card-${card.cardNumber}`,
diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 4c308bd1ba61..500ecaef3928 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -211,6 +211,7 @@ function transferWalletBalance(paymentMethod) {
 
 function resetWalletTransferData() {
     Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {
+        selectedAccountType: '',
         selectedAccountID: null,
         filterPaymentMethodType: null,
         loading: false,
@@ -226,10 +227,11 @@ function saveWalletTransferAmount(transferAmount) {
 }
 
 /**
+ * @param {String} selectedAccountType
  * @param {String} selectedAccountID
  */
-function saveWalletTransferAccountID(selectedAccountID) {
-    Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {selectedAccountID});
+function saveWalletTransferAccountTypeAndID(selectedAccountType, selectedAccountID) {
+    Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {selectedAccountType, selectedAccountID});
 }
 
 /**
@@ -256,7 +258,7 @@ export {
     transferWalletBalance,
     resetWalletTransferData,
     saveWalletTransferAmount,
-    saveWalletTransferAccountID,
+    saveWalletTransferAccountTypeAndID,
     saveWalletTransferMethodType,
     dismissWalletConfirmModal,
 };
diff --git a/src/pages/settings/Payments/ChooseTransferAccountPage.js b/src/pages/settings/Payments/ChooseTransferAccountPage.js
index aa5ef065e321..b1d878340048 100644
--- a/src/pages/settings/Payments/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Payments/ChooseTransferAccountPage.js
@@ -32,10 +32,16 @@ const ChooseTransferAccountPage = (props) => {
     /**
      * Go back to transfer balance screen with the selected bank account set
      * @param {Object} event Click event object
-     * @param {String} accountID of the selected account.
+     * @param {String} accountType of the selected account type
+     * @param {Object} account of the selected account data
      */
-    const selectAccountAndNavigateBack = (event, accountID) => {
-        PaymentMethods.saveWalletTransferAccountID(accountID);
+    const selectAccountAndNavigateBack = (event, accountType, account) => {
+        PaymentMethods.saveWalletTransferAccountTypeAndID(
+            accountType,
+            accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
+                ? account.bankAccountID
+                : account.fundID,
+        );
         Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE);
     };
 
diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index d32675553641..20919bae680c 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -3,7 +3,6 @@ import React from 'react';
 import {View, ScrollView} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../../ONYXKEYS';
 import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton';
 import ScreenWrapper from '../../../components/ScreenWrapper';
@@ -99,7 +98,14 @@ class TransferBalancePage extends React.Component {
 
         PaymentMethods.resetWalletTransferData();
         const selectedAccount = this.getSelectedPaymentMethodAccount();
-        PaymentMethods.saveWalletTransferAccountID(selectedAccount ? selectedAccount.methodID : '');
+        if (!selectedAccount) {
+            return;
+        }
+
+        PaymentMethods.saveWalletTransferAccountTypeAndID(
+            selectedAccount.accountType,
+            selectedAccount.methodID,
+        );
     }
 
     /**
@@ -110,10 +116,13 @@ class TransferBalancePage extends React.Component {
         const paymentMethods = PaymentUtils.formatPaymentMethods(
             this.props.bankAccountList,
             this.props.cardList,
+            '',
+            this.props.userWallet,
         );
 
-        const accountID = this.props.walletTransfer.selectedAccountID || lodashGet(this.props, 'userWallet.walletLinkedAccountID', '');
-        return _.find(paymentMethods, method => method.methodID === accountID);
+        return _.find(paymentMethods, method => (method.accountType === this.props.walletTransfer.selectedAccountType
+                && method.methodID === this.props.walletTransfer.selectedAccountID)
+                || method.isDefault);
     }
 
     /**
@@ -135,7 +144,7 @@ class TransferBalancePage extends React.Component {
 
     render() {
         const selectedAccount = this.getSelectedPaymentMethodAccount();
-        const selectedPaymentType = selectedAccount && selectedAccount.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT
+        const selectedPaymentType = selectedAccount && selectedAccount.accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
             ? CONST.WALLET.TRANSFER_METHOD_TYPE.ACH
             : CONST.WALLET.TRANSFER_METHOD_TYPE.INSTANT;
 
@@ -194,7 +203,7 @@ class TransferBalancePage extends React.Component {
                                         ...styles.mrn5,
                                         ...styles.ph0,
                                     }}
-                                    onPress={() => this.navigateToChooseTransferAccount(selectedAccount.type)}
+                                    onPress={() => this.navigateToChooseTransferAccount(selectedAccount.accountType)}
                                 />
                             )}
                         <Text

From 0dcf5f854004e861a97f4b9b2144d1ac00565128 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:16:24 +0530
Subject: [PATCH 37/96] fix: PaymentMethodlist filtering

---
 src/pages/settings/Payments/PaymentMethodList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index cb96b081113a..8a851e7dcf26 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -93,7 +93,7 @@ class PaymentMethodList extends Component {
         let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList, this.props.payPalMeUsername, this.props.userWallet);
 
         if (!_.isEmpty(this.props.filterType)) {
-            combinedPaymentMethods = _.filter(combinedPaymentMethods, paymentMethod => paymentMethod.type === this.props.filterType);
+            combinedPaymentMethods = _.filter(combinedPaymentMethods, paymentMethod => paymentMethod.accountType === this.props.filterType);
         }
 
         combinedPaymentMethods = _.map(combinedPaymentMethods, paymentMethod => ({

From 8eacf333742ab080c90edfe627cd5d46da55e9a1 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:22:23 +0530
Subject: [PATCH 38/96] more refactoring

---
 src/libs/actions/PaymentMethods.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 500ecaef3928..94a1b6cedb6f 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -184,10 +184,10 @@ function clearDebitCardFormErrorAndSubmit() {
  * Call the API to transfer wallet balance.
  * @param {Object} paymentMethod
  * @param {*} paymentMethod.methodID
- * @param {String} paymentMethod.type
+ * @param {String} paymentMethod.accountType
  */
 function transferWalletBalance(paymentMethod) {
-    const paymentMethodIDKey = paymentMethod.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT
+    const paymentMethodIDKey = paymentMethod.accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT
         ? CONST.PAYMENT_METHOD_ID_KEYS.BANK_ACCOUNT
         : CONST.PAYMENT_METHOD_ID_KEYS.DEBIT_CARD;
     const parameters = {

From af3b5586946f471b94cdfbda523dc70b0b481c2c Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 10:55:20 -0700
Subject: [PATCH 39/96] add loading state to rename policy form

---
 src/ONYXKEYS.js                 | 3 +++
 src/libs/actions/Report.js      | 4 +++-
 src/pages/ReportSettingsPage.js | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 2e77064d3f87..573a8997a072 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -166,6 +166,9 @@ export default {
     // Are we loading the create policy room command
     IS_LOADING_CREATE_POLICY_ROOM: 'isLoadingCratePolicyRoom',
 
+    // Are we loading the rename policy room command
+    IS_LOADING_RENAME_POLICY_ROOM: 'isLoadingRenamePolicyRoom',
+
     // Is Keyboard shortcuts modal open?
     IS_SHORTCUTS_MODAL_OPEN: 'isShortcutsModalOpen',
 
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 36cebc5614ad..4889ff84e0ff 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1537,6 +1537,7 @@ function createPolicyRoom(policyID, reportName, visibility) {
  * @param {String} reportName
  */
 function renameReport(reportID, reportName) {
+    Onyx.set(ONYXKEYS.IS_LOADING_RENAME_POLICY_ROOM, true);
     API.RenameReport({reportID, reportName})
         .then((response) => {
             if (response.jsonCode !== 200) {
@@ -1548,7 +1549,8 @@ function renameReport(reportID, reportName) {
         })
         .catch(() => {
             Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError'));
-        });
+        })
+        .finally(() => Onyx.set(ONYXKEYS.IS_LOADING_RENAME_POLICY_ROOM, false));
 }
 
 export {
diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js
index 9f5630bd7c8b..ac3e914988ca 100644
--- a/src/pages/ReportSettingsPage.js
+++ b/src/pages/ReportSettingsPage.js
@@ -89,7 +89,7 @@ class ReportSettingsPage extends Component {
     }
 
     render() {
-        const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report);
+        const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report) || this.props.isLoadingRenamePolicyRoom;
         const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID);
 
         return (
@@ -142,7 +142,7 @@ class ReportSettingsPage extends Component {
                                 success={!shouldDisableRename}
                                 text={this.props.translate('common.save')}
                                 onPress={() => Report.renameReport(this.props.report.reportID, this.state.newRoomName)}
-                                style={[styles.ml2]}
+                                style={[styles.ml2, styles.flex1]}
                                 textStyles={[styles.label]}
                                 innerStyles={[styles.reportSettingsChangeNameButton]}
                                 isDisabled={Boolean(
@@ -150,6 +150,7 @@ class ReportSettingsPage extends Component {
                                     || this.state.newRoomName === this.props.report.reportName
                                     || this.state.error,
                                 )}
+                                isLoading={this.props.isLoadingRenamePolicyRoom}
                             />
                         </View>
                     </View>
@@ -198,5 +199,8 @@ export default compose(
         policies: {
             key: ONYXKEYS.COLLECTION.POLICY,
         },
+        isLoadingRenamePolicyRoom: {
+            key: ONYXKEYS.IS_LOADING_RENAME_POLICY_ROOM,
+        },
     }),
 )(ReportSettingsPage);

From 39b6327f2042dcb5aab2193962e9d20c1722ac34 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:41:18 +0530
Subject: [PATCH 40/96] preselect default account

---
 src/pages/settings/Payments/TransferBalancePage.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index 20919bae680c..117a22a1cfa7 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -98,7 +98,10 @@ class TransferBalancePage extends React.Component {
 
         PaymentMethods.resetWalletTransferData();
         const selectedAccount = this.getSelectedPaymentMethodAccount();
-        if (!selectedAccount) {
+
+        // Select the default payment account when page is opened,
+        // so that user can see that preselected on choose transfer account page
+        if (!selectedAccount || !selectedAccount.isDefault) {
             return;
         }
 

From 1e46cad67dc49fc325630adefee5bdfd246f5c5d Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 12:57:28 -0700
Subject: [PATCH 41/96] create RenameAction

---
 .../ReportActionItem/RenameAction.js          | 33 +++++++++++++++++++
 src/languages/en.js                           |  1 +
 src/languages/es.js                           |  1 +
 src/pages/home/report/ReportActionItem.js     |  5 +++
 4 files changed, 40 insertions(+)
 create mode 100644 src/components/ReportActionItem/RenameAction.js

diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
new file mode 100644
index 000000000000..865690ee2d64
--- /dev/null
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import Text from '../Text';
+import styles from '../../styles/styles';
+import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+
+const propTypes = {
+    /** All the data of the action */
+    action: PropTypes.shape(reportActionPropTypes).isRequired,
+
+    ...withLocalizePropTypes,
+};
+
+const AnnounceAction = props => {
+    const displayName = lodashGet(props.action, 'message[0].text');
+    const oldName = lodashGet(props.action, 'originalMessage.oldName', '');
+    const newName = lodashGet(props.action, 'originalMessage.newName', '');
+    
+    return (
+        <Text style={[styles.pv2, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
+            <Text style={[styles.h4, styles.textLabelSupporting]}>
+                {displayName}
+            </Text>
+            {props.translate('newRoomPage.renamedRoom', {oldName, newName})}
+        </Text>
+)};
+
+AnnounceAction.propTypes = propTypes;
+AnnounceAction.displayName = 'AnnounceAction';
+
+export default withLocalize(AnnounceAction);
diff --git a/src/languages/en.js b/src/languages/en.js
index ebcc4a3586f4..26d70cdb54d6 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -887,6 +887,7 @@ export default {
         roomRenamed: 'Policy room renamed!',
         roomAlreadyExistsError: 'A room with this name already exists',
         roomNameReservedError: 'This name is reserved and cannot be used',
+        renamedRoom: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}.`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnError: 'Unable to create policy room, please check your connection and try again.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 3333741e93ca..c60c2dced3ff 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -889,6 +889,7 @@ export default {
         roomRenamed: '¡Espacio de trabajo renombrado!',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
         roomNameReservedError: 'Este nombre está reservado y no puede usarse',
+        renamedRoom: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}.`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index a737a01b9109..162b23a226a9 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -24,6 +24,7 @@ import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu'
 import * as ContextMenuActions from './ContextMenu/ContextMenuActions';
 import {withReportActionsDrafts} from '../../../components/OnyxProvider';
 import * as ReportUtils from '../../../libs/reportUtils';
+import RenameAction from '../../../components/ReportActionItem/RenameAction';
 
 const propTypes = {
     /** The ID of the report this action is on. */
@@ -117,6 +118,10 @@ class ReportActionItem extends Component {
     }
 
     render() {
+        if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
+            return <RenameAction action={this.props.action} />
+        }
+
         let children;
         if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
             children = (

From 364a5c4479d4ac4496927d20c6dc96b37d6c014f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 14:02:26 -0700
Subject: [PATCH 42/96] fix style

---
 src/components/ReportActionItem/RenameAction.js | 9 +++++----
 src/pages/home/report/ReportActionItem.js       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
index 865690ee2d64..c55d94566f5f 100644
--- a/src/components/ReportActionItem/RenameAction.js
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -13,11 +13,11 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const AnnounceAction = props => {
-    const displayName = lodashGet(props.action, 'message[0].text');
+const AnnounceAction = (props) => {
+    const displayName = lodashGet(props.action, ['message', 0, 'text']);
     const oldName = lodashGet(props.action, 'originalMessage.oldName', '');
     const newName = lodashGet(props.action, 'originalMessage.newName', '');
-    
+
     return (
         <Text style={[styles.pv2, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
             <Text style={[styles.h4, styles.textLabelSupporting]}>
@@ -25,7 +25,8 @@ const AnnounceAction = props => {
             </Text>
             {props.translate('newRoomPage.renamedRoom', {oldName, newName})}
         </Text>
-)};
+    );
+};
 
 AnnounceAction.propTypes = propTypes;
 AnnounceAction.displayName = 'AnnounceAction';
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 162b23a226a9..f69fd065c7cc 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -119,7 +119,7 @@ class ReportActionItem extends Component {
 
     render() {
         if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
-            return <RenameAction action={this.props.action} />
+            return <RenameAction action={this.props.action} />;
         }
 
         let children;

From 861e88d395eff32cdacb034495ea3dea521d5e55 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 16:31:37 -0700
Subject: [PATCH 43/96] change lastMessage logic

---
 src/libs/actions/Report.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 4889ff84e0ff..329d43940fcf 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -584,7 +584,10 @@ function updateReportWithNewAction(
         setLocalLastRead(reportID, newMaxSequenceNumber);
     }
 
-    const messageText = lodashGet(reportAction, ['message', 0, 'text'], '');
+    let messageText = lodashGet(reportAction, ['message', 0, 'text'], '');
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
+        messageText = lodashGet(reportAction, 'originalMessage.html', '');
+    }
 
     // Always merge the reportID into Onyx
     // If the report doesn't exist in Onyx yet, then all the rest of the data will be filled out

From 0fa0c2d2052960461ec1e9f63d8d9fdacc847be1 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 16:47:15 -0700
Subject: [PATCH 44/96] update isConsecutiveActionMadeByPreviousActor to not
 group renamed actions

---
 src/pages/home/report/ReportActionsView.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index bfebeb49aef5..310389279271 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -372,6 +372,12 @@ class ReportActionsView extends React.Component {
             return false;
         }
 
+        // Do not group if previous action was a room renamed action
+        if (previousAction.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED
+            || currentAction.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
+            return false;
+        }
+
         return currentAction.action.actorEmail === previousAction.action.actorEmail;
     }
 

From 0080bf8788d2026cc9b4698892f52c1160aace74 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 18 Jan 2022 16:47:42 -0700
Subject: [PATCH 45/96] update comment

---
 src/pages/home/report/ReportActionsView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 310389279271..8302b6425fcf 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -372,7 +372,7 @@ class ReportActionsView extends React.Component {
             return false;
         }
 
-        // Do not group if previous action was a room renamed action
+        // Do not group if previous or current action was a renamed action
         if (previousAction.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED
             || currentAction.action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
             return false;

From 67e3817cdf82109713e5b66eecd8165dd6685df3 Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Thu, 13 Jan 2022 22:27:59 +0200
Subject: [PATCH 46/96] add maxwidth and maxheight to image picker

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 src/components/AttachmentPicker/index.native.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index 15cd8f4bba52..6a7e44b3eaec 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -27,11 +27,14 @@ const propTypes = {
 /**
   * See https://github.com/react-native-image-picker/react-native-image-picker/#options
   * for ImagePicker configuration options
+  * maxWidth and maxHeight to avoid android crash when with large images
   */
 const imagePickerOptions = {
     includeBase64: false,
     saveToPhotos: false,
     selectionLimit: 1,
+    maxWidth: 2000,
+    maxHeight: 8000,
 };
 
 /**

From de6664db024b32f998702f11215857a6b77a911b Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Fri, 14 Jan 2022 20:09:19 +0200
Subject: [PATCH 47/96] update comment

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 src/components/AttachmentPicker/index.native.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index 6a7e44b3eaec..9f4040d7df4c 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -27,7 +27,8 @@ const propTypes = {
 /**
   * See https://github.com/react-native-image-picker/react-native-image-picker/#options
   * for ImagePicker configuration options
-  * maxWidth and maxHeight to avoid android crash when with large images
+  * maxWidth and maxHeight  options resize images with width or height more than there value .
+  * to avoid android crash with large images
   */
 const imagePickerOptions = {
     includeBase64: false,

From 92f76172cb6c0d48a425beadcb4b08dde8f63541 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <a.s1171111@gmail.com>
Date: Fri, 14 Jan 2022 20:45:24 +0200
Subject: [PATCH 48/96] Apply suggestions from code review

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 src/components/AttachmentPicker/index.native.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index 9f4040d7df4c..f7bb98391514 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -27,8 +27,7 @@ const propTypes = {
 /**
   * See https://github.com/react-native-image-picker/react-native-image-picker/#options
   * for ImagePicker configuration options
-  * maxWidth and maxHeight  options resize images with width or height more than there value .
-  * to avoid android crash with large images
+  * Restrict maxWidth and maxHeight to prevent app crash on Android. It will resize the image to max values if the resolution of the image is higher than these without compromising the quality.
   */
 const imagePickerOptions = {
     includeBase64: false,

From 71ffd3bcf34deded0f40456a94083c385a550493 Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Sun, 16 Jan 2022 20:22:32 +0200
Subject: [PATCH 49/96] delete resize && disable hardwareAccelerated

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 android/app/src/main/AndroidManifest.xml        | 5 +++--
 src/components/AttachmentPicker/index.native.js | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d416c3cb23ab..8402bb3c9c54 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         <data android:scheme="venmo"/>
       </intent>
     </queries>
-
+    <!-- disable hardwareAccelerated since it lead react-native-image-pan-zoom to crash with large images--> 
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
@@ -23,7 +23,8 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:resizeableActivity="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:hardwareAccelerated="false">
 
       <activity
         android:name=".MainActivity"
diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index f7bb98391514..15cd8f4bba52 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -27,14 +27,11 @@ const propTypes = {
 /**
   * See https://github.com/react-native-image-picker/react-native-image-picker/#options
   * for ImagePicker configuration options
-  * Restrict maxWidth and maxHeight to prevent app crash on Android. It will resize the image to max values if the resolution of the image is higher than these without compromising the quality.
   */
 const imagePickerOptions = {
     includeBase64: false,
     saveToPhotos: false,
     selectionLimit: 1,
-    maxWidth: 2000,
-    maxHeight: 8000,
 };
 
 /**

From 26b8ff672fd64cfd3168ffa762d3b53cb1f7e13d Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Tue, 18 Jan 2022 20:11:05 +0200
Subject: [PATCH 50/96] add resize delete hardware acceleration

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 android/app/src/main/AndroidManifest.xml | 3 +--
 src/components/ImageView/index.native.js | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8402bb3c9c54..afba3d4057d7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,8 +23,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:resizeableActivity="false"
-      android:theme="@style/AppTheme"
-      android:hardwareAccelerated="false">
+      android:theme="@style/AppTheme">
 
       <activity
         android:name=".MainActivity"
diff --git a/src/components/ImageView/index.native.js b/src/components/ImageView/index.native.js
index badf3687ccc3..2ce669e21189 100644
--- a/src/components/ImageView/index.native.js
+++ b/src/components/ImageView/index.native.js
@@ -69,6 +69,13 @@ class ImageView extends PureComponent {
                 imageWidth = Math.round(this.props.windowWidth);
                 imageHeight = Math.round(imageWidth * aspectRatio);
             }
+            const maxZoomRatio = 11;
+            if (width > (this.props.windowWidth * maxZoomRatio)) {
+                imageWidth = (this.props.windowWidth * maxZoomRatio);
+            }
+            if (height > (this.props.windowHeight * maxZoomRatio)) {
+                imageHeight = (this.props.windowHeight * maxZoomRatio);
+            }
             this.setState({imageHeight, imageWidth});
         });
     }

From 6288d7683294f74706448daaf04ab1bc09c578e5 Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Tue, 18 Jan 2022 20:15:14 +0200
Subject: [PATCH 51/96] delete hardwareAccelerated comment

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 android/app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index afba3d4057d7..dc3c654c03fd 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         <data android:scheme="venmo"/>
       </intent>
     </queries>
-    <!-- disable hardwareAccelerated since it lead react-native-image-pan-zoom to crash with large images--> 
+    
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

From 3d2848dd959df40818ae07d1cc5cda7c4be40091 Mon Sep 17 00:00:00 2001
From: Ahmed Sheri <ahmdshrif96@gmail.com>
Date: Tue, 18 Jan 2022 20:16:23 +0200
Subject: [PATCH 52/96] delete white spaces

Signed-off-by: AHMED <a.s1171111@gmail.com>
---
 android/app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index dc3c654c03fd..d416c3cb23ab 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         <data android:scheme="venmo"/>
       </intent>
     </queries>
-    
+
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

From 0b21d5b0a5e96be5979b8c3ef9a5341005da1292 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 13:21:33 -0700
Subject: [PATCH 53/96] add comment

---
 src/libs/actions/Report.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 329d43940fcf..4e210b8ec4e4 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1548,6 +1548,8 @@ function renameReport(reportID, reportName) {
                 return;
             }
             Growl.success(Localize.translateLocal('newRoomPage.roomRenamed'));
+
+            // Optimistically update the report name
             Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {reportName});
         })
         .catch(() => {

From bf3ccfa5d419ec6b393bca60cb747a4ef8d1ffd1 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 13:21:53 -0700
Subject: [PATCH 54/96] remove dot on copy

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 1346e1bee696..ab69b608e2c8 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -887,7 +887,7 @@ export default {
         roomRenamed: 'Policy room renamed!',
         roomAlreadyExistsError: 'A room with this name already exists',
         roomNameReservedError: 'This name is reserved and cannot be used',
-        renamedRoom: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}.`,
+        renamedRoom: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnError: 'Unable to create policy room, please check your connection and try again.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 62634ac4627a..8d9eccbbb25c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -889,7 +889,7 @@ export default {
         roomRenamed: '¡Espacio de trabajo renombrado!',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
         roomNameReservedError: 'Este nombre está reservado y no puede usarse',
-        renamedRoom: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}.`,
+        renamedRoom: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',

From cb2a6187b5649f88aa0996b779827947c2a30133 Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Wed, 19 Jan 2022 22:36:27 +0200
Subject: [PATCH 55/96] apply change from review

---
 src/components/ImageView/index.native.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/ImageView/index.native.js b/src/components/ImageView/index.native.js
index 2ce669e21189..3fe781765994 100644
--- a/src/components/ImageView/index.native.js
+++ b/src/components/ImageView/index.native.js
@@ -69,12 +69,11 @@ class ImageView extends PureComponent {
                 imageWidth = Math.round(this.props.windowWidth);
                 imageHeight = Math.round(imageWidth * aspectRatio);
             }
-            const maxZoomRatio = 11;
-            if (width > (this.props.windowWidth * maxZoomRatio)) {
-                imageWidth = (this.props.windowWidth * maxZoomRatio);
-            }
-            if (height > (this.props.windowHeight * maxZoomRatio)) {
-                imageHeight = (this.props.windowHeight * maxZoomRatio);
+
+            // Resize the image to max dimensions possible on the Native platforms to prevent crashes on Android. To keep the same behavior, apply to IOS as well.
+            const maxDimensionsScale = 11;
+            if (height > (this.props.windowHeight * maxDimensionsScale)) {
+                imageHeight = (this.props.windowHeight * maxDimensionsScale);
             }
             this.setState({imageHeight, imageWidth});
         });

From 644c9959bc09e449d213a1208e8314b8f9d2ddc5 Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Wed, 19 Jan 2022 22:41:52 +0200
Subject: [PATCH 56/96] refactor code

---
 src/components/ImageView/index.native.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/ImageView/index.native.js b/src/components/ImageView/index.native.js
index 3fe781765994..461849319b56 100644
--- a/src/components/ImageView/index.native.js
+++ b/src/components/ImageView/index.native.js
@@ -72,9 +72,7 @@ class ImageView extends PureComponent {
 
             // Resize the image to max dimensions possible on the Native platforms to prevent crashes on Android. To keep the same behavior, apply to IOS as well.
             const maxDimensionsScale = 11;
-            if (height > (this.props.windowHeight * maxDimensionsScale)) {
-                imageHeight = (this.props.windowHeight * maxDimensionsScale);
-            }
+            imageHeight = Math.min(imageHeight, (this.props.windowHeight * maxDimensionsScale));
             this.setState({imageHeight, imageWidth});
         });
     }

From 05314f01bc02483156ffcb4d7f96e6a86e2a0052 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 14:10:40 -0700
Subject: [PATCH 57/96] fix style

---
 ios/Podfile.lock                                | 6 +++---
 src/components/ReportActionItem/RenameAction.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 21ebcd2f67d8..d84734e22936 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -930,9 +930,9 @@ SPEC CHECKSUMS:
   React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
   React-logger: 933f80c97c633ee8965d609876848148e3fef438
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
-  react-native-document-picker: 0e3602a4064da040321bafad6848d8b0edcb1d55
-  react-native-flipper: 169e8ba429b73ad637ce007337ce4b415e783799
-  react-native-image-picker: 4089335b89b625d4e34d53fb249c48a7a791b3ea
+  react-native-document-picker: ebcce6982dd91aa6d2b9a38b666895c381015f1d
+  react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
+  react-native-image-picker: f45729c43d4f854508ab25c0d0f0f711a2a8a267
   react-native-netinfo: 3a61a486f2329f5884753fd5bab21450a535d97c
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
index c55d94566f5f..3cc02ff47cf1 100644
--- a/src/components/ReportActionItem/RenameAction.js
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -20,7 +20,7 @@ const AnnounceAction = (props) => {
 
     return (
         <Text style={[styles.pv2, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
-            <Text style={[styles.h4, styles.textLabelSupporting]}>
+            <Text style={[styles.textLabelSupporting, styles.textStrong]}>
                 {displayName}
             </Text>
             {props.translate('newRoomPage.renamedRoom', {oldName, newName})}

From b6c83d391f7d3a716908238b3a0470a011d946fd Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 14:19:37 -0700
Subject: [PATCH 58/96] rm podlock-file commit

---
 ios/Podfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d84734e22936..21ebcd2f67d8 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -930,9 +930,9 @@ SPEC CHECKSUMS:
   React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
   React-logger: 933f80c97c633ee8965d609876848148e3fef438
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
-  react-native-document-picker: ebcce6982dd91aa6d2b9a38b666895c381015f1d
-  react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
-  react-native-image-picker: f45729c43d4f854508ab25c0d0f0f711a2a8a267
+  react-native-document-picker: 0e3602a4064da040321bafad6848d8b0edcb1d55
+  react-native-flipper: 169e8ba429b73ad637ce007337ce4b415e783799
+  react-native-image-picker: 4089335b89b625d4e34d53fb249c48a7a791b3ea
   react-native-netinfo: 3a61a486f2329f5884753fd5bab21450a535d97c
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0

From e6af3ddd13dd05dbb98635fdfbff944d179c8d9b Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 14:24:28 -0700
Subject: [PATCH 59/96] rename AnnouceAction component

---
 src/components/ReportActionItem/RenameAction.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
index 3cc02ff47cf1..4466c181bca5 100644
--- a/src/components/ReportActionItem/RenameAction.js
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -13,7 +13,7 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const AnnounceAction = (props) => {
+const RenameAction = (props) => {
     const displayName = lodashGet(props.action, ['message', 0, 'text']);
     const oldName = lodashGet(props.action, 'originalMessage.oldName', '');
     const newName = lodashGet(props.action, 'originalMessage.newName', '');
@@ -28,7 +28,7 @@ const AnnounceAction = (props) => {
     );
 };
 
-AnnounceAction.propTypes = propTypes;
-AnnounceAction.displayName = 'AnnounceAction';
+RenameAction.propTypes = propTypes;
+RenameAction.displayName = 'RenameAction';
 
-export default withLocalize(AnnounceAction);
+export default withLocalize(RenameAction);

From cfe9cdac5025e3e0855680807b448d83fe3d1ebd Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 14:26:26 -0700
Subject: [PATCH 60/96] rename translattion keys

---
 src/components/ReportActionItem/RenameAction.js | 2 +-
 src/languages/en.js                             | 4 ++--
 src/languages/es.js                             | 4 ++--
 src/libs/actions/Report.js                      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
index 4466c181bca5..a515bf4245b7 100644
--- a/src/components/ReportActionItem/RenameAction.js
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -23,7 +23,7 @@ const RenameAction = (props) => {
             <Text style={[styles.textLabelSupporting, styles.textStrong]}>
                 {displayName}
             </Text>
-            {props.translate('newRoomPage.renamedRoom', {oldName, newName})}
+            {props.translate('newRoomPage.renamedRoomAction', {oldName, newName})}
         </Text>
     );
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index ab69b608e2c8..85e591c08a31 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -884,10 +884,10 @@ export default {
         restrictedDescription: 'People in your workspace are able to find this room using Search',
         privateDescription: 'Only people invited to this room are able to find it',
         createRoom: 'Create Room',
-        roomRenamed: 'Policy room renamed!',
+        policyRoomRenamed: 'Policy room renamed!',
         roomAlreadyExistsError: 'A room with this name already exists',
         roomNameReservedError: 'This name is reserved and cannot be used',
-        renamedRoom: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
+        renamedRoomAction: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnError: 'Unable to create policy room, please check your connection and try again.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 8d9eccbbb25c..976b83df40f4 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -886,10 +886,10 @@ export default {
         restrictedDescription: 'Sólo las personas en tu espacio de trabajo pueden encontrar esta sala a través de "Buscar"',
         privateDescription: 'Sólo las personas que están invitadas a esta sala pueden encontrarla',
         createRoom: 'Crea una sala de chat',
-        roomRenamed: '¡Espacio de trabajo renombrado!',
+        policyRoomRenamed: '¡Espacio de trabajo renombrado!',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
         roomNameReservedError: 'Este nombre está reservado y no puede usarse',
-        renamedRoom: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
+        renamedRoomAction: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnError: 'No ha sido posible crear el espacio de trabajo, por favor comprueba tu conexión e inténtalo de nuevo.',
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 4e210b8ec4e4..52dfd6213d17 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1547,7 +1547,7 @@ function renameReport(reportID, reportName) {
                 Growl.error(response.message);
                 return;
             }
-            Growl.success(Localize.translateLocal('newRoomPage.roomRenamed'));
+            Growl.success(Localize.translateLocal('newRoomPage.policyRoomRenamed'));
 
             // Optimistically update the report name
             Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {reportName});

From f0f207066bfc2a76174abbd1d1b0403b1812d403 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 19 Jan 2022 14:30:33 -0700
Subject: [PATCH 61/96] update comment

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

diff --git a/src/libs/API.js b/src/libs/API.js
index 61061f2775ac..fd3581706ec5 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -1169,7 +1169,7 @@ function CreatePolicyRoom(parameters) {
 }
 
 /**
- * Renames a user create policy room
+ * Renames a user-created policy room
  * @param {Object} parameters
  * @param {String} parameters.reportID
  * @param {String} parameters.reportName

From d973d7fb7cf1c627fef97e4f506b144afd5cc77c Mon Sep 17 00:00:00 2001
From: Sakar Singhal <singhalsakar@gmail.com>
Date: Thu, 20 Jan 2022 18:01:32 +0530
Subject: [PATCH 62/96] Upgraded react-native-modal to 13.0.0

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14010c366058..1fd418c42ea5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37599,9 +37599,9 @@
       "integrity": "sha1-RvGKMgQyCYol6p+on1FD3SVNMy0="
     },
     "react-native-modal": {
-      "version": "11.10.0",
-      "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-11.10.0.tgz",
-      "integrity": "sha512-syRYDJYSh16bR37R5EKU9T/wC+5bEOfF17IUqf5URdhbEDd+hxyMInC++l45E8oI+MtdOaEp9yAws5xDqk8dnA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-13.0.0.tgz",
+      "integrity": "sha512-k6r9T31mc7HIDFj1V53ceAAN1dwc8052c4JLtDVEmEQ19Bbq9yiLXoDsQuNb+hB8A+2tVOXmo5Gq4IQfb11upw==",
       "requires": {
         "prop-types": "^15.6.2",
         "react-native-animatable": "1.3.3"
diff --git a/package.json b/package.json
index 50998c5249cc..2af1931bae9d 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "react-native-image-picker": "^4.1.2",
     "react-native-image-size": "^1.1.3",
     "react-native-keyboard-spacer": "^0.4.1",
-    "react-native-modal": "^11.10.0",
+    "react-native-modal": "^13.0.0",
     "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#40c5b14dcc77e1193d027ecc9dd5f2563516e148",
     "react-native-pdf": "^6.2.2",
     "react-native-performance": "^2.0.0",

From 1970d36de3128a5508a8d8ff3f08aa1bd480c680 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 20 Jan 2022 11:35:24 -0700
Subject: [PATCH 63/96] use pv3 for style and update comment

---
 ios/Podfile.lock                                | 6 +++---
 src/components/ReportActionItem/RenameAction.js | 2 +-
 src/libs/actions/Report.js                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 21ebcd2f67d8..d84734e22936 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -930,9 +930,9 @@ SPEC CHECKSUMS:
   React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
   React-logger: 933f80c97c633ee8965d609876848148e3fef438
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
-  react-native-document-picker: 0e3602a4064da040321bafad6848d8b0edcb1d55
-  react-native-flipper: 169e8ba429b73ad637ce007337ce4b415e783799
-  react-native-image-picker: 4089335b89b625d4e34d53fb249c48a7a791b3ea
+  react-native-document-picker: ebcce6982dd91aa6d2b9a38b666895c381015f1d
+  react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
+  react-native-image-picker: f45729c43d4f854508ab25c0d0f0f711a2a8a267
   react-native-netinfo: 3a61a486f2329f5884753fd5bab21450a535d97c
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
diff --git a/src/components/ReportActionItem/RenameAction.js b/src/components/ReportActionItem/RenameAction.js
index a515bf4245b7..4b83ba66a610 100644
--- a/src/components/ReportActionItem/RenameAction.js
+++ b/src/components/ReportActionItem/RenameAction.js
@@ -19,7 +19,7 @@ const RenameAction = (props) => {
     const newName = lodashGet(props.action, 'originalMessage.newName', '');
 
     return (
-        <Text style={[styles.pv2, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
+        <Text style={[styles.pv3, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
             <Text style={[styles.textLabelSupporting, styles.textStrong]}>
                 {displayName}
             </Text>
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 52dfd6213d17..d1086ebfcb7e 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1549,7 +1549,7 @@ function renameReport(reportID, reportName) {
             }
             Growl.success(Localize.translateLocal('newRoomPage.policyRoomRenamed'));
 
-            // Optimistically update the report name
+            // Update the report name so that the LHN and header display the updated name
             Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {reportName});
         })
         .catch(() => {

From b8bd6f4ccdc0a4681163bcbb6201b900dd6ecd86 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 20 Jan 2022 11:36:19 -0700
Subject: [PATCH 64/96] rm wrong commit of podfile.lock

---
 ios/Podfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d84734e22936..21ebcd2f67d8 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -930,9 +930,9 @@ SPEC CHECKSUMS:
   React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
   React-logger: 933f80c97c633ee8965d609876848148e3fef438
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
-  react-native-document-picker: ebcce6982dd91aa6d2b9a38b666895c381015f1d
-  react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
-  react-native-image-picker: f45729c43d4f854508ab25c0d0f0f711a2a8a267
+  react-native-document-picker: 0e3602a4064da040321bafad6848d8b0edcb1d55
+  react-native-flipper: 169e8ba429b73ad637ce007337ce4b415e783799
+  react-native-image-picker: 4089335b89b625d4e34d53fb249c48a7a791b3ea
   react-native-netinfo: 3a61a486f2329f5884753fd5bab21450a535d97c
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0

From 7842a81193f0447d781b4ec45d305f1caf4ffc1b Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 20 Jan 2022 15:45:18 -0500
Subject: [PATCH 65/96] Add private_blockedFromConcierge to the list of NVPs
 that is returned for user

---
 src/libs/actions/User.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 455812491ee2..b3ec5411b526 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -103,6 +103,7 @@ function getUserDetails() {
             CONST.NVP.PAYPAL_ME_ADDRESS,
             CONST.NVP.PREFERRED_EMOJI_SKIN_TONE,
             CONST.NVP.FREQUENTLY_USED_EMOJIS,
+            CONST.NVP.BLOCKED_FROM_CONCIERGE,
         ].join(','),
     })
         .then((response) => {

From 0bb7c8d72cdc42ccae1127156f754d3c56d22a34 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 20 Jan 2022 16:16:43 -0500
Subject: [PATCH 66/96] Handle the API response when we attepmt to chat with
 concierge while blocked

---
 src/libs/actions/Report.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 6555425f3e50..9f94d22436e2 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -10,6 +10,7 @@ import * as Pusher from '../Pusher/pusher';
 import LocalNotification from '../Notification/LocalNotification';
 import PushNotification from '../Notification/PushNotification';
 import * as PersonalDetails from './PersonalDetails';
+import * as User from './User';
 import Navigation from '../Navigation/Navigation';
 import * as ActiveClientManager from '../ActiveClientManager';
 import Visibility from '../Visibility';
@@ -1181,6 +1182,18 @@ function addAction(reportID, text, file) {
                 console.error(response.message);
                 return;
             }
+
+            if (response.jsonCode === 666 && reportID === conciergeChatReportID) {
+                Growl.error('You are blocked from chatting with Concierge.');
+                Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+                    [optimisticReportActionID]: null,
+                });
+
+                // The fact that we're getting this error from the API means the BLOCKED_FROM_CONCIERGE nvp in the user details has changed since the last time we checked, so let's trigger an update
+                User.getUserDetails();
+                return;
+            }
+
             updateReportWithNewAction(reportID, response.reportAction);
         });
 }

From 3b0f231d46250f760720322f08a3ce3f7de2e923 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 20 Jan 2022 16:19:45 -0500
Subject: [PATCH 67/96] Translate growl error when concierge communication is
 barred

---
 src/libs/actions/Report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 9f94d22436e2..017fc95e32bf 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1184,7 +1184,7 @@ function addAction(reportID, text, file) {
             }
 
             if (response.jsonCode === 666 && reportID === conciergeChatReportID) {
-                Growl.error('You are blocked from chatting with Concierge.');
+                Growl.error(Localize.translateLocal('reportActionCompose.blockedFromConcierge'));
                 Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
                     [optimisticReportActionID]: null,
                 });

From a083ff87829a7b2f7fca40e55cd30fcc049385a4 Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Fri, 14 Jan 2022 12:10:37 -0800
Subject: [PATCH 68/96] Prevent default rooms from being filtered out

---
 src/libs/OptionsListUtils.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 4dc9af374968..17984bdbe36e 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -395,7 +395,8 @@ function getOptions(reports, personalDetails, activeReportID, {
         const logins = lodashGet(report, ['participants'], []);
 
         // Report data can sometimes be incomplete. If we have no logins or reportID then we will skip this entry.
-        if (!report || !report.reportID || (_.isEmpty(logins) && !ReportUtils.isChatRoom(report))) {
+        const shouldFilterNoParticipants = _.isEmpty(logins) && !ReportUtils.isChatRoom(report) && !ReportUtils.isDefaultRoom(report);
+        if (!report || !report.reportID || shouldFilterNoParticipants) {
             return;
         }
 
@@ -405,7 +406,7 @@ function getOptions(reports, personalDetails, activeReportID, {
             : '';
 
         const reportContainsIOUDebt = iouReportOwner && iouReportOwner !== currentUserLogin;
-        const shouldFilterReportIfEmpty = !showReportsWithNoComments && report.lastMessageTimestamp === 0;
+        const shouldFilterReportIfEmpty = !showReportsWithNoComments && report.lastMessageTimestamp === 0 && !ReportUtils.isDefaultRoom(report);
         const shouldFilterReportIfRead = hideReadReports && report.unreadActionCount === 0;
         const shouldFilterReport = shouldFilterReportIfEmpty || shouldFilterReportIfRead;
         if (report.reportID !== activeReportID

From 8773bcefe5fb59f9cbed5944b66c6d3bd320c32d Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Wed, 19 Jan 2022 14:18:25 -0800
Subject: [PATCH 69/96] Fetch only the default reports on policy creation

---
 src/libs/actions/Policy.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index f71a681b24ce..6433c997e710 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -10,6 +10,7 @@ import * as Localize from '../Localize';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import * as OptionsListUtils from '../OptionsListUtils';
+import * as Report from './Report';
 
 const allPolicies = {};
 Onyx.connect({
@@ -111,6 +112,9 @@ function create(name = '') {
             }
             res = response;
 
+            // Fetch the default reports on the policy
+            Report.fetchChatReportsByIDs([response.policy.chatReportIDAdmins, response.policy.chatReportIDAnnounce]);
+
             // We are awaiting this merge so that we can guarantee our policy is available to any React components connected to the policies collection before we navigate to a new route.
             return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${response.policyID}`, {
                 employeeList: getSimplifiedEmployeeList(response.policy.employeeList),

From 5ea46c113b4d43b1dc2867cb31752c46601ae010 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 20 Jan 2022 17:02:53 -0500
Subject: [PATCH 70/96] Dont show the compose box as selected if user is
 blocked from chatting

---
 src/libs/actions/Report.js                   | 2 +-
 src/pages/home/report/ReportActionCompose.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 017fc95e32bf..971e91f078c4 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1189,7 +1189,7 @@ function addAction(reportID, text, file) {
                     [optimisticReportActionID]: null,
                 });
 
-                // The fact that we're getting this error from the API means the BLOCKED_FROM_CONCIERGE nvp in the user details has changed since the last time we checked, so let's trigger an update
+                // The fact that the API is returning this error means the BLOCKED_FROM_CONCIERGE nvp in the user details has changed since the last time we checked, so let's update
                 User.getUserDetails();
                 return;
             }
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 51759e6bb846..d28b7b75d0fc 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -505,7 +505,7 @@ class ReportActionCompose extends React.Component {
                 {shouldShowReportRecipientLocalTime
                     && <ParticipantLocalTime participant={reportRecipient} />}
                 <View style={[
-                    (this.state.isFocused || this.state.isDraggingOver)
+                    (!isBlockedFromConcierge && (this.state.isFocused || this.state.isDraggingOver))
                         ? styles.chatItemComposeBoxFocusedColor
                         : styles.chatItemComposeBoxColor,
                     styles.chatItemComposeBox,

From 24eaa788d1437185e4e4ca26602007c7a454a430 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Thu, 20 Jan 2022 13:07:37 -1000
Subject: [PATCH 71/96] byumpitup

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fd01c6a5a73c..e11811c1c47d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37125,8 +37125,8 @@
       }
     },
     "react-native-onyx": {
-      "version": "git+https://github.com/Expensify/react-native-onyx.git#40c5b14dcc77e1193d027ecc9dd5f2563516e148",
-      "from": "git+https://github.com/Expensify/react-native-onyx.git#40c5b14dcc77e1193d027ecc9dd5f2563516e148",
+      "version": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
+      "from": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
       "requires": {
         "ascii-table": "0.0.9",
         "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c",
diff --git a/package.json b/package.json
index b6bffcf43131..81267c55aef6 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "react-native-image-size": "^1.1.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.10.0",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#40c5b14dcc77e1193d027ecc9dd5f2563516e148",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
     "react-native-pdf": "^6.2.2",
     "react-native-performance": "^2.0.0",
     "react-native-permissions": "^3.0.1",

From 6408ad2c7a6bd1412a965c5bcd89445169f0cbe2 Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Thu, 20 Jan 2022 15:57:54 -0800
Subject: [PATCH 72/96] Dont require accessibility checkboxes to ship a deploy
 checklist

---
 .github/actions/checkDeployBlockers/checkDeployBlockers.js | 2 +-
 .github/actions/checkDeployBlockers/index.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/checkDeployBlockers/checkDeployBlockers.js b/.github/actions/checkDeployBlockers/checkDeployBlockers.js
index 000ea410b94d..8024303e6714 100644
--- a/.github/actions/checkDeployBlockers/checkDeployBlockers.js
+++ b/.github/actions/checkDeployBlockers/checkDeployBlockers.js
@@ -16,7 +16,7 @@ const run = function () {
             console.log('Checking for unverified PRs or unresolved deploy blockers', data);
 
             // Check the issue description to see if there are any unfinished/un-QAed items in the checklist.
-            const uncheckedBoxRegex = /-\s\[\s]/g;
+            const uncheckedBoxRegex = /-\s\[\s]\sQA/g;
             const matches = uncheckedBoxRegex.exec(data.body);
             if (matches !== null) {
                 console.log('An unverified PR or unresolved deploy blocker was found.');
diff --git a/.github/actions/checkDeployBlockers/index.js b/.github/actions/checkDeployBlockers/index.js
index 2162f09f07f5..4b63ec6765be 100644
--- a/.github/actions/checkDeployBlockers/index.js
+++ b/.github/actions/checkDeployBlockers/index.js
@@ -26,7 +26,7 @@ const run = function () {
             console.log('Checking for unverified PRs or unresolved deploy blockers', data);
 
             // Check the issue description to see if there are any unfinished/un-QAed items in the checklist.
-            const uncheckedBoxRegex = /-\s\[\s]/g;
+            const uncheckedBoxRegex = /-\s\[\s]\sQA/g;
             const matches = uncheckedBoxRegex.exec(data.body);
             if (matches !== null) {
                 console.log('An unverified PR or unresolved deploy blocker was found.');

From d88f3749d895f16b0e9bd5674283e4911a607a7f Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Thu, 20 Jan 2022 17:16:14 -0800
Subject: [PATCH 73/96] Update tests

---
 .../checkDeployBlockers.js                    |   5 +-
 .github/actions/checkDeployBlockers/index.js  |   6 +-
 .../createOrUpdateStagingDeploy/index.js      |   1 +
 .../actions/getPullRequestDetails/index.js    |   1 +
 .github/actions/getReleaseBody/index.js       |   1 +
 .../actions/isPullRequestMergeable/index.js   |   1 +
 .../actions/isStagingDeployLocked/index.js    |   1 +
 .../markPullRequestsAsDeployed/index.js       |   1 +
 .../actions/reopenIssueWithComment/index.js   |   1 +
 .../actions/triggerWorkflowAndWait/index.js   |   1 +
 .github/libs/GithubUtils.js                   |   1 +
 tests/unit/checkDeployBlockersTest.js         | 122 ++++++++++++------
 12 files changed, 99 insertions(+), 43 deletions(-)

diff --git a/.github/actions/checkDeployBlockers/checkDeployBlockers.js b/.github/actions/checkDeployBlockers/checkDeployBlockers.js
index 8024303e6714..c0c50d2cce4e 100644
--- a/.github/actions/checkDeployBlockers/checkDeployBlockers.js
+++ b/.github/actions/checkDeployBlockers/checkDeployBlockers.js
@@ -16,9 +16,8 @@ const run = function () {
             console.log('Checking for unverified PRs or unresolved deploy blockers', data);
 
             // Check the issue description to see if there are any unfinished/un-QAed items in the checklist.
-            const uncheckedBoxRegex = /-\s\[\s]\sQA/g;
-            const matches = uncheckedBoxRegex.exec(data.body);
-            if (matches !== null) {
+            const uncheckedBoxRegex = new RegExp(`-\\s\\[\\s]\\s(?:QA|${GithubUtils.ISSUE_OR_PULL_REQUEST_REGEX.source})`);
+            if (uncheckedBoxRegex.test(data.body)) {
                 console.log('An unverified PR or unresolved deploy blocker was found.');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);
                 return;
diff --git a/.github/actions/checkDeployBlockers/index.js b/.github/actions/checkDeployBlockers/index.js
index 4b63ec6765be..79cbf3100e5b 100644
--- a/.github/actions/checkDeployBlockers/index.js
+++ b/.github/actions/checkDeployBlockers/index.js
@@ -26,9 +26,8 @@ const run = function () {
             console.log('Checking for unverified PRs or unresolved deploy blockers', data);
 
             // Check the issue description to see if there are any unfinished/un-QAed items in the checklist.
-            const uncheckedBoxRegex = /-\s\[\s]\sQA/g;
-            const matches = uncheckedBoxRegex.exec(data.body);
-            if (matches !== null) {
+            const uncheckedBoxRegex = new RegExp(`-\\s\\[\\s]\\s(?:QA|${GithubUtils.ISSUE_OR_PULL_REQUEST_REGEX.source})`);
+            if (uncheckedBoxRegex.test(data.body)) {
                 console.log('An unverified PR or unresolved deploy blocker was found.');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);
                 return;
@@ -512,6 +511,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/createOrUpdateStagingDeploy/index.js b/.github/actions/createOrUpdateStagingDeploy/index.js
index 613ccb0401cb..1fc4bf16c44f 100644
--- a/.github/actions/createOrUpdateStagingDeploy/index.js
+++ b/.github/actions/createOrUpdateStagingDeploy/index.js
@@ -701,6 +701,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/getPullRequestDetails/index.js b/.github/actions/getPullRequestDetails/index.js
index 6e9e8b9fe4cf..342373eebb12 100644
--- a/.github/actions/getPullRequestDetails/index.js
+++ b/.github/actions/getPullRequestDetails/index.js
@@ -565,6 +565,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/getReleaseBody/index.js b/.github/actions/getReleaseBody/index.js
index 794b52333290..e34ba2955069 100644
--- a/.github/actions/getReleaseBody/index.js
+++ b/.github/actions/getReleaseBody/index.js
@@ -483,6 +483,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/isPullRequestMergeable/index.js b/.github/actions/isPullRequestMergeable/index.js
index d6e271850742..e8f8e84cacea 100644
--- a/.github/actions/isPullRequestMergeable/index.js
+++ b/.github/actions/isPullRequestMergeable/index.js
@@ -501,6 +501,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/isStagingDeployLocked/index.js b/.github/actions/isStagingDeployLocked/index.js
index 5a0e38ed3de3..7ea200ca6ff0 100644
--- a/.github/actions/isStagingDeployLocked/index.js
+++ b/.github/actions/isStagingDeployLocked/index.js
@@ -464,6 +464,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/markPullRequestsAsDeployed/index.js b/.github/actions/markPullRequestsAsDeployed/index.js
index 9fc180ac5ec9..cfb143b877a3 100644
--- a/.github/actions/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/markPullRequestsAsDeployed/index.js
@@ -616,6 +616,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/reopenIssueWithComment/index.js b/.github/actions/reopenIssueWithComment/index.js
index a7ce41077ef5..4b34fae9bfce 100644
--- a/.github/actions/reopenIssueWithComment/index.js
+++ b/.github/actions/reopenIssueWithComment/index.js
@@ -475,6 +475,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/actions/triggerWorkflowAndWait/index.js b/.github/actions/triggerWorkflowAndWait/index.js
index 9ba263668e8e..7f1a048fe333 100644
--- a/.github/actions/triggerWorkflowAndWait/index.js
+++ b/.github/actions/triggerWorkflowAndWait/index.js
@@ -634,6 +634,7 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
 
 
 /***/ }),
diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js
index d750c7340ccb..a17a2b875543 100644
--- a/.github/libs/GithubUtils.js
+++ b/.github/libs/GithubUtils.js
@@ -424,3 +424,4 @@ module.exports.EXPENSIFY_CASH_REPO = EXPENSIFY_CASH_REPO;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;
+module.exports.ISSUE_OR_PULL_REQUEST_REGEX = ISSUE_OR_PULL_REQUEST_REGEX;
diff --git a/tests/unit/checkDeployBlockersTest.js b/tests/unit/checkDeployBlockersTest.js
index d439c5ec99b2..983c94f2aac7 100644
--- a/tests/unit/checkDeployBlockersTest.js
+++ b/tests/unit/checkDeployBlockersTest.js
@@ -1,6 +1,7 @@
 /**
  * @jest-environment node
  */
+const _ = require('underscore');
 const core = require('@actions/core');
 const GithubUtils = require('../../.github/libs/GithubUtils');
 const run = require('../../.github/actions/checkDeployBlockers/checkDeployBlockers');
@@ -35,6 +36,23 @@ beforeAll(() => {
     GithubUtils.octokitInternal = mocktokit;
 });
 
+let baseComments = [];
+beforeEach(() => {
+    baseComments = {
+        data: [
+            {
+                body: 'foo',
+            },
+            {
+                body: 'bar',
+            },
+            {
+                body: ':shipit:',
+            },
+        ],
+    };
+});
+
 afterEach(() => {
     mockSetOutput.mockClear();
     mockGetIssue.mockClear();
@@ -45,69 +63,99 @@ afterAll(() => {
     jest.clearAllMocks();
 });
 
-describe('checkDeployBlockers', () => {
-    const baseIssue = {
+function checkbox(isClosed) {
+    return isClosed ? '[x]' : '[ ]';
+}
+
+function mockIssue(prList, deployBlockerList) {
+    return {
         data: {
             number: 1,
-            title: 'Scott\'s Unfinished QA Checklist',
-            body: 'Checklist for Deploy #668\r\n'
-            + '- [x] @foo https://github.com/Expensify/App/issues/1',
+            title: 'Scott\'s QA Checklist',
+            body: `
+**Release Version:** \`1.1.31-2\`
+**Compare Changes:** https://github.com/Expensify/App/compare/production...staging
+
+**This release contains changes from the following pull requests:**
+${_.map(prList, ({url, isQASuccess, isAccessibilitySuccess}) => `
+- ${url}
+  - ${checkbox(isQASuccess)} QA
+  - ${checkbox(isAccessibilitySuccess)} Accessibility
+`)}
+${!_.isEmpty(deployBlockerList) ? `
+
+**Deploy Blockers:**` : ''}  
+${_.map(deployBlockerList, ({url, isQASuccess}) => `
+- ${checkbox(isQASuccess)} ${url}
+`)}
+cc @Expensify/applauseleads
+`,
         },
     };
+}
 
-    const baseComments = {
-        data: [
-            {
-                body: 'foo',
-            },
-            {
-                body: 'bar',
-            },
-            {
-                body: ':shipit:',
-            },
-        ],
-    };
+describe('checkDeployBlockers', () => {
+    const allClearIssue = mockIssue([{url: 'https://github.com/Expensify/App/pull/6882', isQASuccess: true, isAccessibilitySuccess: true}]);
 
     describe('checkDeployBlockers', () => {
-        test('Test an issue with a checked item and :shipit:', () => {
-            mockGetIssue.mockResolvedValue(baseIssue);
+        test('Test an issue with all checked items and :shipit:', () => {
+            mockGetIssue.mockResolvedValue(allClearIssue);
             mockListComments.mockResolvedValue(baseComments);
             return run().then(() => {
                 expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', false);
             });
         });
 
-        test('Test an issue with an unchecked item and :shipit:', () => {
-            const uncheckedItemIssue = baseIssue;
-            uncheckedItemIssue.data.body += '\r\n- [ ] @bar https://github.com/Expensify/App/issues/23';
-            mockGetIssue.mockResolvedValue(uncheckedItemIssue);
-            mockListComments.mockResolvedValue(baseComments);
+        test('Test an issue with all boxes checked but no :shipit:', () => {
+            mockGetIssue.mockResolvedValue(allClearIssue);
+            const extraComments = {
+                data: [
+                    ...baseComments.data,
+                    {body: 'This issue either has unchecked QA steps or has not yet been stamped with a :shipit: comment. Reopening!'},
+                ],
+            };
+            mockListComments.mockResolvedValue(extraComments);
             return run().then(() => {
                 expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', true);
             });
         });
 
-        test('Test an issue with all boxes checked but no :shipit:', () => {
-            const checkedBoxesNoShipitIssue = baseIssue;
-            checkedBoxesNoShipitIssue.data.body = 'Checklist for Deploy #668:\r\n'
-                + '- [x] @bar https://github.com/Expensify/App/issues/23\r\n'
-                + '- [x] @baz https://github.com/Expensify/App/issues/42';
-            mockGetIssue.mockResolvedValue(checkedBoxesNoShipitIssue);
-            // eslint-disable-next-line max-len
-            baseComments.data.push({body: 'This issue either has unchecked QA steps or has not yet been stamped with a :shipit: comment. Reopening!'});
-            mockListComments.mockResolvedValue(baseComments);
+        test('Test an issue with all boxes checked but no comments', () => {
+            mockGetIssue.mockResolvedValue(allClearIssue);
+            mockListComments.mockResolvedValue({data: []});
             return run().then(() => {
                 expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', true);
             });
         });
 
-        test('Test an issue with all boxes checked but no comments', () => {
-            mockGetIssue.mockResolvedValue(baseIssue);
-            mockListComments.mockResolvedValue({data: []});
+        test('Test an issue with all QA checked but no accessibility', () => {
+            mockGetIssue.mockResolvedValue(mockIssue([{url: 'https://github.com/Expensify/App/pull/6882', isQASuccess: true, isAccessibilitySuccess: false}]));
+            mockListComments.mockResolvedValue(baseComments);
+            return run().then(() => {
+                expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', false);
+            });
+        });
+
+        test('Test an issue with all QA checked but not all deploy blockers', () => {
+            mockGetIssue.mockResolvedValue(mockIssue(
+                [{url: 'https://github.com/Expensify/App/pull/6882', isQASuccess: true, isAccessibilitySuccess: false}],
+                [{url: 'https://github.com/Expensify/App/pull/6883', isQASuccess: false}],
+            ));
+            mockListComments.mockResolvedValue(baseComments);
             return run().then(() => {
                 expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', true);
             });
         });
+
+        test('Test an issue with all QA checked and all deploy blockers resolved', () => {
+            mockGetIssue.mockResolvedValue(mockIssue(
+                [{url: 'https://github.com/Expensify/App/pull/6882', isQASuccess: true, isAccessibilitySuccess: false}],
+                [{url: 'https://github.com/Expensify/App/pull/6883', isQASuccess: true}],
+            ));
+            mockListComments.mockResolvedValue(baseComments);
+            return run().then(() => {
+                expect(mockSetOutput).toHaveBeenCalledWith('HAS_DEPLOY_BLOCKERS', false);
+            });
+        });
     });
 });

From 0043cecd96658cd667603e2d431b7d39807dd9b7 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Fri, 21 Jan 2022 07:12:11 +0530
Subject: [PATCH 74/96] Fix code to get the selected Account

---
 src/pages/settings/Payments/TransferBalancePage.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js
index 89635d9ecf73..52a2dfef84de 100644
--- a/src/pages/settings/Payments/TransferBalancePage.js
+++ b/src/pages/settings/Payments/TransferBalancePage.js
@@ -123,9 +123,13 @@ class TransferBalancePage extends React.Component {
             this.props.userWallet,
         );
 
-        return _.find(paymentMethods, method => (method.accountType === this.props.walletTransfer.selectedAccountType
-                && method.methodID === this.props.walletTransfer.selectedAccountID)
-                || method.isDefault);
+        const defaultAccount = _.find(paymentMethods, method => method.isDefault);
+        const selectedAccount = _.find(
+            paymentMethods,
+            method => method.accountType === this.props.walletTransfer.selectedAccountType
+                && method.methodID === this.props.walletTransfer.selectedAccountID,
+        );
+        return selectedAccount || defaultAccount;
     }
 
     /**

From 685830b06463e1bbe532e9e084723d1558f15a53 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Fri, 21 Jan 2022 11:15:24 +0530
Subject: [PATCH 75/96] Correct close account confirmation modal logic.

---
 src/pages/settings/Security/CloseAccountPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index 10025e29d772..7e289680770f 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -141,6 +141,7 @@ export default compose(
     withOnyx({
         isCloseAccoutModalOpen: {
             key: ONYXKEYS.IS_CLOSE_ACCOUNT_MODAL_OPEN,
+            initWithStoredValues: false,
         },
         session: {
             key: ONYXKEYS.SESSION,

From 942bd86cb66e6f1852d00870f8c76d8aee11ff3f Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Fri, 21 Jan 2022 09:34:24 +0200
Subject: [PATCH 76/96] disable Hot key Actions if vr keyboard is open .

---
 src/pages/home/report/ReportActionCompose.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 51759e6bb846..aeff4ab2fb13 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -49,6 +49,7 @@ import {withNetwork, withPersonalDetails} from '../../../components/OnyxProvider
 import DateUtils from '../../../libs/DateUtils';
 import Tooltip from '../../../components/Tooltip';
 import * as EmojiUtils from '../../../libs/EmojiUtils';
+import canUseTouchScreen from '../../../libs/canUseTouchscreen';
 
 const propTypes = {
     /** Beta features list */
@@ -146,6 +147,7 @@ class ReportActionCompose extends React.Component {
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
         this.setPreferredSkinTone = this.setPreferredSkinTone.bind(this);
+        this.isVirtualKeyboardOpen = this.isVirtualKeyboardOpen.bind(this);
 
         this.state = {
             isFocused: this.shouldFocusInputOnScreenFocus,
@@ -353,13 +355,27 @@ class ReportActionCompose extends React.Component {
         }
     }
 
+    /**
+     * Allows us to identify whether Virtual keyboard open or not
+     *
+     * @returns {boolean}
+     */
+    isVirtualKeyboardOpen() {
+        // check if platform is web and supports virtualkeyboard
+        if (navigator && 'virtualkeyboard' in navigator) {
+            const keyboardPosition = navigator.virtualKeyboard.boundingRect.y;
+            return keyboardPosition > 0;
+        }
+        return canUseTouchScreen();
+    }
+
     /**
      * Listens for keyboard shortcuts and applies the action
      *
      * @param {Object} e
      */
     triggerHotkeyActions(e) {
-        if (!e) {
+        if (!e || this.isVirtualKeyboardOpen()) {
             return;
         }
 

From 0681d32a7d44818d1a7a45b51882aebc754f75f3 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Fri, 21 Jan 2022 14:45:08 +0200
Subject: [PATCH 77/96] Update comment

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index aeff4ab2fb13..c967a4f2352e 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -356,9 +356,8 @@ class ReportActionCompose extends React.Component {
     }
 
     /**
-     * Allows us to identify whether Virtual keyboard open or not
-     *
-     * @returns {boolean}
+     * Whether virtual keyboard is open or not
+     * @returns {Boolean}
      */
     isVirtualKeyboardOpen() {
         // check if platform is web and supports virtualkeyboard

From db12c7da7aafea391ad4012880fabc6fa09e8c66 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Fri, 21 Jan 2022 14:46:00 +0200
Subject: [PATCH 78/96] delete not used line

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index c967a4f2352e..0b3878e23ded 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -147,7 +147,6 @@ class ReportActionCompose extends React.Component {
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
         this.setPreferredSkinTone = this.setPreferredSkinTone.bind(this);
-        this.isVirtualKeyboardOpen = this.isVirtualKeyboardOpen.bind(this);
 
         this.state = {
             isFocused: this.shouldFocusInputOnScreenFocus,

From 23f32fe984c17cacbb52f5b5a8f3c89ed6d75d63 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Fri, 21 Jan 2022 14:46:18 +0200
Subject: [PATCH 79/96] refactor

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 0b3878e23ded..537b34a3e6c4 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -361,8 +361,7 @@ class ReportActionCompose extends React.Component {
     isVirtualKeyboardOpen() {
         // check if platform is web and supports virtualkeyboard
         if (navigator && 'virtualkeyboard' in navigator) {
-            const keyboardPosition = navigator.virtualKeyboard.boundingRect.y;
-            return keyboardPosition > 0;
+            return navigator.virtualKeyboard.boundingRect.y > 0;
         }
         return canUseTouchScreen();
     }

From def44eeeae099e921549cc9c81f2e0bbd5875e6f Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Fri, 21 Jan 2022 14:46:37 +0200
Subject: [PATCH 80/96] fix typo

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 537b34a3e6c4..21503ca874e7 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -360,7 +360,7 @@ class ReportActionCompose extends React.Component {
      */
     isVirtualKeyboardOpen() {
         // check if platform is web and supports virtualkeyboard
-        if (navigator && 'virtualkeyboard' in navigator) {
+        if (navigator && 'virtualKeyboard' in navigator) {
             return navigator.virtualKeyboard.boundingRect.y > 0;
         }
         return canUseTouchScreen();

From 5f3be5e6f6784e162fa4d61102bb9d42f324363e Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Fri, 21 Jan 2022 15:06:02 +0200
Subject: [PATCH 81/96] Update comment

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 21503ca874e7..92e19bc29b39 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -359,7 +359,7 @@ class ReportActionCompose extends React.Component {
      * @returns {Boolean}
      */
     isVirtualKeyboardOpen() {
-        // check if platform is web and supports virtualkeyboard
+        // Whether the virtualKeyboard API is supported on the platform.
         if (navigator && 'virtualKeyboard' in navigator) {
             return navigator.virtualKeyboard.boundingRect.y > 0;
         }

From 3e15e90b4381c7db7ef24d8bf16ad20b5ee2ad4b Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Fri, 21 Jan 2022 10:16:21 -0800
Subject: [PATCH 82/96] Update all reports when deleting a policy

---
 src/libs/actions/Policy.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 6433c997e710..5dd0dd627051 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -162,7 +162,9 @@ function deletePolicy(policyID) {
 
             // Removing the workspace data from Onyx as well
             return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, null);
-        }).then(() => {
+        })
+        .then(() => Report.fetchAllReports(false, true))
+        .then(() => {
             Navigation.dismissModal();
             Navigation.navigate(ROUTES.HOME);
             return Promise.resolve();

From 173bc34671f9fa24c12bec5d6055798605a3d274 Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Fri, 21 Jan 2022 10:17:10 -0800
Subject: [PATCH 83/96] Re-render the room name when it changes

---
 src/pages/home/sidebar/OptionRow.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
index 6ce004650d6e..383542cc9347 100644
--- a/src/pages/home/sidebar/OptionRow.js
+++ b/src/pages/home/sidebar/OptionRow.js
@@ -275,5 +275,10 @@ export default withLocalize(memo(OptionRow, (prevProps, nextProps) => {
         return false;
     }
 
+    // Re-render when the text changes
+    if (prevProps.option.text !== nextProps.option.text) {
+        return false;
+    }
+
     return true;
 }));

From 3bfe4ab0767daeeb0003f7b7adc60654993bb868 Mon Sep 17 00:00:00 2001
From: Tushu17 <tusharshrivastav1711@gmail.com>
Date: Sat, 22 Jan 2022 00:13:02 +0530
Subject: [PATCH 84/96] add new error message

---
 src/components/AddPlaidBankAccount.js | 2 +-
 src/languages/en.js                   | 1 +
 src/languages/es.js                   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index 8f72a23afad5..f3837f8ad61d 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -117,7 +117,7 @@ class AddPlaidBankAccount extends React.Component {
         this.getErrors = () => ReimbursementAccountUtils.getErrors(this.props);
         this.clearError = inputKey => ReimbursementAccountUtils.clearError(this.props, inputKey);
         this.getErrorText = inputKey => ReimbursementAccountUtils.getErrorText(this.props, {
-            password: 'passwordForm.error.incorrectLoginOrPassword',
+            password: 'passwordForm.error.incorrectPassword',
         }, inputKey);
     }
 
diff --git a/src/languages/en.js b/src/languages/en.js
index 1520446a1498..571d12e5e23e 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -432,6 +432,7 @@ export default {
         twoFactorCode: 'Two factor code',
         requiredWhen2FAEnabled: 'Required when 2FA is enabled',
         error: {
+            incorrectPassword: 'Incorrect password. Please try again.',
             incorrectLoginOrPassword: 'Incorrect login or password. Please try again.',
             twoFactorAuthenticationEnabled: 'You have 2FA enabled on this account. Please sign in using your email or phone number.',
             invalidLoginOrPassword: 'Invalid login or password. Please try again or reset your password.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 627dd67ccda3..0b911ec8b710 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -432,6 +432,7 @@ export default {
         twoFactorCode: 'Autenticación de 2 factores',
         requiredWhen2FAEnabled: 'Obligatorio cuando A2F está habilitado',
         error: {
+            incorrectPassword: 'Contraseña incorrecta. Por favor inténtalo de nuevo.',
             incorrectLoginOrPassword: 'Usuario o clave incorrectos. Por favor inténtalo de nuevo',
             twoFactorAuthenticationEnabled: 'Tienes autenticación de 2 factores activada en esta cuenta. Por favor conéctate usando su email o número de teléfono',
             invalidLoginOrPassword: 'Usuario o clave incorrectos. Por favor inténtalo de nuevo o resetea tu clave',

From 77bc76e38fa888a8902838fd700a652452740e79 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Fri, 21 Jan 2022 11:03:00 -1000
Subject: [PATCH 85/96] bump with merge commit

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e11811c1c47d..2d63669e2699 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37125,8 +37125,8 @@
       }
     },
     "react-native-onyx": {
-      "version": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
-      "from": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
+      "version": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
+      "from": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
       "requires": {
         "ascii-table": "0.0.9",
         "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c",
diff --git a/package.json b/package.json
index 81267c55aef6..f9024fae6c2e 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "react-native-image-size": "^1.1.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.10.0",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#793fce8f4c19f2ab1a0bf349123cf6a641d7f84a",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
     "react-native-pdf": "^6.2.2",
     "react-native-performance": "^2.0.0",
     "react-native-permissions": "^3.0.1",

From 8e06a462120bb4f953728f9b53fcff68e286bd22 Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Sat, 22 Jan 2022 15:53:26 +0200
Subject: [PATCH 86/96] split virtualKeyboard to lib

---
 src/libs/virtualKeyboard.js                  | 18 ++++++++++++++++++
 src/pages/home/report/ReportActionCompose.js | 15 ++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/libs/virtualKeyboard.js

diff --git a/src/libs/virtualKeyboard.js b/src/libs/virtualKeyboard.js
new file mode 100644
index 000000000000..f28dc84c0bcf
--- /dev/null
+++ b/src/libs/virtualKeyboard.js
@@ -0,0 +1,18 @@
+import _ from 'underscore';
+
+/**
+ * Is the virtual keyboard open?
+ *
+ * @returns {Boolean|null} – null if the VirtualKeyboard API is unavailable
+ */
+function isOpen() {
+    if (!_.has(navigator, 'virtualKeyboard')) {
+        return null;
+    }
+    return navigator.virtualKeyboard.boundingRect.y > 0;
+}
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    isOpen,
+};
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 92e19bc29b39..9b3e44338b8e 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -50,6 +50,7 @@ import DateUtils from '../../../libs/DateUtils';
 import Tooltip from '../../../components/Tooltip';
 import * as EmojiUtils from '../../../libs/EmojiUtils';
 import canUseTouchScreen from '../../../libs/canUseTouchscreen';
+import * as VirtualKeyboard from '../../../libs/virtualKeyboard';
 
 const propTypes = {
     /** Beta features list */
@@ -355,15 +356,11 @@ class ReportActionCompose extends React.Component {
     }
 
     /**
-     * Whether virtual keyboard is open or not
-     * @returns {Boolean}
+     * @returns {boolean}
      */
-    isVirtualKeyboardOpen() {
-        // Whether the virtualKeyboard API is supported on the platform.
-        if (navigator && 'virtualKeyboard' in navigator) {
-            return navigator.virtualKeyboard.boundingRect.y > 0;
-        }
-        return canUseTouchScreen();
+    shouldAssumeVirtualKeyboardIsOpen() {
+        const isOpen = VirtualKeyboard.isOpen();
+        return _.isNull(isOpen) ? canUseTouchScreen() : isOpen;
     }
 
     /**
@@ -372,7 +369,7 @@ class ReportActionCompose extends React.Component {
      * @param {Object} e
      */
     triggerHotkeyActions(e) {
-        if (!e || this.isVirtualKeyboardOpen()) {
+        if (!e || this.shouldAssumeVirtualKeyboardIsOpen()) {
             return;
         }
 

From df12d41a22c07fcdde69c4b2a938595dcd09278a Mon Sep 17 00:00:00 2001
From: Sobit Neupane <073bct543.sobit@pcampus.edu.np>
Date: Mon, 24 Jan 2022 13:07:07 +0545
Subject: [PATCH 87/96] Separate report name and icon configuration from
 personal details

---
 src/libs/OptionsListUtils.js        |  2 +-
 src/libs/actions/PersonalDetails.js | 31 ---------------------
 src/libs/actions/Report.js          | 42 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 4dc9af374968..9c89b974b644 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -782,7 +782,7 @@ function getReportIcons(report, personalDetails) {
     }
     const sortedParticipants = _.map(report.participants, dmParticipant => ({
         firstName: lodashGet(personalDetails, [dmParticipant, 'firstName'], ''),
-        avatar: lodashGet(personalDetails, [dmParticipant, 'avatarThumbnail'], '')
+        avatar: lodashGet(personalDetails, [dmParticipant, 'avatar'], '')
             || getDefaultAvatar(dmParticipant),
     }))
         .sort((first, second) => first.firstName - second.firstName);
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index 22453fcd4ee9..6bbaf0a52ade 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -8,7 +8,6 @@ import CONST from '../../CONST';
 import NetworkConnection from '../NetworkConnection';
 import * as API from '../API';
 import NameValuePair from './NameValuePair';
-import * as ReportUtils from '../reportUtils';
 import * as OptionsListUtils from '../OptionsListUtils';
 import Growl from '../Growl';
 import * as Localize from '../Localize';
@@ -173,36 +172,6 @@ function getFromReportParticipants(reports) {
 
             const formattedPersonalDetails = formatPersonalDetails(details);
             Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, formattedPersonalDetails);
-
-            // The personalDetails of the participants contain their avatar images. Here we'll go over each
-            // report and based on the participants we'll link up their avatars to report icons. This will
-            // skip over default rooms which aren't named by participants.
-            const reportsToUpdate = {};
-            _.each(reports, (report) => {
-                if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report)) {
-                    return;
-                }
-
-                const avatars = OptionsListUtils.getReportIcons(report, details);
-                const reportName = ReportUtils.isChatRoom(report)
-                    ? report.reportName
-                    : _.chain(report.participants)
-                        .filter(participant => participant !== currentUserEmail)
-                        .map(participant => lodashGet(
-                            formattedPersonalDetails,
-                            [participant, 'displayName'],
-                            participant,
-                        ))
-                        .value()
-                        .join(', ');
-
-                reportsToUpdate[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`] = {icons: avatars, reportName};
-            });
-
-            // We use mergeCollection such that it updates ONYXKEYS.COLLECTION.REPORT in one go.
-            // Any withOnyx subscribers to this key will also receive the complete updated props just once
-            // than updating props for each report and re-rendering had merge been used.
-            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, reportsToUpdate);
         });
 }
 
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 6800a7c4aecd..7b9eefe15d6b 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -25,6 +25,7 @@ import Timers from '../Timers';
 import * as ReportActions from './ReportActions';
 import Growl from '../Growl';
 import * as Localize from '../Localize';
+import * as OptionsListUtils from '../OptionsListUtils';
 
 let currentUserEmail;
 let currentUserAccountID;
@@ -319,6 +320,44 @@ function fetchIOUReportID(debtorEmail) {
     });
 }
 
+function configureReportNameAndIcon(reports) {
+    // The personalDetails of the participants contain their avatar images. Here we'll go over each
+    // report and based on the participants we'll link up their avatars to report icons. This will
+    // skip over default rooms which aren't named by participants.
+
+    Onyx.connect({
+        key: ONYXKEYS.PERSONAL_DETAILS,
+        callback: (formattedPersonalDetails) => {
+            const reportsToUpdate = {};
+            _.each(reports, (report) => {
+                if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report)) {
+                    return;
+                }
+
+                const avatars = ReportUtils.isChatRoom(report) ? (['']) : OptionsListUtils.getReportIcons(report, formattedPersonalDetails);
+                const reportName = ReportUtils.isChatRoom(report)
+                    ? report.reportName
+                    : _.chain(report.participants)
+                        .filter(participant => participant !== currentUserEmail)
+                        .map(participant => lodashGet(
+                            formattedPersonalDetails,
+                            [participant, 'displayName'],
+                            participant,
+                        ))
+                        .value()
+                        .join(', ');
+
+                reportsToUpdate[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`] = {icons: avatars, reportName};
+            });
+
+            // We use mergeCollection such that it updates ONYXKEYS.COLLECTION.REPORT in one go.
+            // Any withOnyx subscribers to this key will also receive the complete updated props just once
+            // than updating props for each report and re-rendering had merge been used.
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, reportsToUpdate);
+        },
+    });
+}
+
 /**
  * Fetches chat reports when provided a list of chat report IDs.
  * If the shouldRedirectIfInaccessible flag is set, we redirect to the Concierge chat
@@ -401,6 +440,9 @@ function fetchChatReportsByIDs(chatList, shouldRedirectIfInaccessible = false) {
 
             // Fetch the personal details if there are any
             PersonalDetails.getFromReportParticipants(_.values(simplifiedReports));
+
+            // Configure Report Name and Report Icon
+            configureReportNameAndIcon(_.values(simplifiedReports));
             return fetchedReports;
         })
         .catch((err) => {

From 57f3264ffc3d80b83ff7fd529eacc37e3ca7a954 Mon Sep 17 00:00:00 2001
From: Sobit Neupane <073bct543.sobit@pcampus.edu.np>
Date: Tue, 25 Jan 2022 00:09:27 +0545
Subject: [PATCH 88/96] Resolve race condition in fetchChatReportsByIDs

---
 src/libs/OptionsListUtils.js        |  2 +-
 src/libs/actions/PersonalDetails.js |  4 +-
 src/libs/actions/Report.js          | 61 +++++++++++++----------------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 9c89b974b644..4dc9af374968 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -782,7 +782,7 @@ function getReportIcons(report, personalDetails) {
     }
     const sortedParticipants = _.map(report.participants, dmParticipant => ({
         firstName: lodashGet(personalDetails, [dmParticipant, 'firstName'], ''),
-        avatar: lodashGet(personalDetails, [dmParticipant, 'avatar'], '')
+        avatar: lodashGet(personalDetails, [dmParticipant, 'avatarThumbnail'], '')
             || getDefaultAvatar(dmParticipant),
     }))
         .sort((first, second) => first.firstName - second.firstName);
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index 6bbaf0a52ade..49ab13bc19cc 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -145,6 +145,7 @@ function fetchPersonalDetails() {
  * Get personal details from report participants.
  *
  * @param {Object} reports
+ * @returns {Promise}
  */
 function getFromReportParticipants(reports) {
     const participantEmails = _.chain(reports)
@@ -157,7 +158,7 @@ function getFromReportParticipants(reports) {
         return;
     }
 
-    API.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')})
+    return API.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')})
         .then((data) => {
             const existingDetails = _.pick(data, participantEmails);
 
@@ -172,6 +173,7 @@ function getFromReportParticipants(reports) {
 
             const formattedPersonalDetails = formatPersonalDetails(details);
             Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, formattedPersonalDetails);
+            return details;
         });
 }
 
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 7b9eefe15d6b..2d953dd7d26e 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -320,42 +320,37 @@ function fetchIOUReportID(debtorEmail) {
     });
 }
 
-function configureReportNameAndIcon(reports) {
+function configureReportNameAndIcon(reports, details) {
     // The personalDetails of the participants contain their avatar images. Here we'll go over each
     // report and based on the participants we'll link up their avatars to report icons. This will
     // skip over default rooms which aren't named by participants.
 
-    Onyx.connect({
-        key: ONYXKEYS.PERSONAL_DETAILS,
-        callback: (formattedPersonalDetails) => {
-            const reportsToUpdate = {};
-            _.each(reports, (report) => {
-                if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report)) {
-                    return;
-                }
-
-                const avatars = ReportUtils.isChatRoom(report) ? (['']) : OptionsListUtils.getReportIcons(report, formattedPersonalDetails);
-                const reportName = ReportUtils.isChatRoom(report)
-                    ? report.reportName
-                    : _.chain(report.participants)
-                        .filter(participant => participant !== currentUserEmail)
-                        .map(participant => lodashGet(
-                            formattedPersonalDetails,
-                            [participant, 'displayName'],
-                            participant,
-                        ))
-                        .value()
-                        .join(', ');
-
-                reportsToUpdate[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`] = {icons: avatars, reportName};
-            });
+    const reportsToUpdate = {};
+    _.each(reports, (report) => {
+        if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report)) {
+            return;
+        }
 
-            // We use mergeCollection such that it updates ONYXKEYS.COLLECTION.REPORT in one go.
-            // Any withOnyx subscribers to this key will also receive the complete updated props just once
-            // than updating props for each report and re-rendering had merge been used.
-            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, reportsToUpdate);
-        },
+        const avatars = ReportUtils.isChatRoom(report) ? (['']) : OptionsListUtils.getReportIcons(report, details);
+        const reportName = ReportUtils.isChatRoom(report)
+            ? report.reportName
+            : _.chain(report.participants)
+                .filter(participant => participant !== currentUserEmail)
+                .map(participant => lodashGet(
+                    details,
+                    [participant, 'displayName'],
+                    participant,
+                ))
+                .value()
+                .join(', ');
+
+        reportsToUpdate[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`] = {icons: avatars, reportName};
     });
+
+    // We use mergeCollection such that it updates ONYXKEYS.COLLECTION.REPORT in one go.
+    // Any withOnyx subscribers to this key will also receive the complete updated props just once
+    // than updating props for each report and re-rendering had merge been used.
+    Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, reportsToUpdate);
 }
 
 /**
@@ -439,10 +434,10 @@ function fetchChatReportsByIDs(chatList, shouldRedirectIfInaccessible = false) {
             Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, simplifiedReports);
 
             // Fetch the personal details if there are any
-            PersonalDetails.getFromReportParticipants(_.values(simplifiedReports));
+            Promise.resolve(PersonalDetails.getFromReportParticipants(_.values(simplifiedReports))).then(
+                details => configureReportNameAndIcon(_.values(simplifiedReports), details),
+            );
 
-            // Configure Report Name and Report Icon
-            configureReportNameAndIcon(_.values(simplifiedReports));
             return fetchedReports;
         })
         .catch((err) => {

From bf7aa997cff9b62f1cf8f066f031b0b433e3881e Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Mon, 24 Jan 2022 20:45:04 +0200
Subject: [PATCH 89/96] Update to latest react-native-onyx version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9bf8130a1a12..9c75dcb298a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37125,8 +37125,8 @@
       }
     },
     "react-native-onyx": {
-      "version": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
-      "from": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
+      "version": "git+https://github.com/Expensify/react-native-onyx.git#f3814ff18405e7021c1bb51011396ce37474df86",
+      "from": "git+https://github.com/Expensify/react-native-onyx.git#f3814ff18405e7021c1bb51011396ce37474df86",
       "requires": {
         "ascii-table": "0.0.9",
         "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c",
diff --git a/package.json b/package.json
index e06b584fa26d..25f2b53a6c85 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "react-native-image-size": "^1.1.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#41c0ee3fae92f644463d3d95fd510eb0142f950c",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#f3814ff18405e7021c1bb51011396ce37474df86",
     "react-native-pdf": "^6.2.2",
     "react-native-performance": "^2.0.0",
     "react-native-permissions": "^3.0.1",

From a6e1078dee19e8e0c289e4ccf8676f88e9ced9d8 Mon Sep 17 00:00:00 2001
From: AHMED SHERIF <ahmdshrif96@gmail.com>
Date: Mon, 24 Jan 2022 20:55:47 +0200
Subject: [PATCH 90/96] fix typo

Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
---
 src/pages/home/report/ReportActionCompose.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 9b3e44338b8e..e5275a53deab 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -356,7 +356,7 @@ class ReportActionCompose extends React.Component {
     }
 
     /**
-     * @returns {boolean}
+     * @returns {Boolean}
      */
     shouldAssumeVirtualKeyboardIsOpen() {
         const isOpen = VirtualKeyboard.isOpen();

From e0efcf09b1e05ebee972a8b53792aa09ca0c302d Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Mon, 24 Jan 2022 21:10:48 +0200
Subject: [PATCH 91/96] add des to shouldAssumeVirtualKeyboardIsOpen

---
 src/pages/home/report/ReportActionCompose.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index e5275a53deab..cb85d3267078 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -356,6 +356,10 @@ class ReportActionCompose extends React.Component {
     }
 
     /**
+     * As of January 2022, the VirtualKeyboard web API is not available in all browsers yet
+     * If it is unavailable, we default to assuming that the virtual keyboard is open on touch-enabled devices.
+     * See https://github.com/Expensify/App/issues/6767 for additional context.
+     *
      * @returns {Boolean}
      */
     shouldAssumeVirtualKeyboardIsOpen() {

From a1e29abc8cd7d057b0294332823172a4bfa9d861 Mon Sep 17 00:00:00 2001
From: AHMED <a.s1171111@gmail.com>
Date: Mon, 24 Jan 2022 21:11:47 +0200
Subject: [PATCH 92/96] support native virtual Keyboard

---
 .../index.js}                                 |  0
 src/libs/virtualKeyboard/index.native.js      | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 rename src/libs/{virtualKeyboard.js => virtualKeyboard/index.js} (100%)
 create mode 100644 src/libs/virtualKeyboard/index.native.js

diff --git a/src/libs/virtualKeyboard.js b/src/libs/virtualKeyboard/index.js
similarity index 100%
rename from src/libs/virtualKeyboard.js
rename to src/libs/virtualKeyboard/index.js
diff --git a/src/libs/virtualKeyboard/index.native.js b/src/libs/virtualKeyboard/index.native.js
new file mode 100644
index 000000000000..6c21a32ffcdf
--- /dev/null
+++ b/src/libs/virtualKeyboard/index.native.js
@@ -0,0 +1,33 @@
+import {Keyboard} from 'react-native';
+
+let isVirtualKeyboardOpen = false;
+
+Keyboard.addListener(
+    'keyboardDidShow',
+    () => {
+        isVirtualKeyboardOpen = true;
+    },
+);
+
+Keyboard.addListener(
+    'keyboardDidHide',
+    () => {
+        isVirtualKeyboardOpen = false;
+    },
+);
+
+/**
+ * Is the virtual keyboard open?
+ *
+ * Note – the web equivalent of this function may return null.
+ *
+ * @returns {Boolean}
+ */
+function isOpen() {
+    return isVirtualKeyboardOpen;
+}
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    isOpen,
+};

From 753ad929618f3f859ef3077ff5dab3d0037eb150 Mon Sep 17 00:00:00 2001
From: Sobit Neupane <073bct543.sobit@pcampus.edu.np>
Date: Tue, 25 Jan 2022 11:37:35 +0545
Subject: [PATCH 93/96] Make syntatic change in use of Promise

---
 src/libs/actions/PersonalDetails.js | 2 +-
 src/libs/actions/Report.js          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index 49ab13bc19cc..a4f868acd6cb 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -155,7 +155,7 @@ function getFromReportParticipants(reports) {
         .value();
 
     if (participantEmails.length === 0) {
-        return;
+        return Promise.resolve([]);
     }
 
     return API.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')})
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 2d953dd7d26e..6f78ae6cdc83 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -433,10 +433,11 @@ function fetchChatReportsByIDs(chatList, shouldRedirectIfInaccessible = false) {
             Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_IOUS, reportIOUData);
             Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, simplifiedReports);
 
+            const simplifiedReportsList = _.values(simplifiedReports);
+
             // Fetch the personal details if there are any
-            Promise.resolve(PersonalDetails.getFromReportParticipants(_.values(simplifiedReports))).then(
-                details => configureReportNameAndIcon(_.values(simplifiedReports), details),
-            );
+            PersonalDetails.getFromReportParticipants(simplifiedReportsList)
+                .then(details => configureReportNameAndIcon(simplifiedReportsList, details));
 
             return fetchedReports;
         })

From 8e19bf3efc8891d9676c8e7fa9e381766ee5ecdd Mon Sep 17 00:00:00 2001
From: Sobit Neupane <073bct543.sobit@pcampus.edu.np>
Date: Tue, 25 Jan 2022 12:02:22 +0545
Subject: [PATCH 94/96] Maintain consistent interface

---
 src/libs/actions/PersonalDetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index a4f868acd6cb..aaeb85f953d9 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -155,7 +155,7 @@ function getFromReportParticipants(reports) {
         .value();
 
     if (participantEmails.length === 0) {
-        return Promise.resolve([]);
+        return Promise.resolve({});
     }
 
     return API.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')})

From a926ac0c87996a8dc3099523ad021d7fbd22dc8c Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 25 Jan 2022 14:59:25 +0000
Subject: [PATCH 95/96] add beta flag section to the contributing readme

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b9de823d1b5..7753bc0d30cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,6 +12,10 @@ You can create as many accounts as needed in order to test your changes directly
 ##### Generating Multiple Test Accounts
 You can generate multiple test accounts by using a `+` postfix, for example if your email is test@test.com, you can create multiple New Expensify accounts connected to the same email address by using test+123@test.com, test+456@test.com, etc.
 
+#### Working on beta features
+
+Some features are locked behind beta flags while development is ongoing. As a contributor you can work on these beta features locally by overriding the [`Permissions.canUseAllBetas` function](https://github.com/Expensify/App/blob/5e268df7f2989ed04bc64c0c86ed77faf134554d/src/libs/Permissions.js#L10-L12) to return `true`.
+
 ## Code of Conduct
 This project and everyone participating in it is governed by the Expensify [Code of Conduct](https://github.com/Expensify/App/blob/main/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [contributors@expensify.com](mailto:contributors@expensify.com).
 

From 1e5841a194e810ec4763609fd8bb13ca1878e052 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 25 Jan 2022 19:21:17 +0000
Subject: [PATCH 96/96] Update version to 1.1.32-1

---
 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 e374f6e0e982..eaadee9751c7 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 1001013200
-        versionName "1.1.32-0"
+        versionCode 1001013201
+        versionName "1.1.32-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 579c34777417..c59bd66518e2 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.32.0</string>
+	<string>1.1.32.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0716a4531166..492062abb533 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.32.0</string>
+	<string>1.1.32.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 9c75dcb298a4..4de489ed0f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.32-0",
+  "version": "1.1.32-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 25f2b53a6c85..dc3ecd2cb348 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.32-0",
+  "version": "1.1.32-1",
   "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.",