diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
index b862a297a4..c9553fa057 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -3,10 +3,16 @@ import { FormattedMessage } from 'react-intl';
import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
import type { NotificationGroupMention } from 'mastodon/models/notification_group';
+import type { LabelRenderer } from './notification_group_with_status';
import { NotificationWithStatus } from './notification_with_status';
-const labelRenderer = values =>
-
;
+const labelRenderer: LabelRenderer = (values) => (
+
+);
export const NotificationMention: React.FC<{
notification: NotificationGroupMention;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
index 708b081a6c..ed5701b86b 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
@@ -5,8 +5,12 @@ import type { NotificationGroupPoll } from 'mastodon/models/notification_group';
import { NotificationWithStatus } from './notification_with_status';
-const labelRenderer = values =>
-
;
+const labelRenderer = () => (
+
+);
export const NotificationPoll: React.FC<{
notification: NotificationGroupPoll;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
index d0de0590ff..bff33b4d19 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -3,10 +3,16 @@ import { FormattedMessage } from 'react-intl';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import type { NotificationGroupReblog } from 'mastodon/models/notification_group';
+import type { LabelRenderer } from './notification_group_with_status';
import { NotificationGroupWithStatus } from './notification_group_with_status';
-const labelRenderer = values =>
-
;
+const labelRenderer: LabelRenderer = (values) => (
+
+);
export const NotificationReblog: React.FC<{
notification: NotificationGroupReblog;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
index c0e7c2c1e9..4f15ab0939 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
@@ -3,10 +3,16 @@ import { FormattedMessage } from 'react-intl';
import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
import type { NotificationGroupStatus } from 'mastodon/models/notification_group';
+import type { LabelRenderer } from './notification_group_with_status';
import { NotificationWithStatus } from './notification_with_status';
-const labelRenderer = values =>
-
;
+const labelRenderer: LabelRenderer = (values) => (
+
+);
export const NotificationStatus: React.FC<{
notification: NotificationGroupStatus;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
index cfb05685ce..1f0e005581 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
@@ -3,10 +3,16 @@ import { FormattedMessage } from 'react-intl';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import type { NotificationGroupUpdate } from 'mastodon/models/notification_group';
+import type { LabelRenderer } from './notification_group_with_status';
import { NotificationWithStatus } from './notification_with_status';
-const labelRenderer = values =>
-
;
+const labelRenderer: LabelRenderer = (values) => (
+
+);
export const NotificationUpdate: React.FC<{
notification: NotificationGroupUpdate;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
index 138e436fb3..8a246467f7 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -1,35 +1,42 @@
import { useMemo } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Icon } from 'mastodon/components/icon';
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
import Status from 'mastodon/containers/status_container';
import { NamesList } from './names_list';
+import type { LabelRenderer } from './notification_group_with_status';
-
-export const NotificationWithStatus = ({
- icon,
- accountIds,
- statusId,
- count,
- labelRenderer,
- type,
-}) => {
- const label = useMemo(() => labelRenderer({ name:
}), [labelRenderer, accountIds, count]);
+export const NotificationWithStatus: React.FC<{
+ type: string;
+ icon: IconProp;
+ accountIds: string[];
+ statusId: string;
+ count: number;
+ labelRenderer: LabelRenderer;
+}> = ({ icon, accountIds, statusId, count, labelRenderer, type }) => {
+ const label = useMemo(
+ () =>
+ labelRenderer({
+ name:
,
+ }),
+ [labelRenderer, accountIds, count],
+ );
return (
-
+
-
+ {/* @ts-expect-error --
is not yet typed */}
+
);
};