diff --git a/src/components/Documents/DocumentFilterPanel.jsx b/src/components/Documents/DocumentFilterPanel.jsx
index b266c986..edc613e1 100644
--- a/src/components/Documents/DocumentFilterPanel.jsx
+++ b/src/components/Documents/DocumentFilterPanel.jsx
@@ -78,14 +78,14 @@ const DocumentFilterPanel = forwardRef(
? moment.utc(values.endDate, "DD-MM-YYYY").toISOString()
: null,
});
- closePanel();
+ // closePanel();
};
const onClear = () => {
reset(DocumentFilterDefaultValues);
setResetKey((prev) => prev + 1);
onApply(DocumentFilterDefaultValues);
- closePanel();
+ // closePanel();
};
if (isLoading) return
Loading...
;
diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx
index eadd0ac1..1ec3e71f 100644
--- a/src/components/Expenses/ExpenseList.jsx
+++ b/src/components/Expenses/ExpenseList.jsx
@@ -140,9 +140,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
align: "text-start",
getValue: (e) =>
`${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
- }`.trim() || "N/A",
- `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
- }`.trim() || "N/A",
+ }`.trim() || "N/A",
customRender: (e) => (
navigate(`/employee/${e.createdBy?.id}`)}>
@@ -380,8 +378,6 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
)}
-
-
{data?.data?.length > 0 && (
{
onPageChange={paginate}
/>
)}
+
+
>
);
diff --git a/src/components/gallary/GalleryFilterPanel.jsx b/src/components/gallary/GalleryFilterPanel.jsx
index fadcf135..d71625a3 100644
--- a/src/components/gallary/GalleryFilterPanel.jsx
+++ b/src/components/gallary/GalleryFilterPanel.jsx
@@ -37,13 +37,13 @@ const GalleryFilterPanel = ({ onApply }) => {
startDate: localToUtc(formData.startDate),
endDate: localToUtc(formData.endDate),
});
- closePanel()
+ // closePanel()
};
const onClear=()=>{
reset(defaultGalleryFilterValue);
setResetKey((prev) => prev + 1);
- closePanel()
+ // closePanel()
}
if (isLoading) return Loading....
;
diff --git a/src/pages/Directory/ContactFilterPanel.jsx b/src/pages/Directory/ContactFilterPanel.jsx
index 5f3c84de..5db00bd9 100644
--- a/src/pages/Directory/ContactFilterPanel.jsx
+++ b/src/pages/Directory/ContactFilterPanel.jsx
@@ -67,13 +67,13 @@ const ContactFilterPanel = forwardRef(
const onSubmit = (formData) => {
onApply(formData);
- closePanel();
+ // closePanel();
};
const handleClose = () => {
reset(defaultContactFilter);
onApply(defaultContactFilter);
- closePanel();
+ // closePanel();
};
if (isLoading || isFetching) return ;
@@ -99,16 +99,16 @@ const ContactFilterPanel = forwardRef(
valueKey="id"
/>
-
-
diff --git a/src/pages/Directory/NoteFilterPanel.jsx b/src/pages/Directory/NoteFilterPanel.jsx
index 88fb992e..5c24785c 100644
--- a/src/pages/Directory/NoteFilterPanel.jsx
+++ b/src/pages/Directory/NoteFilterPanel.jsx
@@ -39,13 +39,13 @@ const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref
const onSubmit = (formData) => {
onApply(formData);
- closePanel();
+ // closePanel();
};
const handleClose = () => {
reset(defaultNotesFilter);
onApply(defaultNotesFilter);
- closePanel();
+ // closePanel();
};
//Add this for Filter chip remover
@@ -93,17 +93,17 @@ const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref
labelKey={(item) => item.name}
valueKey="id"
/>
-
-
+
Clear
-
+
Apply