Merge branch 'make-footer-and-account-history-always-visible'

1 files changed, 2 insertions, 11 deletions

diff --git a/gui/src/renderer/components/Login.tsx b/gui/src/renderer/components/Login.tsx
index 29923d7d0f..4198bcb9dd 100644
--- a/gui/src/renderer/components/Login.tsx
+++ b/gui/src/renderer/components/Login.tsx
@@ -82,7 +82,7 @@ export default class Login extends React.Component<IProps, IState> {
   }
 
   public render() {
-    const showFooter = this.shouldShowFooter();
+    const showFooter = this.allowInteraction();
 
     return (
       <Layout>
@@ -208,16 +208,7 @@ export default class Login extends React.Component<IProps, IState> {
   }
 
   private shouldShowAccountHistory() {
-    return (
-      this.allowInteraction() && this.state.isActive && this.props.accountHistory !== undefined
-    );
-  }
-
-  private shouldShowFooter() {
-    return (
-      (this.props.loginState.type === 'none' || this.props.loginState.type === 'failed') &&
-      !this.shouldShowAccountHistory()
-    );
+    return this.allowInteraction() && this.props.accountHistory !== undefined;
   }
 
   private onSelectAccountFromHistory = (accountToken: string) => {