Merge branch 'hidden-blocks' into 'main'

Hidden blocks

See merge request soapbox-pub/soapbox!3080

src/components/status-action-bar.tsx

@@ -558,11 +558,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
         action: handleMuteClick,
         icon: require('@tabler/icons/outline/volume-3.svg'),
       });
-      menu.push({
-        text: intl.formatMessage(messages.block, { name: username }),
-        action: handleBlockClick,
-        icon: require('@tabler/icons/outline/ban.svg'),
-      });
+      if (features.blocks) {
+        menu.push({
+          text: intl.formatMessage(messages.block, { name: username }),
+          action: handleBlockClick,
+          icon: require('@tabler/icons/outline/ban.svg'),
+        });
+      }
       menu.push({
         text: intl.formatMessage(messages.report, { name: username }),
         action: handleReport,

src/features/account/components/header.tsx

@@ -371,11 +371,13 @@ const Header: React.FC<IHeader> = ({ account }) => {
         to: '/mutes',
         icon: require('@tabler/icons/outline/circle-x.svg'),
       });
-      menu.push({
-        text: intl.formatMessage(messages.blocks),
-        to: '/blocks',
-        icon: require('@tabler/icons/outline/ban.svg'),
-      });
+      if (features.blocks) {
+        menu.push({
+          text: intl.formatMessage(messages.blocks),
+          to: '/blocks',
+          icon: require('@tabler/icons/outline/ban.svg'),
+        });
+      }
     } else {
       menu.push({
         text: intl.formatMessage(messages.mention, { name: account.username }),
@@ -453,18 +455,20 @@ const Header: React.FC<IHeader> = ({ account }) => {
         });
       }
 
-      if (account.relationship?.blocking) {
-        menu.push({
-          text: intl.formatMessage(messages.unblock, { name: account.username }),
-          action: onBlock,
-          icon: require('@tabler/icons/outline/ban.svg'),
-        });
-      } else {
-        menu.push({
-          text: intl.formatMessage(messages.block, { name: account.username }),
-          action: onBlock,
-          icon: require('@tabler/icons/outline/ban.svg'),
-        });
+      if (features.blocks) {
+        if (account.relationship?.blocking) {
+          menu.push({
+            text: intl.formatMessage(messages.unblock, { name: account.username }),
+            action: onBlock,
+            icon: require('@tabler/icons/outline/ban.svg'),
+          });
+        } else {
+          menu.push({
+            text: intl.formatMessage(messages.block, { name: account.username }),
+            action: onBlock,
+            icon: require('@tabler/icons/outline/ban.svg'),
+          });
+        }
       }
 
       menu.push({

src/features/settings/index.tsx

@@ -85,7 +85,7 @@ const Settings = () => {
         <CardBody>
           <List>
             <ListItem label={intl.formatMessage(messages.mutes)} to='/mutes' />
-            <ListItem label={intl.formatMessage(messages.blocks)} to='/blocks' />
+            {features.blocks && (<ListItem label={intl.formatMessage(messages.blocks)} to='/blocks' />)}
           </List>
         </CardBody>