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/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
index 2f15878..fbc63ad 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
@@ -119,11 +119,35 @@ const ViewIOTable = () => {
),
"IO Name": (
-
-
- {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
-
-
+ //
+ //
+ //
+ // {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
+ //
+ //
+ //
+
+
+ {item.investmentNameEnglish ? item.investmentNameEnglish : "---"}
+
+
),
Sponsor: (
@@ -150,9 +174,10 @@ const ViewIOTable = () => {
color={"teal.900"}
fontWeight={"500"}
>
- {item.goalAmount
+ {/* {item.goalAmount
? formatCurrency(removeTrailingZeros(item.goalAmount))
- : "---"}
+ : "---"} */}
+ {`$${parseFloat(item.goalAmount||0).toLocaleString()}`}
),
@@ -163,7 +188,7 @@ const ViewIOTable = () => {
{formatDate(item.closingDate ? item.closingDate : "---")}
- ),
+ ),
"IO Status": (
- {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+ {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
|
- {parseFloat(InvestorWallet?.WalletBalance_InInvCur).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+ {parseFloat(InvestorWallet?.WalletBalance_InUSD).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
|
{
),
Description: (
-
-
-
-
+
{item.note}
-
-
-
+
+
),
Status: (
diff --git a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
index 423b85d..18e4ae9 100644
--- a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
@@ -16,13 +16,13 @@ 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";
const PendingRequest = () => {
const toast = useToast();
@@ -38,6 +38,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,
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);
|