From 52089d34cd350e86826c46e3874cf46c12c085c4 Mon Sep 17 00:00:00 2001
From: DmitrySychugov <dmitry.sychugov@onlyoffice.com>
Date: Wed, 10 Apr 2024 19:48:15 +0500
Subject: [PATCH] Web: Client: WebHooks: FilterDialog: fixed the logic of work

---
 .../FilterDialog/DeliveryDatePicker.js        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
index d42413ebf0..140d1eedba 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
@@ -133,7 +133,10 @@ const DeliveryDatePicker = ({
     setIsCalendarOpen(false);
   };
 
-  const showTimePicker = () => setIsTimeOpen(true);
+  const showTimePicker = () => {
+    setIsApplied(false);
+    setIsTimeOpen(true);
+  };
 
   const CalendarElement = () => (
     <StyledCalendar
@@ -187,6 +190,17 @@ const DeliveryDatePicker = ({
     ) &&
     isEqualDates(filters.deliveryTo, filters.deliveryTo.clone().endOf("day"));
 
+  const isDefaultTime = isApplied
+    ? isEqualDates(
+        filters.deliveryFrom,
+        moment().tz(window.timezone).startOf("day"),
+      ) &&
+      isEqualDates(
+        filters.deliveryTo,
+        moment().tz(window.timezone).endOf("day"),
+      )
+    : true;
+
   const isTimeValid = filters.deliveryTo > filters.deliveryFrom;
 
   useEffect(() => {
@@ -214,8 +228,8 @@ const DeliveryDatePicker = ({
           />
         )}
         {filters.deliveryDate !== null &&
-          !isApplied &&
-          (isTimeOpen ? (
+          isDefaultTime &&
+          (isTimeOpen && !isApplied ? (
             <TimePickerCell>
               <span className="timePickerItem">
                 <Text