From b690a55ed3ab60ae48b090c03fcf28f4d33faa41 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Fri, 23 Aug 2024 18:03:18 +0530
Subject: [PATCH 1/4] updated

---
 src/Pages/AccountDeletion/DeletionRequest.jsx                 | 2 +-
 src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx       | 4 ++--
 .../IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx | 3 ++-
 src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx              | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Pages/AccountDeletion/DeletionRequest.jsx b/src/Pages/AccountDeletion/DeletionRequest.jsx
index 4796ae5..f6194b7 100644
--- a/src/Pages/AccountDeletion/DeletionRequest.jsx
+++ b/src/Pages/AccountDeletion/DeletionRequest.jsx
@@ -62,7 +62,7 @@ const DeletionRequest = () => {
   }, []);
 
   // ====================================================[Table Filter]================================================================
-  const filteredData = data?.data?.filter((item) => {
+  const filteredData = data?.data?.rows?.filter((item) => {
     // Filter by name (case insensitive)
     const name = item?.firstName;
     const searchLower = searchTerm.toLowerCase();
diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
index c023501..9d0bcf4 100644
--- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
+++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
@@ -220,7 +220,7 @@ const filteredData = data?.data?.rows
         </Box>
       ),
       "Supporting's": (
-        <Text
+        item.transactionStatus === "Approved" ? <Text
           w={"60px"}
           justifyContent={slideFromRight ? "right" : "left"}
           as={"span"}
@@ -254,7 +254,7 @@ const filteredData = data?.data?.rows
               <Box as="span">View</Box> <ExternalLinkIcon />
             </Link> */}
         </Badge>
-        </Text>
+        </Text>:""
       ),
     }))
 
diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx
index 738540b..1b34622 100644
--- a/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx
+++ b/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx
@@ -228,6 +228,7 @@ const DistributionInvestor = ({ isOpen, onClose, exit }) => {
               whiteSpace="normal"
               wordBreak="normal"
               overflowWrap="normal"
+              opacity={0}
             >
               {calcualtedData?.distributed_per?.toFixed(2)}%
             </Th>
@@ -383,7 +384,7 @@ const DistributionInvestor = ({ isOpen, onClose, exit }) => {
             emptyMessage={`We don't have any Sponers `}
             tableHeadRow={tableHeadRow}
             data={extractedArray}
-            total={<Total />}
+            // total={<Total />}
             // isLoading={isLoading}
           /> : <Alert status='info' fontSize={'sm'} rounded={'sm'}>
           <AlertIcon />
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
index 750ddc1..4262bfe 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
@@ -125,7 +125,7 @@ const ViewIOdetails = () => {
       country: country?.countryName,
       value: removeTrailingZeros(minInvestmentAmt),
       logo: country?.flagIcon,
-      curr: currencyCode,
+      curr: country?.countryCode,
     }
   })
 

From c97de1314e0f03d16683f729218129e18859b901 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Fri, 23 Aug 2024 18:06:32 +0530
Subject: [PATCH 2/4] updated

---
 .../Investor_Management/InvestorDetails/ViewInvestorDetails.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
index e7c543e..f7ed28b 100644
--- a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
@@ -156,7 +156,7 @@ console.log(viewInvestor);
     "Return on Investment": (
       <Box w={"auto"} isTruncated={true}>
         <Text as={"span"} color={"teal.900"}>
-          {item.TotalReturn} %
+          {item.MarketValue_Per} %
         </Text>
       </Box>
     ),

From 3165c11af77bd4f5bf655d879e2616c3f165b5af Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Fri, 23 Aug 2024 18:09:31 +0530
Subject: [PATCH 3/4] update

---
 .../Investor_Management/InvestorDetails/ViewInvestorDetails.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
index f7ed28b..44cb097 100644
--- a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx
@@ -139,7 +139,7 @@ console.log(viewInvestor);
     "Percentage": (
       <Box w={"auto"} isTruncated={true}>
         <Text as={"span"} color={"teal.900"}>
-          {item?.MarketValue_Per} %
+          {item?.Investor_Holidings} %
         </Text>
       </Box>
     ),

From 0db739c55704c12a239e091ef855b218406b1997 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Fri, 23 Aug 2024 19:44:03 +0530
Subject: [PATCH 4/4] update

---
 src/Pages/AccountDeletion/DeletionHistory.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pages/AccountDeletion/DeletionHistory.jsx b/src/Pages/AccountDeletion/DeletionHistory.jsx
index c88f9be..b578bfe 100644
--- a/src/Pages/AccountDeletion/DeletionHistory.jsx
+++ b/src/Pages/AccountDeletion/DeletionHistory.jsx
@@ -90,7 +90,7 @@ const DeletionHistory = () => {
         className="d-flex align-items-center web-text-small"
         fontWeight={'500'}
       >
-        {formatDate(item.RequestOn)}
+        {formatDate(item.Requested_on)}
       </Text>
     ),
     "Client ID": (