From 1d06999e419988c6d99e2740dfaa4a701d5ff713 Mon Sep 17 00:00:00 2001 From: jude Date: Tue, 16 Apr 2024 12:44:19 +0100 Subject: [PATCH] Fix bugs with time picker * Load UTC time correctly at page load * Don't translate to/from timezone when using the browser date/time input --- .../src/components/Reminder/CreateReminder.tsx | 3 ++- reminder-dashboard/src/components/Reminder/TimeInput.tsx | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/reminder-dashboard/src/components/Reminder/CreateReminder.tsx b/reminder-dashboard/src/components/Reminder/CreateReminder.tsx index b5fada2..4e6cffc 100644 --- a/reminder-dashboard/src/components/Reminder/CreateReminder.tsx +++ b/reminder-dashboard/src/components/Reminder/CreateReminder.tsx @@ -10,6 +10,7 @@ import { useQuery } from "react-query"; import "./styles.scss"; import { useGuild } from "../App/useGuild"; import { DEFAULT_COLOR } from "./Embed"; +import { useTimezone } from "../App/TimezoneProvider"; function defaultReminder(): Reminder { return { @@ -38,7 +39,7 @@ function defaultReminder(): Reminder { tts: false, uid: "", username: "", - utc_time: DateTime.now().toFormat("yyyy-LL-dd'T'HH:mm:ss"), + utc_time: DateTime.now().setZone("UTC").toFormat("yyyy-LL-dd'T'HH:mm:ss"), }; } diff --git a/reminder-dashboard/src/components/Reminder/TimeInput.tsx b/reminder-dashboard/src/components/Reminder/TimeInput.tsx index 823505e..e237bbb 100644 --- a/reminder-dashboard/src/components/Reminder/TimeInput.tsx +++ b/reminder-dashboard/src/components/Reminder/TimeInput.tsx @@ -284,11 +284,7 @@ export const TimeInput = ({ defaultValue, onInput }) => { onInput={(ev) => { ev.currentTarget.value === "" ? updateTime(null) - : setTime( - DateTime.fromISO(ev.currentTarget.value, { zone: timezone }).setZone( - "UTC", - ), - ); + : setTime(DateTime.fromISO(ev.currentTarget.value, { zone: "UTC" })); }} >