diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx
index b25067ae..d71bb90c 100644
--- a/src/components/Expenses/ExpenseFilterPanel.jsx
+++ b/src/components/Expenses/ExpenseFilterPanel.jsx
@@ -145,7 +145,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
handleGroupBy,
selectedGroup.id,
appliedStatusId,
- selectedProjectId, // ✅ Added dependency
+ selectedProjectId,
]);
if (isLoading || isFetching) return ;
@@ -180,7 +180,6 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
-
diff --git a/src/components/PaymentRequest/ManagePaymentRequest.jsx b/src/components/PaymentRequest/ManagePaymentRequest.jsx
index a390b0f4..b9cc5927 100644
--- a/src/components/PaymentRequest/ManagePaymentRequest.jsx
+++ b/src/components/PaymentRequest/ManagePaymentRequest.jsx
@@ -217,12 +217,13 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
{errors.dueDate && (
diff --git a/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx b/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx
index 5aaa894e..05ffe14a 100644
--- a/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx
+++ b/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx
@@ -96,11 +96,11 @@ const PaymentRequestFilterPanel = ({ onApply, handleGroupBy }) => {
-
{
valueKey="id"
/>
item.name}
diff --git a/src/components/PaymentRequest/ViewPaymentRequest.jsx b/src/components/PaymentRequest/ViewPaymentRequest.jsx
index d8d70a32..d5180618 100644
--- a/src/components/PaymentRequest/ViewPaymentRequest.jsx
+++ b/src/components/PaymentRequest/ViewPaymentRequest.jsx
@@ -127,7 +127,7 @@ const ViewPaymentRequest = ({ requestId }) => {
className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }}
>
- Projct Name :
+ Project Name :
{data.project.name}
@@ -153,7 +153,7 @@ const ViewPaymentRequest = ({ requestId }) => {
className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }}
>
- Expense Type :
+ Expense Category :
{data?.expenseCategory?.name}
diff --git a/src/hooks/useExpense.js b/src/hooks/useExpense.js
index 4915ebdb..af8fb1b0 100644
--- a/src/hooks/useExpense.js
+++ b/src/hooks/useExpense.js
@@ -10,7 +10,7 @@ import moment from "moment";
const cleanFilter = (filter) => {
const cleaned = { ...filter };
- ["projectIds", "statusIds", "createdByIds", "paidById","ExpenseTypeIds"].forEach((key) => {
+ ["projectIds", "statusIds", "createdByIds", "paidById","expenseCategoryIds"].forEach((key) => {
if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
delete cleaned[key];
}
@@ -364,7 +364,11 @@ export const usePaymentRequestFilter = () => {
return useQuery({
queryKey: ["PaymentRequestFilter"],
queryFn: async () =>
- await ExpenseRepository.GetPaymentRequestFilter().then((res) => res.data),
+ {
+ const response = await ExpenseRepository.GetPaymentRequestFilter();
+ return response.data;
+ }
+
});
};