diff --git a/.changeset/khaki-shrimps-play.md b/.changeset/khaki-shrimps-play.md new file mode 100644 index 00000000000..599feaea49d --- /dev/null +++ b/.changeset/khaki-shrimps-play.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +App and User avatars in order details now all have the same color. diff --git a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventCreatedBy.tsx b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventCreatedBy.tsx index 20d176735ea..17d9145716c 100644 --- a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventCreatedBy.tsx +++ b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventCreatedBy.tsx @@ -1,12 +1,13 @@ // @ts-strict-ignore import { AppUrls } from "@dashboard/apps/urls"; +import { UserAvatar } from "@dashboard/components/UserAvatar"; import { AppAvatarFragment, StaffMemberAvatarFragment, } from "@dashboard/graphql"; import { getUserInitials, getUserName } from "@dashboard/misc"; import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; -import { Avatar, makeStyles } from "@saleor/macaw-ui"; +import { Box } from "@saleor/macaw-ui/next"; import React from "react"; import { Link } from "react-router-dom"; @@ -14,24 +15,9 @@ interface EventCreatedByProps { createdBy: StaffMemberAvatarFragment | AppAvatarFragment | null; } -const useStyles = makeStyles( - theme => ({ - userWrapper: { - display: "inline-flex", - height: "100%", - gap: theme.spacing(1), - alignItems: "center", - justifyContent: "flex-end", - }, - }), - { name: "EventCreatedBy" }, -); - export const EventCreatedBy: React.FC = ({ createdBy, }) => { - const classes = useStyles(); - if (!createdBy) { return null; } @@ -43,15 +29,21 @@ export const EventCreatedBy: React.FC = ({ } return ( - - {getUserName(createdBy, true)} - + ); };