diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx
index 31888f70..c346a49c 100644
--- a/src/components/Expenses/ExpenseList.jsx
+++ b/src/components/Expenses/ExpenseList.jsx
@@ -112,10 +112,10 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
};
const expenseColumns = [
- {
+ {
key: "expenseUId",
label: "Expense Id",
- getValue: (e) => e.expenseUId|| "N/A",
+ getValue: (e) => e.expenseUId || "N/A",
align: "text-start mx-2",
},
{
@@ -294,26 +294,61 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
})
}
>
- {canEditExpense(expense) && (
-
- setManageExpenseModal({
- IsOpen: true,
- expenseId: expense.id,
- })
- }
- >
- )}
- {canDetetExpense(expense) && (
- {
- setIsDeleteModalOpen(true);
- setDeletingId(expense.id);
- }}
- >
- )}
+ {canDetetExpense(expense) &&
+ canEditExpense(expense) && (
+
+
+
+ {canDetetExpense(expense) && (
+ -
+ setManageExpenseModal({
+ IsOpen: true,
+ expenseId: expense.id,
+ })
+ }
+ >
+
+
+
+ Modify
+
+
+
+ )}
+
+ {canDetetExpense(expense) && (
+ - {
+ setIsDeleteModalOpen(true);
+ setDeletingId(expense.id);
+ }}
+ >
+
+
+
+ Delete
+
+
+
+ )}
+
+
+ )}
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index c75851c2..e2d10ebf 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -40,11 +40,11 @@ const Header = () => {
const isProjectPath = pathname === "/projects";
const isDirectory = pathname === "/directory";
const isEmployeeList = pathname === "/employees";
- const isExpense = pathname === "/expenses";
+ // const isExpense = pathname === "/expenses";
const isEmployeeProfile = UUID_REGEX.test(pathname);
const hideDropPaths =
- isDirectory || isEmployeeList || isExpense || isEmployeeProfile;
+ isDirectory || isEmployeeList || isEmployeeProfile;
const showProjectDropdown = !hideDropPaths;