Merge pull request #2534 from withspectrum/last-merge

brianlovin · web-flow · commit 76ba819f626b · 2018-03-08T14:33:18.000-08:00
Last merge
diff --git a/src/views/dashboard/components/inboxThread.js b/src/views/dashboard/components/inboxThread.js
@@ -87,6 +87,8 @@ class InboxThread extends React.Component<Props> {
     }
 
     if (currentUserLastSeen && lastActive && currentUserLastSeen < lastActive) {
+      if (active) return defaultMessageCountString;
+
       return (
         <MetaTextPill offset={participants.length} active={active} new>
           New messages!

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ class InboxThread extends React.Component<Props> {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`if (currentUserLastSeen && lastActive && currentUserLastSeen < lastActive) {`
	`90`	`+ if (active) return defaultMessageCountString;`
	`91`	`+`
`90`	`92`	`return (`
`91`	`93`	`<MetaTextPill offset={participants.length} active={active} new>`
`92`	`94`	`New messages!`