From 1d0067e6e50190d1392a1ae436eb24048f53f4f5 Mon Sep 17 00:00:00 2001 From: Beaudan Date: Tue, 23 Jul 2019 12:16:11 +1000 Subject: [PATCH] Forgot to add this part --- stylesheets/_modules.scss | 13 +++++++++++++ ts/components/conversation/Message.tsx | 13 +++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 4a011d833..ee97bdf7a 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -517,10 +517,20 @@ color: $color-gray-60; text-transform: uppercase; } +.module-message__metadata__public { + font-size: 11px; + line-height: 16px; + letter-spacing: 0.3px; + color: $color-gray-60; + text-transform: uppercase; +} .module-message__metadata__date--incoming, .module-message__metadata__p2p--incoming { color: $color-white-08; } +.module-message__metadata__public--incoming { + color: $color-white-08; +} .module-message__metadata__date--with-image-no-caption { color: $color-white; } @@ -528,6 +538,9 @@ .module-message__metadata__p2p { font-weight: bold; } +.module-message__metadata__public { + font-weight: bold; +} .module-message__metadata__spacer { flex-grow: 1; diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 8c29c60fe..279d98425 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -86,6 +86,7 @@ export interface Props { expirationLength?: number; expirationTimestamp?: number; isP2p?: boolean; + isPublic?: boolean; onClickAttachment?: (attachment: AttachmentType) => void; onClickLinkPreview?: (url: string) => void; @@ -203,6 +204,7 @@ export class Message extends React.PureComponent { textPending, timestamp, isP2p, + isPublic, } = this.props; if (collapseMetadata) { @@ -212,6 +214,9 @@ export class Message extends React.PureComponent { const isShowingImage = this.isShowingImage(); const withImageNoCaption = Boolean(!text && isShowingImage); const showError = status === 'error' && direction === 'outgoing'; + const hasBadge = isP2p || isPublic; + const badgeText = isPublic ? 'Public' : isP2p ? 'P2p' : ''; + const badgeType = badgeText.toLowerCase(); return (
{ module="module-message__metadata__date" /> )} - {isP2p ? ( + {hasBadge ? ( -  • P2P +  • ${badgeText} ) : null} {expirationLength && expirationTimestamp ? (