src/components/Expenses/ManageExpense.jsx

@@ -34,6 +34,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
     isLoading,
     error: ExpenseErrorLoad,
   } = useExpense(expenseToEdit);
+  console.log(data)
   const [ExpenseType, setExpenseType] = useState();
   const dispatch = useDispatch();
   const {

src/components/Layout/Sidebar.jsx

@@ -7,7 +7,7 @@ import { MenuItemSkeleton } from "./MenuItemSkeleton";
 
 const Sidebar = () => {
   const navigate = useNavigate();
-  const { data, isError, isLoading, isFetched, error } = useSidBarMenu();
+  const { data, isError, isLoading, isFetched,error } = useSidBarMenu();
   return (
     <aside
       id="layout-menu"
@@ -35,6 +35,7 @@ const Sidebar = () => {
       <div className="menu-inner-shadow"></div>
 
       <ul className="menu-inner py-1">
+
         {isError && (
           <div className="text-center text-small">{error.message}</div>
         )}
@@ -51,17 +52,13 @@ const Sidebar = () => {
         )}
         {data &&
           data?.data.map((section) => (
-            <React.Fragment
-              key={section.id || section.header || section.items[0]?.id}
-            >
+            <React.Fragment key={(Math.random() + 1).toString(36)}>
               {/* {section.header && (
               <li className="menu-header small text-uppercase">
                 <span className="menu-header-text">{section.header}</span>
               </li>
             )} */}
-              {section.items.map((item) => (
-                <MenuItem key={item.id || item.link} {...item} />
-              ))}
+              {section.items.map(MenuItem)}
             </React.Fragment>
           ))}
       </ul>

src/components/Tenant/TenantFilterPanel.jsx

@@ -56,7 +56,6 @@ const [resetKey, setResetKey] = useState(0);
             startField="startDate"
             endField="endDate"
             resetSignal={resetKey}
-            defaultRange={false}
           />
           </div>
           <div className="text-strat mb-2">

src/components/common/DateRangePicker.jsx

@@ -76,8 +76,7 @@ export const DateRangePicker1 = ({
   placeholder = "Select date range",
   className = "",
   allowText = false,
-  resetSignal,
-  defaultRange = true, 
+  resetSignal, // <- NEW prop
   ...rest
 }) => {
   const inputRef = useRef(null);
@@ -125,9 +124,10 @@ export const DateRangePicker1 = ({
       ...rest,
     });
 
+    // Apply default if empty
     const currentStart = getValues(startField);
     const currentEnd = getValues(endField);
-    if (defaultRange && !currentStart && !currentEnd) {
+    if (!currentStart && !currentEnd) {
       applyDefaultDates();
     } else if (currentStart && currentEnd) {
       instance.setDate([
@@ -139,11 +139,12 @@ export const DateRangePicker1 = ({
     return () => instance.destroy();
   }, []);
 
+  // Reapply default range on resetSignal change
   useEffect(() => {
-    if (defaultRange && resetSignal !== undefined) {
+    if (resetSignal !== undefined) {
       applyDefaultDates();
     }
-  }, [resetSignal, defaultRange]);
+  }, [resetSignal]);
 
   const start = getValues(startField);
   const end = getValues(endField);
@@ -172,4 +173,3 @@ export const DateRangePicker1 = ({
     </div>
   );
 };
-

src/hooks/masterHook/useMaster.js

@@ -15,6 +15,7 @@ export const useMasterMenu = ()=>{
   return useQuery({
     queryKey:["MasterMenu"],
     queryFn:async()=> {
+      debugger
       const resp = await MasterRespository.getMasterMenus();
       return resp.data
     }

src/hooks/useTenant.js

@@ -16,7 +16,18 @@ const cleanFilter = (filter) => {
     }
   });
 
+  // moment.utc() to get consistent UTC ISO strings
+  if (!cleaned.startDate) {
+    cleaned.startDate = moment
+      .utc()
+      .subtract(7, "days")
+      .startOf("day")
+      .toISOString();
+  }
 
+  if (!cleaned.endDate) {
+    cleaned.endDate = moment.utc().startOf("day").toISOString();
+  }
   return cleaned;
 };
 

src/pages/Activities/DailyTask.jsx

@@ -21,6 +21,7 @@ const DailyTask = () => {
   const dispatch = useDispatch();
   const selectedProject = useSelectedproject();
   const { projectNames } = useProjectName();
+console.log(selectedProject)
   const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK);
   const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK);
 

src/pages/Tenant/TenantDetails.jsx

@@ -64,7 +64,7 @@ const TenantDetails = ({
       },
     ];
 
-    return ManageTenant
+    return ManageTenant && ModifyTenant
       ? allTabs
       : [allTabs[0], allTabs[allTabs.length - 1]];
   }, [data, activeTenantId, ManageTenant, ModifyTenant]);