package.json

@@ -1,6 +1,6 @@
 {
   "name": "network-resurrector-frontend",
-  "version": "1.2.2",
+  "version": "1.2.1",
   "description": "Frontend component of Network resurrector system",
   "author": {
     "name": "Tudor Stanciu",
@@ -14,7 +14,7 @@
   "private": true,
   "dependencies": {
     "@flare/js-utils": "^1.0.3",
-    "@flare/tuitio-client-react": "^1.1.1",
+    "@flare/tuitio-client-react": "^1.0.1",
     "@material-ui/core": "^4.11.2",
     "@material-ui/icons": "^4.11.2",
     "axios": "^1.3.4",

src/components/layout/ProfileButton.js

@@ -3,16 +3,10 @@ import { IconButton, Menu, MenuItem } from "@material-ui/core";
 import AccountCircle from "@material-ui/icons/AccountCircle";
 import { useHistory } from "react-router-dom";
 import { useTuitioClient } from "@flare/tuitio-client-react";
-import { useToast } from "../../hooks";
 
 const ProfileButton = () => {
   const history = useHistory();
-  const { error } = useToast();
+  const { logout } = useTuitioClient();
-
-  const { logout } = useTuitioClient({
-    onLogoutFailed: errorMessage => error(errorMessage),
-    onLogoutError: err => error(err.message)
-  });
 
   const [anchorEl, setAnchorEl] = useState(null);
   const openUserMenu = Boolean(anchorEl);
@@ -59,7 +53,7 @@ const ProfileButton = () => {
         >
           Profile
         </MenuItem>
-        <MenuItem onClick={logout}>Logout</MenuItem>
+        <MenuItem onClick={() => logout()}>Logout</MenuItem>
       </Menu>
     </div>
   );

src/features/login/components/LoggedInComponent.js

@@ -27,16 +27,20 @@ const LoggedInComponent = ({ credentials, onChange, onLogin, onLogout }) => {
   const { t } = useTranslation();
   const [expanded, setExpanded] = useState(false);
   const { info } = useToast();
-  const { userName } = useTuitioUser();
+  const { lastLoginDate, userName } = useTuitioUser();
 
   const handleExpandLogin = () => {
     setExpanded(!expanded);
   };
 
   const loginDate = useMemo(() => {
-    const valueForDisplay = t("LONG_DATE", { date: new Date() });
+    if (lastLoginDate) {
+      const valueForDisplay = t("LONG_DATE", { date: lastLoginDate });
       return valueForDisplay;
-  }, [t]);
+    }
+
+    return "N/A";
+  }, [lastLoginDate, t]);
 
   const handleLogin = async () => {
     const result = await onLogin();

src/features/login/components/LoginComponent.js

@@ -48,7 +48,7 @@ const LoginComponent = ({ credentials, onChange, onLogin }) => {
           }}
         />
       </CardContent>
-      <CardActions className={classes.actions}>
+      <CardActions>
         <Button
           className={classes.onRight}
           variant="contained"

src/features/login/styles.js

@@ -27,10 +27,6 @@ const styles = theme => ({
   field: {
     margin: theme.spacing(1),
     width: "300px"
-  },
-  actions: {
-    paddingRight: "16px",
-    paddingLeft: "16px"
   }
 });
 

src/utils/axios.js

@@ -8,7 +8,7 @@ function getHeaders() {
 
   return {
     "Content-Type": "application/json",
-    Authorization: `Tuitio ${token}`,
+    Authorization: `Basic ${token.raw}`,
     "Accept-Language": `${language}`
   };
 }