From f955691d012fccc3eba0d2a78a9850f78cc5fa92 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 18 Dec 2022 12:56:35 -0600
Subject: [PATCH 1/2] Settings: Messages --> Chats, reword follow criteria

---
 .../features/settings/components/messages-settings.tsx        | 2 +-
 app/soapbox/features/settings/index.tsx                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/settings/components/messages-settings.tsx b/app/soapbox/features/settings/components/messages-settings.tsx
index 4ff005742a..78d46e7515 100644
--- a/app/soapbox/features/settings/components/messages-settings.tsx
+++ b/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 = () => {
diff --git a/app/soapbox/features/settings/index.tsx b/app/soapbox/features/settings/index.tsx
index 68558e40a5..c0a7a30563 100644
--- a/app/soapbox/features/settings/index.tsx
+++ b/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>

From 26cb4b1029aca69b73fc3539ae4eeeebde82e58b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 18 Dec 2022 12:58:19 -0600
Subject: [PATCH 2/2] Hide button to chat with yourself Fixes
 https://gitlab.com/soapbox-pub/soapbox/-/issues/1258

---
 app/soapbox/features/account/components/header.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx
index ee4304e4e7..e269b16680 100644
--- a/app/soapbox/features/account/components/header.tsx
+++ b/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;