diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx index 39276c9f5..1fbdeeb03 100644 --- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx +++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx @@ -161,12 +161,13 @@ export const CalendarEventRow = ({ key={[participant.workspaceMemberId, participant.displayName] .filter(isDefined) .join('-')} - avatarUrl={ - participant.workspaceMemberId === currentWorkspaceMember?.id - ? currentWorkspaceMember?.avatarUrl - : undefined + avatarUrl={participant.avatarUrl} + placeholder={ + participant.firstName && participant.lastName + ? `${participant.firstName} ${participant.lastName}` + : participant.displayName } - placeholder={participant.displayName} + entityId={participant.workspaceMemberId ?? participant.personId} type="rounded" /> ))} diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx index e83adb4ed..f42f2e35f 100644 --- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx +++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx @@ -1,5 +1,4 @@ import { useContext } from 'react'; -import styled from '@emotion/styled'; import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent'; import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext'; @@ -9,15 +8,11 @@ type CalendarMonthCardProps = { dayTimes: number[]; }; -const StyledCard = styled(Card)` - overflow: visible; -`; - export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => { const { calendarEventsByDayTime } = useContext(CalendarContext); return ( - + {dayTimes.map((dayTime, index) => { const dayCalendarEvents = calendarEventsByDayTime[dayTime] || []; @@ -29,6 +24,6 @@ export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => { /> ); })} - + ); };