diff --git a/src/webapp/features/notifications/components/notificationActivityStatus/NotificationActivityStatus.tsx b/src/webapp/features/notifications/components/notificationActivityStatus/NotificationActivityStatus.tsx index db043051..51c9994e 100644 --- a/src/webapp/features/notifications/components/notificationActivityStatus/NotificationActivityStatus.tsx +++ b/src/webapp/features/notifications/components/notificationActivityStatus/NotificationActivityStatus.tsx @@ -1,5 +1,6 @@ import { Anchor, + Box, Card, Group, Menu, @@ -16,6 +17,7 @@ import { NotificationType, CollectionAccessType, } from '@/api-client'; + import { Fragment } from 'react'; import styles from '../../../feeds/components/feedActivityStatus/FeedActivityStatus.module.css'; import { getRelativeTime } from '@/lib/utils/time'; @@ -239,21 +241,40 @@ export default function NotificationActivityStatus(props: Props) { return ( - - - {TypeIcon && ( - - - - )} - + + + + + {TypeIcon && ( + + + + )} + + {getActivityText()} - + {time} diff --git a/src/webapp/features/notifications/components/notificationItem/NotificationItem.tsx b/src/webapp/features/notifications/components/notificationItem/NotificationItem.tsx index dd671d0d..e582d9ef 100644 --- a/src/webapp/features/notifications/components/notificationItem/NotificationItem.tsx +++ b/src/webapp/features/notifications/components/notificationItem/NotificationItem.tsx @@ -61,7 +61,6 @@ export default function NotificationItem(props: Props) { targetType="USER" targetHandle={notification.item.user.handle} initialIsFollowing={notification.item.user.isFollowing} - followText="Follow back" /> ) : undefined } diff --git a/src/webapp/features/notifications/containers/notificationsContainer/NotificationsContainer.tsx b/src/webapp/features/notifications/containers/notificationsContainer/NotificationsContainer.tsx index 7fe0c9a4..8c19d331 100644 --- a/src/webapp/features/notifications/containers/notificationsContainer/NotificationsContainer.tsx +++ b/src/webapp/features/notifications/containers/notificationsContainer/NotificationsContainer.tsx @@ -101,7 +101,7 @@ export default function NotificationsContainer() {