diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx index 282cc43e5..2933035ac 100644 --- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx +++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx @@ -38,10 +38,19 @@ const StyledMainContainer = styled.div` } `; +const StyledRightDrawerAnimatedPlaceholderEmptyContainer = styled( + AnimatedPlaceholderEmptyContainer, +)` + height: auto; + padding-top: ${({ theme }) => theme.spacing(8)}; +`; + export const TimelineActivities = ({ targetableObject, + isInRightDrawer, }: { targetableObject: ActivityTargetableObject; + isInRightDrawer?: boolean; }) => { const { timelineActivities, loading, fetchMoreRecords } = useTimelineActivities(targetableObject); @@ -54,8 +63,12 @@ export const TimelineActivities = ({ } if (isTimelineActivitiesEmpty) { + const EmptyContainer = isInRightDrawer + ? StyledRightDrawerAnimatedPlaceholderEmptyContainer + : AnimatedPlaceholderEmptyContainer; + return ( - @@ -68,7 +81,7 @@ export const TimelineActivities = ({ There is no activity associated with this record. - + ); } diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx index 61db5c786..065fdc9ee 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx @@ -41,8 +41,11 @@ type CardComponentProps = { type CardComponentType = (props: CardComponentProps) => JSX.Element | null; export const CardComponents: Record = { - [CardType.TimelineCard]: ({ targetableObject }) => ( - + [CardType.TimelineCard]: ({ targetableObject, isInRightDrawer }) => ( + ), [CardType.FieldCard]: ({ targetableObject, isInRightDrawer }) => (