From 64149035678633bc11f8888dd9bc99389f0e9ffa Mon Sep 17 00:00:00 2001 From: Nafees Nazik <84864519+G3root@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:47:57 +0530 Subject: [PATCH] fix: guess correct timezone when onboarding (#6430) * fix: guess correct timezone * fix: redirect if on boarded Co-authored-by: Peer Richelsen --- .../components/getting-started/steps-views/UserSettings.tsx | 3 ++- apps/web/pages/getting-started/[[...step]].tsx | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/web/components/getting-started/steps-views/UserSettings.tsx b/apps/web/components/getting-started/steps-views/UserSettings.tsx index 9e1ae55562..ab4acce211 100644 --- a/apps/web/components/getting-started/steps-views/UserSettings.tsx +++ b/apps/web/components/getting-started/steps-views/UserSettings.tsx @@ -19,7 +19,8 @@ interface IUserSettingsProps { const UserSettings = (props: IUserSettingsProps) => { const { user, nextStep } = props; const { t } = useLocale(); - const [selectedTimeZone, setSelectedTimeZone] = useState(user.timeZone ?? dayjs.tz.guess()); + const [selectedTimeZone, setSelectedTimeZone] = useState(dayjs.tz.guess()); + const { register, handleSubmit, diff --git a/apps/web/pages/getting-started/[[...step]].tsx b/apps/web/pages/getting-started/[[...step]].tsx index b4c9ce8978..5632e63ce3 100644 --- a/apps/web/pages/getting-started/[[...step]].tsx +++ b/apps/web/pages/getting-started/[[...step]].tsx @@ -178,6 +178,10 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => throw new Error("User from session not found"); } + if (user.completedOnboarding) { + return { redirect: { permanent: false, destination: "/event-types" } }; + } + return { props: { ...(await serverSideTranslations(context.locale ?? "", ["common"])),