diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index a9a8d7e..fff3b23 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -31,6 +31,7 @@ import ToastBox from "../../../Components/ToastBox"; import DataTable from "../../../Components/DataTable/DataTable"; import DepositRequestApprove from "./DepositRequestApprove"; import DepositRequestReject from "./DepositRequestReject"; +import NormalTable from "../../../Components/DataTable/NormalTable"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -68,17 +69,13 @@ const DepositRequest = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr.no", - "Date", + // "Sr.no", + "Deposit Date", "Client ID", "First Name", "Last Name", "Country", "Phone Number", - "Currency", - "Deposit Amount", - "Fees", - "Total Amount", "Amount in Investor currency", "Action", ]; @@ -130,7 +127,7 @@ const DepositRequest = () => { {index + 1} ), - Date: ( + "Deposit Date": ( { ), "First Name": ( - + {item.firstName} ), "Last Name": ( - + {item.lastName} ), Country: ( - + {item.country} ), "Phone Number": ( - + {item.phoneNumber} ), - Currency: ( - - - - {item.currency} - - - - ), - "Deposit Amount": ( - - - {item.depositAmount} - - - ), - Fees: ( - - - {item.fees} - - - ), - "Total Amount": ( - - - {item.totalAmount} - - - ), "Amount in Investor currency": ( diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx index 7c22add..66209ad 100644 --- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx +++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx @@ -60,16 +60,12 @@ const DepositHistory = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ "Sr.no", - "Date", + "Deposit Date", "Client ID", "First Name", "Last Name", "Country", "Phone Number", - "Currency", - "Deposit Amount", - "Fees", - "Total Amount", "Amount in Investor currency", "Status", ]; @@ -116,7 +112,7 @@ const DepositHistory = () => { {index + 1} ), - "Date": ( + "Deposit Date": ( { ), "First Name": ( - + {item.firstName} ), "Last Name": ( - + {item.lastName} ), Country: ( - + {item.country} ), "Phone Number": ( - + {item.phoneNumber} ), - Currency: ( + "Amount in Investor currency": ( @@ -177,34 +173,6 @@ const DepositHistory = () => { ), - "Deposit Amount": ( - - - {item.depositAmount} - - - ), - Fees: ( - - - {item.fees} - - - ), - "Total Amount": ( - - - {item.totalAmount} - - - ), - "Amount in Investor currency": ( - - - {item.amountcurrency} - - - ), Status: ( { {IODetails?.currentValuation ? IODetails?.currentValuation : "00.00"} - + IO cash diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx index cc9513e..8006148 100644 --- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx @@ -82,7 +82,7 @@ const InvestorDetails = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr N/O", + // "Sr N/O", "Client ID", "First Name", "Last Name",