Merge pull request #523 from pankona/fix-glitch-in-header

Fix glitch in header
pankona · May 6, 2022 · 77b7eed · 77b7eed
2 parents 08178ce + ad23608
commit 77b7eed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/hashira-web/src/AccessToken.tsx b/hashira-web/src/AccessToken.tsx
@@ -22,8 +22,10 @@ const AccessToken: React.FC<{ user: firebase.User | null | undefined }> = ({
 
   return (
     <div>
-      <Header user={user} isLoading={!user} />
-      {user && accesstokens && (
+      <Header user={user} />
+      {!user || !accesstokens ? (
+        <div>Loading...</div>
+      ) : (
         <>
           <button
             onClick={async () => {

diff --git a/hashira-web/src/App.tsx b/hashira-web/src/App.tsx
@@ -145,7 +145,7 @@ const App: React.FC<{ user: firebase.User | null | undefined }> = ({
 
   return (
     <div>
-      <Header user={user} isLoading={!user || !tasksAndPriorities} />
+      <Header user={user} />
       <StyledBody>
         {user !== null && (
           <TaskInput

diff --git a/hashira-web/src/Header.tsx b/hashira-web/src/Header.tsx
@@ -32,8 +32,7 @@ const StyledLoginLogout = styled.div`
 
 const Header: React.FC<{
   user: firebase.User | null | undefined;
-  isLoading: boolean;
-}> = ({ user, isLoading }) => {
+}> = ({ user }) => {
   const navigate = useNavigate();
 
   return (
@@ -63,9 +62,6 @@ const Header: React.FC<{
                 </div>
               );
             default:
-              if (isLoading) {
-                return <div></div>;
-              }
               return (
                 <>
                   <div