From 987315edb2286e3378892900777d33b988613fd4 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Tue, 21 Jul 2020 18:49:20 +0200
Subject: [PATCH] Fix endless loading screen

---
 src/auth/index.tsx | 13 ++-----------
 src/index.tsx      |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/auth/index.tsx b/src/auth/index.tsx
index 447631f8d..9a5349b2c 100644
--- a/src/auth/index.tsx
+++ b/src/auth/index.tsx
@@ -3,7 +3,6 @@ import React from "react";
 import { Route, Switch } from "react-router-dom";
 
 import Layout from "./components/Layout";
-import LoginLoading from "./components/LoginLoading";
 import {
   newPasswordPath,
   passwordResetPath,
@@ -33,20 +32,12 @@ export const UserContext = React.createContext<UserContext>({
   tokenVerifyLoading: false
 });
 
-interface AuthRouterProps {
-  hasToken: boolean;
-}
-
-const AuthRouter: React.FC<AuthRouterProps> = ({ hasToken }) => (
+const AuthRouter: React.FC = () => (
   <Layout>
     <Switch>
       <Route path={passwordResetSuccessPath} component={ResetPasswordSuccess} />
       <Route path={passwordResetPath} component={ResetPassword} />
-      {!hasToken ? (
-        <Route path={newPasswordPath} component={NewPassword} />
-      ) : (
-        <LoginLoading />
-      )}
+      <Route path={newPasswordPath} component={NewPassword} />
       <Route component={LoginView} />
     </Switch>
   </Layout>
diff --git a/src/index.tsx b/src/index.tsx
index 4bf643631..2118f7298 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -293,7 +293,7 @@ const Routes: React.FC = () => {
       ) : hasToken && tokenVerifyLoading ? (
         <LoginLoading />
       ) : (
-        <Auth hasToken={hasToken} />
+        <Auth />
       )}
     </>
   );