diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index 1f95fc3..6e75f03 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -191,7 +191,7 @@ const DepositRequest = () => { "Deposit Date": ( clearTimeout(timer); }, []); + + const formatDate = (date) => { + return new Date(date).toLocaleDateString('en-GB', { + day: '2-digit', + month: '2-digit', + year: 'numeric', + }); + }; // ====================================================[Table Setup]================================================================ const tableHeadRow = [ @@ -96,7 +104,7 @@ console.log(transaction); const extractedArray = filteredData?.map((item) => ({ id: item?.id, "Sr N/O": ( - ), "Date": ( - + {formatDate(item.transactionDate)} ), "Transaction": ( - + {item.investorTransaction?.transactionName} @@ -127,38 +135,40 @@ console.log(transaction); ), "Amount in investors currency": ( - + {/* {item.investorAmount} */} {parseFloat(item?.investorAmount || 0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2, })} + {item?.investorCurrency} ), "From USD": ( - + {item.USDToInvCur_Rate} ), "TO USD": ( - + {item.invCurToUSD_Rate} ), "USD amount": ( - + {/* {item.USDAmount} */} {parseFloat(item?.USDAmount || 0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2, })} + $ ), @@ -193,13 +203,13 @@ console.log(transaction); const Total = () => { return ( - +
- - @@ -282,7 +274,10 @@ console.log(transaction); wordBreak="normal" overflowWrap="normal" > - {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} + + {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} + {InvestorWallet?.currencyCode_InCur} +
- {" "} + + {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} + {InvestorWallet?.currencyCode_InCur} + - {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} - - {" "} - {" "} { const toast = useToast(); @@ -105,7 +106,7 @@ const PendingRequest = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - // "Sr.no", + "Sr.no", "Date", "Client ID", "First Name", @@ -120,7 +121,7 @@ const PendingRequest = () => { - const extractedArray = filteredData?.map((item, index) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ // id: item?.id, "Sr.no": ( { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {index + 1} + {generateSerialNumber(idx,currentPage, pageSize )} ), "Date": (