diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx index 241662be..6d2d64e2 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": @@ -97,9 +96,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"}
), @@ -127,15 +124,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 +137,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { align: "text-center", getValue: (e) => ( {e?.expenseStatus?.name || "Unknown"} @@ -183,13 +176,20 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { if (isLoading) return ; const grouped = groupBy - ? groupByField(data?.data ?? [], 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" }, ]?.includes(groupBy); + const canEditExpense = (paymentRequest) => { return ( (paymentRequest?.expenseStatus?.id === EXPENSE_DRAFT || @@ -367,9 +367,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { {[...Array(totalPages)].map((_, index) => (