From d05f03c0caa6e782f9fdd16df8fd7fab8c51c598 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Mon, 28 Oct 2024 13:37:59 +0530
Subject: [PATCH] update

---
 .../LatestTransactions/LatestTransactions.jsx |  4 ++--
 src/pages/SubnetIdOverview.jsx                |  3 ++-
 src/pages/Transaction/TransactionDetails.jsx  | 20 +++++++++++++++++--
 src/pages/Transaction/TransactionTable.jsx    | 10 ++++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/LatestTransactions/LatestTransactions.jsx b/src/components/LatestTransactions/LatestTransactions.jsx
index 6c0ca24..6708700 100644
--- a/src/components/LatestTransactions/LatestTransactions.jsx
+++ b/src/components/LatestTransactions/LatestTransactions.jsx
@@ -440,12 +440,12 @@ const LatestTransactions = () => {
                       <Text
                         color={colorMode === "light" ? "#230A79" : "#B09AFF"}
                       >
-                        <Link
+                        {subNetworkId === "MainNet" ?<Text>{subNetworkId}</Text>:<Link
                           to={`/subnet-id-overview/${subNetworkId}`}
                           style={{ fontWeight: "inherit" }}
                         >
                           {subNetworkId}
-                        </Link>
+                        </Link>}
                       </Text>
                     </HStack>
                   </VStack>
diff --git a/src/pages/SubnetIdOverview.jsx b/src/pages/SubnetIdOverview.jsx
index e6fc31a..1243470 100644
--- a/src/pages/SubnetIdOverview.jsx
+++ b/src/pages/SubnetIdOverview.jsx
@@ -11,6 +11,7 @@ import rbtLogoOutline from "../assets/images/rubix-filled.svg";
 import { HiOutlineRefresh } from "react-icons/hi";
 import { rotate } from "../components/LatestTransactions/LatestTransactions";
 import Search from '../assets/images/search.png'
+import { formatUTCToDDMMYYHHMMSS } from "../Constants/Constants";
 
 const SubnetInner = () => {
 
@@ -360,7 +361,7 @@ const SubnetInner = () => {
                       Date and Time Stamp :
                     </Text>
                     <Text color={colorMode === "light" ? "#230A79" : "#B09AFF"}>
-                      {timestamp}
+                      {formatUTCToDDMMYYHHMMSS(timestamp)}
                     </Text>
                   </Box>
                   <Box>
diff --git a/src/pages/Transaction/TransactionDetails.jsx b/src/pages/Transaction/TransactionDetails.jsx
index b9cc8cc..97cf604 100644
--- a/src/pages/Transaction/TransactionDetails.jsx
+++ b/src/pages/Transaction/TransactionDetails.jsx
@@ -53,7 +53,23 @@ const TransactionDetails = () => {
         console.error("Failed to copy text: ", err);
       });
   }
-  console.log("Bug", data);
+  
+
+  const [ dataArray, setDataArray ] = useState(null)
+  
+  useEffect(() => {
+    if (data?.data?.pledgeInfo?.pledgeDetails) {
+      const dataArrayOfObject = Object?.entries(data?.data?.pledgeInfo?.pledgeDetails)?.map(([id, linkedIds]) => ({ id, linkedIds }));
+      setDataArray(dataArrayOfObject)
+    }
+  }, [data])
+
+  console.log(dataArray);
+  
+
+
+
+
 
   // ===============================[ Table Header ]
   const tableHeadRow = [
@@ -392,7 +408,7 @@ const TransactionDetails = () => {
             />
           )}
 
-          <TransactionTable />
+         {dataArray&& <TransactionTable data={dataArray} />}
         </Container>
       </Box>
       <RelatedTransactions />
diff --git a/src/pages/Transaction/TransactionTable.jsx b/src/pages/Transaction/TransactionTable.jsx
index bfd2763..5df2bc0 100644
--- a/src/pages/Transaction/TransactionTable.jsx
+++ b/src/pages/Transaction/TransactionTable.jsx
@@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom";
 import GlobalStateContext from "../../Contexts/GlobalStateContext";
 import NormalTable from "../../components/DataTable/NormalTable";
 
-const TransactionTable = () => {
+const TransactionTable = ({data}) => {
   const { subnetId } = useContext(GlobalStateContext);
   const [isLoading, setIsLoading] = useState(false);
   const { colorMode } = useColorMode();
@@ -18,6 +18,8 @@ const TransactionTable = () => {
     return () => clearTimeout(timer);
   }, []);
 
+  console.log(data);
+
   // ===============================[ Table Header ]
   const tableHeadRow = [
     // "Sr. no", 
@@ -25,7 +27,7 @@ const TransactionTable = () => {
     "Pledge Token(s)"];
 
   // const extractedArray = reportsHistory.map((item)=>({ }))
-  const extractedArray = subnetId.map((item, index) => ({
+  const extractedArray = data?.map((item, index) => ({
     "Sr. no": (
       <Text w={57} as={"span"} display={"flex"} gap={2} alignItems={"center"}>
         {index + 1}
@@ -36,10 +38,10 @@ const TransactionTable = () => {
         color={colorMode === "light" ? "#230A79" : "#B09AFF"}
         onClick={() => navigate(`/subnet-id-overview/${row["Subnet Id"]}`)}
       >
-        {item?.subnetId}
+        {item?.id}
       </Box>
     ),
-    "Pledge Token(s)": item?.transactionCount?.map((trans, index) => (
+    "Pledge Token(s)": item?.linkedIds?.map((trans, index) => (
       <Box mb={1} key={index} color={colorMode === "light" ? "#230A79" : "#B09AFF"}>
         {trans}
       </Box>