Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' into jajaja
Mike Caoedb7022c55fd
diff --cc src/components/hooks/useTimezone.tsindex 4a949b67b,99c1f1152..0e1fe6cd3--- a/src/components/hooks/useTimezone.ts+++ b/src/components/hooks/useTimezone.ts@@@ -1,12 -1,14 +1,14 @@@import { setItem } from '@/lib/storage';import { TIMEZONE_CONFIG } from '@/lib/constants';import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';-import useStore, { setTimezone } from '@/store/app';-import useLocale from './useLocale';+import { useApp, setTimezone } from '@/store/app';++import { useLocale } from './useLocale';const selector = (state: { timezone: string }) => state.timezone;export function useTimezone() {- const timezone = useStore(selector);+ const timezone = useApp(selector);+ const { dateLocale } = useLocale();const saveTimezone = (value: string) => {setItem(TIMEZONE_CONFIG, value);