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

---
 .../components/date-range-picker/Calendar.js  |  4 +--
 .../date-range-picker/DateRangePicker.js      | 30 +++++++------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.js b/new-lamassu-admin/src/components/date-range-picker/Calendar.js
index c6151d73..c0480530 100644
--- a/new-lamassu-admin/src/components/date-range-picker/Calendar.js
+++ b/new-lamassu-admin/src/components/date-range-picker/Calendar.js
@@ -178,9 +178,7 @@ const Calendar = ({ minDate, maxDate, handleSelect, ...props }) => {
           {R.range(1, 8).map((row, key) => (
             <tr key={key}>
               {getRow(currentDisplayedMonth, row).map((day, key) => (
-                <td
-                  key={key}
-                  onClick={() => handleSelect(day, minDate, maxDate)}>
+                <td key={key} onClick={() => handleSelect(day)}>
                   <Tile
                     isDisabled={
                       (maxDate && isAfter(maxDate, day)) ||
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 93a7791b..b24e6622 100644
--- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
+++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
@@ -1,11 +1,6 @@
 import { makeStyles } from '@material-ui/core/styles'
 import classnames from 'classnames'
-import {
-  differenceInDays,
-  differenceInMonths,
-  isSameMonth,
-  set
-} from 'date-fns/fp'
+import { differenceInDays, set } from 'date-fns/fp'
 import React, { useState, useEffect } from 'react'
 
 import Calendar from './Calendar'
@@ -36,20 +31,15 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange }) => {
     )
       return
 
-    if (from && !to && differenceInDays(day, from) > 0) {
-      setTo(from)
-      setFrom(day)
-      return
-    }
-
-    if (
-      from &&
-      !to &&
-      (isSameMonth(from, day) || differenceInMonths(from, day) > 0)
-    ) {
-      setTo(
-        set({ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, day)
-      )
+    if (from && !to) {
+      if (differenceInDays(from, day) >= 0) {
+        setTo(
+          set({ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, day)
+        )
+      } else {
+        setTo(from)
+        setFrom(day)
+      }
       return
     }