Merge remote-tracking branch 'origin/develop' into chat-composer

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.

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',
@@ -387,14 +385,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) {

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>

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}

package.json

@@ -167,7 +167,7 @@
     "react-swipeable-views": "^0.14.0",
     "react-textarea-autosize": "^8.3.4",
     "react-toggle": "^4.1.2",
-    "react-virtuoso": "^4.0.6",
+    "react-virtuoso": "^4.0.8",
     "redux": "^4.1.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",

yarn.lock

@@ -9704,10 +9704,10 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react-virtuoso@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.0.6.tgz#5ee8a72bf0b57d31063cef6343b26e6cde5529e3"
-  integrity sha512-TJ4fyTbre0uTpXE0AXaMG2BOX9PgKfDC7wLhnSmDvBU0WoEUrIAcNJACLJvqyWZMDAuEv3v+b4OyK6jiSkFL9Q==
+react-virtuoso@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.0.8.tgz#6543573e5b2da8cd5808bd687655cf24d7930dfe"
+  integrity sha512-ne9QzKajqwDT13t2nt5uktuFkyBTjRsJCdF06gdwcPVP6lrWt/VE5tkKf2OVtMqfethR8/FHuAYDOLyT5YtddQ==
 
 react@^18.0.0:
   version "18.2.0"