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

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": (

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>:""
       ),
     }))
 

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 />

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,
     }
   })
 

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>
     ),
@@ -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>
     ),