From 746e6781aedddbc47cdfca241bcbf1d1886c004b Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Fri, 12 Mar 2021 16:04:56 -0600 Subject: [PATCH] Fix styling for left pane: muted conversations and message requests --- ts/components/conversationList/BaseConversationListItem.tsx | 2 +- ts/components/conversationList/ConversationListItem.tsx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ts/components/conversationList/BaseConversationListItem.tsx b/ts/components/conversationList/BaseConversationListItem.tsx index 37580dbaaf..aeaae639c3 100644 --- a/ts/components/conversationList/BaseConversationListItem.tsx +++ b/ts/components/conversationList/BaseConversationListItem.tsx @@ -18,7 +18,7 @@ const CONTENT_CLASS_NAME = `${BASE_CLASS_NAME}__content`; const HEADER_CLASS_NAME = `${CONTENT_CLASS_NAME}__header`; export const DATE_CLASS_NAME = `${HEADER_CLASS_NAME}__date`; const TIMESTAMP_CLASS_NAME = `${DATE_CLASS_NAME}__timestamp`; -export const MESSAGE_CLASS_NAME = `${CONTENT_CLASS_NAME}__message`; +const MESSAGE_CLASS_NAME = `${CONTENT_CLASS_NAME}__message`; export const MESSAGE_TEXT_CLASS_NAME = `${MESSAGE_CLASS_NAME}__text`; const CHECKBOX_CLASS_NAME = `${BASE_CLASS_NAME}__checkbox`; diff --git a/ts/components/conversationList/ConversationListItem.tsx b/ts/components/conversationList/ConversationListItem.tsx index 86ac06dfdf..c6dfdfd23b 100644 --- a/ts/components/conversationList/ConversationListItem.tsx +++ b/ts/components/conversationList/ConversationListItem.tsx @@ -11,7 +11,6 @@ import classNames from 'classnames'; import { BaseConversationListItem, - MESSAGE_CLASS_NAME, MESSAGE_TEXT_CLASS_NAME, } from './BaseConversationListItem'; import { MessageBody } from '../conversation/MessageBody'; @@ -123,10 +122,10 @@ export const ConversationListItem: FunctionComponent = React.memo( messageText = ( <> {muteExpiresAt && Date.now() < muteExpiresAt && ( - + )} {!acceptedMessageRequest ? ( - + {i18n('ConversationListItem--message-request')} ) : typingContact ? (