diff --git a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx index 01718381c9a..441b8345fb3 100644 --- a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx +++ b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx @@ -138,12 +138,16 @@ export const CollectionAccountsList: React.FC<{ const renderAccountItemButton = useCallback( ({ relationship, accountId }: RenderButtonOptions) => { + if (!me || !relationship) { + // Show follow button when logged out (it will trigger the remote interaction modal) + return ; + } + // When viewing your own collection, only show the Follow button // for accounts you're not following anymore. const withoutButton = - !relationship || - (collectionOwnerId === me && - (relationship.following || relationship.requested)); + collectionOwnerId === me && + (relationship.following || relationship.requested); if (withoutButton) return null; diff --git a/app/javascript/mastodon/features/interaction_modal/index.tsx b/app/javascript/mastodon/features/interaction_modal/index.tsx index 624ecd5613f..a4ba40c069a 100644 --- a/app/javascript/mastodon/features/interaction_modal/index.tsx +++ b/app/javascript/mastodon/features/interaction_modal/index.tsx @@ -483,11 +483,19 @@ const InteractionModal: React.FC<{ />

- + {intent === 'follow' ? ( + + ) : ( + + )}

diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index b306d90bd38..12536608980 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -796,6 +796,7 @@ "info_button.label": "Help", "info_button.what_is_alt_text": "

What is alt text?

Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.

You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.

", "interaction_modal.action": "To interact with {name}'s post, you need to sign into your account on whatever Mastodon server you use.", + "interaction_modal.action_follow": "To follow {name}, you need to sign into your account on whatever Mastodon server you use.", "interaction_modal.go": "Go", "interaction_modal.no_account_yet": "Don't have an account yet?", "interaction_modal.on_another_server": "On a different server",