diff --git a/src/Components/DataTable/NormalTable.jsx b/src/Components/DataTable/NormalTable.jsx
index 25028cb..e2ac208 100644
--- a/src/Components/DataTable/NormalTable.jsx
+++ b/src/Components/DataTable/NormalTable.jsx
@@ -20,11 +20,10 @@ const DataTable = ({
tableHeadRow,
emptyMessage,
centered,
- total
+ total,
}) => {
-
console.log(data);
-
+
const columnWidth =
data && data[0]
? `${(100 / Object.keys(data[0]).length).toFixed(2)}%`
@@ -35,7 +34,9 @@ const DataTable = ({
) : (
- {total? total :"Tanami v1.0.0"}
+
+ {total ? total : "Tanami v1.0.0"}
+
{tableHeadRow.map((heading, index) => (
@@ -52,8 +53,7 @@ const DataTable = ({
whiteSpace="normal" // Allow text to wrap
wordBreak="normal" // Ensure long words break properly
overflowWrap="normal" // Break long words if necessary
- textTransform={'none'}
-
+ textTransform={"none"}
>
{isLoading ? : heading}
{/* {heading} */}
@@ -63,24 +63,26 @@ const DataTable = ({
{isLoading
- ? Array.from({ length: TABLE_PAGINATION?.size }).map((_, index) => (
-
- {tableHeadRow.map((_, i) => (
- |
-
- |
- ))}
-
- ))
+ ? Array.from({ length: TABLE_PAGINATION?.size }).map(
+ (_, index) => (
+
+ {tableHeadRow.map((_, i) => (
+ |
+
+ |
+ ))}
+
+ )
+ )
: data?.map((item, index) => (
{tableHeadRow.map((heading, i) => (
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": (
{
),
"IO Name": (
-
-
- {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
-
-
+ //
+ //
+ //
+ // {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
+ //
+ //
+ //
+
+
+ {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
+
+
),
Sponsor: (
@@ -163,9 +187,10 @@ const ViewIOTable = () => {
color={"teal.900"}
fontWeight={"500"}
>
- {item.goalAmount
+ {/* {item.goalAmount
? formatCurrency(removeTrailingZeros(item.goalAmount))
- : "---"}
+ : "---"} */}
+ {`$${parseFloat(item.goalAmount||0).toLocaleString()}`}
),
@@ -176,7 +201,7 @@ const ViewIOTable = () => {
{formatDate(item.closingDate ? item.closingDate : "---")}
- ),
+ ),
"IO Status": (
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 (
-
+
|
|
- {" "}
+
+ {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+ {InvestorWallet?.currencyCode_InCur}
+
|
- {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
- |
-
- {" "}
- |
-
{" "}
|
@@ -282,7 +274,10 @@ console.log(transaction);
wordBreak="normal"
overflowWrap="normal"
>
- {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+
+ {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+ {InvestorWallet?.currencyCode_InCur}
+
{
),
Description: (
-
-
-
-
+
{item.note}
-
-
-
+
+
),
Status: (
diff --git a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
index 2e0bb0c..b32eb75 100644
--- a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
@@ -16,13 +16,14 @@ import DataTable from "../../../Components/DataTable/DataTable";
import Pagination from "../../../Components/Pagination";
import GlobalStateContext from "../../../Contexts/GlobalStateContext";
import CustomAlertDialog from "../../../Components/CustomAlertDialog";
-import { formatDate } from "../../../Components/Functions/UTCConvertor";
import { CheckIcon, CloseIcon } from "@chakra-ui/icons";
import DrawalRequestReject from "./DrawalRequestReject";
import { useGetDrawalRequestQuery } from "../../../Services/drawal.request.service";
import { TABLE_PAGINATION } from "../../../Constants/Paginations";
import NormalTable from "../../../Components/DataTable/NormalTable"
import DrawalRequestApprove from "./DrawalRequestApprove";
+import { formatDate } from "../../../Components/Functions/UTCConvertor";
+import { generateSerialNumber } from "../../../Constants/Constants";
const PendingRequest = () => {
const toast = useToast();
@@ -38,6 +39,14 @@ const PendingRequest = () => {
const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
+ const formatDate = (date) => {
+ return new Date(date).toLocaleDateString('en-GB', {
+ day: '2-digit',
+ month: '2-digit',
+ year: 'numeric',
+ });
+ };
+
const {
isOpen: isConfirmOpen,
onOpen: onConfirmOpen,
@@ -97,7 +106,7 @@ const PendingRequest = () => {
// ====================================================[Table Setup]================================================================
const tableHeadRow = [
- // "Sr.no",
+ "Sr.no",
"Date",
"Client ID",
"First Name",
@@ -112,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": (
diff --git a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
index d3b0452..d680f19 100644
--- a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
+++ b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
@@ -47,6 +47,15 @@ const ViewHistory = () => {
// onClose: onRejectClose,
// } = useDisclosure();
+
+ const formatDate = (date) => {
+ return new Date(date).toLocaleDateString('en-GB', {
+ day: '2-digit',
+ month: '2-digit',
+ year: 'numeric',
+ });
+ };
+
const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
|