From 3a7d1747660bde154af0d3c226bd0c777ea09656 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 23 Aug 2024 22:01:17 +0530 Subject: [PATCH 1/3] coma updated after sprint 5 --- src/Components/DataTable/DataTable.jsx | 4 +- src/Components/DataTable/NormalTable.jsx | 4 +- .../DepositRequest/DepositRequestApprove.jsx | 41 ++++++++----------- .../DepositViewHistory/DepositHistory.jsx | 3 +- .../InvestorDetails/Transaction.jsx | 15 +++---- .../InvestorDetails/ViewInvestorDetails.jsx | 2 +- .../DrawalRequest/PendingRequest.jsx | 12 +++--- .../WithDrawal/DrawalView/ViewHistory.jsx | 36 +++++++--------- 8 files changed, 51 insertions(+), 66 deletions(-) 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} From 79bcf851d986241283dd30dd4a8243bf93a2b13a Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 23 Aug 2024 22:18:50 +0530 Subject: [PATCH 2/3] [Coma update after sprint 5] --- .../Investor_Management/InvestorDetails/Transaction.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx index 5caee7a..5067255 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx @@ -58,10 +58,10 @@ import { // "Sr N/O", "Date", "Transaction", - // "Currency", - "From USD", - "TO USD", "Amount in investors currency", + // "Currency", + "TO USD", + "From USD", "USD amount", "IO Name", "Payment Method", From b713845df677df3dc47468bfdb4db10e2a41dc07 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 26 Aug 2024 12:11:38 +0530 Subject: [PATCH 3/3] update --- .../Deposit/DepositRequest/DepositRequest.jsx | 2 +- src/Pages/IO_Management/IOArtifactsAdd.jsx | 25 +++++++++++++++++-- .../InvestorDetails/Transaction.jsx | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index 362ed57..f1507e4 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -37,7 +37,7 @@ import { current } from "@reduxjs/toolkit"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; import { removeTrailingZeros } from "../../../Constants/Constants"; -const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter +export const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter const DepositRequest = () => { const navigate = useNavigate(); diff --git a/src/Pages/IO_Management/IOArtifactsAdd.jsx b/src/Pages/IO_Management/IOArtifactsAdd.jsx index aaba30a..401437a 100644 --- a/src/Pages/IO_Management/IOArtifactsAdd.jsx +++ b/src/Pages/IO_Management/IOArtifactsAdd.jsx @@ -84,6 +84,7 @@ const IOArtifactsAdd = ({ const onSubmit = async (data) => { + console.log("hit"); setIsLoading(true); const formData = new FormData(); formData.append("artifactName", data.artifactName); @@ -95,6 +96,7 @@ const IOArtifactsAdd = ({ data: formData, id: found?.id, }); + if (res?.data?.statusCode === 200) { toast({ render: () => , @@ -108,6 +110,20 @@ const IOArtifactsAdd = ({ artifactName: "", artifactPathName: "", }); + } else{ + toast({ + render: () => , + }); + setFile(null); + setIsLoading(false); + setAlert(false); + setPreview(null); + onClose(); + reset({ + artifactName: "", + artifactPathName: "", + }); + } if (res?.error) { @@ -184,6 +200,11 @@ const IOArtifactsAdd = ({ } } + const handleAlertClose = () =>{ + setAlert(false) + setIsLoading(false) + } + return ( <> @@ -225,7 +246,7 @@ const IOArtifactsAdd = ({ Artifact Image setAlert(false)} + onClose={handleAlertClose} alertHandler={handleSave} message={"Are you sure you want to add this artifact?"} isLoading={loading} diff --git a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx index 5067255..3ec9b04 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx @@ -108,7 +108,7 @@ console.log(transaction); "Date": ( - {item.transactionDate} + {formatDate(item.transactionDate)} ),