diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx index 077b6d8e40..3c46dfc10b 100644 --- a/app/javascript/mastodon/components/account.jsx +++ b/app/javascript/mastodon/components/account.jsx @@ -105,7 +105,7 @@ const Account = ({ size = 46, account, onBlock, onMute, onMuteNotifications, hid } else { buttons = ; } - } else { + } else if (!hideButtons) { buttons = ; } diff --git a/app/javascript/mastodon/features/antennas/index.tsx b/app/javascript/mastodon/features/antennas/index.tsx index 7808011c93..02d19bb438 100644 --- a/app/javascript/mastodon/features/antennas/index.tsx +++ b/app/javascript/mastodon/features/antennas/index.tsx @@ -25,8 +25,6 @@ const messages = defineMessages({ edit: { id: 'antennas.edit', defaultMessage: 'Edit antenna' }, delete: { id: 'antennas.delete', defaultMessage: 'Delete antenna' }, more: { id: 'status.more', defaultMessage: 'More' }, - insert_list: { id: 'antennas.insert_list', defaultMessage: 'List' }, - insert_home: { id: 'antennas.insert_home', defaultMessage: 'Home' }, }); const AntennaItem: React.FC<{ @@ -35,7 +33,9 @@ const AntennaItem: React.FC<{ insert_feeds: boolean; isList: boolean; listTitle?: string; -}> = ({ id, title, insert_feeds, isList, listTitle }) => { + stl: boolean; + ltl: boolean; +}> = ({ id, title, insert_feeds, isList, listTitle, stl, ltl }) => { const dispatch = useAppDispatch(); const intl = useIntl(); @@ -62,15 +62,38 @@ const AntennaItem: React.FC<{
- {title} - {insert_feeds ? ( - - {isList - ? (listTitle?.slice(0, 4) ?? - intl.formatMessage(messages.insert_list)) - : intl.formatMessage(messages.insert_home)} - - ) : undefined} + + {title} + + {stl && ( + + + + )} + {ltl && ( + + + + )} + + {insert_feeds && ( + + {isList && listTitle && ( + + )} + {!isList && ( + + )} + + )} + ))} diff --git a/app/javascript/mastodon/features/antennas/members.tsx b/app/javascript/mastodon/features/antennas/members.tsx index 4c4c242b18..9b262a8fc8 100644 --- a/app/javascript/mastodon/features/antennas/members.tsx +++ b/app/javascript/mastodon/features/antennas/members.tsx @@ -159,6 +159,7 @@ const AccountItem: React.FC<{ {' '} {firstVerifiedField && ( diff --git a/app/javascript/mastodon/features/antennas/new.tsx b/app/javascript/mastodon/features/antennas/new.tsx index 5f00a745d9..3a84190d09 100644 --- a/app/javascript/mastodon/features/antennas/new.tsx +++ b/app/javascript/mastodon/features/antennas/new.tsx @@ -358,8 +358,8 @@ const NewAntenna: React.FC<{
@@ -382,11 +382,24 @@ const NewAntenna: React.FC<{ )} {id && mode === 'filtering' && ( - <> -
- -
+
+ +
+ )} + {!id && mode === 'filtering' && ( +
+
+ +
+
+ )} + + {mode === 'filtering' && ( + <>
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
)} + {!id && ( +
+
+ +
+
+ )}