Skip to content

Fix: [v2] Exclude the optional param when locale is undefined in the dateFns utils #103

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

Merged
merged 1 commit into from
Feb 24, 2022
Merged

Fix: [v2] Exclude the optional param when locale is undefined in the dateFns utils #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/ui/ChannelPreview/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ export const getChannelTitle = (channel = {}, currentUserId, stringSet = LabelSt

export const getLastMessageCreatedAt = (channel, locale) => {
const createdAt = channel?.lastMessage?.createdAt;
const optionalParam = locale ? { locale } : null;
if (!createdAt) {
return '';
}
if (isToday(createdAt)) {
return format(createdAt, 'p', { locale });
return format(createdAt, 'p', optionalParam);
}
if (isYesterday(createdAt)) {
return formatRelative(createdAt, new Date(), { locale });
return formatRelative(createdAt, new Date(), optionalParam);
}
return format(createdAt, 'MMM dd', { locale });
return format(createdAt, 'MMM dd', optionalParam);
};

export const getTotalMembers = (channel) => (
Expand Down
7 changes: 4 additions & 3 deletions src/ui/MessageSearchFileItem/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ import isYesterday from 'date-fns/isYesterday';
import { IconTypes } from '../Icon';

export function getCreatedAt(createdAt: number, locale: Locale): string {
const optionalParam = locale ? { locale } : null;
if (!createdAt) {
return '';
}
if (isToday(createdAt)) {
return format(createdAt, 'p', { locale });
return format(createdAt, 'p', optionalParam);
}
if (isYesterday(createdAt)) {
return formatRelative(createdAt, new Date(), { locale });
return formatRelative(createdAt, new Date(), optionalParam);
}
return format(createdAt, 'MMM dd', { locale });
return format(createdAt, 'MMM dd', optionalParam);
}

export function getIconOfFileType(message: SendbirdUIKit.ClientFileMessage): string {
Expand Down
7 changes: 4 additions & 3 deletions src/ui/MessageSearchItem/getCreatedAt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import isYesterday from 'date-fns/isYesterday';

// getCreatedAt
export default (createdAt: number, locale: Locale): string => {
const optionalParam = locale ? { locale } : null;
if (!createdAt) {
return '';
}
if (isToday(createdAt)) {
return format(createdAt, 'p', { locale });
return format(createdAt, 'p', optionalParam);
}
if (isYesterday(createdAt)) {
return formatRelative(createdAt, new Date(), { locale });
return formatRelative(createdAt, new Date(), optionalParam);
}
return format(createdAt, 'MMM dd', { locale });
return format(createdAt, 'MMM dd', optionalParam);
};