Skip to content

Commit 41d0899

Browse files
committed
revert date changes
1 parent 777c2ab commit 41d0899

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

lib/date/dayjs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { nbsp } from 'toolkit/utils/htmlEntities';
1212
export const relativeTimeConfig = {
1313
thresholds: [
1414
{ l: 's', r: 1 },
15-
{ l: 'ss', r: 59, d: 'secondasdfasdf' },
15+
{ l: 'ss', r: 59, d: 'second' },
1616
{ l: 'm', r: 1 },
1717
{ l: 'mm', r: 59, d: 'minute' },
1818
{ l: 'h', r: 1 },
@@ -42,7 +42,7 @@ dayjs.updateLocale('en', {
4242
},
4343
relativeTime: {
4444
s: '1s',
45-
ss: '%d seconds',
45+
ss: '%ds',
4646
future: 'in %s',
4747
past: '%s ago',
4848
m: '1m',

lib/hooks/useTimeAgoIncrement.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import relativeTime from 'dayjs/plugin/relativeTime';
21
import React from 'react';
32

4-
import dayjs, { relativeTimeConfig } from 'lib/date/dayjs';
3+
import dayjs from 'lib/date/dayjs';
54
import { DAY, HOUR, MINUTE, SECOND } from 'toolkit/utils/consts';
65

7-
dayjs.extend(relativeTime, relativeTimeConfig);
8-
96
function getUnits(diff: number) {
107
if (diff < MINUTE) {
118
return [ SECOND, MINUTE ];
@@ -45,9 +42,7 @@ function getUpdateParams(ts: string | number) {
4542
}
4643

4744
export default function useTimeAgoIncrement(ts: string | number | null = 0, isEnabled?: boolean) {
48-
const date = ts ? dayjs(ts ?? 0) : null;
49-
50-
const [ value, setValue ] = React.useState(date ? date.toString() : '');
45+
const [ value, setValue ] = React.useState(ts ? dayjs(ts).fromNow() : null);
5146

5247
React.useEffect(() => {
5348
if (ts !== null) {

0 commit comments

Comments
 (0)