diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx index 1eac0127d..387964eb5 100644 --- a/src/app/(main)/reports/retention/RetentionTable.tsx +++ b/src/app/(main)/reports/retention/RetentionTable.tsx @@ -3,8 +3,8 @@ import classNames from 'classnames'; import { ReportContext } from '../[reportId]/Report'; import EmptyPlaceholder from 'components/common/EmptyPlaceholder'; import { useMessages } from 'components/hooks'; -import styles from './RetentionTable.module.css'; import { useIntl } from 'react-intl'; +import styles from './RetentionTable.module.css'; const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28]; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx index 5c72860d8..af12715b2 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx @@ -4,12 +4,12 @@ import WebsiteDateFilter from 'components/input/WebsiteDateFilter'; import MetricCard from 'components/metrics/MetricCard'; import MetricsBar from 'components/metrics/MetricsBar'; import { formatLongNumberOptions, formatShortTime } from 'lib/format'; +import { useIntl } from 'react-intl'; import WebsiteFilterButton from './WebsiteFilterButton'; import useWebsiteStats from 'components/hooks/queries/useWebsiteStats'; import styles from './WebsiteMetricsBar.module.css'; import { Dropdown, Item } from 'react-basics'; import useStore, { setWebsiteDateCompare } from 'store/websites'; -import { useIntl } from 'react-intl'; export function WebsiteMetricsBar({ websiteId, diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx index 08e0e3a89..3be25c7b9 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx @@ -2,6 +2,7 @@ import useFormat from 'components//hooks/useFormat'; import Empty from 'components/common/Empty'; import FilterButtons from 'components/common/FilterButtons'; import { useMessages, useTimezone } from 'components/hooks'; +import { useIntl } from 'react-intl'; import Icons from 'components/icons'; import { BROWSERS, OS_NAMES } from 'lib/constants'; import { stringToColor } from 'lib/format'; @@ -12,7 +13,6 @@ import { Icon, SearchField, StatusLight, Text } from 'react-basics'; import { FixedSizeList } from 'react-window'; import { WebsiteContext } from '../WebsiteProvider'; import styles from './RealtimeLog.module.css'; -import { useIntl } from 'react-intl'; const TYPE_ALL = 'all'; const TYPE_PAGEVIEW = 'pageview'; diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx index ef9aa75eb..ea7bfd7f2 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx @@ -4,8 +4,8 @@ import WebsiteDateFilter from 'components/input/WebsiteDateFilter'; import MetricCard from 'components/metrics/MetricCard'; import MetricsBar from 'components/metrics/MetricsBar'; import { formatLongNumberOptions } from 'lib/format'; -import { Flexbox } from 'react-basics'; import { useIntl } from 'react-intl'; +import { Flexbox } from 'react-basics'; export function SessionsMetricsBar({ websiteId }: { websiteId: string }) { const { formatMessage, labels } = useMessages(); diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx index bdee0e6f6..540fde301 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx @@ -1,9 +1,9 @@ import { useFormat, useMessages, useRegionNames, useTimezone } from 'components/hooks'; +import { useIntl } from 'react-intl'; import TypeIcon from 'components/common/TypeIcon'; import { Icon, CopyIcon } from 'react-basics'; import Icons from 'components/icons'; import styles from './SessionInfo.module.css'; -import { useIntl } from 'react-intl'; export default function SessionInfo({ data }) { const intl = useIntl(); diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts index b98c79711..af00771bf 100644 --- a/src/components/hooks/useTimezone.ts +++ b/src/components/hooks/useTimezone.ts @@ -1,8 +1,8 @@ import { setItem } from 'next-basics'; import { TIMEZONE_CONFIG } from 'lib/constants'; import { zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz'; -import useStore, { setTimezone } from 'store/app'; import type { FormatDateOptions, IntlShape } from 'react-intl'; +import useStore, { setTimezone } from 'store/app'; const selector = (state: { timezone: string }) => state.timezone; diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx index e4f4282a7..c6f0703d5 100644 --- a/src/components/input/DateFilter.tsx +++ b/src/components/input/DateFilter.tsx @@ -3,11 +3,11 @@ import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics'; import { endOfYear, isSameDay } from 'date-fns'; import DatePickerForm from 'components/metrics/DatePickerForm'; import { useMessages } from 'components/hooks'; +import { useIntl } from 'react-intl'; import Icons from 'components/icons'; import { parseDateValue } from 'lib/date'; import styles from './DateFilter.module.css'; import classNames from 'classnames'; -import { useIntl } from 'react-intl'; export interface DateFilterProps { value: string; diff --git a/src/components/input/MonthSelect.tsx b/src/components/input/MonthSelect.tsx index 9556b8e7c..94874f4c1 100644 --- a/src/components/input/MonthSelect.tsx +++ b/src/components/input/MonthSelect.tsx @@ -11,8 +11,8 @@ import { import { startOfMonth, endOfMonth } from 'date-fns'; import Icons from 'components/icons'; import { useLocale } from 'components/hooks'; -import styles from './MonthSelect.module.css'; import { useIntl } from 'react-intl'; +import styles from './MonthSelect.module.css'; export function MonthSelect({ date = new Date(), onChange }) { const { dateLocale } = useLocale(); diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx index e06f0023b..e138d9270 100644 --- a/src/components/metrics/EventsChart.tsx +++ b/src/components/metrics/EventsChart.tsx @@ -2,9 +2,9 @@ import { useMemo } from 'react'; import { colord } from 'colord'; import BarChart from 'components/charts/BarChart'; import { useDateRange, useWebsiteEventsSeries } from 'components/hooks'; +import { useIntl } from 'react-intl'; import { CHART_COLORS } from 'lib/constants'; import { renderDateLabels } from 'lib/charts'; -import { useIntl } from 'react-intl'; export interface EventsChartProps { websiteId: string;