Undo the change to fix animation image increasing the content height …

…when SAML is enabled
Expensify · Apr 11, 2024 · f8bbc25 · f8bbc25
1 parent 280d5ef
commit f8bbc25
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
@@ -61,7 +61,6 @@ type RenderOption = {
     shouldInitiateSAMLLogin: boolean;
     shouldShowWelcomeHeader: boolean;
     shouldShowWelcomeText: boolean;
-    isSAMLEnabled: boolean;
 };
 
 type GetRenderOptionsParams = {
@@ -93,7 +92,7 @@ function getRenderOptions({
     shouldShowAnotherLoginPageOpenedMessage,
 }: GetRenderOptionsParams): RenderOption {
     const hasAccount = !isEmptyObject(account);
-    const isSAMLEnabled = !!account?.isSAMLEnabled;
+    const isSAMLEnabled = true; //!!account?.isSAMLEnabled;
     const isSAMLRequired = !!account?.isSAMLRequired;
     const hasEmailDeliveryFailure = !!account?.hasEmailDeliveryFailure;
 
@@ -124,7 +123,6 @@ function getRenderOptions({
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
-        isSAMLEnabled,
     };
 }
 
@@ -183,7 +181,6 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
-        isSAMLEnabled,
     } = getRenderOptions({
         hasLogin: !!credentials?.login,
         hasValidateCode: !!credentials?.validateCode,
@@ -263,7 +260,6 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                 shouldShowWelcomeText={shouldShowWelcomeText}
                 ref={signInPageLayoutRef}
                 navigateFocus={navigateFocus}
-                isSAMLEnabled={isSAMLEnabled}
             >
                 {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
              so that password managers can access the values. Conditionally rendering this component will break this feature. */}

diff --git a/src/pages/signin/SignInPageLayout/index.tsx b/src/pages/signin/SignInPageLayout/index.tsx
@@ -33,7 +33,6 @@ function SignInPageLayout(
         shouldShowWelcomeText = false,
         navigateFocus = () => {},
         children,
-        isSAMLEnabled = false,
     }: SignInPageLayoutProps,
     ref: ForwardedRef<SignInPageLayoutRef>,
 ) {
@@ -79,7 +78,7 @@ function SignInPageLayout(
 
     const scrollViewStyles = useMemo(() => scrollViewContentContainerStyles(styles), [styles]);
 
-    const backgroundImageHeight = Math.max(isSAMLEnabled ? variables.signInSAMLContentMinHeight : variables.signInContentMinHeight, containerHeight);
+    const backgroundImageHeight = Math.max(variables.signInContentMinHeight, containerHeight);
 
     return (
         <View style={containerStyles}>

diff --git a/src/pages/signin/SignInPageLayout/types.ts b/src/pages/signin/SignInPageLayout/types.ts
@@ -25,10 +25,6 @@ type SignInPageLayoutProps = {
     customHeroBody?: string;
 
     navigateFocus?: () => void;
-
-    /** Whether to use the default minimun content height or the recommened one
-     *  for login with SAML at the login page */
-    isSAMLEnabled?: boolean;
 };
 
 type SignInPageLayoutRef = {

diff --git a/src/styles/variables.ts b/src/styles/variables.ts
@@ -148,7 +148,6 @@ export default {
     signInContentMaxWidth: 1360,
     signInHeroContextMaxWidth: 680,
     signInContentMinHeight: 800,
-    signInSAMLContentMinHeight: 1000,
     signInLogoHeightSmallScreen: 28,
     signInLogoHeight: 34,
     signInLogoWidth: 120,