diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx
index 32b21988..20b3d470 100644
--- a/src/components/PaymentRequest/PaymentRequestList.jsx
+++ b/src/components/PaymentRequest/PaymentRequestList.jsx
@@ -43,9 +43,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
displayField = "Status";
break;
case "submittedBy":
- key = `${item?.createdBy?.firstName ?? ""} ${
- item.createdBy?.lastName ?? ""
- }`.trim();
+ key = `${item?.createdBy?.firstName ?? ""} ${item.createdBy?.lastName ?? ""
+ }`.trim();
displayField = "Submitted By";
break;
case "project":
@@ -98,9 +97,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
label: "Submitted By",
align: "text-start",
getValue: (e) =>
- `${e.createdBy?.firstName ?? ""} ${
- e.createdBy?.lastName ?? ""
- }`.trim() || "N/A",
+ `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
+ }`.trim() || "N/A",
customRender: (e) => (
{
lastName={e.createdBy?.lastName}
/>
- {`${e.createdBy?.firstName ?? ""} ${
- e.createdBy?.lastName ?? ""
- }`.trim() || "N/A"}
+ {`${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
+ }`.trim() || "N/A"}
),
@@ -128,15 +125,12 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
},
{
key: "amount",
- label: " Amount",
- align: "text-start",
- getValue: (e) => (
- <>
- {formatCurrency(e?.amount)} {e.currency.currencyCode}
- >
- ),
-
- align: "text-end px-3",
+ label: "Amount",
+ align: "text-end",
+ getValue: (e) =>
+ e?.amount
+ ? `${e?.currency?.symbol ? e.currency.symbol + " " : ""}${e.amount.toLocaleString()}`
+ : "N/A",
},
{
key: "expenseStatus",
@@ -144,9 +138,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
align: "text-center",
getValue: (e) => (
{e?.expenseStatus?.name || "Unknown"}
@@ -180,14 +173,14 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
];
if (isLoading) return ;
- const grouped = groupBy
+ const grouped = groupBy
? Object.fromEntries(
Object.entries(groupByField(data?.data ?? [], groupBy)).sort(([keyA], [keyB]) =>
keyA.localeCompare(keyB)
)
)
: { All: data?.data ?? [] };
-
+
const IsGroupedByDate = [
{ key: "transactionDate", displayField: "Transaction Date" },
{ key: "createdAt", displayField: "created Date" },
diff --git a/src/components/RecurringExpense/RecurringExpenseList.jsx b/src/components/RecurringExpense/RecurringExpenseList.jsx
index cb9bee5b..51ae40b3 100644
--- a/src/components/RecurringExpense/RecurringExpenseList.jsx
+++ b/src/components/RecurringExpense/RecurringExpenseList.jsx
@@ -68,7 +68,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
align: "text-end",
getValue: (e) =>
e?.amount
- ? `${e?.currency?.symbol || ""}${e.amount.toLocaleString()}`
+ ? `${e?.currency?.symbol ? e.currency.symbol + " " : ""}${e.amount.toLocaleString()}`
: "N/A",
},
{
@@ -109,7 +109,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
);
- const paginate = (page) => {
+ const paginate = (page) => {
if (page >= 1 && page <= (data?.totalPages ?? 1)) {
setCurrentPage(page);
}
@@ -277,11 +277,11 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
{/* Pagination */}
-
+
>
);