Fix timeline (#3262)

src/components/Timeline/Timeline.tsx

@@ -1,20 +1,18 @@
+import { useUser } from "@dashboard/auth";
 import { Button } from "@dashboard/components/Button";
-import { Avatar, CardContent, TextField } from "@material-ui/core";
+import { getUserInitials } from "@dashboard/misc";
-import deepPurple from "@material-ui/core/colors/deepPurple";
+import { CardContent, TextField } from "@material-ui/core";
-import PersonIcon from "@material-ui/icons/Person";
 import { makeStyles } from "@saleor/macaw-ui";
+import { Avatar, vars } from "@saleor/macaw-ui/next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
 const useStyles = makeStyles(
   theme => ({
     avatar: {
-      "& span": {
+      left: -19,
-        height: "100%",
+      position: "absolute",
-        width: "100%",
+      top: 20,
-      },
-      alignSelf: "flex-start",
-      marginRight: theme.spacing(3.5),
     },
     button: {
       padding: `7px`,
@@ -33,11 +31,11 @@ const useStyles = makeStyles(
           opacity: [[1], "!important"] as any,
         },
       },
-      background: theme.palette.background.paper,
+      background: vars.colors.background.surfaceNeutralPlain,
     },
     noteRoot: {
       marginBottom: theme.spacing(3),
-      position: "absolute",
+      // position: "absolute",
       top: 0,
       left: -19,
       right: 0,
@@ -47,14 +45,11 @@ const useStyles = makeStyles(
         paddingBottom: 0,
         paddingRight: 0,
       },
-      alignItems: "center",
-      display: "flex",
       paddingLeft: 0,
     },
     root: {
       marginLeft: 20,
-      paddingTop: theme.spacing(12),
+      paddingLeft: 21,
-      paddingLeft: theme.spacing(3.27),
       position: "relative",
     },
   }),
@@ -84,6 +79,7 @@ export const Timeline: React.FC<TimelineProps> = props => {
 export const TimelineAddNote: React.FC<TimelineAddNoteProps> = props => {
   const { message, onChange, onSubmit, reset, disabled } = props;
   const classes = useStyles(props);
+  const { user } = useUser();
 
   const intl = useIntl();
 
@@ -95,12 +91,12 @@ export const TimelineAddNote: React.FC<TimelineAddNoteProps> = props => {
   return (
     <div className={classes.noteRoot}>
       <CardContent className={classes.noteTitle}>
-        <Avatar
+        <Avatar.User
-          style={{ background: deepPurple[500] }}
+          initials={getUserInitials(user)}
+          scheme="decorative2"
+          src={user?.avatar?.url}
           className={classes.avatar}
-        >
+        />
-          <PersonIcon />
-        </Avatar>
         <TextField
           disabled={disabled}
           className={classes.input}

src/components/Timeline/TimelineNote.tsx

@@ -1,33 +1,12 @@
 import { useUser } from "@dashboard/auth";
-import { UserFragment } from "@dashboard/graphql";
+import { getUserInitials } from "@dashboard/misc";
-import { Avatar, Card, CardContent, Typography } from "@material-ui/core";
+import { Card, CardContent, Typography } from "@material-ui/core";
-import * as colors from "@material-ui/core/colors";
-import PersonIcon from "@material-ui/icons/Person";
 import { makeStyles } from "@saleor/macaw-ui";
-import CRC from "crc-32";
+import { Avatar, vars } from "@saleor/macaw-ui/next";
 import React from "react";
 
 import { DateTime } from "../Date";
 
-const palette = [
-  colors.amber,
-  colors.blue,
-  colors.cyan,
-  colors.deepOrange,
-  colors.deepPurple,
-  colors.green,
-  colors.indigo,
-  colors.lightBlue,
-  colors.lightGreen,
-  colors.lime,
-  colors.orange,
-  colors.pink,
-  colors.purple,
-  colors.red,
-  colors.teal,
-  colors.yellow,
-].map(color => color[500]);
-
 const useStyles = makeStyles(
   theme => ({
     avatar: {
@@ -37,11 +16,13 @@ const useStyles = makeStyles(
     },
     card: {
       marginBottom: theme.spacing(3),
-      marginLeft: theme.spacing(3),
       position: "relative",
       boxShadow: "none",
+      background: vars.colors.background.surfaceNeutralPlain,
     },
     cardContent: {
+      borderRadius: "4px",
+      border: `1px solid ${vars.colors.border.neutralDefault}`,
       "&:last-child": {
         padding: 16,
       },
@@ -57,7 +38,6 @@ const useStyles = makeStyles(
       display: "flex",
       justifyContent: "space-between",
       marginBottom: theme.spacing(),
-      paddingLeft: theme.spacing(3),
     },
   }),
   { name: "TimelineNote" },
@@ -104,26 +84,15 @@ export const TimelineNote: React.FC<TimelineNoteProps> = props => {
     return user?.email;
   };
 
-  const getBackgroundColor = (
-    user: TimelineNoteProps["user"],
-    currentUser: UserFragment,
-  ) => {
-    if (user.email === currentUser.email) {
-      return colors.deepPurple[500];
-    }
-
-    return palette[CRC.str(user.email) % palette.length];
-  };
-
   return (
     <div className={classes.root}>
       {user && (
-        <Avatar
+        <Avatar.User
+          initials={getUserInitials(currentUser)}
+          scheme="decorative2"
+          src={currentUser?.avatar?.url}
           className={classes.avatar}
-          style={{ background: getBackgroundColor(user, currentUser) }}
+        />
-        >
-          <PersonIcon />
-        </Avatar>
       )}
       <div className={classes.title}>
         <Typography>{getUserTitleOrEmail()}</Typography>