diff --git a/src/Components/DataTable/DataTable.jsx b/src/Components/DataTable/DataTable.jsx index 94be903..539cded 100644 --- a/src/Components/DataTable/DataTable.jsx +++ b/src/Components/DataTable/DataTable.jsx @@ -97,7 +97,7 @@ const DataTable = ({ bg: "blue.50", cursor: "grab", }} - bg={snapshot.isDragging ? "blue.100" : "white"} + bg={snapshot.isDragging ? "blue.100" : index % 2 ? "white" : "gray.50"} boxShadow={snapshot.isDragging ? "0 0 1em rgba(0, 0, 0, 0.2)" : "none"} > @@ -121,7 +121,7 @@ const DataTable = ({ )} ) : ( - + {tableHeadRow.map((heading, i) => ( {total? total :"Tanami v1.0.0"} - + {tableHeadRow.map((heading, index) => ( )) : data?.map((item, index) => ( - + {tableHeadRow.map((heading, i) => ( item?.id === id) - console.log(fileredData); + @@ -51,25 +51,30 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa skip: !id, }); + console.log(data?.data?.investorAmount); + const { register, reset, + watch, handleSubmit, formState: { errors }, } = useForm({ resolver: yupResolver(conformModalSchema), }); - - useEffect(() => { - reset({ - investorAmount:fileredData?.investorAmount - }) - - }, [requestData, id]) + useEffect(() => { + if (data) { + const investorAmount = parseFloat(data?.data?.investorAmount); + reset({ + investorAmount: investorAmount, + accountName: data?.data?.accountName, + }); + } + }, [id, data, reset]); const onSubmit = async(data) => { setIsBtnLoading(true) @@ -108,20 +113,6 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa heandleOnClose(); }; - const handleFileChange = (event) => { - const selectedFile = event.target.files[0]; - setFile(selectedFile); - }; - - - useEffect(() => { - if (data) { - reset({ - investorAmount: data?.data?.investorAmount, - accountName:data?.data?.accountName - }); - } - }, [data, reset]); const heandleOnClose = () =>{ reset() @@ -141,11 +132,13 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa - Deposit Amount {fileredData?.currencyCode} + Deposit Amount {data?.data?.currencyCode} {/* */} - {item?.investorAmount} {item?.currencyCode} + + {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} {item?.currencyCode} {/* */} diff --git a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx index 7c643c7..5caee7a 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx @@ -55,13 +55,13 @@ import { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr N/O", + // "Sr N/O", "Date", "Transaction", - "Currency", - "Amount", + // "Currency", "From USD", "TO USD", + "Amount in investors currency", "USD amount", "IO Name", "Payment Method", @@ -126,10 +126,11 @@ console.log(transaction); ), - "Amount": ( - + "Amount in investors currency": ( + - {item.investorAmount} + {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} + {item?.investorCurrency} ), @@ -150,7 +151,7 @@ console.log(transaction); "USD amount": ( - {item.USDAmount} + ${parseFloat(item?.USDAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} ), diff --git a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx index 44cb097..f871af0 100644 --- a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx @@ -60,7 +60,7 @@ const ViewInvestorDetails = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr N/O", + // "Sr N/O", "Deal Name", "Sponsor Name", "Investment Amount", diff --git a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx index cbacf30..5237e0c 100644 --- a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx +++ b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx @@ -97,7 +97,7 @@ const PendingRequest = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr.no", + // "Sr.no", "Date", "Client ID", "First Name", @@ -105,7 +105,6 @@ const PendingRequest = () => { "Country", "Phone Number", "Amount in Investor currency", - "Currency", "Withdrawal Amount", "Action", ]; @@ -151,7 +150,7 @@ const PendingRequest = () => { ), "First Name": ( - + {item.firstName} @@ -181,7 +180,6 @@ const PendingRequest = () => { Currency: ( - {/* {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} */} {item?.currencyCode} @@ -189,14 +187,14 @@ const PendingRequest = () => { "Withdrawal Amount": ( - {item.USDAmount}💲 + ${parseFloat(item?.USDAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} ), "Amount in Investor currency": ( - + - {item.investorAmount} + {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}{item?.currencyCode} ), diff --git a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx index 6696033..f6d2a79 100644 --- a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx +++ b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx @@ -65,15 +65,7 @@ const ViewHistory = () => { // console.log(data?.data?.rows); - useEffect(() => { - // Simulate loading - const timer = setTimeout(() => { - setIsLoading(false); - }, 1500); - - // Cleanup the timer on component unmount - return () => clearTimeout(timer); - }, []); + // ====================================================[Table Filter]================================================================ const filteredData = data?.data?.rows.filter((item) => { @@ -96,16 +88,16 @@ const ViewHistory = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr.no", + // "Sr.no", "Date", "Client ID", "First Name", "Last Name", "Country", "Phone Number", - "Currency", - "Withdrawal Amount", + // "Currency", "Amount in Investor currency", + "Withdrawal Amount", "Status", ]; @@ -148,35 +140,35 @@ const ViewHistory = () => { ), "First Name": ( - + {item.firstName} ), "Last Name": ( - + {item.lastName} ), Country: ( - + {item.countryName} ), "Phone Number": ( - + {item.mobileNumber} ), Currency: ( - + {item.currencyCode} @@ -185,16 +177,16 @@ const ViewHistory = () => { ), "Withdrawal Amount": ( - + - {item.USDAmount} + ${parseFloat(item?.USDAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} ), "Amount in Investor currency": ( - + - {item.investorAmount} + {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}{item?.currencyCode} ), @@ -279,7 +271,7 @@ const ViewHistory = () => { emptyMessage={`We don't have any Sponers `} tableHeadRow={tableHeadRow} data={extractedArray} - isLoading={isLoading} + isLoading={drawalHistoryLoading} viewActionId={actionId} setViewActionId={setActionId} // totalPages={10}