From 473eb695e626c02ebe06e53ed7ad4fafb92f99df Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 7 Sep 2021 14:25:23 +0530
Subject: [PATCH 01/49] Update style

---
 src/pages/signin/ResendValidationForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index f494941421ba..a3fefd43e68d 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -83,7 +83,7 @@ class ResendValidationForm extends React.Component {
         return (
             <>
                 <View>
-                    <Text>
+                    <Text style={[styles.mt5, styles.mb1, styles.textLabel, styles.h3]}>
                         {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
                             loginType: (Str.isSMSLogin(this.props.credentials.login)
                                 ? this.props.translate('common.phoneNumber').toLowerCase()

From c5e3aff9257a0ff909f28970985d0f5977124435 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 7 Sep 2021 14:30:14 +0530
Subject: [PATCH 02/49] Pass props to show welcome message

---
 src/pages/signin/SignInPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index ce47478da5d3..05bc0feb6b40 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -92,7 +92,7 @@ class SignInPage extends Component {
                 <SafeAreaView style={[styles.signInPage]}>
                     <SignInPageLayout
                         welcomeText={welcomeText}
-                        shouldShowWelcomeText={showLoginForm}
+                        shouldShowWelcomeText={showLoginForm || showPasswordForm || !showResendValidationLinkForm}
                         shouldShowWelcomeScreenshot={showLoginForm}
                     >
                         {showLoginForm && <LoginForm />}

From 154f465411029f98138a68fc3e57b98f2e3017b1 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 7 Sep 2021 14:33:24 +0530
Subject: [PATCH 03/49] Handle props in main layout

---
 src/pages/signin/SignInPageLayout/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 1a5a88a4c7ad..87e43d249c93 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -13,11 +13,19 @@ const SignInPageLayout = props => (
             <SignInPageLayoutWide
                 welcomeText={props.welcomeText}
                 isMediumScreenWidth={props.isMediumScreenWidth}
+                shouldShowWelcomeText={props.shouldShowWelcomeText}
             >
                 {props.children}
             </SignInPageLayoutWide>
         )
-        : <SignInPageLayoutNarrow welcomeText={props.welcomeText}>{props.children}</SignInPageLayoutNarrow>
+        : (
+            <SignInPageLayoutNarrow
+                welcomeText={props.welcomeText}
+                shouldShowWelcomeText={props.shouldShowWelcomeText}
+            >
+                {props.children}
+            </SignInPageLayoutNarrow>
+        )
 );
 
 SignInPageLayout.propTypes = propTypes;

From 2211940522b276d5125da02b0b7c59e10df4deb0 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 7 Sep 2021 14:34:04 +0530
Subject: [PATCH 04/49] Conditional welcome message on wide layout

---
 .../signin/SignInPageLayout/SignInPageLayoutWide.js    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
index 947dfe41603f..67bc08fc244f 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -22,6 +22,8 @@ const propTypes = {
     /* Flag to check medium screen with device */
     isMediumScreenWidth: PropTypes.bool.isRequired,
 
+    shouldShowWelcomeText: PropTypes.bool.isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -45,9 +47,11 @@ const SignInPageLayoutWide = props => (
                                 height={variables.componentSizeLarge}
                             />
                         </View>
-                        <Text style={[styles.mv5, styles.textLabel, styles.h3]}>
-                            {props.welcomeText}
-                        </Text>
+                        {props.shouldShowWelcomeText && (
+                            <Text style={[styles.mv5, styles.textLabel, styles.h3]}>
+                                {props.welcomeText}
+                            </Text>
+                        )}
                         <View>
                             {props.children}
                         </View>

From 8f850b1b4661b490eaf947c272bbfbf23150cee7 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 7 Sep 2021 14:34:27 +0530
Subject: [PATCH 05/49] Conditional welcome message on mobile layout

---
 .../signin/SignInPageLayout/SignInPageLayoutNarrow.js  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
index 74d213eff0ca..4eb4b54b4d31 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
@@ -16,6 +16,8 @@ const propTypes = {
      * on form type (set password, sign in, etc.) */
     welcomeText: PropTypes.string.isRequired,
 
+    shouldShowWelcomeText: PropTypes.bool.isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -47,9 +49,11 @@ const SignInPageLayoutNarrow = props => (
                             height={variables.componentSizeLarge}
                         />
                     </View>
-                    <Text style={[styles.mv5, styles.textLabel, styles.h3]}>
-                        {props.welcomeText}
-                    </Text>
+                    {props.shouldShowWelcomeText && (
+                        <Text style={[styles.mv5, styles.textLabel, styles.h3]}>
+                            {props.welcomeText}
+                        </Text>
+                    )}
                     {props.children}
                 </View>
             </View>

From 2385500e366bff5b5300a9867038d47164d71869 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Wed, 15 Sep 2021 00:34:43 +0530
Subject: [PATCH 06/49] fix(emoji-skintone):  Fixed emoji border radius and
 width

---
 src/styles/styles.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index a84ae33bf43e..f4fcb24e4e7a 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1177,6 +1177,9 @@ const styles = {
 
     emojiSkinToneItem: {
         width: 'auto',
+        minWidth: 36,
+        textAlign: 'center',
+        borderRadius: 8,
         ...spacing.ph1,
     },
 

From 85c6862088427661f3784674876fdbcfc1573ab1 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Wed, 15 Sep 2021 00:35:10 +0530
Subject: [PATCH 07/49] fix(emoji-skintone): Retain last selected emoji with
 default highlight

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

diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index e88cdc7f3655..dfae05e7cd6d 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -45,7 +45,7 @@ class EmojiSkinToneList extends Component {
      * @param {object} skinToneEmoji
      */
     updateSelectedSkinTone(skinToneEmoji) {
-        this.setState(prev => ({isSkinToneListVisible: !prev.isSkinToneListVisible}));
+        this.setState(prev => ({isSkinToneListVisible: !prev.isSkinToneListVisible, highlightedIndex: skinToneEmoji.skinTone}));
         this.props.updatePreferredSkinTone(skinToneEmoji.skinTone);
     }
 

From fe30323d88bd5911a17a2df6dc7607a7db4bdfa8 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Wed, 15 Sep 2021 00:57:21 +0530
Subject: [PATCH 08/49] fix(emoji-skintone): Aligned skintone with other emojis

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

diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index dfae05e7cd6d..18909c93cd97 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -52,7 +52,7 @@ class EmojiSkinToneList extends Component {
     render() {
         const selectedEmoji = getSkinToneEmojiFromIndex(this.props.preferredSkinTone);
         return (
-            <View style={[styles.flexRow, styles.p1, styles.ph3]}>
+            <View style={[styles.flexRow, styles.p1, styles.ph4]}>
                 {
                     !this.state.isSkinToneListVisible && (
                         <Pressable

From ec46c63e87ca45658466b37a084b91c3d852ad3a Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Wed, 15 Sep 2021 02:06:07 +0530
Subject: [PATCH 09/49] fix(emoji-skintone): Fixed alignment for Emoji skintone
 picker

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

diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index 18909c93cd97..d8409801b14d 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -68,7 +68,7 @@ class EmojiSkinToneList extends Component {
                                 styles.alignItemsCenter,
                             ]}
                         >
-                            <Text style={[styles.emojiText, styles.ph1]}>
+                            <Text style={[styles.emojiText, styles.ph2]}>
                                 {selectedEmoji.code}
                             </Text>
                             <Text style={[styles.emojiSkinToneTitle]}>

From 15a0b4149f53d6096df34c506138d3609a388834 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Sep 2021 15:49:48 +0530
Subject: [PATCH 10/49] Update copy

---
 src/languages/en.js                      |  1 +
 src/languages/es.js                      |  1 +
 src/pages/signin/ResendValidationForm.js | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index efcb20b5b9cc..48938805c076 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -344,6 +344,7 @@ export default {
         linkHasBeenResent: 'Link has been re-sent',
         weSentYouMagicSignInLink: ({loginType}) => `We've sent a magic sign in link to your ${loginType}.`,
         resendLink: 'Resend link',
+        unvalidatedAccount: 'This account exists but isn\'t validated, please check your inbox for the validation link.',
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index 6fbd8ab352cc..de94e74c7096 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -344,6 +344,7 @@ export default {
         linkHasBeenResent: 'El enlace se ha reenviado',
         weSentYouMagicSignInLink: ({loginType}) => `Hemos enviado un enlace mágico de inicio de sesión a tu ${loginType}.`,
         resendLink: 'Reenviar enlace',
+        unvalidatedAccount: 'Esta cuenta ya existe pero no está validada, por favor busca en tu email el link de validación.',
     },
     detailsPage: {
         localTime: 'Hora local',
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index a3fefd43e68d..0844d820dbb7 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -84,11 +84,16 @@ class ResendValidationForm extends React.Component {
             <>
                 <View>
                     <Text style={[styles.mt5, styles.mb1, styles.textLabel, styles.h3]}>
-                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                            loginType: (Str.isSMSLogin(this.props.credentials.login)
-                                ? this.props.translate('common.phoneNumber').toLowerCase()
-                                : this.props.translate('common.email')).toLowerCase(),
-                        })}
+                        {
+                            this.props.account.validated
+                                ? this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
+                                    loginType: (Str.isSMSLogin(this.props.credentials.login)
+                                        ? this.props.translate('common.phoneNumber')
+                                            .toLowerCase()
+                                        : this.props.translate('common.email')).toLowerCase(),
+                                })
+                                : this.props.translate('resendValidationForm.unvalidatedAccount')
+                        }
                     </Text>
                 </View>
                 {!_.isEmpty(this.state.formSuccess) && (

From 2e698f30de0fff53e99140a08d10662068d3df11 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Sep 2021 18:07:56 +0530
Subject: [PATCH 11/49] Update resend link layout and style

---
 src/pages/signin/ResendValidationForm.js | 34 +++++++++++++++++++-----
 src/styles/utilities/positioning.js      |  3 +++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 0844d820dbb7..76f026554b4e 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {View} from 'react-native';
+import {TouchableOpacity, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
@@ -9,9 +9,13 @@ import Button from '../../components/Button';
 import Text from '../../components/Text';
 import {reopenAccount, resendValidationLink, resetPassword} from '../../libs/actions/Session';
 import ONYXKEYS from '../../ONYXKEYS';
-import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
+import redirectToSignIn from '../../libs/actions/SignInRedirect';
+import Avatar from '../../components/Avatar';
+import {getDefaultAvatar} from '../../libs/OptionsListUtils';
+import Icon from '../../components/Icon';
+import {BackArrow} from '../../components/Icon/Expensicons';
 
 const propTypes = {
     /* Onyx Props */
@@ -82,8 +86,23 @@ class ResendValidationForm extends React.Component {
     render() {
         return (
             <>
+                <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
+                    <TouchableOpacity
+                        style={[styles.pAbsolute, styles.ln6]}
+                        onPress={() => redirectToSignIn()}
+                    >
+                        <Icon src={BackArrow} />
+                    </TouchableOpacity>
+                    <Avatar
+                        source={getDefaultAvatar(this.props.credentials.login)}
+                        imageStyles={[styles.mr2]}
+                    />
+                    <Text style={[styles.textStrong]}>
+                        {Str.isSMSLogin(this.props.credentials.login) ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login}
+                    </Text>
+                </View>
                 <View>
-                    <Text style={[styles.mt5, styles.mb1, styles.textLabel, styles.h3]}>
+                    <Text style={[styles.mv5]}>
                         {
                             this.props.account.validated
                                 ? this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
@@ -101,15 +120,18 @@ class ResendValidationForm extends React.Component {
                         {this.state.formSuccess}
                     </Text>
                 )}
-                <View style={[styles.mt4]}>
+                <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                    <TouchableOpacity onPress={() => redirectToSignIn()}>
+                        <Text>
+                            {this.props.translate('common.cancel')}
+                        </Text>
+                    </TouchableOpacity>
                     <Button
                         success
-                        style={[styles.mb2]}
                         text={this.props.translate('resendValidationForm.resendLink')}
                         isLoading={this.props.account.loading}
                         onPress={this.validateAndSubmitForm}
                     />
-                    <ChangeExpensifyLoginLink />
                 </View>
             </>
         );
diff --git a/src/styles/utilities/positioning.js b/src/styles/utilities/positioning.js
index 455566b4655d..4e0ac5d7c58a 100644
--- a/src/styles/utilities/positioning.js
+++ b/src/styles/utilities/positioning.js
@@ -21,4 +21,7 @@ export default {
     b0: {
         bottom: 0,
     },
+    ln6: {
+        left: -24,
+    },
 };

From afbaa5e6f172f8e94be260e6df33b58b4a7671f8 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Sep 2021 18:22:38 +0530
Subject: [PATCH 12/49] Comments and declare prop types

---
 .../SignInPageLayout/SignInPageLayoutNarrow.js      |  3 +++
 .../signin/SignInPageLayout/SignInPageLayoutWide.js |  3 +++
 src/pages/signin/SignInPageLayout/index.js          | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
index 4eb4b54b4d31..43d354f1b15c 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
@@ -16,6 +16,9 @@ const propTypes = {
      * on form type (set password, sign in, etc.) */
     welcomeText: PropTypes.string.isRequired,
 
+    /**
+     * Whether to show welcome text on a particular page
+     */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
     ...withLocalizePropTypes,
diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
index 67bc08fc244f..3ab47d5b4680 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -22,6 +22,9 @@ const propTypes = {
     /* Flag to check medium screen with device */
     isMediumScreenWidth: PropTypes.bool.isRequired,
 
+    /**
+     * Whether to show welcome text on a particular page
+     */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
     ...withLocalizePropTypes,
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 87e43d249c93..b1bda4e0e977 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -1,9 +1,22 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import SignInPageLayoutNarrow from './SignInPageLayoutNarrow';
 import SignInPageLayoutWide from './SignInPageLayoutWide';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 
 const propTypes = {
+    /** The children to show inside the layout */
+    children: PropTypes.node.isRequired,
+
+    /** Welcome text to show in the header of the form, changes depending
+     * on form type (set password, sign in, etc.) */
+    welcomeText: PropTypes.string.isRequired,
+
+    /**
+     * Whether to show welcome text on a particular page
+     */
+    shouldShowWelcomeText: PropTypes.bool.isRequired,
+
     ...windowDimensionsPropTypes,
 };
 

From e73166984c71e0ef9e458fb156ca917f1edf6618 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 21 Sep 2021 20:52:51 +0530
Subject: [PATCH 13/49] fix(emoji-skintone): Removed unwanted View and extra
 styling

---
 src/pages/home/report/EmojiSkinToneList.js | 26 ++++++++++------------
 src/styles/styles.js                       |  8 -------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index d8409801b14d..b3c1f28e90fa 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -79,21 +79,19 @@ class EmojiSkinToneList extends Component {
                 }
                 {
                     this.state.isSkinToneListVisible && (
-                        <View>
-                            <View style={[styles.flexRow]}>
-                                {
-                                    skinTones.map(skinToneEmoji => (
-                                        <EmojiPickerMenuItem
-                                            onPress={() => this.updateSelectedSkinTone(skinToneEmoji)}
-                                            onHover={() => this.setState({highlightedIndex: skinToneEmoji.skinTone})}
-                                            key={skinToneEmoji.code}
-                                            emojiItemStyle={styles.emojiSkinToneItem}
-                                            emoji={skinToneEmoji.code}
-                                            isHighlighted={skinToneEmoji.skinTone === this.state.highlightedIndex}
-                                        />
-                                    ))
+
+                        <View style={[styles.flexRow, styles.flex1]}>
+                            {
+                                skinTones.map(skinToneEmoji => (
+                                    <EmojiPickerMenuItem
+                                        onPress={() => this.updateSelectedSkinTone(skinToneEmoji)}
+                                        onHover={() => this.setState({highlightedIndex: skinToneEmoji.skinTone})}
+                                        key={skinToneEmoji.code}
+                                        emoji={skinToneEmoji.code}
+                                        isHighlighted={skinToneEmoji.skinTone === this.state.highlightedIndex}
+                                    />
+                                ))
                                 }
-                            </View>
                         </View>
                     )
                 }
diff --git a/src/styles/styles.js b/src/styles/styles.js
index f4fcb24e4e7a..8a5cf05d15ca 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1175,14 +1175,6 @@ const styles = {
         borderRadius: 8,
     },
 
-    emojiSkinToneItem: {
-        width: 'auto',
-        minWidth: 36,
-        textAlign: 'center',
-        borderRadius: 8,
-        ...spacing.ph1,
-    },
-
     emojiItemHighlighted: {
         transition: '0.2s ease',
         backgroundColor: themeColors.buttonDefaultBG,

From eecd438d8dd5d18d9c0f3d93a100f61d50503b7e Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 21 Sep 2021 20:53:59 +0530
Subject: [PATCH 14/49] fix(emoji-skintone): Removed unused prop from
 EmojiPickerMenuItem

---
 src/pages/home/report/EmojiPickerMenuItem.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/home/report/EmojiPickerMenuItem.js b/src/pages/home/report/EmojiPickerMenuItem.js
index e464fa5eacfe..1e24aac47ea9 100644
--- a/src/pages/home/report/EmojiPickerMenuItem.js
+++ b/src/pages/home/report/EmojiPickerMenuItem.js
@@ -18,11 +18,6 @@ const propTypes = {
 
     /** Whether this menu item is currently highlighted or not */
     isHighlighted: PropTypes.bool,
-
-    /** Override default emojiItem style */
-    // eslint-disable-next-line react/forbid-prop-types
-    emojiItemStyle: PropTypes.any,
-
 };
 
 const EmojiPickerMenuItem = props => (
@@ -34,7 +29,7 @@ const EmojiPickerMenuItem = props => (
             styles.pv1,
             getButtonBackgroundColorStyle(getButtonState(false, pressed)),
             props.isHighlighted ? styles.emojiItemHighlighted : {},
-            props.emojiItemStyle ? props.emojiItemStyle : styles.emojiItem,
+            styles.emojiItem,
         ])}
     >
         <Hoverable onHoverIn={props.onHover}>
@@ -50,7 +45,6 @@ EmojiPickerMenuItem.displayName = 'EmojiPickerMenuItem';
 EmojiPickerMenuItem.defaultProps = {
     isHighlighted: false,
     onHover: () => {},
-    emojiItemStyle: undefined,
 };
 
 // Significantly speeds up re-renders of the EmojiPickerMenu's FlatList

From 6edfce81aead3051ec69ee97e0487f6dc6812f5b Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 21 Sep 2021 21:10:46 +0530
Subject: [PATCH 15/49] fix(emoji-skintone): Added common emojiItem style to
 skintone picker

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

diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index b3c1f28e90fa..a41611b0bb19 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -68,7 +68,7 @@ class EmojiSkinToneList extends Component {
                                 styles.alignItemsCenter,
                             ]}
                         >
-                            <Text style={[styles.emojiText, styles.ph2]}>
+                            <Text style={[styles.emojiText, styles.ph2, styles.emojiItem]}>
                                 {selectedEmoji.code}
                             </Text>
                             <Text style={[styles.emojiSkinToneTitle]}>

From 51b2d583c15ab42ab44158042811dd9e9e11602a Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Wed, 22 Sep 2021 20:00:21 +0530
Subject: [PATCH 16/49] Remove and update some code

---
 src/pages/signin/ResendValidationForm.js               | 10 +---------
 .../signin/SignInPageLayout/SignInPageLayoutNarrow.js  |  4 +---
 src/pages/signin/SignInPageLayout/index.js             |  4 +---
 src/styles/utilities/positioning.js                    |  3 ---
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 76f026554b4e..b59f8eb5ffa1 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -14,8 +14,6 @@ import compose from '../../libs/compose';
 import redirectToSignIn from '../../libs/actions/SignInRedirect';
 import Avatar from '../../components/Avatar';
 import {getDefaultAvatar} from '../../libs/OptionsListUtils';
-import Icon from '../../components/Icon';
-import {BackArrow} from '../../components/Icon/Expensicons';
 
 const propTypes = {
     /* Onyx Props */
@@ -87,12 +85,6 @@ class ResendValidationForm extends React.Component {
         return (
             <>
                 <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
-                    <TouchableOpacity
-                        style={[styles.pAbsolute, styles.ln6]}
-                        onPress={() => redirectToSignIn()}
-                    >
-                        <Icon src={BackArrow} />
-                    </TouchableOpacity>
                     <Avatar
                         source={getDefaultAvatar(this.props.credentials.login)}
                         imageStyles={[styles.mr2]}
@@ -123,7 +115,7 @@ class ResendValidationForm extends React.Component {
                 <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
                     <TouchableOpacity onPress={() => redirectToSignIn()}>
                         <Text>
-                            {this.props.translate('common.cancel')}
+                            {this.props.translate('common.back')}
                         </Text>
                     </TouchableOpacity>
                     <Button
diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
index 43d354f1b15c..4ab52883f600 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
@@ -16,9 +16,7 @@ const propTypes = {
      * on form type (set password, sign in, etc.) */
     welcomeText: PropTypes.string.isRequired,
 
-    /**
-     * Whether to show welcome text on a particular page
-     */
+    /** Whether to show welcome text on a particular page */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
     ...withLocalizePropTypes,
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index b1bda4e0e977..813b051de259 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -12,9 +12,7 @@ const propTypes = {
      * on form type (set password, sign in, etc.) */
     welcomeText: PropTypes.string.isRequired,
 
-    /**
-     * Whether to show welcome text on a particular page
-     */
+    /** Whether to show welcome text on a particular page */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
     ...windowDimensionsPropTypes,
diff --git a/src/styles/utilities/positioning.js b/src/styles/utilities/positioning.js
index 4e0ac5d7c58a..455566b4655d 100644
--- a/src/styles/utilities/positioning.js
+++ b/src/styles/utilities/positioning.js
@@ -21,7 +21,4 @@ export default {
     b0: {
         bottom: 0,
     },
-    ln6: {
-        left: -24,
-    },
 };

From 17fd7cad6c088332eb03aee17c994b659e0709f8 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Wed, 22 Sep 2021 20:06:07 +0530
Subject: [PATCH 17/49] Pass appropriate props

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

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index da1033747ad9..7a9baacced89 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -82,7 +82,10 @@ class SetPasswordPage extends Component {
     render() {
         return (
             <SafeAreaView style={[styles.signInPage]}>
-                <SignInPageLayout welcomeText={this.props.translate('setPasswordPage.passwordFormTitle')}>
+                <SignInPageLayout
+                    shouldShowWelcomeText
+                    welcomeText={this.props.translate('setPasswordPage.passwordFormTitle')}
+                >
                     <View style={[styles.mb4]}>
                         <NewPasswordForm
                             password={this.state.password}

From 08de2ed1f64d53d7a4c18dc023af5eadb4cb7066 Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Sat, 25 Sep 2021 23:19:47 +0530
Subject: [PATCH 18/49] Added validation for phone, ssn and taxt_id_number

---
 src/CONST.js                                   |  5 +++++
 src/libs/ValidationUtils.js                    | 10 ++++++++++
 src/pages/ReimbursementAccount/CompanyStep.js  |  9 +++++++--
 src/pages/ReimbursementAccount/IdentityForm.js |  3 +++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index f73743110eb1..6f8891c501b6 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -73,6 +73,10 @@ const CONST = {
             VERIFYING: 'VERIFYING',
             PENDING: 'PENDING',
         },
+        MAX_LENGTH: {
+            TAX_ID_NUMBER: 9,
+            SSN: 4,
+        },
     },
     INCORPORATION_TYPES: {
         LLC: 'LLC',
@@ -419,6 +423,7 @@ const CONST = {
         US_PHONE: /^\+1\d{10}$/,
         DIGITS_AND_PLUS: /^\+?[0-9]*$/,
         PHONE_E164_PLUS: /^\+?[1-9]\d{1,14}$/,
+        PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]*$/,
         NON_ALPHA_NUMERIC: /[^A-Za-z0-9+]/g,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 7174d276f5af..f14178ac919e 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -69,6 +69,15 @@ function isValidAge(date) {
     return moment().diff(moment(date), 'years') >= 18;
 }
 
+/**
+ *
+ * @param {String} phoneNumber
+ * @returns {Boolean}
+ */
+function isValidPhoneWithSpecialChars(phoneNumber) {
+    return CONST.REGEX.PHONE_WITH_SPECIAL_CHARS.test(phoneNumber);
+}
+
 /**
  * @param {Object} identity
  * @returns {Boolean}
@@ -125,4 +134,5 @@ export {
     isValidIdentity,
     isValidZipCode,
     isRequiredFulfilled,
+    isValidPhoneWithSpecialChars,
 };
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 0bc66f9ef3a4..822727f3114e 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -22,7 +22,7 @@ import TextLink from '../../components/TextLink';
 import StatePicker from '../../components/StatePicker';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import {
-    isValidAddress, isValidDate, isValidZipCode, isRequiredFulfilled,
+    isValidAddress, isValidDate, isValidZipCode, isRequiredFulfilled, isValidPhoneWithSpecialChars,
 } from '../../libs/ValidationUtils';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -142,6 +142,10 @@ class CompanyStep extends React.Component {
             errors.incorporationDate = true;
         }
 
+        if (!isValidPhoneWithSpecialChars(this.state.companyPhone)) {
+            errors.companyPhone = true;
+        }
+
         _.each(this.requiredFields, (inputKey) => {
             if (!isRequiredFulfilled(this.state[inputKey])) {
                 errors[inputKey] = true;
@@ -237,11 +241,12 @@ class CompanyStep extends React.Component {
                     <ExpensiTextInput
                         label={this.props.translate('companyStep.taxIDNumber')}
                         containerStyles={[styles.mt4]}
-                        keyboardType={CONST.KEYBOARD_TYPE.PHONE_PAD}
+                        keyboardType={CONST.KEYBOARD_TYPE.NUMERIC}
                         onChangeText={value => this.clearErrorAndSetValue('companyTaxID', value)}
                         value={this.state.companyTaxID}
                         disabled={shouldDisableCompanyTaxID}
                         errorText={this.getErrorText('companyTaxID')}
+                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.TAX_ID_NUMBER}
                     />
                     <View style={styles.mt4}>
                         <ExpensiPicker
diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index 57c782b23878..54a93d48cd3e 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -8,6 +8,7 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
 import {translateLocal} from '../../libs/translate';
 import {hideBankAccountErrors} from '../../libs/actions/BankAccounts';
 import Text from '../../components/Text';
+import CONST from '../../CONST';
 
 const propTypes = {
     /** Style for wrapping View */
@@ -118,6 +119,7 @@ const IdentityForm = ({
             <ExpensiTextInput
                 label={`${translate('common.ssnLast4')}`}
                 containerStyles={[styles.mt4]}
+                keyboardType={CONST.KEYBOARD_TYPE.NUMERIC}
                 value={ssnLast4}
                 onChangeText={(val) => {
                     if (error === translateLocal('bankAccount.error.ssnLast4')) {
@@ -126,6 +128,7 @@ const IdentityForm = ({
                     onFieldChange('ssnLast4', val);
                 }}
                 errorText={error === translateLocal('bankAccount.error.ssnLast4') ? error : ''}
+                maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
             />
             <ExpensiTextInput
                 label={translate('common.personalAddress')}

From 26d2e621498387c5bbed5998f851d3bc379da3c6 Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Sat, 25 Sep 2021 23:23:17 +0530
Subject: [PATCH 19/49] Added maxlength and keyboard type for zipcode and phone
 number

---
 src/CONST.js                                  | 2 ++
 src/pages/ReimbursementAccount/CompanyStep.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/CONST.js b/src/CONST.js
index 6f8891c501b6..49391e096431 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -76,6 +76,8 @@ const CONST = {
         MAX_LENGTH: {
             TAX_ID_NUMBER: 9,
             SSN: 4,
+            ZIP_CODE: 5,
+            PHONE_NUMBER: 15,
         },
     },
     INCORPORATION_TYPES: {
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 822727f3114e..6c7928dbf978 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -218,9 +218,11 @@ class CompanyStep extends React.Component {
                     <ExpensiTextInput
                         label={this.props.translate('common.zip')}
                         containerStyles={[styles.mt4]}
+                        keyboardType={CONST.KEYBOARD_TYPE.NUMERIC}
                         onChangeText={value => this.clearErrorAndSetValue('addressZipCode', value)}
                         value={this.state.addressZipCode}
                         errorText={this.getErrorText('addressZipCode')}
+                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
                     />
                     <ExpensiTextInput
                         label={this.props.translate('common.phoneNumber')}
@@ -230,6 +232,8 @@ class CompanyStep extends React.Component {
                         value={this.state.companyPhone}
                         placeholder={this.props.translate('companyStep.companyPhonePlaceholder')}
                         errorText={this.getErrorText('companyPhone')}
+                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.PHONE_NUMBER}
+
                     />
                     <ExpensiTextInput
                         label={this.props.translate('companyStep.companyWebsite')}

From f0f9680054ebbab3d4ee3c02e694d111412f5839 Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Sun, 26 Sep 2021 00:36:18 +0530
Subject: [PATCH 20/49] Added maxlength to zipcode

---
 src/pages/ReimbursementAccount/IdentityForm.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index 54a93d48cd3e..2ac6c4187a24 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -175,6 +175,7 @@ const IdentityForm = ({
             <ExpensiTextInput
                 label={translate('common.zip')}
                 containerStyles={[styles.mt4]}
+                keyboardType={CONST.KEYBOARD_TYPE.NUMERIC}
                 value={zipCode}
                 onChangeText={(val) => {
                     if (error === translateLocal('bankAccount.error.zipCode')) {
@@ -183,6 +184,7 @@ const IdentityForm = ({
                     onFieldChange('zipCode', val);
                 }}
                 errorText={error === translateLocal('bankAccount.error.zipCode') ? error : ''}
+                maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
             />
         </View>
     );

From 8f16a56ff51755f5f3859becfa6652c5581b47f0 Mon Sep 17 00:00:00 2001
From: Santhoshkumar Sellavel <Santhoshsellavel@gmail.com>
Date: Sun, 26 Sep 2021 22:35:55 +0530
Subject: [PATCH 21/49] Shows NEW indicator over unread messages, on
 interaction with new marker badge

---
 src/pages/home/report/ReportActionsView.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index bc91c5def802..2cd1ef3831e5 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -399,11 +399,15 @@ class ReportActionsView extends React.Component {
      * @param {Boolean} [shouldResetLocalCount=false] Whether count should increment or reset
      */
     updateLocalUnreadActionCount(shouldResetLocalCount = false) {
-        this.setState(prevState => ({
-            localUnreadActionCount: shouldResetLocalCount
+        this.setState((prevState) => {
+            const localUnreadActionCount = shouldResetLocalCount
                 ? this.props.report.unreadActionCount
-                : prevState.localUnreadActionCount + this.props.report.unreadActionCount,
-        }));
+                : prevState.localUnreadActionCount + this.props.report.unreadActionCount;
+            this.updateUnreadIndicatorPosition(localUnreadActionCount);
+            return {
+                localUnreadActionCount,
+            };
+        });
     }
 
     /**

From 5b03d881466be46f741ab3bee48c9b302389952d Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Mon, 27 Sep 2021 22:06:33 +0530
Subject: [PATCH 22/49] Handle message appropriately

---
 src/languages/en.js                      |  5 ++--
 src/languages/es.js                      |  5 ++--
 src/pages/signin/ResendValidationForm.js | 38 ++++++++++++++++--------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 48938805c076..b84515efff62 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -342,9 +342,10 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        weSentYouMagicSignInLink: ({loginType}) => `We've sent a magic sign in link to your ${loginType}.`,
+        weSentYouMagicSignInLink: ({login}) => `We've sent a magic sign in link to ${login}. Check your Inbox and your Spam folder and wait 5-10 minutes before trying again.`,
         resendLink: 'Resend link',
-        unvalidatedAccount: 'This account exists but isn\'t validated, please check your inbox for the validation link.',
+        unvalidatedAccount: ({loginType}) => `This account exists but isn't validated, please check your ${loginType} for the validation link.`,
+        newAccount: ({login, loginType}) => `Welcome ${login}, it's always great to see a new face around here! Please check your ${loginType} for a magic link to validate your account.`,
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index de94e74c7096..151d696a63d6 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -342,9 +342,10 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({loginType}) => `Hemos enviado un enlace mágico de inicio de sesión a tu ${loginType}.`,
+        weSentYouMagicSignInLink: ({login}) => `Hemos enviado un enlace mágico de inicio de sesión a tu ${login}. Verifique su bandeja de entrada y su carpeta de correo no deseado y espere de 5 a 10 minutos antes de intentarlo de nuevo.`,
         resendLink: 'Reenviar enlace',
-        unvalidatedAccount: 'Esta cuenta ya existe pero no está validada, por favor busca en tu email el link de validación.',
+        unvalidatedAccount: ({loginType}) => `Esta cuenta ya existe pero no está validada, por favor busca en tu ${loginType} el link de validación.`,
+        newAccount: ({login, loginType}) => `¡Bienvenido ${login}, es genial ver una cara nueva por aquí! En tu ${loginType} encontrarás un enlace para validar tu cuenta, por favor, revísalo`,
     },
     detailsPage: {
         localTime: 'Hora local',
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index b59f8eb5ffa1..dd6c0c99b006 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -34,6 +34,9 @@ const propTypes = {
 
         /** Whether or not the account is closed */
         closed: PropTypes.bool,
+
+        /** Whether or not the account already exists */
+        accountExists: PropTypes.bool,
     }),
 
     ...withLocalizePropTypes,
@@ -82,6 +85,26 @@ class ResendValidationForm extends React.Component {
     }
 
     render() {
+        const isNewAccount = !this.props.account.accountExists && !this.props.account.validated;
+        const isOldUnvalidatedAccount = this.props.account.accountExists && !this.props.account.validated;
+        const loginType = (Str.isSMSLogin(this.props.credentials.login) ? this.props.translate('common.phoneNumber') : this.props.translate('common.email')).toLowerCase();
+        let message = '';
+
+        if (isNewAccount) {
+            message = this.props.translate('resendValidationForm.newAccount', {
+                login: this.props.credentials.login,
+                loginType,
+            });
+        } else if (isOldUnvalidatedAccount) {
+            message = this.props.translate('resendValidationForm.unvalidatedAccount', {
+                loginType,
+            });
+        } else {
+            message = this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
+                login: this.props.credentials.login,
+            });
+        }
+
         return (
             <>
                 <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
@@ -93,18 +116,9 @@ class ResendValidationForm extends React.Component {
                         {Str.isSMSLogin(this.props.credentials.login) ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login}
                     </Text>
                 </View>
-                <View>
-                    <Text style={[styles.mv5]}>
-                        {
-                            this.props.account.validated
-                                ? this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                                    loginType: (Str.isSMSLogin(this.props.credentials.login)
-                                        ? this.props.translate('common.phoneNumber')
-                                            .toLowerCase()
-                                        : this.props.translate('common.email')).toLowerCase(),
-                                })
-                                : this.props.translate('resendValidationForm.unvalidatedAccount')
-                        }
+                <View style={[styles.mv5]}>
+                    <Text>
+                        {message}
                     </Text>
                 </View>
                 {!_.isEmpty(this.state.formSuccess) && (

From df0df918565d1493e5da23280650482d0cf5d6c2 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Sep 2021 17:46:34 -0700
Subject: [PATCH 23/49] Update throttled error with new copy

---
 src/languages/en.js                           |  2 +-
 src/languages/es.js                           |  2 +-
 .../ReimbursementAccountPage.js               | 19 +++++++------------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 382630a84470..4d3287d26b03 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -387,7 +387,7 @@ export default {
         checkHelpLine: 'Your routing number and account number can be found on a check for the account.',
         validateAccountError: 'In order to finish setting up your bank account, you must validate your account. Please check your email to validate your account, and return here to finish up!',
         hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
-        hasBeenThrottledError: ({fromNow}) => `For security reasons, we're taking a break from bank account setup so you can double-check your company information. Please try again ${fromNow}. Sorry!`,
+        hasBeenThrottledError: 'There was an error adding your bank account. Please wait a few minutes and try again.',
         buttonConfirm: 'Got it',
         error: {
             noBankAccountAvailable: 'Sorry, no bank account is available',
diff --git a/src/languages/es.js b/src/languages/es.js
index 1b6117274c8a..1cc547239d8d 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -387,7 +387,7 @@ export default {
         checkHelpLine: 'Su número de ruta y número de cuenta se pueden encontrar en un cheque de la cuenta bancaria.',
         validateAccountError: 'Para terminar de configurar tu cuenta bancaria, debes validar tu cuenta de Expensify. Por favor revisa tu correo electrónico para validar tu cuenta y regresa aquí para continuar.',
         hasPhoneLoginError: 'Para agregar una cuenta bancaria verificada, asegúrate de que tu nombre de usuario principal sea un correo electrónico válido y vuelve a intentarlo. Puedes agregar tu número de teléfono como nombre de usuario secundario.',
-        hasBeenThrottledError: ({fromNow}) => `Por razones de seguridad, nos tomamos un descanso en la configuración de la cuenta bancaria para que pueda verificar la información de su empresa. Inténtalo de nuevo ${fromNow}. ¡Lo siento!`,
+        hasBeenThrottledError: 'Se produjo un error al intentar agregar tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
         buttonConfirm: 'OK',
         error: {
             noBankAccountAvailable: 'Lo sentimos, no hay ninguna cuenta bancaria disponible',
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 3adffd340a27..2c7eaced2962 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -161,18 +161,13 @@ class ReimbursementAccountPage extends React.Component {
 
         const throttledDate = lodashGet(this.props, 'reimbursementAccount.throttledDate');
         if (throttledDate) {
-            const throttledEnd = moment().add(24, 'hours');
-            if (moment() < throttledEnd) {
-                errorComponent = (
-                    <View style={[styles.m5]}>
-                        <Text>
-                            {this.props.translate('bankAccount.hasBeenThrottledError', {
-                                fromNow: throttledEnd.fromNow(),
-                            })}
-                        </Text>
-                    </View>
-                );
-            }
+            errorComponent = (
+                <View style={[styles.m5]}>
+                    <Text>
+                        {this.props.translate('bankAccount.hasBeenThrottledError')}
+                    </Text>
+                </View>
+            );
         }
 
         if (errorComponent) {

From 70a5ecaed863f0aef1ca11cc1914d6cded569ee4 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Sep 2021 18:53:09 -0700
Subject: [PATCH 24/49] Removed unused import

---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 2c7eaced2962..2f4b1bb9ee51 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';

From 8bd989ef25a5a77945b0b16306a0ed3b9dccfdf3 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Wed, 29 Sep 2021 23:16:45 +0530
Subject: [PATCH 25/49] Edit message and minor changes

---
 src/languages/en.js                                   |  2 +-
 src/languages/es.js                                   |  4 ++--
 src/pages/signin/ResendValidationForm.js              | 11 +++++------
 .../signin/SignInPageLayout/SignInPageLayoutWide.js   |  4 +---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index b84515efff62..aa6692b4eae7 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -344,7 +344,7 @@ export default {
         linkHasBeenResent: 'Link has been re-sent',
         weSentYouMagicSignInLink: ({login}) => `We've sent a magic sign in link to ${login}. Check your Inbox and your Spam folder and wait 5-10 minutes before trying again.`,
         resendLink: 'Resend link',
-        unvalidatedAccount: ({loginType}) => `This account exists but isn't validated, please check your ${loginType} for the validation link.`,
+        unvalidatedAccount: 'This account exists but isn\'t validated, please check your inbox for your magic link.',
         newAccount: ({login, loginType}) => `Welcome ${login}, it's always great to see a new face around here! Please check your ${loginType} for a magic link to validate your account.`,
     },
     detailsPage: {
diff --git a/src/languages/es.js b/src/languages/es.js
index 151d696a63d6..dc882a50595f 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -342,9 +342,9 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({login}) => `Hemos enviado un enlace mágico de inicio de sesión a tu ${login}. Verifique su bandeja de entrada y su carpeta de correo no deseado y espere de 5 a 10 minutos antes de intentarlo de nuevo.`,
+        weSentYouMagicSignInLink: ({login}) => `Hemos enviado un enlace mágico de inicio de sesión a ${login}. Verifica tu bandeja de entrada y tu carpeta de correo no deseado y espera de 5 a 10 minutos antes de intentarlo de nuevo.`,
         resendLink: 'Reenviar enlace',
-        unvalidatedAccount: ({loginType}) => `Esta cuenta ya existe pero no está validada, por favor busca en tu ${loginType} el link de validación.`,
+        unvalidatedAccount: 'Esta cuenta existe pero no está validada, por favor busca el enlace mágico en tu bandeja de entrada',
         newAccount: ({login, loginType}) => `¡Bienvenido ${login}, es genial ver una cara nueva por aquí! En tu ${loginType} encontrarás un enlace para validar tu cuenta, por favor, revísalo`,
     },
     detailsPage: {
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index dd6c0c99b006..06cf6df309df 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -87,21 +87,20 @@ class ResendValidationForm extends React.Component {
     render() {
         const isNewAccount = !this.props.account.accountExists && !this.props.account.validated;
         const isOldUnvalidatedAccount = this.props.account.accountExists && !this.props.account.validated;
+        const login = Str.isSMSLogin(this.props.credentials.login) ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login;
         const loginType = (Str.isSMSLogin(this.props.credentials.login) ? this.props.translate('common.phoneNumber') : this.props.translate('common.email')).toLowerCase();
         let message = '';
 
         if (isNewAccount) {
             message = this.props.translate('resendValidationForm.newAccount', {
-                login: this.props.credentials.login,
+                login,
                 loginType,
             });
         } else if (isOldUnvalidatedAccount) {
-            message = this.props.translate('resendValidationForm.unvalidatedAccount', {
-                loginType,
-            });
+            message = this.props.translate('resendValidationForm.unvalidatedAccount');
         } else {
             message = this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                login: this.props.credentials.login,
+                login,
             });
         }
 
@@ -113,7 +112,7 @@ class ResendValidationForm extends React.Component {
                         imageStyles={[styles.mr2]}
                     />
                     <Text style={[styles.textStrong]}>
-                        {Str.isSMSLogin(this.props.credentials.login) ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login}
+                        {login}
                     </Text>
                 </View>
                 <View style={[styles.mv5]}>
diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
index 3ab47d5b4680..47b9faa96125 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -22,9 +22,7 @@ const propTypes = {
     /* Flag to check medium screen with device */
     isMediumScreenWidth: PropTypes.bool.isRequired,
 
-    /**
-     * Whether to show welcome text on a particular page
-     */
+    /** Whether to show welcome text on a particular page */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
     ...withLocalizePropTypes,

From 830b7f985a0c9f7ea5d4d63f369c3fa6e8bc071f Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Wed, 29 Sep 2021 23:22:19 +0530
Subject: [PATCH 26/49] Added translations for phone number placeholder

---
 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 fb85686d62b5..89be5e8d23ad 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -538,7 +538,7 @@ export default {
         confirmCompanyIsNot: 'I confirm that this company is not on the',
         listOfRestrictedBusinesses: 'list of restricted businesses',
         incorporationDatePlaceholder: 'Start date (yyyy-mm-dd)',
-        companyPhonePlaceholder: '10 digits, no hyphens',
+        companyPhonePlaceholder: 'Phone Number (xxx)xxx-xxxx',
     },
     requestorStep: {
         headerTitle: 'Personal information',
diff --git a/src/languages/es.js b/src/languages/es.js
index 99b3b7ceb785..fd8d0ab78ac8 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -540,7 +540,7 @@ export default {
         confirmCompanyIsNot: 'Confirmo que esta empresa no está en el',
         listOfRestrictedBusinesses: 'lista de negocios restringidos',
         incorporationDatePlaceholder: 'Fecha de inicio (aaaa-mm-dd)',
-        companyPhonePlaceholder: '10 dígitos, sin guiones',
+        companyPhonePlaceholder: '(prefijo) + (número)',
     },
     requestorStep: {
         headerTitle: 'Información personal',

From 9fb2257a9eccff4b33a00b3553ef02ac822b2fb8 Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Wed, 29 Sep 2021 23:22:44 +0530
Subject: [PATCH 27/49] Updated regex validation for length and added length
 check in function

---
 src/CONST.js                                  | 5 ++---
 src/libs/ValidationUtils.js                   | 2 +-
 src/pages/ReimbursementAccount/CompanyStep.js | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 49391e096431..7e53f10e5e3b 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -77,7 +77,6 @@ const CONST = {
             TAX_ID_NUMBER: 9,
             SSN: 4,
             ZIP_CODE: 5,
-            PHONE_NUMBER: 15,
         },
     },
     INCORPORATION_TYPES: {
@@ -420,12 +419,12 @@ const CONST = {
         LARGE: 'large',
         DEFAULT: 'default',
     },
-
+    PHONE_MAX_LENGTH: 15,
     REGEX: {
         US_PHONE: /^\+1\d{10}$/,
         DIGITS_AND_PLUS: /^\+?[0-9]*$/,
         PHONE_E164_PLUS: /^\+?[1-9]\d{1,14}$/,
-        PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]*$/,
+        PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]{0,11}$/,
         NON_ALPHA_NUMERIC: /[^A-Za-z0-9+]/g,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index f14178ac919e..f2da0dc19b3c 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -75,7 +75,7 @@ function isValidAge(date) {
  * @returns {Boolean}
  */
 function isValidPhoneWithSpecialChars(phoneNumber) {
-    return CONST.REGEX.PHONE_WITH_SPECIAL_CHARS.test(phoneNumber);
+    return CONST.REGEX.PHONE_WITH_SPECIAL_CHARS.test(phoneNumber) && phoneNumber.length <= CONST.PHONE_MAX_LENGTH;
 }
 
 /**
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 6c7928dbf978..2e903a7e1722 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -232,7 +232,7 @@ class CompanyStep extends React.Component {
                         value={this.state.companyPhone}
                         placeholder={this.props.translate('companyStep.companyPhonePlaceholder')}
                         errorText={this.getErrorText('companyPhone')}
-                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.PHONE_NUMBER}
+                        maxLength={CONST.PHONE_MAX_LENGTH}
 
                     />
                     <ExpensiTextInput

From 6ed6a773b9f1b81f51c306f825ce2521e558fdba Mon Sep 17 00:00:00 2001
From: Akshaya Salvi <akshayasalvi12@gmail.com>
Date: Thu, 30 Sep 2021 08:53:39 +0530
Subject: [PATCH 28/49] Updated length to 12

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

diff --git a/src/CONST.js b/src/CONST.js
index 7e53f10e5e3b..909d10baf4b3 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -424,7 +424,7 @@ const CONST = {
         US_PHONE: /^\+1\d{10}$/,
         DIGITS_AND_PLUS: /^\+?[0-9]*$/,
         PHONE_E164_PLUS: /^\+?[1-9]\d{1,14}$/,
-        PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]{0,11}$/,
+        PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]{0,12}$/,
         NON_ALPHA_NUMERIC: /[^A-Za-z0-9+]/g,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,

From 58b278bdc7524b17ec52762f3b69ab0c62c6e3ab Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Thu, 30 Sep 2021 11:49:16 +0530
Subject: [PATCH 29/49] Edit message and simplify code

---
 src/languages/en.js                      | 1 +
 src/languages/es.js                      | 1 +
 src/pages/signin/ResendValidationForm.js | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index aa6692b4eae7..8a97f7079cf9 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -26,6 +26,7 @@ export default {
         continue: 'Continue',
         firstName: 'First name',
         lastName: 'Last name',
+        phone: 'Phone',
         phoneNumber: 'Phone number',
         email: 'Email',
         and: 'and',
diff --git a/src/languages/es.js b/src/languages/es.js
index dc882a50595f..1d144785d85d 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -26,6 +26,7 @@ export default {
         continue: 'Continuar',
         firstName: 'Primer nombre',
         lastName: 'Apellido',
+        phone: 'teléfono',
         phoneNumber: 'Número de teléfono',
         email: 'Email',
         and: 'y',
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 06cf6df309df..29411cd76967 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -85,10 +85,11 @@ class ResendValidationForm extends React.Component {
     }
 
     render() {
-        const isNewAccount = !this.props.account.accountExists && !this.props.account.validated;
+        const isNewAccount = !this.props.account.accountExists;
         const isOldUnvalidatedAccount = this.props.account.accountExists && !this.props.account.validated;
-        const login = Str.isSMSLogin(this.props.credentials.login) ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login;
-        const loginType = (Str.isSMSLogin(this.props.credentials.login) ? this.props.translate('common.phoneNumber') : this.props.translate('common.email')).toLowerCase();
+        const isSMSLogin = Str.isSMSLogin(this.props.credentials.login);
+        const login = isSMSLogin ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login;
+        const loginType = (isSMSLogin ? this.props.translate('common.phone') : this.props.translate('common.email')).toLowerCase();
         let message = '';
 
         if (isNewAccount) {

From ed8ac2c8b850b5560adf60f5bca444fac43c85a6 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 30 Sep 2021 18:08:34 -0700
Subject: [PATCH 30/49] Add bank logo to account selection page

---
 src/components/AddPlaidBankAccount.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index fa10e5c0f19e..5af13b251914 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -24,6 +24,9 @@ import ExpensiPicker from './ExpensiPicker';
 import Text from './Text';
 import * as ReimbursementAccountUtils from '../libs/ReimbursementAccountUtils';
 import ReimbursementAccountForm from '../pages/ReimbursementAccount/ReimbursementAccountForm';
+import getBankIcon from './Icon/BankIcons';
+import Icon from './Icon';
+import {Exclamation} from './Icon/Expensicons';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -179,7 +182,12 @@ class AddPlaidBankAccount extends React.Component {
                         )}
                         {/* @TODO there are a bunch of logos to incorporate here to replace this name
                         https://d2k5nsl2zxldvw.cloudfront.net/images/plaid/bg_plaidLogos_12@2x.png */}
-                        <Text style={[styles.mb5, styles.h1]}>{this.state.institution.name}</Text>
+                        <View style={[styles.flexRow, styles.mb5]}>
+                            <Icon
+                                src={getBankIcon(this.state.institution.name).icon}
+                            />
+                            <Text style={[styles.ml3, styles.h1]}>{this.state.institution.name}</Text>
+                        </View>
                         <View style={[styles.mb5]}>
                             <ExpensiPicker
                                 label={this.props.translate('addPersonalBankAccountPage.chooseAccountLabel')}

From 4d2da6149990097ff410190b4380fdee97fe9966 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 30 Sep 2021 18:15:37 -0700
Subject: [PATCH 31/49] update style for bank icon alignment

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

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index 5af13b251914..b16fc5aba8af 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -182,7 +182,7 @@ class AddPlaidBankAccount extends React.Component {
                         )}
                         {/* @TODO there are a bunch of logos to incorporate here to replace this name
                         https://d2k5nsl2zxldvw.cloudfront.net/images/plaid/bg_plaidLogos_12@2x.png */}
-                        <View style={[styles.flexRow, styles.mb5]}>
+                        <View style={[styles.flexRow,styles.alignItemsCenter, styles.mb5]}>
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}
                             />

From 298cd850d646dd4a033dbf716e9f25d11cd71ed6 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 30 Sep 2021 18:17:45 -0700
Subject: [PATCH 32/49] fix linter errors

---
 src/components/AddPlaidBankAccount.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index b16fc5aba8af..faf119f2f7f1 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -26,7 +26,6 @@ import * as ReimbursementAccountUtils from '../libs/ReimbursementAccountUtils';
 import ReimbursementAccountForm from '../pages/ReimbursementAccount/ReimbursementAccountForm';
 import getBankIcon from './Icon/BankIcons';
 import Icon from './Icon';
-import {Exclamation} from './Icon/Expensicons';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -182,7 +181,7 @@ class AddPlaidBankAccount extends React.Component {
                         )}
                         {/* @TODO there are a bunch of logos to incorporate here to replace this name
                         https://d2k5nsl2zxldvw.cloudfront.net/images/plaid/bg_plaidLogos_12@2x.png */}
-                        <View style={[styles.flexRow,styles.alignItemsCenter, styles.mb5]}>
+                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}
                             />

From 8bf44ec0375edd2599d6e8a173800497bf3ad27b Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Thu, 30 Sep 2021 18:19:01 -0700
Subject: [PATCH 33/49] remove placeholder comment

---
 src/components/AddPlaidBankAccount.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index faf119f2f7f1..4bbf5adb153b 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -179,8 +179,6 @@ class AddPlaidBankAccount extends React.Component {
                         {!_.isEmpty(this.props.text) && (
                             <Text style={[styles.mb5]}>{this.props.text}</Text>
                         )}
-                        {/* @TODO there are a bunch of logos to incorporate here to replace this name
-                        https://d2k5nsl2zxldvw.cloudfront.net/images/plaid/bg_plaidLogos_12@2x.png */}
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}

From efae1089fc70017012aa086637c96eaeaee69bf3 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Fri, 1 Oct 2021 10:10:39 -0700
Subject: [PATCH 34/49] Update icon and text size for bank name/logo

---
 src/components/AddPlaidBankAccount.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index 4bbf5adb153b..1c04f7d9bff0 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -182,8 +182,10 @@ class AddPlaidBankAccount extends React.Component {
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}
+                                height={40}
+                                width={41}
                             />
-                            <Text style={[styles.ml3, styles.h1]}>{this.state.institution.name}</Text>
+                            <Text style={[styles.ml3, styles.textStrong]}>{this.state.institution.name}</Text>
                         </View>
                         <View style={[styles.mb5]}>
                             <ExpensiPicker

From a82d82b7a3c8a8a84e89b64a03b0722fb81b4827 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Fri, 1 Oct 2021 10:46:30 -0700
Subject: [PATCH 35/49] Fix width to 40

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

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index 1c04f7d9bff0..a8312d9da208 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -183,7 +183,7 @@ class AddPlaidBankAccount extends React.Component {
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}
                                 height={40}
-                                width={41}
+                                width={40}
                             />
                             <Text style={[styles.ml3, styles.textStrong]}>{this.state.institution.name}</Text>
                         </View>

From 09d508889afe0c768a850a4a5bbc4527067a6db0 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Sat, 2 Oct 2021 13:21:52 -0400
Subject: [PATCH 36/49] Replace hardcoded height/width with variables

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

diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index a8312d9da208..180bf9ea39b4 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -26,6 +26,7 @@ import * as ReimbursementAccountUtils from '../libs/ReimbursementAccountUtils';
 import ReimbursementAccountForm from '../pages/ReimbursementAccount/ReimbursementAccountForm';
 import getBankIcon from './Icon/BankIcons';
 import Icon from './Icon';
+import variables from '../styles/variables';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -182,8 +183,8 @@ class AddPlaidBankAccount extends React.Component {
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                             <Icon
                                 src={getBankIcon(this.state.institution.name).icon}
-                                height={40}
-                                width={40}
+                                height={variables.avatarSizeNormal}
+                                width={variables.avatarSizeNormal}
                             />
                             <Text style={[styles.ml3, styles.textStrong]}>{this.state.institution.name}</Text>
                         </View>

From 7d9433c5a89b875a7fadbdf70eaa7895b3d75af3 Mon Sep 17 00:00:00 2001
From: Prashant Mangukiya <pbmangukiya@gmail.com>
Date: Mon, 4 Oct 2021 22:16:32 +0530
Subject: [PATCH 37/49] Corrected: Unable to enter some combination of decimal
 numbers

---
 src/pages/iou/steps/IOUAmountPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js
index da49f58e0284..c03824f18bc7 100755
--- a/src/pages/iou/steps/IOUAmountPage.js
+++ b/src/pages/iou/steps/IOUAmountPage.js
@@ -101,7 +101,7 @@ class IOUAmountPage extends React.Component {
      */
     validateAmount(amount) {
         const decimalNumberRegex = new RegExp(/^\d+(,\d+)*(\.\d{0,3})?$/, 'i');
-        return amount === '' || (decimalNumberRegex.test(amount) && ((parseFloat(amount) * 100).toString().length <= CONST.IOU.AMOUNT_MAX_LENGTH));
+        return amount === '' || (decimalNumberRegex.test(amount) && (parseFloat((amount * 100).toFixed(3)).toString().length <= CONST.IOU.AMOUNT_MAX_LENGTH));
     }
 
     /**

From abbe9571a1aadadeadd3452271ffbd82f7d4633a Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 4 Oct 2021 07:37:15 -1000
Subject: [PATCH 38/49] check all required fields in identity validator

---
 src/libs/ValidationUtils.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 7055ab4d4488..92ec85296787 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -158,17 +158,19 @@ function isValidURL(url) {
  * @returns {Object}
  */
 function validateIdentity(identity) {
+    const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zip', 'state', 'ssnLast4'];
     const errors = {};
-    if (!isValidAddress(identity.street)) {
-        errors.street = true;
-    }
 
-    if (!isRequiredFulfilled(identity.state)) {
-        errors.state = true;
-    }
+    // Check that all required fields are filled
+    _.each(requiredFields, (fieldName) => {
+        if (isRequiredFulfilled(identity[fieldName])) {
+            return;
+        }
+        errors[fieldName] = true;
+    });
 
-    if (!isRequiredFulfilled(identity.city)) {
-        errors.city = true;
+    if (!isValidAddress(identity.street)) {
+        errors.street = true;
     }
 
     if (!isValidZipCode(identity.zipCode)) {

From 2faf2ce880f9d549a9525133ad573065bdd4686c Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 4 Oct 2021 07:39:46 -1000
Subject: [PATCH 39/49] Fix dob validation

---
 src/libs/ValidationUtils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 92ec85296787..b167e18596aa 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -46,6 +46,10 @@ function isValidAddress(value) {
  * @returns {Boolean} true if valid
  */
 function isValidDate(date) {
+    if (!date) {
+        return false;
+    }
+
     const pastDate = moment().subtract(1000, 'years');
     const futureDate = moment().add(1000, 'years');
     const testDate = moment(date);
@@ -158,7 +162,7 @@ function isValidURL(url) {
  * @returns {Object}
  */
 function validateIdentity(identity) {
-    const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zip', 'state', 'ssnLast4'];
+    const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zip', 'state', 'ssnLast4', 'dob'];
     const errors = {};
 
     // Check that all required fields are filled

From 60d37c06ba3c289aa7a32cea9267ee095db6b908 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 4 Oct 2021 07:55:42 -1000
Subject: [PATCH 40/49] Fix zip + pass firstName and lastName

---
 src/libs/ValidationUtils.js                     | 2 +-
 src/pages/ReimbursementAccount/RequestorStep.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index b167e18596aa..831647b1b9d2 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -162,7 +162,7 @@ function isValidURL(url) {
  * @returns {Object}
  */
 function validateIdentity(identity) {
-    const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zip', 'state', 'ssnLast4', 'dob'];
+    const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zipCode', 'state', 'ssnLast4', 'dob'];
     const errors = {};
 
     // Check that all required fields are filled
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index ba3d9c673f8f..d75628f65a7f 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -110,6 +110,8 @@ class RequestorStep extends React.Component {
      */
     validate() {
         const errors = validateIdentity({
+            firstName: this.state.firstName,
+            lastName: this.state.lastName,
             street: this.state.requestorAddressStreet,
             state: this.state.requestorAddressState,
             city: this.state.requestorAddressCity,

From bf129495c507a7a52b143cf077377fe46b133323 Mon Sep 17 00:00:00 2001
From: Santhoshkumar Sellavel
 <85645967+Santhosh-Sellavel@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:28:28 +0530
Subject: [PATCH 41/49] PR Requested Changes.

---
 src/pages/home/report/ReportActionsView.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 2cd1ef3831e5..851cbaf0cbab 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -404,9 +404,7 @@ class ReportActionsView extends React.Component {
                 ? this.props.report.unreadActionCount
                 : prevState.localUnreadActionCount + this.props.report.unreadActionCount;
             this.updateUnreadIndicatorPosition(localUnreadActionCount);
-            return {
-                localUnreadActionCount,
-            };
+            return {localUnreadActionCount};
         });
     }
 

From 459d0de21d2635e270ffd2d0f3663cfaa99a5cc8 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 5 Oct 2021 10:48:25 -0400
Subject: [PATCH 42/49] Update copy for remove members

---
 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 0ea6002cfb52..c82338d4bfdb 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -629,7 +629,7 @@ export default {
         },
         people: {
             genericFailureMessage: 'An error occurred removing a user from the workspace, please try again.',
-            removeMembersPrompt: 'Are you sure you want to remove the selected people from your workspace?',
+            removeMembersPrompt: 'Are you sure you want to remove the selected members from your workspace?',
             removeMembersTitle: 'Remove members',
             selectAll: 'Select all',
         },
diff --git a/src/languages/es.js b/src/languages/es.js
index d093dddd02df..78ea12f48b4f 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -631,7 +631,7 @@ export default {
         },
         people: {
             genericFailureMessage: 'Se ha producido un error al intentar eliminar a un usuario del espacio de trabajo. Por favor inténtalo más tarde.',
-            removeMembersPrompt: '¿Estás seguro que quieres eliminar a las personas seleccionadas de tu espacio de trabajo?',
+            removeMembersPrompt: '¿Estás seguro que quieres eliminar a las miembros seleccionadas de tu espacio de trabajo?',
             removeMembersTitle: 'Eliminar miembros',
             selectAll: 'Seleccionar todo',
         },

From 5d5f64678e02db6a58c57944b7f7a7a2e2c1902c Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 5 Oct 2021 12:01:10 -0400
Subject: [PATCH 43/49] keep original spanish transaltion

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

diff --git a/src/languages/es.js b/src/languages/es.js
index 78ea12f48b4f..d093dddd02df 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -631,7 +631,7 @@ export default {
         },
         people: {
             genericFailureMessage: 'Se ha producido un error al intentar eliminar a un usuario del espacio de trabajo. Por favor inténtalo más tarde.',
-            removeMembersPrompt: '¿Estás seguro que quieres eliminar a las miembros seleccionadas de tu espacio de trabajo?',
+            removeMembersPrompt: '¿Estás seguro que quieres eliminar a las personas seleccionadas de tu espacio de trabajo?',
             removeMembersTitle: 'Eliminar miembros',
             selectAll: 'Seleccionar todo',
         },

From d1ecb4a3933b584f61f00eda5c2dfd58e37c3f70 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 5 Oct 2021 12:05:27 -0400
Subject: [PATCH 44/49] Update spanish translation for remove members

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

diff --git a/src/languages/es.js b/src/languages/es.js
index d093dddd02df..e649012d9ac3 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -631,7 +631,7 @@ export default {
         },
         people: {
             genericFailureMessage: 'Se ha producido un error al intentar eliminar a un usuario del espacio de trabajo. Por favor inténtalo más tarde.',
-            removeMembersPrompt: '¿Estás seguro que quieres eliminar a las personas seleccionadas de tu espacio de trabajo?',
+            removeMembersPrompt: '¿Estás seguro que quieres eliminar a los miembros seleccionados de tu espacio de trabajo?',
             removeMembersTitle: 'Eliminar miembros',
             selectAll: 'Seleccionar todo',
         },

From bbebcda4b7cdce9dcf75ab2412babbc0860a303b Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Tue, 5 Oct 2021 11:25:09 -0700
Subject: [PATCH 45/49] Update copy for 'Invite people' step

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 0ea6002cfb52..778824dd4357 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -644,8 +644,8 @@ export default {
             cardReadyTagline: 'Your Expensify Cards are ready to go!',
         },
         invite: {
-            invitePeople: 'Invite people',
-            invitePeoplePrompt: 'Invite colleagues to your workspace.',
+            invitePeople: 'Invite new members',
+            invitePeoplePrompt: 'Invite new members to your workspace.',
             personalMessagePrompt: 'Add a personal message (optional)',
             enterEmailOrPhone: 'Emails or phone numbers',
             EmailOrPhonePlaceholder: 'Enter comma-separated list of emails or phone numbers',
diff --git a/src/languages/es.js b/src/languages/es.js
index d093dddd02df..82bb3d7ef2aa 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -646,8 +646,8 @@ export default {
             cardReadyTagline: 'Tus tarjetas Expensify están listas para usar!',
         },
         invite: {
-            invitePeople: 'Invitar a la gente',
-            invitePeoplePrompt: 'Invita a tus compañeros a tu espacio de trabajo.',
+            invitePeople: 'Invitar nuevos miembros',
+            invitePeoplePrompt: 'Invita nuevos miembros a tu espacio de trabajo.',
             personalMessagePrompt: 'Agregar un mensaje personal (Opcional)',
             enterEmailOrPhone: 'Correos electrónicos o números de teléfono',
             EmailOrPhonePlaceholder: 'Introduce una lista de correos electrónicos o números de teléfono separado por comas',

From b7d295078d5cc18bc45a2cc65067edcc3fa26448 Mon Sep 17 00:00:00 2001
From: Nicholas Murray <nmurray@expensify.com>
Date: Tue, 5 Oct 2021 11:26:51 -0700
Subject: [PATCH 46/49] Add if statement

---
 src/components/IOUConfirmationList.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 438c0fb62558..8c98d99a0b57 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -161,7 +161,10 @@ class IOUConfirmationList extends Component {
     }
 
     componentDidMount() {
-        this.addVenmoPaymentOptionToMenu();
+        // Only add the Venmo option if we're sending a payment
+        if (this.props.iouType === CONST.IOU.IOU_TYPE.SEND) {
+            this.addVenmoPaymentOptionToMenu();
+        }
     }
 
     componentWillUnmount() {

From 339acea1ecb58c4a81f68dcc2de62507e9c79731 Mon Sep 17 00:00:00 2001
From: OSBotify <runner@Mac-1633461567831.local>
Date: Tue, 5 Oct 2021 19:27:19 +0000
Subject: [PATCH 47/49] Update version to 1.1.5-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 7a24adbd8b52..7c3fb1a4a7c2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010500
-        versionName "1.1.5-0"
+        versionCode 1001010501
+        versionName "1.1.5-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3de1080f2d27..b1a0a0cd2c24 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.5.0</string>
+	<string>1.1.5.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 504ce2c5ae2b..7a8857297500 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.5.0</string>
+	<string>1.1.5.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 5c7e1d1c9a96..7b17467407a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.5-0",
+  "version": "1.1.5-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 120b7d1ee3bb..bf180864e533 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.5-0",
+  "version": "1.1.5-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.",

From 05e2f3e1a82e962dee91a0ea96fa8693fbe9d7ee Mon Sep 17 00:00:00 2001
From: Kosuke Tseng <ctseng@expensify.com>
Date: Tue, 5 Oct 2021 20:45:20 -0700
Subject: [PATCH 48/49] Clear error state

---
 src/pages/signin/LoginForm.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 4b2eb6e9321b..6c08bd5034fb 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -44,6 +44,7 @@ class LoginForm extends React.Component {
     constructor(props) {
         super(props);
 
+        this.onTextInput = this.onTextInput.bind(this);
         this.validateAndSubmitForm = this.validateAndSubmitForm.bind(this);
 
         this.state = {
@@ -52,6 +53,18 @@ class LoginForm extends React.Component {
         };
     }
 
+    /**
+     * Handle text input and clear formError upon text change
+     *
+     * @param {String} text
+     */
+    onTextInput(text) {
+        this.setState({
+            login: text,
+            formError: null,
+        });
+    }
+
     /**
      * Check that all the form fields are valid, then trigger the submit callback
      */
@@ -83,7 +96,7 @@ class LoginForm extends React.Component {
                         value={this.state.login}
                         autoCompleteType="email"
                         textContentType="username"
-                        onChangeText={text => this.setState({login: text})}
+                        onChangeText={this.onTextInput}
                         onSubmitEditing={this.validateAndSubmitForm}
                         autoCapitalize="none"
                         autoCorrect={false}

From ee5aa6389622b8e8ad0a514b4d8abb73d9053083 Mon Sep 17 00:00:00 2001
From: OSBotify <runner@Mac-1633539685476.local>
Date: Wed, 6 Oct 2021 17:03:05 +0000
Subject: [PATCH 49/49] Update version to 1.1.5-2

---
 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 7c3fb1a4a7c2..d156d13fa412 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010501
-        versionName "1.1.5-1"
+        versionCode 1001010502
+        versionName "1.1.5-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b1a0a0cd2c24..e320feff6566 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.5.1</string>
+	<string>1.1.5.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7a8857297500..f8169ae4bb2c 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.5.1</string>
+	<string>1.1.5.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 7b17467407a9..81768591181a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.5-1",
+  "version": "1.1.5-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bf180864e533..8b454768bafc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.5-1",
+  "version": "1.1.5-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",