diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 9ab35d50875e..c9f28d07a0a2 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -18,7 +18,6 @@ import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
import Performance from '@libs/Performance';
import Visibility from '@libs/Visibility';
-import type navigationRef from '@navigation/navigationRef';
import * as App from '@userActions/App';
import * as Session from '@userActions/Session';
import CONST from '@src/CONST';
@@ -72,7 +71,7 @@ type GetRenderOptionsParams = {
isPrimaryLogin: boolean;
isUsingMagicCode: boolean;
hasInitiatedSAMLLogin: boolean;
- showLoginPageOpenedMessage: boolean;
+ shouldShowAnotherLoginPageOpenedMessage: boolean;
};
/**
@@ -84,7 +83,15 @@ type GetRenderOptionsParams = {
* @param hasInitiatedSAMLLogin
* @param hasEmailDeliveryFailure
*/
-function getRenderOptions({hasLogin, hasValidateCode, account, isPrimaryLogin, isUsingMagicCode, hasInitiatedSAMLLogin, showLoginPageOpenedMessage}: GetRenderOptionsParams): RenderOption {
+function getRenderOptions({
+ hasLogin,
+ hasValidateCode,
+ account,
+ isPrimaryLogin,
+ isUsingMagicCode,
+ hasInitiatedSAMLLogin,
+ shouldShowAnotherLoginPageOpenedMessage,
+}: GetRenderOptionsParams): RenderOption {
const hasAccount = !isEmptyObject(account);
const isSAMLEnabled = !!account?.isSAMLEnabled;
const isSAMLRequired = !!account?.isSAMLRequired;
@@ -101,13 +108,13 @@ function getRenderOptions({hasLogin, hasValidateCode, account, isPrimaryLogin, i
Session.clearSignInData();
}
- const shouldShowLoginForm = !showLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
+ const shouldShowLoginForm = !shouldShowAnotherLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;
const shouldShowValidateCodeForm =
hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired;
const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin;
- const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || showLoginPageOpenedMessage;
+ const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage;
return {
shouldShowLoginForm,
shouldShowEmailDeliveryFailurePage,
@@ -143,7 +150,8 @@ function SignInPageInner({credentials, account, isInModal = false, activeClients
const isClientTheLeader = !!activeClients && ActiveClientManager.isClientTheLeader();
// We need to show "Another login page is opened" message if the page isn't active and visible
- const showLoginPageOpenedMessage = Visibility.isVisible() && !isClientTheLeader;
+ // eslint-disable-next-line rulesdir/no-negated-variables
+ const shouldShowAnotherLoginPageOpenedMessage = Visibility.isVisible() && !isClientTheLeader;
useEffect(() => Performance.measureTTI(), []);
useEffect(() => {
@@ -182,7 +190,7 @@ function SignInPageInner({credentials, account, isInModal = false, activeClients
isPrimaryLogin: !account?.primaryLogin || account.primaryLogin === credentials?.login,
isUsingMagicCode,
hasInitiatedSAMLLogin,
- showLoginPageOpenedMessage,
+ shouldShowAnotherLoginPageOpenedMessage,
});
if (shouldInitiateSAMLLogin) {
@@ -194,7 +202,7 @@ function SignInPageInner({credentials, account, isInModal = false, activeClients
let welcomeText = '';
const headerText = translate('login.hero.header');
- if (showLoginPageOpenedMessage) {
+ if (shouldShowAnotherLoginPageOpenedMessage) {
welcomeHeader = translate('welcomeText.anotherLoginPageIsOpen');
welcomeText = translate('welcomeText.anotherLoginPageIsOpenExplanation');
} else if (shouldShowLoginForm) {
@@ -266,12 +274,12 @@ function SignInPageInner({credentials, account, isInModal = false, activeClients
{shouldShowValidateCodeForm && (
)}
- {!showLoginPageOpenedMessage && (
+ {!shouldShowAnotherLoginPageOpenedMessage && (
<>
{shouldShowUnlinkLoginForm && }
{shouldShowChooseSSOOrMagicCode && }
@@ -285,7 +293,7 @@ function SignInPageInner({credentials, account, isInModal = false, activeClients
SignInPageInner.displayName = 'SignInPage';
-type SignInPageProps = SignInPageInnerProps & {navigation?: Partial};
+type SignInPageProps = SignInPageInnerProps;
type SignInPageOnyxProps = SignInPageInnerOnyxProps;
function SignInPage(props: SignInPageProps) {
diff --git a/src/pages/signin/SignInPageLayout/signInPageStyles/index.native.ts b/src/pages/signin/SignInPageLayout/signInPageStyles/index.native.ts
index 674e79a06d20..2cf1c2d8c143 100644
--- a/src/pages/signin/SignInPageLayout/signInPageStyles/index.native.ts
+++ b/src/pages/signin/SignInPageLayout/signInPageStyles/index.native.ts
@@ -1,7 +1,7 @@
-// Using flexGrow on mobile allows the ScrollView container to grow to fit the content.
-// This is necessary because making the sign-in content fit exactly the viewheight causes the scroll to stop working on mobile.
import type ScrollViewContentContainerStyles from './types';
+// Using flexGrow on mobile allows the ScrollView container to grow to fit the content.
+// This is necessary because making the sign-in content fit exactly the viewheight causes the scroll to stop working on mobile.
const scrollViewContentContainerStyles: ScrollViewContentContainerStyles = (styles) => styles.flexGrow1;
export default scrollViewContentContainerStyles;
diff --git a/src/pages/signin/SignInPageLayout/signInPageStyles/index.ts b/src/pages/signin/SignInPageLayout/signInPageStyles/index.ts
index 31603cc2d55a..3f40aa18c5ac 100644
--- a/src/pages/signin/SignInPageLayout/signInPageStyles/index.ts
+++ b/src/pages/signin/SignInPageLayout/signInPageStyles/index.ts
@@ -1,6 +1,6 @@
-// On web, we can use flex to fit the content to fit the viewport within a ScrollView.
import type ScrollViewContentContainerStyles from './types';
+// On the web, we can use flex to fit the content to fit the viewport within a ScrollView.
const scrollViewContentContainerStyles: ScrollViewContentContainerStyles = (styles) => styles.flex1;
export default scrollViewContentContainerStyles;
diff --git a/src/pages/signin/UnlinkLoginForm.tsx b/src/pages/signin/UnlinkLoginForm.tsx
index a4308957908b..c2e62e3b80f3 100644
--- a/src/pages/signin/UnlinkLoginForm.tsx
+++ b/src/pages/signin/UnlinkLoginForm.tsx
@@ -62,7 +62,7 @@ function UnlinkLoginForm({account, credentials}: UnlinkLoginFormProps) {
messages={{0: account.message}}
/>
)}
- {!!account?.errors && !isEmptyObject(account?.errors) && (
+ {!!account?.errors && !isEmptyObject(account.errors) && (
Session.requestUnlinkValidationLink()}
isDisabled={!!isOffline || !!account?.message}
/>
diff --git a/tests/perf-test/SignInPage.perf-test.tsx b/tests/perf-test/SignInPage.perf-test.tsx
index dde8596fb2ae..f122439322a4 100644
--- a/tests/perf-test/SignInPage.perf-test.tsx
+++ b/tests/perf-test/SignInPage.perf-test.tsx
@@ -47,6 +47,7 @@ function SignInPageWrapper(args: Props) {