From b1f91c921ba88b9a4a9d20f49d8438d2aa8e66ec Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 12 Aug 2021 15:36:24 +0300
Subject: [PATCH] Calendar: Fix incorrect time when scheduling (#1379)

---
 src/components/common/CalendarModal.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/common/CalendarModal.tsx b/src/components/common/CalendarModal.tsx
index aac0c549d..1fd022078 100644
--- a/src/components/common/CalendarModal.tsx
+++ b/src/components/common/CalendarModal.tsx
@@ -73,6 +73,14 @@ const CalendarModal: FC<OwnProps> = ({
     }
   }, [isOpen, defaultSelectedDate, prevIsOpen]);
 
+  useEffect(() => {
+    if (isFutureMode && selectedDate.getTime() < defaultSelectedDate.getTime()) {
+      setSelectedDate(defaultSelectedDate);
+      setSelectedHours(formatInputTime(defaultSelectedDate.getHours()));
+      setSelectedMinutes(formatInputTime(defaultSelectedDate.getMinutes()));
+    }
+  }, [defaultSelectedDate, isFutureMode, selectedDate]);
+
   const shouldDisableNextMonth = (isPastMode && currentYear >= now.getFullYear() && currentMonth >= now.getMonth())
     || (maxDate && currentYear >= maxDate.getFullYear() && currentMonth >= maxDate.getMonth());
   const shouldDisablePrevMonth = isFutureMode && currentYear <= now.getFullYear() && currentMonth <= now.getMonth();