1 files changed, 13 insertions, 8 deletions
diff --git a/gui/src/renderer/components/MainView.tsx b/gui/src/renderer/components/MainView.tsx
index c7a8851a90..56878fb521 100644
--- a/gui/src/renderer/components/MainView.tsx
+++ b/gui/src/renderer/components/MainView.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
 import { hasExpired } from '../../shared/account-expiry';
-import { IReduxState } from '../redux/store';
+import { useSelector } from '../redux/store';
 import ConnectPage from '../containers/ConnectPage';
 import ExpiredAccountErrorViewContainer from '../containers/ExpiredAccountErrorViewContainer';
 import { useHistory } from '../lib/history';
@@ -9,13 +8,15 @@ import { RoutePath } from '../lib/routes';
 
 export default function MainView() {
   const history = useHistory();
-  const accountExpiry = useSelector((state: IReduxState) => state.account.expiry);
-  const accountHasExpired = accountExpiry && hasExpired(accountExpiry);
+  const accountExpiry = useSelector((state) => state.account.expiry);
+  const accountHasExpired = accountExpiry !== undefined && hasExpired(accountExpiry);
   const isNewAccount = useSelector(
-    (state: IReduxState) =>
-      state.account.status.type === 'ok' && state.account.status.method === 'new_account',
+    (state) => state.account.status.type === 'ok' && state.account.status.method === 'new_account',
+  );
+
+  const [showAccountExpired, setShowAccountExpired] = useState<boolean>(
+    isNewAccount || accountHasExpired,
   );
-  const [showAccountExpired, setShowAccountExpired] = useState(isNewAccount || accountHasExpired);
 
   useEffect(() => {
     if (accountHasExpired) {
@@ -25,5 +26,9 @@ export default function MainView() {
     }
   }, [showAccountExpired, accountHasExpired]);
 
-  return showAccountExpired ? <ExpiredAccountErrorViewContainer /> : <ConnectPage />;
+  if (showAccountExpired) {
+    return <ExpiredAccountErrorViewContainer />;
+  } else {
+    return <ConnectPage />;
+  }
 }