diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index ee4304e4e..e269b1668 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 = ({ 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; diff --git a/app/soapbox/features/settings/components/messages-settings.tsx b/app/soapbox/features/settings/components/messages-settings.tsx index 4ff005742..78d46e751 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 68558e40a..c0a7a3056 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 ? ( <> - + } />