Merge pull request finos#1353 from jescalada/user-auth-error-message

fix: error message on fetching auth'd user

Author: kriswest

src/ui/components/Navbars/DashboardNavbarLinks.tsx

@@ -27,11 +27,10 @@ const DashboardNavbarLinks: React.FC = () => {
   const [openProfile, setOpenProfile] = useState<HTMLElement | null>(null);
   const [, setAuth] = useState<boolean>(true);
   const [, setIsLoading] = useState<boolean>(true);
-  const [errorMessage, setErrorMessage] = useState<string>('');
   const [user, setUser] = useState<PublicUser | null>(null);
 
   useEffect(() => {
-    getUser(setIsLoading, setUser, setAuth, setErrorMessage);
+    getUser(setIsLoading, setUser, setAuth);
   }, []);
 
   const handleClickProfile = (event: React.MouseEvent<HTMLElement>) => {
@@ -66,7 +65,6 @@ const DashboardNavbarLinks: React.FC = () => {
 
   return (
     <div>
-      {errorMessage && <div className={classes.errorMessage}>{errorMessage}</div>}
       <div className={classes.manager}>
         <Button
           color={window.innerWidth > 959 ? 'transparent' : 'white'}

src/ui/views/User/UserProfile.tsx

@@ -16,6 +16,7 @@ import { LogoGithubIcon } from '@primer/octicons-react';
 import CloseRounded from '@material-ui/icons/CloseRounded';
 import { Check, Save } from '@material-ui/icons';
 import { TextField, Theme } from '@material-ui/core';
+import Danger from '../../components/Typography/Danger';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {
@@ -52,19 +53,22 @@ export default function UserProfile(): React.ReactElement {
   }, [id]);
 
   if (isLoading) return <div>Loading...</div>;
-  if (errorMessage) return <div>{errorMessage}</div>;
 
   if (!auth && window.location.pathname === '/dashboard/profile') {
     return <Navigate to='/login' />;
   }
+
+  if (errorMessage) return <Danger>{errorMessage}</Danger>;
+
   if (!user) return <div>No user data available</div>;
 
   const updateProfile = async (): Promise<void> => {
     const updatedData = {
       ...user,
       gitAccount: escapeHTML(gitAccount),
     };
-    //does not reject and will display any errors that occur
+
+    // Does not reject and will display any errors that occur
     await updateUser(updatedData, setErrorMessage, setIsLoading);
     setUser(updatedData);
     navigate(`/dashboard/profile`);