From e9e9da7c309f82b39c5a6634135e72490c5f7559 Mon Sep 17 00:00:00 2001
From: Mohammad Jalali <muhammad.art79@gmail.com>
Date: Thu, 11 Jul 2024 10:53:05 +0330
Subject: [PATCH] complete merging conflict and remove logs

---
 src/app/(withAuth)/dashboard/layout.js           | 16 ++++++++++++----
 .../fieldsType/CustomDate/MuiDatePicker.jsx      |  4 ----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/(withAuth)/dashboard/layout.js b/src/app/(withAuth)/dashboard/layout.js
index dc62e10..f00cb95 100644
--- a/src/app/(withAuth)/dashboard/layout.js
+++ b/src/app/(withAuth)/dashboard/layout.js
@@ -1,7 +1,15 @@
-import "react-toastify/dist/ReactToastify.css";
+import HeaderWithLogo from "@/components/layouts/dashboard/headerWithLogo";
+import HeaderWithSidebar from "@/components/layouts/dashboard/headerWithSidebar";
+import { Box, Stack } from "@mui/material";
 
 const Layout = ({ children }) => {
-    return <>{children}</>;
+    return (
+        <Stack>
+            <HeaderWithLogo />
+            <Box>
+                <HeaderWithSidebar>{children}</HeaderWithSidebar>
+            </Box>
+        </Stack>
+    );
 };
-
-export default Layout;
+export default Layout;
\ No newline at end of file
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
index d715192..22eb5f9 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
@@ -7,10 +7,6 @@ import ClearIcon from "@mui/icons-material/Clear";
 import moment from "jalali-moment";
 
 function MuiDatePicker({ value, setFieldValue, name, minDate, maxDate, helperText, placeholder, error }) {
-    // console.log("error", error);
-    //
-    // console.log("helperText", helperText)
-
     return (
         <Box sx={{ display: "flex", flexDirection: "column", my: 1 }}>
             <LocalizationProvider