Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit 52b5e09

Browse files
authored
Merge pull request #3399 from withspectrum/threadLikes-ui-fix
had not saved with new icon that separates private from locked status…
2 parents 546b444 + da577eb commit 52b5e09

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

src/components/icons/index.js

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/views/dashboard/components/inboxThread.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ const MessageCount = props => {
4646
const now = new Date().getTime() / 1000;
4747
const createdAtTime = new Date(createdAt).getTime() / 1000;
4848
const lastActiveTime = lastActive && new Date(lastActive).getTime() / 1000;
49-
const createdYesterday = now - createdAtTime > 86400;
49+
const createdMoreThanOneDayAgo = now - createdAtTime > 86400;
5050
const newMessagesSinceLastWeek =
5151
lastActiveTime && now - lastActiveTime > 86400 * 7;
5252
const newMessagesSinceLastViewed =
5353
currentUserLastSeen && lastActive && currentUserLastSeen < lastActive;
5454

55-
if (currentUserLastSeen && !lastActive && !createdYesterday) {
55+
if (!currentUserLastSeen && !lastActive && !createdMoreThanOneDayAgo) {
5656
return <NewThreadPill active={active}>New thread!</NewThreadPill>;
5757
}
5858

src/views/dashboard/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ const StatusPill = styled(CountWrapper)`
511511
background: ${props =>
512512
props.active ? props.theme.text.reverse : props.theme.brand.alt};
513513
border-radius: 20px;
514-
padding: 0 12px;
514+
padding: 4px 12px;
515515
font-size: 11px;
516516
text-transform: uppercase;
517517
font-weight: 700;

0 commit comments

Comments
 (0)