From 8418a11bfb23cff39285290476dd78f2de5d06dd Mon Sep 17 00:00:00 2001
From: Omri Levy <omri.levy0197@gmail.com>
Date: Sun, 19 Jan 2025 14:05:24 +0200
Subject: [PATCH] fix(backoffice-v2): reverted default logic for from and to

---
 .../useMerchantMonitoringLogic.tsx              | 17 +++++++++++++++++
 .../src/pages/MerchantMonitoring/schemas.ts     |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/apps/backoffice-v2/src/pages/MerchantMonitoring/hooks/useMerchantMonitoringLogic/useMerchantMonitoringLogic.tsx b/apps/backoffice-v2/src/pages/MerchantMonitoring/hooks/useMerchantMonitoringLogic/useMerchantMonitoringLogic.tsx
index 268fa5c3a0..0c3208a742 100644
--- a/apps/backoffice-v2/src/pages/MerchantMonitoring/hooks/useMerchantMonitoringLogic/useMerchantMonitoringLogic.tsx
+++ b/apps/backoffice-v2/src/pages/MerchantMonitoring/hooks/useMerchantMonitoringLogic/useMerchantMonitoringLogic.tsx
@@ -23,6 +23,21 @@ import {
 import { useLocation } from 'react-router-dom';
 import { MERCHANT_MONITORING_QUERY_PARAMS_KEY } from '@/pages/MerchantMonitoring/constants';
 
+const useDefaultDateRange = () => {
+  const [{ from, to }, setSearchParams] = useZodSearchParams(MerchantMonitoringSearchSchema);
+
+  useEffect(() => {
+    if (from || to) {
+      return;
+    }
+
+    setSearchParams({
+      from: dayjs().subtract(30, 'day').format('YYYY-MM-DD'),
+      to: dayjs().format('YYYY-MM-DD'),
+    });
+  }, []);
+};
+
 export const useMerchantMonitoringLogic = () => {
   const locale = useLocale();
   const { data: customer } = useCustomerQuery();
@@ -164,6 +179,8 @@ export const useMerchantMonitoringLogic = () => {
     [findingsOptions],
   );
 
+  useDefaultDateRange();
+
   return {
     totalPages: data?.totalPages || 0,
     totalItems: Intl.NumberFormat(locale).format(data?.totalItems || 0),
diff --git a/apps/backoffice-v2/src/pages/MerchantMonitoring/schemas.ts b/apps/backoffice-v2/src/pages/MerchantMonitoring/schemas.ts
index 1f96385351..dd564c0d8b 100644
--- a/apps/backoffice-v2/src/pages/MerchantMonitoring/schemas.ts
+++ b/apps/backoffice-v2/src/pages/MerchantMonitoring/schemas.ts
@@ -126,6 +126,6 @@ export const MerchantMonitoringSearchSchema = BaseSearchSchema.extend({
       ],
     )
     .catch('All'),
-  from: z.string().date().catch(dayjs().subtract(30, 'day').format('YYYY-MM-DD')),
-  to: z.string().date().catch(dayjs().format('YYYY-MM-DD')),
+  from: z.string().date().optional(),
+  to: z.string().date().optional(),
 });