diff --git a/components/common/Calendar.js b/components/common/Calendar.js index 288cb184..b6c5cd0b 100644 --- a/components/common/Calendar.js +++ b/components/common/Calendar.js @@ -117,8 +117,6 @@ const DaySelector = ({ date, minDate, maxDate, locale, onSelect }) => { const month = date.getMonth(); const year = date.getFullYear(); - console.log({ dateLocale, startDay, startWeek, startMonth, month, year }); - const daysOfWeek = []; for (let i = 0; i < 7; i++) { daysOfWeek.push(addDays(startWeek, i)); diff --git a/components/common/RefreshButton.js b/components/common/RefreshButton.js index 91a43ab8..1e3dd9e7 100644 --- a/components/common/RefreshButton.js +++ b/components/common/RefreshButton.js @@ -7,12 +7,9 @@ import Button from './Button'; import Refresh from 'assets/redo.svg'; import Dots from 'assets/ellipsis-h.svg'; import useDateRange from 'hooks/useDateRange'; -import { getDateRange } from '../../lib/date'; -import useLocale from 'hooks/useLocale'; function RefreshButton({ websiteId }) { const dispatch = useDispatch(); - const { locale } = useLocale(); const [dateRange] = useDateRange(websiteId); const [loading, setLoading] = useState(false); const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]); @@ -20,7 +17,7 @@ function RefreshButton({ websiteId }) { function handleClick() { if (dateRange) { setLoading(true); - dispatch(setDateRange(websiteId, getDateRange(dateRange.value, locale))); + dispatch(setDateRange(websiteId, dateRange)); } } diff --git a/lib/date.js b/lib/date.js index 84516de0..6897df21 100644 --- a/lib/date.js +++ b/lib/date.js @@ -39,7 +39,11 @@ export function getDateRange(value, locale = 'en-US') { const now = new Date(); const dateLocale = getDateLocale(locale); - const { num, unit } = value.match(/^(?[0-9]+)(?hour|day|week|month|year)$/).groups; + const match = value.match(/^(?[0-9]+)(?hour|day|week|month|year)$/); + + if (!match) return; + + const { num, unit } = match.groups; if (+num === 1) { switch (unit) {