From c0ddf22e97594ddb5e24866996552ad209531086 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Thu, 9 Mar 2023 17:05:43 -0800
Subject: [PATCH 01/19] add unlinkLoginForm

---
 src/languages/en.js                 |   5 ++
 src/pages/signin/UnlinkLoginForm.js | 117 ++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 src/pages/signin/UnlinkLoginForm.js

diff --git a/src/languages/en.js b/src/languages/en.js
index 44ce40366d71..c66e656ef98b 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -629,6 +629,11 @@ export default {
         resendLink: 'Resend link',
         validationCodeFailedMessage: 'It looks like there was an error with your validation link or it has expired.',
     },
+    unlinkLoginForm: {
+        toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
+        unlink: 'Unlink',
+    },
     detailsPage: {
         localTime: 'Local time',
     },
diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
new file mode 100644
index 000000000000..ea4349f27bd8
--- /dev/null
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -0,0 +1,117 @@
+import React from 'react';
+import _ from 'underscore';
+import {TouchableOpacity, View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import Str from 'expensify-common/lib/str';
+import styles from '../../styles/styles';
+import Button from '../../components/Button';
+import Text from '../../components/Text';
+import * as Session from '../../libs/actions/Session';
+import ONYXKEYS from '../../ONYXKEYS';
+import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import compose from '../../libs/compose';
+import redirectToSignIn from '../../libs/actions/SignInRedirect';
+import Avatar from '../../components/Avatar';
+import * as ReportUtils from '../../libs/ReportUtils';
+import networkPropTypes from '../../components/networkPropTypes';
+import {withNetwork} from '../../components/OnyxProvider';
+import DotIndicatorMessage from '../../components/DotIndicatorMessage';
+
+const propTypes = {
+    /* Onyx Props */
+
+    /** The credentials of the logged in person */
+    credentials: PropTypes.shape({
+        /** The email/phone the user logged in with */
+        login: PropTypes.string,
+    }).isRequired,
+
+    /** The details about the account that the user is signing in with */
+    account: PropTypes.shape({
+        /** Whether or not a sign on form is loading (being submitted) */
+        loading: PropTypes.bool,
+
+        /** Whether or not the account is validated */
+        validated: PropTypes.bool,
+
+        /** The primaryLogin associated with the account */
+        primaryLogin: PropTypes.string,
+    }),
+
+    /** Information about the network */
+    network: networkPropTypes.isRequired,
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    account: {},
+};
+
+const UnlinkLoginForm = (props) => {
+    const primaryLogin = Str.isSMSLogin(props.account.primaryLogin) ? Str.removeSMSDomain(props.account.primaryLogin) : props.account.primaryLogin;
+    const secondaryLogin = Str.isSMSLogin(props.credentials.login) ? Str.removeSMSDomain(props.credentials.login) : props.credentials.login;
+
+    return (
+        <>
+            <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
+                <Avatar
+                    source={ReportUtils.getDefaultAvatar(props.credentials.login)}
+                    imageStyles={[styles.mr2]}
+                />
+                <View style={[styles.flex1]}>
+                    <Text style={[styles.textStrong]}>
+                        {secondaryLogin}
+                    </Text>
+                </View>
+            </View>
+            <View style={[styles.mt5]}>
+                <Text>
+                    {props.translate('unlinkLoginForm.toValidateLogin', {primaryLogin, secondaryLogin})}
+                </Text>
+            </View>
+            <View style={[styles.mv5]}>
+                <Text>
+                    {props.translate('unlinkLoginForm.noLongerHaveAccess', {primaryLogin})}
+                </Text>
+            </View>
+            {!_.isEmpty(props.account.message) && (
+
+                // DotIndicatorMessage mostly expects onyxData errors so we need to mock an object so that the messages looks similar to prop.account.errors
+                <DotIndicatorMessage style={[styles.mb5, styles.flex0]} type="success" messages={{0: props.account.message}} />
+            )}
+            {!_.isEmpty(props.account.errors) && (
+                <DotIndicatorMessage style={[styles.mb5]} type="error" messages={props.account.errors} />
+            )}
+            <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                <TouchableOpacity onPress={() => redirectToSignIn()}>
+                    <Text style={[styles.link]}>
+                        {props.translate('common.back')}
+                    </Text>
+                </TouchableOpacity>
+                <Button
+                    medium
+                    success
+                    text={props.translate('unlinkLoginForm.unlink')}
+                    isLoading={props.account.isLoading}
+                    onPress={() => {}}
+                    isDisabled={props.network.isOffline}
+                />
+            </View>
+        </>
+    );
+};
+
+UnlinkLoginForm.propTypes = propTypes;
+UnlinkLoginForm.defaultProps = defaultProps;
+UnlinkLoginForm.displayName = 'UnlinkLoginForm';
+
+export default compose(
+    withLocalize,
+    withNetwork(),
+    withOnyx({
+        credentials: {key: ONYXKEYS.CREDENTIALS},
+        account: {key: ONYXKEYS.ACCOUNT},
+    }),
+)(UnlinkLoginForm);

From 5213996bc7cdb04e7f7b97566b53585bb400755f Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Thu, 9 Mar 2023 17:06:07 -0800
Subject: [PATCH 02/19] update SignInPage to conditionally show unlink form

---
 src/pages/signin/SignInPage.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 323c166b3ec4..b582538336c4 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -14,6 +14,7 @@ import ResendValidationForm from './ResendValidationForm';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import Performance from '../../libs/Performance';
 import Permissions from '../../libs/Permissions';
+import UnlinkLoginForm from './UnlinkLoginForm';
 
 const propTypes = {
     /* Onyx Props */
@@ -25,6 +26,9 @@ const propTypes = {
 
         /** Whether the account is validated */
         validated: PropTypes.bool,
+
+        /** The primaryLogin associated with the account */
+        primaryLogin: PropTypes.string,
     }),
 
     /** List of betas available to current user */
@@ -57,31 +61,45 @@ class SignInPage extends Component {
         // - AND a validateCode has not been cached with sign in link
         const showLoginForm = !this.props.credentials.login && !this.props.credentials.validateCode;
 
+        // Show the unlink form if
+        // - A login has been entered
+        // - AND the login is not the primary login
+        // - AND the login is not validated
+        const showUnlinkLoginForm = this.props.credentials.login
+            && this.props.account.primaryLogin != this.props.credentials.login
+            && !this.props.account.validated;
+
         // Show the old password form if
         // - A login has been entered
         // - AND an account exists and is validated for this login
         // - AND a password hasn't been entered yet
         // - AND haven't forgotten password
+        // - AND the login isn't an unvalidated secondary login
         // - AND the user is NOT on the passwordless beta
         const showPasswordForm = this.props.credentials.login
             && this.props.account.validated
             && !this.props.credentials.password
             && !this.props.account.forgotPassword
+            && !showUnlinkLoginForm
             && !Permissions.canUsePasswordlessLogins(this.props.betas);
 
         // Show the new magic code / validate code form if
         // - A login has been entered or a validateCode has been cached from sign in link
+        // - AND the login isn't an unvalidated secondary login
         // - AND the user is on the 'passwordless' beta
         const showValidateCodeForm = (this.props.credentials.login
             || this.props.credentials.validateCode)
+            && !showUnlinkLoginForm
             && Permissions.canUsePasswordlessLogins(this.props.betas);
 
         // Show the resend validation link form if
         // - A login has been entered
         // - AND is not validated or password is forgotten
+        // - AND the login isn't an unvalidated secondary login
         // - AND user is not on 'passwordless' beta
         const showResendValidationForm = this.props.credentials.login
             && (!this.props.account.validated || this.props.account.forgotPassword)
+            && !showUnlinkLoginForm
             && !Permissions.canUsePasswordlessLogins(this.props.betas);
 
         let welcomeText = '';
@@ -105,7 +123,7 @@ class SignInPage extends Component {
             <SafeAreaView style={[styles.signInPage]}>
                 <SignInPageLayout
                     welcomeText={welcomeText}
-                    shouldShowWelcomeText={showLoginForm || showPasswordForm || showValidateCodeForm || !showResendValidationForm}
+                    shouldShowWelcomeText={showLoginForm || showPasswordForm || showValidateCodeForm}
                 >
                     {/* LoginForm and PasswordForm must use the isVisible prop. This keeps them mounted, but visually hidden
                     so that password managers can access the values. Conditionally rendering these components will break this feature. */}
@@ -116,6 +134,7 @@ class SignInPage extends Component {
                         <PasswordForm isVisible={showPasswordForm} />
                     )}
                     {showResendValidationForm && <ResendValidationForm />}
+                    {showUnlinkLoginForm && <UnlinkLoginForm />}
                 </SignInPageLayout>
             </SafeAreaView>
         );

From 7ba9f6e36f2196cf11a150d2093752799e668574 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 13 Mar 2023 22:40:00 -0700
Subject: [PATCH 03/19] Add Session.requestUnlinkValidationLink command

add more copy
---
 src/languages/en.js                 |  1 +
 src/libs/actions/Session/index.js   | 36 +++++++++++++++++++++++++++++
 src/pages/signin/UnlinkLoginForm.js |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 58327a329d9a..f45b28abec0c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -633,6 +633,7 @@ export default {
         toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
         noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
         unlink: 'Unlink',
+        linkSent: 'Link sent!',
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index edf29b069400..3ef394a2ec16 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -555,6 +555,40 @@ function authenticatePusher(socketID, channelName, callback) {
     });
 }
 
+/**
+ * Request a new validate / magic code for user to sign in via passwordless flow
+ *
+ */
+function requestUnlinkValidationLink() {
+    const optimisticData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: true,
+            errors: null,
+            message: null,
+        },
+    }];
+    const successData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: Localize.translateLocal('unlinkLoginForm.linkSent'),
+        },
+    }];
+    const failureData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: null,
+        },
+    }];
+
+    API.write('RequestUnlinkValidationLink', {email: credentials.login}, {optimisticData, successData, failureData});
+}
+
 export {
     beginSignIn,
     updatePasswordAndSignin,
@@ -569,6 +603,8 @@ export {
     resendValidateCode,
     resetPassword,
     resendResetPassword,
+    requestUnlinkValidationLink,
+    unlinkLogin,
     clearSignInData,
     clearAccountMessages,
     authenticatePusher,
diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index ea4349f27bd8..ae245bd594a8 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -95,7 +95,7 @@ const UnlinkLoginForm = (props) => {
                     success
                     text={props.translate('unlinkLoginForm.unlink')}
                     isLoading={props.account.isLoading}
-                    onPress={() => {}}
+                    onPress={() => { Session.requestUnlinkValidationLink() }}
                     isDisabled={props.network.isOffline}
                 />
             </View>

From 810b3b13f6abeeff626b86f880b22cb5fbc4b937 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 13 Mar 2023 22:40:30 -0700
Subject: [PATCH 04/19] Add unlinkLogin command

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 3ef394a2ec16..ceb31aac19e4 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -589,6 +589,83 @@ function requestUnlinkValidationLink() {
     API.write('RequestUnlinkValidationLink', {email: credentials.login}, {optimisticData, successData, failureData});
 }
 
+/**
+ * Request a new validate / magic code for user to sign in via passwordless flow
+ *
+ */
+function requestUnlinkValidationLink() {
+    const optimisticData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: true,
+            errors: null,
+            message: null,
+        },
+    }];
+    const successData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: Localize.translateLocal('unlinkLoginForm.linkSent'),
+        },
+    }];
+    const failureData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: null,
+        },
+    }];
+
+    API.write('RequestUnlinkValidationLink', {email: credentials.login}, {optimisticData, successData, failureData});
+}
+
+function unlinkLogin(accountID, validateCode) {
+    const optimisticData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                ...CONST.DEFAULT_ACCOUNT_DATA,
+                isLoading: true,
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.CREDENTIALS,
+            value: {
+                accountID,
+                validateCode,
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    API.write('UnlinkLogin', {accountID, validateCode}, {optimisticData, successData, failureData});
+}
+
 export {
     beginSignIn,
     updatePasswordAndSignin,

From 0d105e66e7e7a5b4654f799fd52e16211673f305 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Tue, 14 Mar 2023 17:09:14 -0700
Subject: [PATCH 05/19] jsx style

disable button after link is sent
---
 src/libs/actions/Session/index.js   | 34 -----------------------------
 src/pages/signin/SignInPage.js      |  2 +-
 src/pages/signin/UnlinkLoginForm.js |  4 ++--
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index ceb31aac19e4..ef1ed704dc20 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -589,40 +589,6 @@ function requestUnlinkValidationLink() {
     API.write('RequestUnlinkValidationLink', {email: credentials.login}, {optimisticData, successData, failureData});
 }
 
-/**
- * Request a new validate / magic code for user to sign in via passwordless flow
- *
- */
-function requestUnlinkValidationLink() {
-    const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
-        key: ONYXKEYS.ACCOUNT,
-        value: {
-            isLoading: true,
-            errors: null,
-            message: null,
-        },
-    }];
-    const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
-        key: ONYXKEYS.ACCOUNT,
-        value: {
-            isLoading: false,
-            message: Localize.translateLocal('unlinkLoginForm.linkSent'),
-        },
-    }];
-    const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
-        key: ONYXKEYS.ACCOUNT,
-        value: {
-            isLoading: false,
-            message: null,
-        },
-    }];
-
-    API.write('RequestUnlinkValidationLink', {email: credentials.login}, {optimisticData, successData, failureData});
-}
-
 function unlinkLogin(accountID, validateCode) {
     const optimisticData = [
         {
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index b582538336c4..79797662d54a 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -66,7 +66,7 @@ class SignInPage extends Component {
         // - AND the login is not the primary login
         // - AND the login is not validated
         const showUnlinkLoginForm = this.props.credentials.login
-            && this.props.account.primaryLogin != this.props.credentials.login
+            && this.props.account.primaryLogin !== this.props.credentials.login
             && !this.props.account.validated;
 
         // Show the old password form if
diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index ae245bd594a8..b972a5edd58a 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -95,8 +95,8 @@ const UnlinkLoginForm = (props) => {
                     success
                     text={props.translate('unlinkLoginForm.unlink')}
                     isLoading={props.account.isLoading}
-                    onPress={() => { Session.requestUnlinkValidationLink() }}
-                    isDisabled={props.network.isOffline}
+                    onPress={() => Session.requestUnlinkValidationLink()}
+                    isDisabled={props.network.isOffline || !_.isEmpty(props.account.message)}
                 />
             </View>
         </>

From e686df59810d44d9a7dfe50e7abb14afdcb9fe9e Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 3 Apr 2023 18:22:30 -0700
Subject: [PATCH 06/19] Add UnlinkLogin route and page

---
 src/ROUTES.js                                 |  1 +
 .../Navigation/AppNavigator/PublicScreens.js  |  6 ++++
 src/libs/Navigation/linkingConfig.js          |  1 +
 src/libs/actions/Session/index.js             |  3 +-
 src/pages/UnlinkLoginPage.js                  | 35 +++++++++++++++++++
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/UnlinkLoginPage.js

diff --git a/src/ROUTES.js b/src/ROUTES.js
index 2412e7e42550..d370080b7e24 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -107,6 +107,7 @@ export default {
     VALIDATE_LOGIN: 'v/:accountID/:validateCode',
     GET_ASSISTANCE: 'get-assistance/:taskID',
     getGetAssistanceRoute: taskID => `get-assistance/${taskID}`,
+    UNLINK_LOGIN: 'u/:accountID/:validateCode',
 
     // This is a special validation URL that will take the user to /workspace/new after validation. This is used
     // when linking users from e.com in order to share a session in this app.
diff --git a/src/libs/Navigation/AppNavigator/PublicScreens.js b/src/libs/Navigation/AppNavigator/PublicScreens.js
index 855efccad709..2bcee425cfbc 100644
--- a/src/libs/Navigation/AppNavigator/PublicScreens.js
+++ b/src/libs/Navigation/AppNavigator/PublicScreens.js
@@ -6,6 +6,7 @@ import ValidateLoginPage from '../../../pages/ValidateLoginPage';
 import LogInWithShortLivedAuthTokenPage from '../../../pages/LogInWithShortLivedAuthTokenPage';
 import SCREENS from '../../../SCREENS';
 import defaultScreenOptions from './defaultScreenOptions';
+import UnlinkLoginPage from '../../../pages/UnlinkLoginPage';
 
 const RootStack = createStackNavigator();
 
@@ -26,6 +27,11 @@ const PublicScreens = () => (
             options={defaultScreenOptions}
             component={ValidateLoginPage}
         />
+        <RootStack.Screen
+            name="UnlinkLogin"
+            options={defaultScreenOptions}
+            component={UnlinkLoginPage}
+        />
         <RootStack.Screen
             name="SetPassword"
             options={defaultScreenOptions}
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index a096a7421867..b855b03efd2f 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -27,6 +27,7 @@ export default {
             // Main Routes
             SetPassword: ROUTES.SET_PASSWORD_WITH_VALIDATE_CODE,
             ValidateLogin: ROUTES.VALIDATE_LOGIN,
+            UnlinkLogin: ROUTES.UNLINK_LOGIN,
             [SCREENS.TRANSITION_FROM_OLD_DOT]: ROUTES.TRANSITION_FROM_OLD_DOT,
             Concierge: ROUTES.CONCIERGE,
 
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 3842f995e810..d9732dcf0465 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -637,8 +637,7 @@ function authenticatePusher(socketID, channelName, callback) {
 }
 
 /**
- * Request a new validate / magic code for user to sign in via passwordless flow
- *
+ * Request a new validation link / magic code to unlink an unvalidated secondary login from a primary login
  */
 function requestUnlinkValidationLink() {
     const optimisticData = [{
diff --git a/src/pages/UnlinkLoginPage.js b/src/pages/UnlinkLoginPage.js
new file mode 100644
index 000000000000..d7e0cb597f71
--- /dev/null
+++ b/src/pages/UnlinkLoginPage.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import lodashGet from 'lodash/get';
+import {
+    propTypes as validateLinkPropTypes,
+    defaultProps as validateLinkDefaultProps,
+} from './ValidateLoginPage/validateLinkPropTypes';
+import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
+import Navigation from '../libs/Navigation/Navigation';
+import * as Session from '../libs/actions/Session';
+import ROUTES from '../ROUTES';
+
+const propTypes = {
+    /** The accountID and validateCode are passed via the URL */
+    route: validateLinkPropTypes,
+
+};
+
+const defaultProps = {
+    route: validateLinkDefaultProps,
+};
+
+const UnlinkLoginPage = (props) => {
+    const accountID = lodashGet(props.route.params, 'accountID', '');
+    const validateCode = lodashGet(props.route.params, 'validateCode', '');
+
+    Session.unlinkLogin(accountID, validateCode);
+    Navigation.navigate(ROUTES.HOME);
+    return <FullScreenLoadingIndicator />;
+};
+
+UnlinkLoginPage.propTypes = propTypes;
+UnlinkLoginPage.defaultProps = defaultProps;
+UnlinkLoginPage.displayName = 'UnlinkLoginPage';
+
+export default UnlinkLoginPage;

From a7dc7c717729afd54db436eaa5e9216a55da18c1 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Tue, 4 Apr 2023 17:27:46 -0700
Subject: [PATCH 07/19] clear login from credentials, add some spanish
 translations, add dot indicators for success and failure messages

---
 src/languages/en.js               | 2 ++
 src/languages/es.js               | 6 ++++++
 src/libs/actions/Session/index.js | 7 +++++--
 src/pages/signin/LoginForm.js     | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 4d4280836ed6..9f370ec44e31 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -665,6 +665,8 @@ export default {
         noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
         unlink: 'Unlink',
         linkSent: 'Link sent!',
+        succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
+        unlinkFailedMessage: 'It looks like there was an error with your link or it has expired.',
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index c7ea908b8897..c7810c49be2c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -659,6 +659,12 @@ export default {
         resendLink: 'Reenviar enlace',
         validationCodeFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
     },
+    unlinkLoginForm: {
+        toValidateLogin: ({primaryLogin, secondaryLogin}) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
+        unlink: 'Desvincula',
+        linkSent: 'Link sent!',
+    },
     detailsPage: {
         localTime: 'Hora local',
     },
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index d9732dcf0465..d7c5bd14d54b 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -687,14 +687,14 @@ function unlinkLogin(accountID, validateCode) {
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
+                message: Localize.translateLocal('unlinkLoginForm.succesfullyUnlinkedLogin'),
             },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: ONYXKEYS.CREDENTIALS,
             value: {
-                accountID,
-                validateCode,
+                login: '',
             },
         },
     ];
@@ -705,6 +705,9 @@ function unlinkLogin(accountID, validateCode) {
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
+                errors: {
+                    [DateUtils.getMicroseconds()]: Localize.translateLocal('unlinkLoginForm.unlinkFailedMessage'),
+                },
             },
         },
     ];
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 34ec29fcaa9a..6df6e4694248 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -190,10 +190,10 @@ class LoginForm extends React.Component {
                         {this.props.account.success}
                     </Text>
                 )}
-                {!_.isEmpty(this.props.closeAccount.success) && (
+                {!_.isEmpty(this.props.closeAccount.success || this.props.account.message) && (
 
                     // DotIndicatorMessage mostly expects onyxData errors, so we need to mock an object so that the messages looks similar to prop.account.errors
-                    <DotIndicatorMessage style={[styles.mv2]} type="success" messages={{0: this.props.closeAccount.success}} />
+                    <DotIndicatorMessage style={[styles.mv2]} type="success" messages={{0: this.props.closeAccount.success || this.props.account.message}} />
                 )}
                 { // We need to unmount the submit button when the component is not visible so that the Enter button
                   // key handler gets unsubscribed and does not conflict with the Password Form

From 5cc40ba0f13baf60a4256d7f958088b3b6225047 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Thu, 6 Apr 2023 14:58:53 -0700
Subject: [PATCH 08/19] move styles to prevent padding jump when moving between
 sign in views

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

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 76f03ec87715..b784f398ff3a 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -44,7 +44,7 @@ const SignInPageContent = props => (
             {/* This empty view creates margin on the top of the sign in form which will shrink and grow depending on if the keyboard is open or not */}
             <View style={[styles.flexGrow1, styles.signInPageContentTopSpacer]} />
 
-            <View style={[styles.flexGrow2]}>
+            <View style={[styles.flexGrow2, styles.signInPageWelcomeTextContainer]}>
                 <SignInPageForm style={[styles.alignSelfStretch]}>
                     <View style={[
                         styles.componentHeightLarge,
@@ -57,7 +57,7 @@ const SignInPageContent = props => (
                         />
                     </View>
                     {props.shouldShowWelcomeText && (
-                    <View style={[styles.signInPageWelcomeTextContainer]}>
+                    <View>
                         <Text style={[styles.mv5, styles.textLabel, styles.h3]}>
                             {props.welcomeText}
                         </Text>

From 0b2ff29473af1b275159a7782fdb35295653ead7 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 7 Apr 2023 11:22:14 -0700
Subject: [PATCH 09/19] update copy

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 9f370ec44e31..ed6b5340b616 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -658,7 +658,6 @@ export default {
         linkHasBeenResent: 'Link has been re-sent',
         weSentYouMagicSignInLink: ({login, loginType}) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
         resendLink: 'Resend link',
-        validationCodeFailedMessage: 'It looks like there was an error with your validation link or it has expired.',
     },
     unlinkLoginForm: {
         toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
@@ -666,7 +665,7 @@ export default {
         unlink: 'Unlink',
         linkSent: 'Link sent!',
         succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
-        unlinkFailedMessage: 'It looks like there was an error with your link or it has expired.',
+        validationLinkFailedMessage: 'It looks like there was an error with your validation link or it has expired.'
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index c7810c49be2c..613b81f812c9 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -657,13 +657,14 @@ export default {
         linkHasBeenResent: 'El enlace se ha reenviado',
         weSentYouMagicSignInLink: ({login, loginType}) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor revisa tu ${loginType}`,
         resendLink: 'Reenviar enlace',
-        validationCodeFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
     },
     unlinkLoginForm: {
         toValidateLogin: ({primaryLogin, secondaryLogin}) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
         noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
-        unlink: 'Desvincula',
-        linkSent: 'Link sent!',
+        unlink: 'Desvincular',
+        linkSent: '¡Enlace enviado!',
+        succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
+        validationLinkFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
     },
     detailsPage: {
         localTime: 'Hora local',
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index d7c5bd14d54b..6bc55cf961c8 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -706,7 +706,7 @@ function unlinkLogin(accountID, validateCode) {
             value: {
                 isLoading: false,
                 errors: {
-                    [DateUtils.getMicroseconds()]: Localize.translateLocal('unlinkLoginForm.unlinkFailedMessage'),
+                    [DateUtils.getMicroseconds()]: Localize.translateLocal('unlinkLoginForm.validationLinkFailedMessage'),
                 },
             },
         },

From b175e734cddb7e2049e87c56938eaa8942596cf6 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 10 Apr 2023 17:58:53 -0700
Subject: [PATCH 10/19] minor style + copy update

---
 src/languages/en.js               |  1 -
 src/languages/es.js               |  3 +-
 src/libs/actions/Session/index.js | 64 +++++++++++++------------------
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index ed6b5340b616..8f2bcd12968d 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -665,7 +665,6 @@ export default {
         unlink: 'Unlink',
         linkSent: 'Link sent!',
         succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
-        validationLinkFailedMessage: 'It looks like there was an error with your validation link or it has expired.'
     },
     detailsPage: {
         localTime: 'Local time',
diff --git a/src/languages/es.js b/src/languages/es.js
index 613b81f812c9..95821a5326e4 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -663,8 +663,7 @@ export default {
         noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
         unlink: 'Desvincular',
         linkSent: '¡Enlace enviado!',
-        succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
-        validationLinkFailedMessage: 'Parece que hubo un error con el enlace de validación o ha caducado.',
+        succesfullyUnlinkedLogin: '¡Nombre de usuario secundario desvinculado correctamente!',
     },
     detailsPage: {
         localTime: 'Hora local',
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 6bc55cf961c8..456b35f491cc 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -670,47 +670,37 @@ function requestUnlinkValidationLink() {
 }
 
 function unlinkLogin(accountID, validateCode) {
-    const optimisticData = [
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                ...CONST.DEFAULT_ACCOUNT_DATA,
-                isLoading: true,
-            },
+    const optimisticData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            ...CONST.DEFAULT_ACCOUNT_DATA,
+            isLoading: true,
         },
-    ];
-
-    const successData = [
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: false,
-                message: Localize.translateLocal('unlinkLoginForm.succesfullyUnlinkedLogin'),
-            },
+    }];
+    const successData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: Localize.translateLocal('unlinkLoginForm.succesfullyUnlinkedLogin'),
         },
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: ONYXKEYS.CREDENTIALS,
-            value: {
-                login: '',
-            },
+    },
+    {
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.CREDENTIALS,
+        value: {
+            login: '',
         },
-    ];
-
-    const failureData = [
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: false,
-                errors: {
-                    [DateUtils.getMicroseconds()]: Localize.translateLocal('unlinkLoginForm.validationLinkFailedMessage'),
-                },
-            },
+    }];
+    const failureData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: null,
         },
-    ];
+    }];
 
     API.write('UnlinkLogin', {accountID, validateCode}, {optimisticData, successData, failureData});
 }

From 1649b94f6301d8fe51290711e96f14ebb05a48e5 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 14 Apr 2023 18:30:40 -0700
Subject: [PATCH 11/19] don't require credentials prop

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

diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index b972a5edd58a..7c471947974f 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -25,7 +25,7 @@ const propTypes = {
     credentials: PropTypes.shape({
         /** The email/phone the user logged in with */
         login: PropTypes.string,
-    }).isRequired,
+    }),
 
     /** The details about the account that the user is signing in with */
     account: PropTypes.shape({

From 51ae01837f851c8ac50d5321aa11058d33282878 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 14 Apr 2023 18:40:25 -0700
Subject: [PATCH 12/19] add default value for prop

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

diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index 7c471947974f..f6c6f0815d3f 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -47,6 +47,7 @@ const propTypes = {
 
 const defaultProps = {
     account: {},
+    credentials: {},
 };
 
 const UnlinkLoginForm = (props) => {

From 722f0d701ed8c49e772104915f565fdb5cabc1e3 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Wed, 19 Apr 2023 17:42:36 -0700
Subject: [PATCH 13/19] remove unneeded dot indicator and failure messages

---
 src/libs/actions/Session/index.js   | 2 --
 src/pages/signin/UnlinkLoginForm.js | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index bd89e079e4dc..a26e34f61227 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -668,7 +668,6 @@ function requestUnlinkValidationLink() {
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
-            message: null,
         },
     }];
 
@@ -704,7 +703,6 @@ function unlinkLogin(accountID, validateCode) {
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
-            message: null,
         },
     }];
 
diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index f6c6f0815d3f..f2498c592699 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -77,11 +77,6 @@ const UnlinkLoginForm = (props) => {
                     {props.translate('unlinkLoginForm.noLongerHaveAccess', {primaryLogin})}
                 </Text>
             </View>
-            {!_.isEmpty(props.account.message) && (
-
-                // DotIndicatorMessage mostly expects onyxData errors so we need to mock an object so that the messages looks similar to prop.account.errors
-                <DotIndicatorMessage style={[styles.mb5, styles.flex0]} type="success" messages={{0: props.account.message}} />
-            )}
             {!_.isEmpty(props.account.errors) && (
                 <DotIndicatorMessage style={[styles.mb5]} type="error" messages={props.account.errors} />
             )}

From fafaf995e658dcaa6a877c7a8ba2ae7d55f4fafa Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 21 Apr 2023 14:15:39 -0700
Subject: [PATCH 14/19] remove avatar + login from unlink form and add welcome
 text

---
 src/pages/signin/SignInPage.js      |  4 +++-
 src/pages/signin/UnlinkLoginForm.js | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index f59e49ace6d8..8dacffa643dd 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -139,6 +139,8 @@ class SignInPage extends Component {
             welcomeText = this.props.isSmallScreenWidth
                 ? `${this.props.translate('welcomeText.welcomeBack')} ${this.props.translate('welcomeText.enterPassword')}`
                 : this.props.translate('welcomeText.enterPassword');
+        } else if (showUnlinkLoginForm) {
+            welcomeHeader = this.props.isSmallScreenWidth ? this.props.translate('login.hero.header') : this.props.translate('welcomeText.welcomeBack');
         } else if (!showResendValidationForm) {
             welcomeHeader = this.props.isSmallScreenWidth ? this.props.translate('login.hero.header') : this.props.translate('welcomeText.getStarted');
             welcomeText = this.props.isSmallScreenWidth ? this.props.translate('welcomeText.getStarted') : '';
@@ -149,7 +151,7 @@ class SignInPage extends Component {
                 <SignInPageLayout
                     welcomeHeader={welcomeHeader}
                     welcomeText={welcomeText}
-                    shouldShowWelcomeHeader={(showLoginForm || showPasswordForm || showValidateCodeForm) || !this.props.isSmallScreenWidth}
+                    shouldShowWelcomeHeader={(showLoginForm || showPasswordForm || showValidateCodeForm || showUnlinkLoginForm) || !this.props.isSmallScreenWidth}
                     shouldShowWelcomeText={showLoginForm || showPasswordForm || showValidateCodeForm}
                 >
                     {/* LoginForm and PasswordForm must use the isVisible prop. This keeps them mounted, but visually hidden
diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index f2498c592699..2c28268d5716 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -56,17 +56,6 @@ const UnlinkLoginForm = (props) => {
 
     return (
         <>
-            <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
-                <Avatar
-                    source={ReportUtils.getDefaultAvatar(props.credentials.login)}
-                    imageStyles={[styles.mr2]}
-                />
-                <View style={[styles.flex1]}>
-                    <Text style={[styles.textStrong]}>
-                        {secondaryLogin}
-                    </Text>
-                </View>
-            </View>
             <View style={[styles.mt5]}>
                 <Text>
                     {props.translate('unlinkLoginForm.toValidateLogin', {primaryLogin, secondaryLogin})}

From fb78f5bd2baac00014723a26b5ae8883be979e26 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 21 Apr 2023 14:15:52 -0700
Subject: [PATCH 15/19] re-add dot indicator for non-error messages

---
 src/pages/signin/UnlinkLoginForm.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index 2c28268d5716..2d72b6426fec 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -66,6 +66,11 @@ const UnlinkLoginForm = (props) => {
                     {props.translate('unlinkLoginForm.noLongerHaveAccess', {primaryLogin})}
                 </Text>
             </View>
+            {!_.isEmpty(props.account.message) && (
+
+            // DotIndicatorMessage mostly expects onyxData errors so we need to mock an object so that the messages looks similar to prop.account.errors
+            <DotIndicatorMessage style={[styles.mb5, styles.flex0]} type="success" messages={{0: props.account.message}} />
+            )}
             {!_.isEmpty(props.account.errors) && (
                 <DotIndicatorMessage style={[styles.mb5]} type="error" messages={props.account.errors} />
             )}

From cb88f68bd550e70e3ac293946131fc04ec29eb1b Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 21 Apr 2023 14:49:30 -0700
Subject: [PATCH 16/19] remove unneeded imports

---
 src/pages/signin/UnlinkLoginForm.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/signin/UnlinkLoginForm.js b/src/pages/signin/UnlinkLoginForm.js
index 2d72b6426fec..8e68be76db99 100644
--- a/src/pages/signin/UnlinkLoginForm.js
+++ b/src/pages/signin/UnlinkLoginForm.js
@@ -12,8 +12,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
 import redirectToSignIn from '../../libs/actions/SignInRedirect';
-import Avatar from '../../components/Avatar';
-import * as ReportUtils from '../../libs/ReportUtils';
 import networkPropTypes from '../../components/networkPropTypes';
 import {withNetwork} from '../../components/OnyxProvider';
 import DotIndicatorMessage from '../../components/DotIndicatorMessage';

From a850b7c3ece316ed021c92271f2d1fd98ae6a088 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 28 Apr 2023 15:14:08 +0200
Subject: [PATCH 17/19] ensure we have a primaryLogin before showing
 unlinkLoginForm

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

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 8dacffa643dd..06a1ec7b9160 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -74,6 +74,7 @@ class SignInPage extends Component {
         // - AND the login is not the primary login
         // - AND the login is not validated
         const showUnlinkLoginForm = this.props.credentials.login
+            && this.props.account.primaryLogin
             && this.props.account.primaryLogin !== this.props.credentials.login
             && !this.props.account.validated;
 

From f2333c63a9051b727eb5f66a75ecdfa69a7dc72e Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Thu, 4 May 2023 16:18:01 +0200
Subject: [PATCH 18/19] optimistically remove message from account key when
 beginning sign in

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 45fa494bd769..5493b944da8c 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -187,6 +187,8 @@ function beginSignIn(login) {
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
                 isLoading: true,
+                errors: null,
+                message: null,
             },
         },
     ];

From 93cf44cb479deb42a154ba1a05dd2454ee5869f5 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 5 May 2023 10:42:33 +0200
Subject: [PATCH 19/19] minor style updates

---
 src/libs/actions/Session/index.js | 1 -
 src/pages/UnlinkLoginPage.js      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 5493b944da8c..375c7aa41877 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -187,7 +187,6 @@ function beginSignIn(login) {
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
                 isLoading: true,
-                errors: null,
                 message: null,
             },
         },
diff --git a/src/pages/UnlinkLoginPage.js b/src/pages/UnlinkLoginPage.js
index d7e0cb597f71..c68df43c8483 100644
--- a/src/pages/UnlinkLoginPage.js
+++ b/src/pages/UnlinkLoginPage.js
@@ -12,7 +12,6 @@ import ROUTES from '../ROUTES';
 const propTypes = {
     /** The accountID and validateCode are passed via the URL */
     route: validateLinkPropTypes,
-
 };
 
 const defaultProps = {