Merge pull request #258 from Blobscan/fix/timestamp-normalization

fix(web): resolve timestamp normalization issue

.changeset/flat-ducks-love.md

@@ -0,0 +1,5 @@
+---
+"@blobscan/web": patch
+---
+
+Resolved timestamp normalization issue

apps/web/src/components/Cards/SurfaceCards/BlobTransactionCard.tsx

@@ -10,15 +10,14 @@ import { animated, useSpring } from "@react-spring/web";
 import "react-loading-skeleton/dist/skeleton.css";
 import Skeleton from "react-loading-skeleton";
 
-import dayjs from "@blobscan/dayjs";
-
 import type { Block } from "~/types";
 import {
   buildAddressRoute,
   buildBlobRoute,
   buildBlockRoute,
   buildTransactionRoute,
   formatBytes,
+  normalizeTimestamp,
 } from "~/utils";
 import { Link } from "../../Link";
 import { SurfaceCardBase } from "./SurfaceCardBase";
@@ -164,7 +163,7 @@ const BlobTransactionCard: FC<BlobTransactionCardProps> = function ({
                 <Link href={buildBlockRoute(number)}>{number}</Link>
               </div>
               <div className="text-xs italic text-contentSecondary-light dark:text-contentSecondary-dark">
-                {dayjs(timestamp).fromNow()}
+                {normalizeTimestamp(timestamp).fromNow()}
               </div>
             </div>
           )}

apps/web/src/components/Cards/SurfaceCards/BlockCard.tsx

@@ -4,10 +4,8 @@ import type { FC } from "react";
 import "react-loading-skeleton/dist/skeleton.css";
 import Skeleton from "react-loading-skeleton";
 
-import dayjs from "@blobscan/dayjs";
-
 import type { Block } from "~/types";
-import { buildBlockRoute } from "~/utils";
+import { buildBlockRoute, normalizeTimestamp } from "~/utils";
 import { Link } from "../../Link";
 import { CardHeader } from "../Card";
 import { SurfaceCardBase } from "./SurfaceCardBase";
@@ -40,7 +38,7 @@ const BlockCard: FC<Partial<BlockCardProps>> = function ({
       <div className="pt-2 text-sm">
         {timestamp ? (
           <div className="mb-2 text-xs italic text-contentSecondary-light dark:text-contentSecondary-dark">
-            {dayjs(timestamp).fromNow()}
+            {normalizeTimestamp(timestamp).fromNow()}
           </div>
         ) : (
           <Skeleton width={100} />

apps/web/src/utils/date.ts

@@ -1,8 +1,13 @@
 import dayjs from "@blobscan/dayjs";
 
+export function normalizeTimestamp(timestamp: number | Date) {
+  return typeof timestamp === "number"
+    ? dayjs.unix(timestamp)
+    : dayjs(timestamp);
+}
+
 export function formatTimestamp(timestamp: number | Date) {
-  const unixHandler =
-    typeof timestamp === "number" ? dayjs.unix(timestamp) : dayjs(timestamp);
+  const unixHandler = normalizeTimestamp(timestamp);
 
   return `${unixHandler.fromNow()} (${unixHandler.format(
     "MMM D, YYYY h:mm AZ"