diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index d18adaa5e..fc9233a9c 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -1,8 +1,10 @@
import PropTypes from 'prop-types';
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
import { FormattedMessage } from 'react-intl';
+import classNames from 'classnames';
+
import { useDispatch } from 'react-redux';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
@@ -17,6 +19,9 @@ import { Icon } from 'mastodon/components/icon';
export const BlockModal = ({ accountId, acct }) => {
const dispatch = useDispatch();
+ const [expanded, setExpanded] = useState(false);
+
+ const domain = acct.split('@')[1];
const handleClick = useCallback(() => {
dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
@@ -27,6 +32,10 @@ export const BlockModal = ({ accountId, acct }) => {
dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
}, [dispatch]);
+ const handleToggleLearnMore = useCallback(() => {
+ setExpanded(!expanded);
+ }, [expanded, setExpanded]);
+
return (
@@ -64,8 +73,28 @@ export const BlockModal = ({ accountId, acct }) => {
-
+
+ {domain && (
+
+ )}
+
+ {domain && (
+
+ )}
+
+
+
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f893c98a3..376dfb7e4 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,6 +89,9 @@
"announcement.announcement": "Announcement",
"attachments_list.unprocessed": "(unprocessed)",
"audio.hide": "Hide audio",
+ "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+ "block_modal.show_less": "Show less",
+ "block_modal.show_more": "Show more",
"block_modal.they_cant_mention": "They can't mention or follow you.",
"block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
"block_modal.they_will_know": "They can see that they're blocked.",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 805ffb963..8b7e5f5e8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5922,6 +5922,15 @@ a.status-card {
}
}
+ &__caveats {
+ font-size: 14px;
+ padding: 0 12px;
+
+ strong {
+ font-weight: 500;
+ }
+ }
+
&__bottom {
padding-top: 0;