Merge branch 'fix-account-expiry-view'

1 files changed, 15 insertions, 6 deletions

diff --git a/gui/src/renderer/components/MainView.tsx b/gui/src/renderer/components/MainView.tsx
index ea678aa061..f59097854e 100644
--- a/gui/src/renderer/components/MainView.tsx
+++ b/gui/src/renderer/components/MainView.tsx
@@ -7,6 +7,8 @@ import { useHistory } from '../lib/history';
 import { RoutePath } from '../lib/routes';
 import { useSelector } from '../redux/store';
 
+type ExpiryData = { show: false } | { show: true; expiry: string | undefined };
+
 export default function MainView() {
   const history = useHistory();
   const accountExpiry = useSelector((state) => state.account.expiry);
@@ -15,19 +17,26 @@ export default function MainView() {
     (state) => state.account.status.type === 'ok' && state.account.status.method === 'new_account',
   );
 
-  const [showAccountExpired, setShowAccountExpired] = useState<boolean>(
-    isNewAccount || accountHasExpired,
+  const [showAccountExpired, setShowAccountExpired] = useState<ExpiryData>(() =>
+    isNewAccount || accountHasExpired ? { show: true, expiry: accountExpiry } : { show: false },
   );
 
   useEffect(() => {
-    if (accountHasExpired) {
-      setShowAccountExpired(true);
-    } else if (showAccountExpired && !accountHasExpired) {
+    if (
+      accountHasExpired &&
+      (!showAccountExpired.show || showAccountExpired.expiry !== accountExpiry)
+    ) {
+      setShowAccountExpired({ show: true, expiry: accountExpiry });
+    } else if (
+      showAccountExpired.show &&
+      accountExpiry !== showAccountExpired.expiry &&
+      !accountHasExpired
+    ) {
       history.push(RoutePath.timeAdded);
     }
   }, [showAccountExpired, accountHasExpired]);
 
-  if (showAccountExpired) {
+  if (showAccountExpired.show) {
     return <ExpiredAccountErrorViewContainer />;
   } else {
     return <ConnectPage />;