diff --git a/next-tavla/src/Board/scenarios/Table/components/Time/index.tsx b/next-tavla/src/Board/scenarios/Table/components/Time/index.tsx
index 64a3c524a..c4fb3cd0b 100644
--- a/next-tavla/src/Board/scenarios/Table/components/Time/index.tsx
+++ b/next-tavla/src/Board/scenarios/Table/components/Time/index.tsx
@@ -1,5 +1,5 @@
import { useNonNullContext } from 'hooks/useNonNullContext'
-import { formatTime, getRelativeTimeString } from 'Board/utils/time'
+import { formatDateString, getRelativeTimeString } from 'utils/time'
import { DepartureContext } from '../../contexts'
import classes from './styles.module.css'
@@ -18,7 +18,7 @@ function Time() {
{getRelativeTimeString(departure.expectedDepartureTime)}
- {formatTime(departure.aimedDepartureTime)}
+ {formatDateString(departure.aimedDepartureTime)}
)
diff --git a/next-tavla/src/Board/utils/time.ts b/next-tavla/src/Board/utils/time.ts
deleted file mode 100644
index b2b1eca3c..000000000
--- a/next-tavla/src/Board/utils/time.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export function getRelativeTimeString(timestamp: string) {
- const timeDiff = Date.parse(timestamp) - Date.now()
- if (timeDiff < 60_000) return 'Nå'
- else if (timeDiff < 900_000) return Math.floor(timeDiff / 60_000) + ' min'
- else return formatTime(timestamp)
-}
-
-export function formatTime(timestamp: string) {
- return Intl.DateTimeFormat('no-NB', {
- hour12: false,
- hour: '2-digit',
- minute: '2-digit',
- }).format(Date.parse(timestamp))
-}
diff --git a/next-tavla/src/Shared/components/Clock/index.tsx b/next-tavla/src/Shared/components/Clock/index.tsx
index 00e13a82b..c681634be 100644
--- a/next-tavla/src/Shared/components/Clock/index.tsx
+++ b/next-tavla/src/Shared/components/Clock/index.tsx
@@ -1,24 +1,18 @@
import { useEffect, useState } from 'react'
import classes from './styles.module.css'
+import { formatTimeStamp } from 'utils/time'
function Clock() {
- const [currentTime, setCurrentTime] = useState(Date.now())
+ const [currentTime, setCurrentTime] = useState(0)
useEffect(() => {
const intervalId = setInterval(() => setCurrentTime(Date.now()), 1000)
return () => clearInterval(intervalId)
}, [])
- const time = new Intl.DateTimeFormat('no-NB', {
- timeStyle: 'short',
- timeZone: 'Europe/Oslo',
- }).format(currentTime)
+ const time = formatTimeStamp(currentTime)
- return (
-
- {time}
-
- )
+ return {time}
}
export { Clock }
diff --git a/next-tavla/src/Shared/utils/time.ts b/next-tavla/src/Shared/utils/time.ts
new file mode 100644
index 000000000..3a40eea14
--- /dev/null
+++ b/next-tavla/src/Shared/utils/time.ts
@@ -0,0 +1,22 @@
+export function getRelativeTimeString(dateString: string) {
+ const timeDiff = Date.parse(dateString) - Date.now()
+ if (timeDiff < 60_000) return 'Nå'
+ else if (timeDiff < 900_000) return Math.floor(timeDiff / 60_000) + ' min'
+ else return formatDateString(dateString)
+}
+
+export function formatDateString(dateString: string) {
+ return Intl.DateTimeFormat('no-NB', {
+ hour12: false,
+ hour: '2-digit',
+ minute: '2-digit',
+ }).format(Date.parse(dateString))
+}
+
+export function formatTimeStamp(timestamp: number) {
+ return Intl.DateTimeFormat('no-NB', {
+ hour12: false,
+ hour: '2-digit',
+ minute: '2-digit',
+ }).format(timestamp)
+}