diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx index 241662be..30979103 100644 --- a/src/components/PaymentRequest/PaymentRequestList.jsx +++ b/src/components/PaymentRequest/PaymentRequestList.jsx @@ -42,9 +42,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": @@ -91,15 +90,13 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { align: "text-start", getValue: (e) => e.title || "N/A", }, - // { key: "payee", label: "Payee", align: "text-start" }, { key: "SubmittedBy", 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"}
), @@ -127,15 +123,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", @@ -143,9 +136,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { align: "text-center", getValue: (e) => ( {e?.expenseStatus?.name || "Unknown"} @@ -367,9 +359,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { {[...Array(totalPages)].map((_, index) => (