Skip to content

Commit 840840e

Browse files
authored
Fix: [v2] Exclude the optional param when locale is undefined in the dateFns utils (#103)
* Exclude the optional param when locale is undefined in the dateFns utils
1 parent a79fbd4 commit 840840e

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/ui/ChannelPreview/utils.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,17 @@ export const getChannelTitle = (channel = {}, currentUserId, stringSet = LabelSt
2626

2727
export const getLastMessageCreatedAt = (channel, locale) => {
2828
const createdAt = channel?.lastMessage?.createdAt;
29+
const optionalParam = locale ? { locale } : null;
2930
if (!createdAt) {
3031
return '';
3132
}
3233
if (isToday(createdAt)) {
33-
return format(createdAt, 'p', { locale });
34+
return format(createdAt, 'p', optionalParam);
3435
}
3536
if (isYesterday(createdAt)) {
36-
return formatRelative(createdAt, new Date(), { locale });
37+
return formatRelative(createdAt, new Date(), optionalParam);
3738
}
38-
return format(createdAt, 'MMM dd', { locale });
39+
return format(createdAt, 'MMM dd', optionalParam);
3940
};
4041

4142
export const getTotalMembers = (channel) => (

src/ui/MessageSearchFileItem/utils.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ import isYesterday from 'date-fns/isYesterday';
55
import { IconTypes } from '../Icon';
66

77
export function getCreatedAt(createdAt: number, locale: Locale): string {
8+
const optionalParam = locale ? { locale } : null;
89
if (!createdAt) {
910
return '';
1011
}
1112
if (isToday(createdAt)) {
12-
return format(createdAt, 'p', { locale });
13+
return format(createdAt, 'p', optionalParam);
1314
}
1415
if (isYesterday(createdAt)) {
15-
return formatRelative(createdAt, new Date(), { locale });
16+
return formatRelative(createdAt, new Date(), optionalParam);
1617
}
17-
return format(createdAt, 'MMM dd', { locale });
18+
return format(createdAt, 'MMM dd', optionalParam);
1819
}
1920

2021
export function getIconOfFileType(message: SendbirdUIKit.ClientFileMessage): string {

src/ui/MessageSearchItem/getCreatedAt.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import isYesterday from 'date-fns/isYesterday';
55

66
// getCreatedAt
77
export default (createdAt: number, locale: Locale): string => {
8+
const optionalParam = locale ? { locale } : null;
89
if (!createdAt) {
910
return '';
1011
}
1112
if (isToday(createdAt)) {
12-
return format(createdAt, 'p', { locale });
13+
return format(createdAt, 'p', optionalParam);
1314
}
1415
if (isYesterday(createdAt)) {
15-
return formatRelative(createdAt, new Date(), { locale });
16+
return formatRelative(createdAt, new Date(), optionalParam);
1617
}
17-
return format(createdAt, 'MMM dd', { locale });
18+
return format(createdAt, 'MMM dd', optionalParam);
1819
};

0 commit comments

Comments
 (0)