diff --git a/src/Pages/IO_Management/CreateIO/IODetails.jsx b/src/Pages/IO_Management/CreateIO/IODetails.jsx index 8425d95..5bdf631 100644 --- a/src/Pages/IO_Management/CreateIO/IODetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IODetails.jsx @@ -624,6 +624,11 @@ const IODetails = ({ enableNextTab, index, data }) => { toast({ render: () => , }); + }else if(res?.error?.status === 500){ + setIsLoading(false); + toast({ + render: () => , + }); } } catch (error) { setIsLoading(false); diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx index e7a5767..4963cb4 100644 --- a/src/Pages/IO_Management/CreateIO/Investors.jsx +++ b/src/Pages/IO_Management/CreateIO/Investors.jsx @@ -24,7 +24,7 @@ import { } from "@chakra-ui/react"; import React, { useContext, useEffect, useState } from "react"; import { OPACITY_ON_LOAD } from "../../../Layout/animations"; -import DataTable from "../../../Components/DataTable/DataTable"; +import NormalTable from "../../../Components/DataTable/NormalTable"; import { HiDotsVertical } from "react-icons/hi"; import { Link, Link as RouterLink } from "react-router-dom"; import Pagination from "../../../Components/Pagination"; @@ -35,10 +35,16 @@ import { debounce } from "../../Master/Sponser/AddSponser"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter -const Investors = () => { +const Investors = ({data}) => { const toast = useToast(); - const { investors, setInvestors, slideFromRight } = + const { investors, setInvestors, slideFromRight, IODetails } = useContext(GlobalStateContext); + + + console.log(IODetails?.investors); + + + const [searchTerm, setSearchTerm] = useState(""); const [isLoading, setIsLoading] = useState(true); const [deleteAlert, setDeleteAlert] = useState(false); @@ -100,15 +106,17 @@ const Investors = () => { }, 300); // Table filter - const filteredData = investors.filter((item) => { + const filteredData = IODetails?.investors?.filter((item) => { const name = item.firstName; const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); return nameMatches; }); + - const [ extractedArray, setExtractedArray ] = useState(filteredData?.map((item, index) => ({ + + const extractedArray = filteredData?.map((item, index) => ({ id: item?.id, "Client ID": ( { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {item.clientId} + {item?.clientReference_id} ), "First name": ( @@ -151,7 +159,7 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {`$${item.investedAmount}`} + {`$${item.InvestedAmount_USD}`} ), "Percentage": ( @@ -162,7 +170,7 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {item.percentage} + {item.Distribution_Per}% ), "Market Value": ( @@ -173,7 +181,7 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {`$${item.marketValue}`} + {`$${item.Market_Value || 0}`} ), "Return on Investment": ( @@ -185,7 +193,7 @@ const Investors = () => { h={6} className="d-flex align-items-center web-text-small" > - {item.returnOnInvestment} + {item.returnOnInvestment || 0} ), "Distribution": ( @@ -196,7 +204,7 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {`$${item.distribution}`} + {`$${item.Distribution_Amt}`} ), "Total Return": ( @@ -207,7 +215,7 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {`$${item.totalReturn}`} + {`$${item.Total_Return || 0}`} ), "Total return on Investment": ( @@ -218,10 +226,10 @@ const Investors = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {item.totalReturnOnInvestment} + {item.Total_Return_On_Investment||0} ), - }))); + })); const handleDelete = () => { const updatedSponsors = sponser.filter( @@ -383,12 +391,11 @@ const Investors = () => { - { { label: "Investment documents", content: }, { label: "Key merits", content: }, { label: "IO artifacts", content: }, - // { label: "Investors", content: }, - { label: "Investors", content: }, + { label: "Investors", content: }, + // { label: "Investors", content: }, { label: "IO Cash Details", content: }, { label: "IO NAV Details", content: }, // { label: "Distribution to Investors", content: }, @@ -85,7 +85,8 @@ const ViewIOdata = () => { index === 0 || index === 1 || index === 2 || - index === 3 ? + index === 3 || + index === 4 ? false : !IODetails?.isInvestedAmount} key={index}