Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { Select, type SingleValue } from "chakra-react-select";
import dayjs from "dayjs";
import timezone from "dayjs/plugin/timezone";
import utc from "dayjs/plugin/utc";
import React, { useMemo } from "react";
import React, { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";

import { useTimezone } from "src/context/timezone";
Expand All @@ -33,6 +33,8 @@ dayjs.extend(timezone);
const TimezoneSelector: React.FC = () => {
const { selectedTimezone, setSelectedTimezone } = useTimezone();
const { t: translate } = useTranslation("common");
const [currentTime, setCurrentTime] = useState<string>("");

const timezones = useMemo<Array<string>>(() => {
const tzList = Intl.supportedValuesOf("timeZone");
const guessedTz = dayjs.tz.guess();
Expand All @@ -56,7 +58,17 @@ const TimezoneSelector: React.FC = () => {
}
};

const currentTime = dayjs().tz(selectedTimezone).format("YYYY-MM-DD HH:mm:ss");
useEffect(() => {
const updateTime = () => {
setCurrentTime(dayjs().tz(selectedTimezone).format("YYYY-MM-DD HH:mm:ss"));
};

updateTime();

const interval = setInterval(updateTime, 1000);

return () => clearInterval(interval);
}, [selectedTimezone]);

return (
<VStack align="stretch" gap={6}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { useDisclosure } from "@chakra-ui/react";
import dayjs from "dayjs";
import timezone from "dayjs/plugin/timezone";
import utc from "dayjs/plugin/utc";
import { useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { FiClock, FiGrid, FiLogOut, FiMoon, FiSun, FiUser, FiGlobe } from "react-icons/fi";
import { MdOutlineAccountTree } from "react-icons/md";
Expand Down Expand Up @@ -49,8 +49,20 @@ export const UserSettingsButton = () => {

const [time, setTime] = useState(dayjs());

useEffect(() => {
const updateTime = () => {
setTime(dayjs());
};

updateTime();

const interval = setInterval(updateTime, 1000);

return () => clearInterval(interval);
}, [selectedTimezone]);

return (
<Menu.Root onOpenChange={() => setTime(dayjs())} positioning={{ placement: "right" }}>
<Menu.Root positioning={{ placement: "right" }}>
<Menu.Trigger asChild>
<NavButton icon={<FiUser size="1.75rem" />} title={translate("user")} />
</Menu.Trigger>
Expand Down