From fea170e141a312af012799b45598ffed73876b59 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:26:23 +0200
Subject: [PATCH] fix: max date

---
 .../src/components/LogsDownloaderPopper.js           | 12 ++++++++++--
 .../components/date-range-picker/DateRangePicker.js  |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.js b/new-lamassu-admin/src/components/LogsDownloaderPopper.js
index 5d879fe7..9c348810 100644
--- a/new-lamassu-admin/src/components/LogsDownloaderPopper.js
+++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.js
@@ -1,7 +1,7 @@
 import { useLazyQuery } from '@apollo/react-hooks'
 import { makeStyles, ClickAwayListener } from '@material-ui/core'
 import classnames from 'classnames'
-import { format } from 'date-fns/fp'
+import { format, set } from 'date-fns/fp'
 import FileSaver from 'file-saver'
 import * as R from 'ramda'
 import React, { useState, useCallback } from 'react'
@@ -280,7 +280,15 @@ const LogsDownloaderPopover = ({
                   )}
                 </div>
                 <DateRangePicker
-                  maxDate={new Date()}
+                  maxDate={set(
+                    {
+                      hours: 23,
+                      minutes: 59,
+                      seconds: 59,
+                      milliseconds: 999
+                    },
+                    new Date()
+                  )}
                   onRangeChange={handleRangeChange}
                 />
               </div>
diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
index b24e6622..7552c5d4 100644
--- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
+++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
@@ -1,6 +1,6 @@
 import { makeStyles } from '@material-ui/core/styles'
 import classnames from 'classnames'
-import { differenceInDays, set } from 'date-fns/fp'
+import { compareAsc, differenceInDays, set } from 'date-fns/fp'
 import React, { useState, useEffect } from 'react'
 
 import Calendar from './Calendar'
@@ -24,9 +24,9 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange }) => {
 
   const classes = useStyles()
 
-  const handleSelect = (day, minDate, maxDate) => {
+  const handleSelect = day => {
     if (
-      (maxDate && differenceInDays(maxDate, day) > 0) ||
+      (maxDate && compareAsc(maxDate, day) > 0) ||
       (minDate && differenceInDays(day, minDate) > 0)
     )
       return