diff --git a/src/components/Expenses/ViewExpense.jsx b/src/components/Expenses/ViewExpense.jsx index 352026d3..79333593 100644 --- a/src/components/Expenses/ViewExpense.jsx +++ b/src/components/Expenses/ViewExpense.jsx @@ -12,7 +12,7 @@ import { useExpenseContext } from "../../pages/Expense/ExpensePage"; import { getColorNameFromHex } from "../../utils/appUtils"; import { ExpenseDetailsSkeleton } from "./ExpenseSkeleton"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; -import { PROCESS_EXPENSE, REVIEW_EXPENSE } from "../../utils/constants"; +import { EXPENSE_REJECTEDBY, PROCESS_EXPENSE, REVIEW_EXPENSE } from "../../utils/constants"; import { useProfile } from "../../hooks/useProfile"; import { useSelector } from "react-redux"; import { useNavigate } from "react-router-dom"; @@ -49,6 +49,9 @@ const ViewExpense = ({ ExpenseId }) => { const userPermissions = useSelector( (state) => state?.globalVariables?.loginUser?.featurePermissions || [] ); + const CurrentUser = useSelector( + (state) => state?.globalVariables?.loginUser?.employeeInfo + ); const nextStatusWithPermission = useMemo(() => { if (!Array.isArray(data?.nextStatus)) return []; @@ -66,6 +69,14 @@ const ViewExpense = ({ ExpenseId }) => { }); }, [data, userPermissions]); + const IsRejectedExpense = useMemo(()=>{ + return EXPENSE_REJECTEDBY.includes(data?.status?.id) + },[data]) + + const isCreatedBy = useMemo(() => { + return data?.createdBy.id === CurrentUser?.id; +}, [data, CurrentUser]); + const { mutate: MakeAction,isPending } = useActionOnExpense(() => { setClickedStatusId(null); reset()}); @@ -184,7 +195,7 @@ const ViewExpense = ({ ExpenseId }) => { getColorNameFromHex(data?.status?.color) || "secondary" }`} > - {data?.status?.displayName} + {data?.status?.name} @@ -466,43 +477,49 @@ const ViewExpense = ({ ExpenseId }) => { )} -