From d0078e7f1710de41e81e010fc0b8ec07b3415ee1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 2 Feb 2023 12:13:23 -0500
Subject: [PATCH 1/2] Permit muting a thread as an option on any post in the
 thread

---
 app/soapbox/components/status-action-bar.tsx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 618db3e8d..79f20605b 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -387,14 +387,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
     menu.push(null);
 
-    if (ownAccount || withDismiss) {
-      menu.push({
-        text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation),
-        action: handleConversationMuteClick,
-        icon: mutingConversation ? require('@tabler/icons/bell.svg') : require('@tabler/icons/bell-off.svg'),
-      });
-      menu.push(null);
-    }
+    menu.push({
+      text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation),
+      action: handleConversationMuteClick,
+      icon: mutingConversation ? require('@tabler/icons/bell.svg') : require('@tabler/icons/bell-off.svg'),
+    });
+
+    menu.push(null);
 
     if (ownAccount) {
       if (publicStatus) {

From 01aef5e89e8be5b5a0a1ac935bf7be0bca311992 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 2 Feb 2023 12:06:39 -0600
Subject: [PATCH 2/2] Remove withDismiss prop from status, update CHANGELOG

---
 CHANGELOG.md                                                  | 1 +
 app/soapbox/components/status-action-bar.tsx                  | 2 --
 app/soapbox/components/status.tsx                             | 4 +---
 .../features/notifications/components/notification.tsx        | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 619a1d207..b0d0c5977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Chats: improved display of media attachments.
 - ServiceWorker: switch to a network-first strategy. The "An update is available!" prompt goes away.
 - Posts: increased font size of focused status in threads.
+- Posts: let "mute conversation" be clicked from any feed, not just noficiations.
 
 ### Fixed
 - Chats: media attachments rendering at the wrong size and/or causing the chat to scroll on load.
diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx
index 79f20605b..a4a5e1a70 100644
--- a/app/soapbox/components/status-action-bar.tsx
+++ b/app/soapbox/components/status-action-bar.tsx
@@ -98,7 +98,6 @@ const messages = defineMessages({
 
 interface IStatusActionBar {
   status: Status,
-  withDismiss?: boolean,
   withLabels?: boolean,
   expandable?: boolean,
   space?: 'expand' | 'compact',
@@ -106,7 +105,6 @@ interface IStatusActionBar {
 
 const StatusActionBar: React.FC<IStatusActionBar> = ({
   status,
-  withDismiss = false,
   withLabels = false,
   expandable = true,
   space = 'compact',
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 5a644e6da..2f3c280d2 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -53,7 +53,6 @@ export interface IStatus {
   hoverable?: boolean,
   variant?: 'default' | 'rounded',
   showGroup?: boolean,
-  withDismiss?: boolean,
   accountAction?: React.ReactElement,
 }
 
@@ -74,7 +73,6 @@ const Status: React.FC<IStatus> = (props) => {
     hideActionBar,
     variant = 'rounded',
     showGroup = true,
-    withDismiss,
   } = props;
 
   const intl = useIntl();
@@ -421,7 +419,7 @@ const Status: React.FC<IStatus> = (props) => {
 
             {(!hideActionBar && !isUnderReview) && (
               <div className='pt-4'>
-                <StatusActionBar status={actualStatus} withDismiss={withDismiss} />
+                <StatusActionBar status={actualStatus} />
               </div>
             )}
           </div>
diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index 40b5b1041..0ac907ada 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -325,7 +325,6 @@ const Notification: React.FC<INotificaton> = (props) => {
         return status && typeof status === 'object' ? (
           <StatusContainer
             id={status.id}
-            withDismiss
             hidden={hidden}
             onMoveDown={handleMoveDown}
             onMoveUp={handleMoveUp}