Merge branch 'dm-fixes' into 'develop'

Small chats fixes

Closes #1258

See merge request soapbox-pub/soapbox!2018

app/soapbox/features/account/components/header.tsx

@@ -526,11 +526,11 @@ const Header: React.FC<IHeader> = ({ account }) => {
   };
 
   const renderMessageButton = () => {
-    if (features.chatsWithFollowers) { // Truth Social
-      if (!ownAccount || !account || account.id === ownAccount?.id) {
-        return null;
-      }
+    if (!ownAccount || !account || account.id === ownAccount?.id) {
+      return null;
+    }
 
+    if (features.chatsWithFollowers) { // Truth Social
       const canChat = account.relationship?.followed_by;
       if (!canChat) {
         return null;

app/soapbox/features/settings/components/messages-settings.tsx

@@ -7,7 +7,7 @@ import { useOwnAccount } from 'soapbox/hooks';
 import { useUpdateCredentials } from 'soapbox/queries/accounts';
 
 const messages = defineMessages({
-  label: { id: 'settings.messages.label', defaultMessage: 'Allow users you follow to start a new chat with you' },
+  label: { id: 'settings.messages.label', defaultMessage: 'Allow users to start a new chat with you' },
 });
 
 const MessagesSettings = () => {

app/soapbox/features/settings/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 
@@ -106,7 +106,7 @@ const Settings = () => {
         {features.chats ? (
           <>
             <CardHeader>
-              <CardTitle title='Direct Messages' />
+              <CardTitle title={<FormattedMessage id='column.chats' defaultMessage='Chats' />} />
             </CardHeader>
 
             <CardBody>