about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/direct_timeline
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-12-01 07:06:20 +0100
committerGitHub <noreply@github.com>2019-12-01 07:06:20 +0100
commited73376f1ca7ef5e254a3ec21e1ead85b2d34fd6 (patch)
treeea2e795354a74a7b1d770a4014c78bfdda9b9be2 /app/javascript/mastodon/features/direct_timeline
parentf05b0463dbc83a85dee7490e07bd79859132ee48 (diff)
Fix conversations not having an unread indicator in web UI (#12506)
Diffstat (limited to 'app/javascript/mastodon/features/direct_timeline')
-rw-r--r--app/javascript/mastodon/features/direct_timeline/components/conversation.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 2cbaa0791..235cb7ad8 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -12,6 +12,7 @@ import IconButton from 'mastodon/components/icon_button';
 import RelativeTimestamp from 'mastodon/components/relative_timestamp';
 import { HotKeys } from 'react-hotkeys';
 import { autoPlayGif } from 'mastodon/initial_state';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -158,7 +159,7 @@ class Conversation extends ImmutablePureComponent {
 
     return (
       <HotKeys handlers={handlers}>
-        <div className='conversation focusable muted' tabIndex='0'>
+        <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex='0'>
           <div className='conversation__avatar'>
             <AvatarComposite accounts={accounts} size={48} />
           </div>
@@ -166,7 +167,7 @@ class Conversation extends ImmutablePureComponent {
           <div className='conversation__content'>
             <div className='conversation__content__info'>
               <div className='conversation__content__relative-time'>
-                <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
+                {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
               </div>
 
               <div className='conversation__content__names' ref={this.setNamesRef}>