Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/time-formatting.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const convertTimestampToDate = (timestamp: number) => {
let minutes = date.getMinutes();
minutes = minutes >= 10 ? minutes : '0' + minutes.toString(); // turns 4 minutes into 04 minutes
let ampm = hours >= 12 ? 'pm' : 'am'; // todo: support 24hr time
return `${month} ${day}, ${year} · ${cleanHours}:${minutes}${ampm}`;
return `${month} ${day}, ${year} at ${cleanHours}:${minutes}${ampm}`;
};

export const convertTimestampToTime = (timestamp: Date) => {
Expand Down
6 changes: 2 additions & 4 deletions src/views/thread/components/threadDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -496,14 +496,12 @@ class ThreadDetailPure extends React.Component<Props, State> {
{thread.channel.name}
</Link>
</ChannelHoverProfile>
</ThreadSubtitle>

<ThreadSubtitle>
<span>&nbsp;·&nbsp;</span>
<Link to={`/thread/${thread.id}`}>
{timestamp}
{thread.modifiedAt && (
<React.Fragment>
{' · '}(Edited{' '}
(Edited{' '}
{timeDifference(Date.now(), editedTimestamp).toLowerCase()})
</React.Fragment>
)}
Expand Down