Skip to content

fix(livechat): show Today/Yesterday labels in message date separator #40928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rish106-hub wants to merge 2 commits into
base: develop
Choose a base branch
from
+19 −8
Open

fix(livechat): show Today/Yesterday labels in message date separator #40928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6f000
fix(livechat): show Today/Yesterday labels in message date separator
rish106-hub Jun 12, 2026
150be60
Merge branch 'develop' into fix/issue-40588-message-separator-today-l…
rish106-hub Jun 12, 2026
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
5 changes: 5 additions & 0 deletions .changeset/fix-message-separator-today-label.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/livechat': patch
---

fix(livechat): show "Today"/"Yesterday" labels in message date separator instead of full date
20 changes: 12 additions & 8 deletions packages/livechat/src/components/Messages/MessageSeparator/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { isToday, isYesterday } from 'date-fns';
import type { TFunction } from 'i18next';
import type { CSSProperties } from 'preact/compat';
import { memo } from 'preact/compat';
Expand All @@ -15,6 +16,16 @@ type MessageSeparatorProps = {
use?: any;
};

const formatDateLabel = (date: string, t: TFunction): string => {
const d = new Date(date);
if (isToday(d)) return t('today').toUpperCase();
if (isYesterday(d)) return t('yesterday').toUpperCase();
return t('message_separator_date', {
val: d,
formatParams: { val: { month: 'short', day: '2-digit', year: 'numeric' } },
}).toUpperCase();
};

// TODO: find a better way to pass `use` and do not default to a string
// eslint-disable-next-line @typescript-eslint/naming-convention
const MessageSeparator = ({ date, unread, use: Element = 'div', className, style = {}, t }: MessageSeparatorProps) => (
Expand All @@ -33,14 +44,7 @@ const MessageSeparator = ({ date, unread, use: Element = 'div', className, style
<hr className={createClassName(styles, 'separator__line')} />
{(date || unread) && (
<span className={createClassName(styles, 'separator__text')}>
{(!!date &&
t('message_separator_date', {
val: new Date(date),
formatParams: {
val: { month: 'short', day: '2-digit', year: 'numeric' },
},
}).toUpperCase()) ||
(unread && t('unread_messages'))}
{(!!date && formatDateLabel(date, t)) || (unread && t('unread_messages'))}
</span>
)}
<hr className={createClassName(styles, 'separator__line')} />
Expand Down
2 changes: 2 additions & 0 deletions packages/livechat/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
"message": "Message",
"messages": "Messages",
"message_separator_date": "{{val, datetime}}",
"today": "Today",
"yesterday": "Yesterday",
"message_time": "{{val, datetime}}",
"minimize_chat": "Minimize chat",
"name": "Name",
Expand Down