Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel into dev

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}
         </Text>
       ),
-      Date: (
+      "Deposit Date": (
         <Text
           w={"60px"}
           justifyContent={slideFromRight ? "right" : "left"}
@@ -155,63 +152,33 @@ const DepositRequest = () => {
         </Text>
       ),
       "First Name": (
-        <Box isTruncated={true} w={"50px"}>
+        <Box isTruncated={true} w={"70px"}>
           <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
             {item.firstName}
           </Text>
         </Box>
       ),
       "Last Name": (
-        <Box w={"50px"} isTruncated={true}>
+        <Box w={"70px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.lastName}
           </Text>
         </Box>
       ),
       Country: (
-        <Box w={"70px"} isTruncated={true}>
+        <Box w={"100px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.country}
           </Text>
         </Box>
       ),
       "Phone Number": (
-        <Box w={"70px"} isTruncated={true}>
+        <Box w={"80px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.phoneNumber}
           </Text>
         </Box>
       ),
-      Currency: (
-        <Box w={"50px"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            <Badge px={2} py={1}>
-              {item.currency}
-            </Badge>
-          </Text>
-        </Box>
-      ),
-      "Deposit Amount": (
-        <Box w={"50px"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.depositAmount}
-          </Text>
-        </Box>
-      ),
-      Fees: (
-        <Box w={"auto"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.fees}
-          </Text>
-        </Box>
-      ),
-      "Total Amount": (
-        <Box w={"auto"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.totalAmount}
-          </Text>
-        </Box>
-      ),
       "Amount in Investor currency": (
         <Box w={"70px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>

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}
         </Text>
       ),
-      "Date": (
+      "Deposit Date": (
         <Text
           w={"60px"}
           justifyContent={slideFromRight ? "right" : "left"}
@@ -141,34 +137,34 @@ const DepositHistory = () => {
         </Text>
       ),
       "First Name": (
-        <Box isTruncated={true} w={"50px"}>
+        <Box isTruncated={true} w={"60px"}>
           <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
             {item.firstName}
           </Text>
         </Box>
       ),
       "Last Name": (
-        <Box w={"50px"} isTruncated={true}>
+        <Box w={"70px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.lastName}
           </Text>
         </Box>
       ),
       Country: (
-        <Box w={"70px"} isTruncated={true}>
+        <Box w={"80px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.country}
           </Text>
         </Box>
       ),
       "Phone Number": (
-        <Box w={"70px"} isTruncated={true}>
+        <Box w={"80px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             {item.phoneNumber}
           </Text>
         </Box>
       ),
-      Currency: (
+      "Amount in Investor currency": (
         <Box w={"50px"} isTruncated={true}>
           <Text as={"span"} color={"teal.900"}>
             <Badge px={2} py={1}>
@@ -177,34 +173,6 @@ const DepositHistory = () => {
           </Text>
         </Box>
       ),
-      "Deposit Amount": (
-        <Box w={"50px"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.depositAmount}
-          </Text>
-        </Box>
-      ),
-      Fees: (
-        <Box w={"auto"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.fees}
-          </Text>
-        </Box>
-      ),
-      "Total Amount": (
-        <Box w={"auto"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.totalAmount}
-          </Text>
-        </Box>
-      ),
-      "Amount in Investor currency": (
-        <Box w={"70px"} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"}>
-            {item.amountcurrency}
-          </Text>
-        </Box>
-      ),
       Status: (
         <Box w={"70px"} isTruncated={true} cursor={'pointer'}>
           <Text

src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx

@@ -229,7 +229,7 @@ const ViewIOdataHeader = () => {
           {IODetails?.currentValuation ? IODetails?.currentValuation : "00.00"}
         </Text>
       </Box>
-      <Box display={"flex"} flexDirection={"column"} gap={2}>
+      <Box display={"flex"} flexDirection={"column"} gap={2}> 
         <Text as={"span"} fontSize={"xs"} color={"gray.500"} fontWeight={"500"}>
           IO cash
         </Text>

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",