Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fix: hydration error due to detailed seconds (#192)

Ayushf3b6d7722f06
diff --git a/src/components/admin/reports.tsx b/src/components/admin/reports.tsx
index 12c2a9ba..7a042f8c 100644
--- a/src/components/admin/reports.tsx
+++ b/src/components/admin/reports.tsx
@@ -1,6 +1,5 @@
'use client';
-import { formatDistance } from 'date-fns';
import { EyeOff, Gavel, X } from 'lucide-react';
import { useSession } from 'next-auth/react';
import { useRouter } from 'next/navigation';
@@ -11,6 +10,7 @@ import {
dismissChallengeReport,
type AdminReportDetails,
} from '~/components/admin/admin.actions';
+import { getRelativeTime } from '~/utils/relativeTime';
import { Badge } from '../ui/badge';
import { Button } from '../ui/button';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card';
@@ -125,10 +125,7 @@ export const ReportDetails = ({ data }: ReportsProps) => {
// 2. Local State
const challengeName = report.challenge.name;
const text = report.text;
- const relativeTime = formatDistance(report.createdAt, Date.now(), {
- addSuffix: true,
- includeSeconds: true,
- });
+ const relativeTime = getRelativeTime(report.createdAt);
const absoluteTime = new Intl.DateTimeFormat('en-US', {
dateStyle: 'medium',
timeStyle: 'medium',
diff --git a/src/components/admin/users.tsx b/src/components/admin/users.tsx
index 193978f7..6539f4a7 100644
--- a/src/components/admin/users.tsx
+++ b/src/components/admin/users.tsx
@@ -1,8 +1,8 @@
'use client';
-import { formatDistance } from 'date-fns';
import { useRouter } from 'next/navigation';
import { unbanUser, type AdminBannedUsers } from '~/components/admin/admin.actions';
+import { getRelativeTime } from '~/utils/relativeTime';
import { ActionMenu } from '../ui/action-menu';
import { Badge } from '../ui/badge';
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '../ui/table';
@@ -58,10 +58,7 @@ export const BannedUsers = ({ data }: BannedUsersProps) => {
{data.map((user, userIdx) => {
const username = user.name;
const status = user.status;
- const relativeTime = formatDistance(user.updatedAt, Date.now(), {
- addSuffix: true,
- includeSeconds: true,
- });
+ const relativeTime = getRelativeTime(user.updatedAt);
const absoluteTime = new Intl.DateTimeFormat('en-US', {
dateStyle: 'medium',
timeStyle: 'medium',
diff --git a/src/utils/relativeTime.ts b/src/utils/relativeTime.ts
index 16a7732b..f62c0a90 100644
--- a/src/utils/relativeTime.ts
+++ b/src/utils/relativeTime.ts
@@ -1,24 +1,7 @@
-// in miliseconds
-const units = {
- year: 24 * 60 * 60 * 1000 * 365,
- month: (24 * 60 * 60 * 1000 * 365) / 12,
- day: 24 * 60 * 60 * 1000,
- hour: 60 * 60 * 1000,
- minute: 60 * 1000,
- second: 1000,
-};
-
-const rtf = new Intl.RelativeTimeFormat('en', {
- numeric: 'auto',
- style: 'long',
-});
+import { formatDistanceToNow } from 'date-fns';
export const getRelativeTime = (date: Date) => {
- const elapsed = date.getTime() - Date.now();
-
- for (const [unit, ms] of Object.entries(units)) {
- if (Math.abs(elapsed) > ms || unit === 'second') {
- return rtf.format(Math.round(elapsed / ms), unit as Intl.RelativeTimeFormatUnit);
- }
- }
+ return formatDistanceToNow(date, {
+ addSuffix: true,
+ });
};