From 7a62d57427f925f3e7de4444cb25c5c190425161 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 26 Sep 2024 14:47:56 +0200
Subject: [PATCH] Add fallback to domain block confirmation modal (#32105)

---
 .../ui/components/domain_block_modal.tsx      | 51 +++++++++++++------
 app/javascript/mastodon/locales/en.json       |  1 +
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
index 7e6715990e..ec08991144 100644
--- a/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
@@ -30,9 +30,9 @@ export const DomainBlockModal: React.FC<{
 }> = ({ domain, accountId, acct }) => {
   const dispatch = useAppDispatch();
   const [loading, setLoading] = useState(true);
-  const [preview, setPreview] = useState<DomainBlockPreviewResponse | null>(
-    null,
-  );
+  const [preview, setPreview] = useState<
+    DomainBlockPreviewResponse | 'error' | null
+  >(null);
 
   const handleClick = useCallback(() => {
     if (loading) {
@@ -65,6 +65,7 @@ export const DomainBlockModal: React.FC<{
         return '';
       })
       .catch(() => {
+        setPreview('error');
         setLoading(false);
       });
   }, [setPreview, setLoading, domain]);
@@ -89,7 +90,35 @@ export const DomainBlockModal: React.FC<{
         </div>
 
         <div className='safety-action-modal__bullet-points'>
-          {preview && preview.followers_count + preview.following_count > 0 && (
+          {preview &&
+            preview !== 'error' &&
+            preview.followers_count + preview.following_count > 0 && (
+              <div>
+                <div className='safety-action-modal__bullet-points__icon'>
+                  <Icon id='' icon={PersonRemoveIcon} />
+                </div>
+                <div>
+                  <strong>
+                    <FormattedMessage
+                      id='domain_block_modal.you_will_lose_num_followers'
+                      defaultMessage='You will lose {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} followers}} and {followingCount, plural, one {{followingCountDisplay} person you follow} other {{followingCountDisplay} people you follow}}.'
+                      values={{
+                        followersCount: preview.followers_count,
+                        followersCountDisplay: (
+                          <ShortNumber value={preview.followers_count} />
+                        ),
+                        followingCount: preview.following_count,
+                        followingCountDisplay: (
+                          <ShortNumber value={preview.following_count} />
+                        ),
+                      }}
+                    />
+                  </strong>
+                </div>
+              </div>
+            )}
+
+          {preview === 'error' && (
             <div>
               <div className='safety-action-modal__bullet-points__icon'>
                 <Icon id='' icon={PersonRemoveIcon} />
@@ -97,18 +126,8 @@ export const DomainBlockModal: React.FC<{
               <div>
                 <strong>
                   <FormattedMessage
-                    id='domain_block_modal.you_will_lose_num_followers'
-                    defaultMessage='You will lose {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} followers}} and {followingCount, plural, one {{followingCountDisplay} person you follow} other {{followingCountDisplay} people you follow}}.'
-                    values={{
-                      followersCount: preview.followers_count,
-                      followersCountDisplay: (
-                        <ShortNumber value={preview.followers_count} />
-                      ),
-                      followingCount: preview.following_count,
-                      followingCountDisplay: (
-                        <ShortNumber value={preview.following_count} />
-                      ),
-                    }}
+                    id='domain_block_modal.you_will_lose_relationships'
+                    defaultMessage='You will lose all followers and people you follow from this server.'
                   />
                 </strong>
               </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 0dc4ccee80..b20934388c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -222,6 +222,7 @@
   "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
   "domain_block_modal.title": "Block domain?",
   "domain_block_modal.you_will_lose_num_followers": "You will lose {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} followers}} and {followingCount, plural, one {{followingCountDisplay} person you follow} other {{followingCountDisplay} people you follow}}.",
+  "domain_block_modal.you_will_lose_relationships": "You will lose all followers and people you follow from this server.",
   "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
   "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
   "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",