From 2b08985dfee9e57e0fe862c1d4fffed0811bf494 Mon Sep 17 00:00:00 2001
From: DariusLukasukas <64962012+DariusLukasukas@users.noreply.github.com>
Date: Sun, 29 Oct 2023 13:03:26 +0200
Subject: [PATCH] fix

simplified clock comp.
---
 components/ui/clock.tsx | 8 +++-----
 lib/dateUtils.ts        | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/ui/clock.tsx b/components/ui/clock.tsx
index 2ee549a..82eee82 100644
--- a/components/ui/clock.tsx
+++ b/components/ui/clock.tsx
@@ -1,15 +1,13 @@
 "use client"
 
-import { useEffect, useMemo, useState } from "react"
-import { twMerge } from "tailwind-merge"
+import { useEffect, useState } from "react"
 
 interface ClockProps {
   initial: Date
   timezone: number
-  className?: string
 }
 
-export default function Clock({ initial, timezone, className }: ClockProps) {
+export default function Clock({ initial, timezone }: ClockProps) {
   const [time, setTime] = useState(calculateLocalTime(initial, timezone))
 
   useEffect(() => {
@@ -27,7 +25,7 @@ export default function Clock({ initial, timezone, className }: ClockProps) {
   }
 
   return (
-    <div className={twMerge("tabular.nums", className)}>
+    <div className="tabular.nums">
       {time.toLocaleTimeString("en-US", {
         timeZone: "UTC",
         hour12: true,
diff --git a/lib/dateUtils.ts b/lib/dateUtils.ts
index a3419e0..fb82bff 100644
--- a/lib/dateUtils.ts
+++ b/lib/dateUtils.ts
@@ -18,6 +18,7 @@ export function formatSunTimeWithAMPM(
 ): string {
   const date = new Date((timestamp + timezoneOffset) * 1000)
   const formattedTime = new Intl.DateTimeFormat("en-US", {
+    timeZone: "UTC",
     hour: "numeric",
     minute: "2-digit",
     hour12: true,