Profile redesign: Quality pass (#37766)

app/javascript/mastodon/components/follow_button.tsx

@@ -5,7 +5,6 @@ import { useIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 
 import { useIdentity } from '@/mastodon/identity_context';
-import { isClientFeatureEnabled } from '@/mastodon/utils/environment';
 import {
   fetchRelationships,
   followAccount,
@@ -60,7 +59,14 @@ export const FollowButton: React.FC<{
   compact?: boolean;
   labelLength?: 'auto' | 'short' | 'long';
   className?: string;
-}> = ({ accountId, compact, labelLength = 'auto', className }) => {
+  withUnmute?: boolean;
+}> = ({
+  accountId,
+  compact,
+  labelLength = 'auto',
+  className,
+  withUnmute = true,
+}) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const { signedIn } = useIdentity();
@@ -102,10 +108,7 @@ export const FollowButton: React.FC<{
           modalProps: { account },
         }),
       );
-    } else if (
-      relationship.muting &&
-      !isClientFeatureEnabled('profile_redesign')
-    ) {
+    } else if (relationship.muting && withUnmute) {
       dispatch(unmuteAccount(accountId));
     } else if (account && relationship.following) {
       dispatch(
@@ -121,7 +124,7 @@ export const FollowButton: React.FC<{
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, accountId, relationship, account, signedIn]);
+  }, [signedIn, relationship, accountId, withUnmute, account, dispatch]);
 
   const isNarrow = useBreakpoint('narrow');
   const useShortLabel =
@@ -140,10 +143,7 @@ export const FollowButton: React.FC<{
     label = intl.formatMessage(messages.editProfile);
   } else if (!relationship) {
     label = <LoadingIndicator />;
-  } else if (
-    relationship.muting &&
-    !isClientFeatureEnabled('profile_redesign')
-  ) {
+  } else if (relationship.muting && withUnmute) {
     label = intl.formatMessage(messages.unmute);
   } else if (relationship.following) {
     label = intl.formatMessage(messages.unfollow);