From 51baa1c70e3de2c5c6f48d820392dcbd36ef6fd4 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Tue, 5 Nov 2024 12:30:05 +0530
Subject: [PATCH] update

---
 dev-dist/sw.js                 |   2 +-
 src/pages/MainNet.jsx          | 664 ++++++++++++++++++++-------------
 src/pages/SubnetIdOverview.jsx | 222 +++++++++--
 3 files changed, 609 insertions(+), 279 deletions(-)

diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 838bfc7..42fdf07 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-b5f7729d'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.ls5ql28gp78"
+    "revision": "0.4pi6ovbpjag"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/pages/MainNet.jsx b/src/pages/MainNet.jsx
index fa085e4..d665026 100644
--- a/src/pages/MainNet.jsx
+++ b/src/pages/MainNet.jsx
@@ -9,6 +9,7 @@ import {
   Image,
   Select,
   Text,
+  Tooltip,
   useColorMode,
   useToast,
   VStack,
@@ -205,282 +206,437 @@ const MainNet = () => {
                   amount,
                   transactionType,
                   subNetworkId,
+
+
+
+
+              executor,
+              deployer,
+              creator,
+              pledgeAmount,
+              scTokenHash
                 },
                 index
               ) => (
-                <Grid
-                  bg={
-                    index % 2 === 0
-                      ? colorMode === "light"
-                        ? "#F2EFFF"
-                        : "#312F35"
-                      : colorMode === "light"
-                      ? "#fff"
-                      : "#232127"
-                  }
-                  key={transactionId}
-                  templateColumns={{ base: "100% 0%", md: "10% 90%" }}
-                  gap={0}
+            <Grid
+              bg={
+                index % 2 === 0
+                  ? colorMode === "light"
+                    ? "#F2EFFF"
+                    : "#312F35"
+                  : colorMode === "light"
+                  ? "#fff"
+                  : "#232127"
+              }
+              key={transactionId}
+              templateColumns={{ base: "100% 0%", md: "10% 90%" }}
+              gap={0}
+            >
+              <GridItem
+                display={{ base: "none", md: "grid" }}
+                p={4}
+                color={colorMode === "light" ? "#000" : "#fff"}
+              >
+                {index + 1}.
+              </GridItem>
+              <GridItem p={4}>
+                {/* <Box> */}
+                <Text // This ensures the text is truncated with ellipsis when it overflows ss__298
+                  display={"flex"}
+                  fontSize={{ base: "xs", md: "sm" }}
+                  mb={2}
+                  color={colorMode === "light" ? "#230A79" : "#B09AFF"}
                 >
-                  <GridItem
-                    display={{ base: "none", md: "grid" }}
-                    p={4}
-                    color={colorMode === "light" ? "#000" : "#fff"}
+                  <Text
+                    maxW={{ base: "100%", md: "100%" }} // Set a max-width to control when the truncation happens
+                    // overflow={'hidden'} // Ensure overflow is hidden
+                    whiteSpace={"nowrap"} // Prevent the text from wrapping
+                    textOverflow={"ellipsis"}
+                    isTruncated
+                    cursor={"pointer"}
+                    onClick={() => navigate(`/transaction/${transactionId}`)}
                   >
-                    {index + 1}.
-                  </GridItem>
-                  <GridItem p={4}>
-                    {/* <Box> */}
-                    <Text // This ensures the text is truncated with ellipsis when it overflows ss__298
-                      display={"flex"}
-                      fontSize={{ base: "xs", md: "sm" }}
+                    {transactionId}
+                  </Text>
+
+                  <Text
+                    _hover={{ bg: "gray.50" }}
+                    transition={"0.5s"}
+                    rounded={"sm"}
+                    p={1}
+                    as={"span"}
+                    ml={1}
+                    cursor={"pointer"}
+                  >
+                    <MdContentCopy
+                      onClick={() => copyToClipboard(transactionId)}
+                    />
+                  </Text>
+                </Text>
+
+                {sender&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  gap={{ base: 2, md: 4 }}
+                  mb={2}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Sender:
+                  </Text>
+
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    w={"84%"}
+                    // justifyContent={'space-between'}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "90%", md: "100%" }} // Set a max-width to control when the truncation happens
+                      // overflow={'hidden'} // Ensure overflow is hidden
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${sender}`)}
+                    >
+                      {sender}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy onClick={() => copyToClipboard(sender)} />
+                    </Text>
+                  </HStack>
+                </HStack>}
+                {receiver&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Receiver:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${receiver}`)}
+                    >
+                      {receiver}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(receiver)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+
+
+                {creator&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Creator:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${creator}`)}
+                    >
+                      {creator}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(creator)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+                {executor&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Executor:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${executor}`)}
+                    >
+                      {executor}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(executor)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+
+                {deployer&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Deployer:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${deployer}`)}
+                    >
+                      {deployer}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(deployer)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+
+
+
+                <HStack
+                  flexDirection={{ base: "column", md: "row" }}
+                  justifyContent={{ base: "", md: scTokenHash?"space-between" :"flex-start" }}
+                  gap={{base:4,md:scTokenHash ? 4:44}}
+                  alignItems={{ base: "flex-start", md: "" }}
+                  // flexWrap={'wrap'}
+
+                  // w={"80%"}
+                  w={{ base: "100%", md:scTokenHash?"90%": "80%" }}
+                  fontSize={{ base: "xs", md: "sm" }}
+                  mb={3}
+                >
+                  {scTokenHash && (
+                    <Box>
+                      <Text
+                        mb={2}
+                        // fontSize={{base:"xs", md:"sm" }}
+                        color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                      >
+                        Smart contract ID :
+                      </Text>
+                      <Text
+                        color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                      >
+                        <Link to="/smart-contract">{scTokenHash}</Link>
+                      </Text>
+                    </Box>
+                  )}
+
+                  <Box>
+                    <Text
                       mb={2}
+                      color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                    >
+                      Date and Time Stamp :
+                    </Text>
+                    <Text color={colorMode === "light" ? "#230A79" : "#B09AFF"}>
+                      {formatUTCToDDMMYYHHMMSS(timestamp)}
+                    </Text>
+                  </Box>
+
+
+
+                  {amount&&<Box>
+                    <Text
+                      mb={2}
+                      color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                    >
+                      Amount:
+                    </Text>
+                    <Text
+                      display={"flex"}
+                      gap={2}
+                      alignItems={"center"}
                       color={colorMode === "light" ? "#230A79" : "#B09AFF"}
                     >
-                      <Text
-                        maxW={{ base: "100%", md: "100%" }} // Set a max-width to control when the truncation happens
-                        // overflow={'hidden'} // Ensure overflow is hidden
-                        whiteSpace={"nowrap"} // Prevent the text from wrapping
-                        textOverflow={"ellipsis"}
-                        isTruncated
-                        cursor={"pointer"}
-                        onClick={() =>
-                          navigate(`/transaction/${transactionId}`)
-                        }
-                      >
-                        {transactionId}
-                      </Text>
-
-                      <Text
-                        _hover={{ bg: "gray.50" }}
-                        transition={"0.5s"}
-                        rounded={"sm"}
-                        p={1}
-                        as={"span"}
-                        ml={1}
-                        cursor={"pointer"}
-                      >
-                        <MdContentCopy
-                          onClick={() => copyToClipboard(transactionId)}
-                        />
-                      </Text>
+                      <Image w={4} src={rbtLogoOutline} />
+                      {amount}
                     </Text>
+                  </Box>}
 
-                    <HStack
-                      fontSize={{ base: "xs", md: "sm" }}
-                      gap={{ base: 2, md: 4 }}
+                  
+                  {pledgeAmount&&<Box>
+                    <Text
                       mb={2}
+                      color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
                     >
-                      <Text
-                        color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}
-                      >
-                        Sender:
-                      </Text>
+                      Pledge Amount:
+                    </Text>
+                    <Text
+                      display={"flex"}
+                      gap={2}
+                      alignItems={"center"}
+                      color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    >
+                      <Image w={4} src={rbtLogoOutline} />
+                      {pledgeAmount}
+                    </Text>
+                  </Box>}
 
-                      <HStack
-                        color={colorMode === "light" ? "#230A79" : "#B09AFF"}
-                        textDecoration={"underline"}
-                        w={"84%"}
-                        // justifyContent={'space-between'}
-                        fontSize={{ base: "xs", md: "sm" }}
-                      >
-                        <Text
-                          cursor={"pointer"}
-                          maxW={{ base: "90%", md: "100%" }} // Set a max-width to control when the truncation happens
-                          // overflow={'hidden'} // Ensure overflow is hidden
-                          whiteSpace={"nowrap"} // Prevent the text from wrapping
-                          textOverflow={"ellipsis"}
-                          isTruncated
-                          onClick={() => navigate(`/did-info/${sender}`)}
-                        >
-                          {sender}
-                        </Text>
-                        <Text
-                          _hover={{ bg: "gray.50" }}
-                          transition={"0.5s"}
-                          rounded={"sm"}
-                          p={1}
-                          as={"span"}
-                          ml={1}
-                          cursor={"pointer"}
-                        >
-                          <MdContentCopy
-                            onClick={() => copyToClipboard(sender)}
-                          />
-                        </Text>
-                      </HStack>
-                    </HStack>
-                    <HStack
-                      fontSize={{ base: "xs", md: "sm" }}
-                      cursor={"pointer"}
-                      gap={{ base: 2, md: 4 }}
-                      mb={3}
-                    >
-                      <Text
-                        color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}
-                      >
-                        Receiver:
-                      </Text>
-                      <HStack
-                        color={colorMode === "light" ? "#230A79" : "#B09AFF"}
-                        textDecoration={"underline"}
-                        fontSize={{ base: "xs", md: "sm" }}
-                        isTruncated
-                      >
-                        <Text
-                          cursor={"pointer"}
-                          maxW={{ base: "55%", md: "100%" }}
-                          whiteSpace={"nowrap"} // Prevent the text from wrapping
-                          textOverflow={"ellipsis"}
-                          isTruncated
-                          onClick={() => navigate(`/did-info/${receiver}`)}
-                        >
-                          {receiver}
-                        </Text>
-                        <Text
-                          _hover={{ bg: "gray.50" }}
-                          transition={"0.5s"}
-                          rounded={"sm"}
-                          p={1}
-                          as={"span"}
-                          ml={1}
-                          cursor={"pointer"}
-                        >
-                          <MdContentCopy
-                            onClick={() => copyToClipboard(receiver)}
-                          />
-                        </Text>
-                      </HStack>
-                    </HStack>
-                    <HStack
-                      flexDirection={{ base: "column", md: "row" }}
-                      justifyContent={{ base: "", md: "flex-start" }}
-                      gap={{base:4,md:44}}
-                      alignItems={{ base: "flex-start", md: "" }}
-                      // flexWrap={'wrap'}
 
-                      // w={"80%"}
-                      w={{ base: "100%", md: "80%" }}
-                      fontSize={{ base: "xs", md: "sm" }}
-                      mb={3}
-                    >
-                      {smartContract && (
-                        <Box>
-                          <Text
-                            mb={2}
-                            // fontSize={{base:"xs", md:"sm" }}
-                            color={
-                              colorMode === "light" ? "#7B7B7B" : "#E8E8E8"
-                            }
-                          >
-                            Smart contract ID :
-                          </Text>
-                          <Text
-                            color={
-                              colorMode === "light" ? "#230A79" : "#B09AFF"
-                            }
-                          >
-                            <Link to="/smart-contract">{smartContract}</Link>
-                          </Text>
-                        </Box>
-                      )}
-                      <Box>
-                        <Text
-                          mb={2}
-                          color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
-                        >
-                          Date and Time Stamp :
-                        </Text>
-                        <Text
-                          color={colorMode === "light" ? "#230A79" : "#B09AFF"}
-                        >
-                          {formatUTCToDDMMYYHHMMSS(timestamp)}
-                        </Text>
-                      </Box>
-                      <Box>
-                        <Text
-                          mb={2}
-                          color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
-                        >
-                          Amount:
-                        </Text>
-                        <Text
-                          display={"flex"}
-                          gap={2}
-                          alignItems={"center"}
-                          color={colorMode === "light" ? "#230A79" : "#B09AFF"}
-                        >
-                          <Image w={4} src={rbtLogoOutline} />
-                          {amount}
-                        </Text>
-                      </Box>
-                    </HStack>
+                </HStack>
 
-                    <HStack
-                      fontSize={"sm"}
-                      alignItems={"flex-start"}
-                      position={"relative"}
-                    >
+                <HStack
+                  fontSize={"sm"}
+                  alignItems={"flex-start"}
+                  position={"relative"}
+                >
+                  <Tooltip 
+                  p={2}
+                   fontWeight={400}
+                   lineHeight={"18px"}
+                   boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
+                  color={colorMode === "light" ? "#230A79" : "#230A79"}
+                    fontStyle={"xs"}
+                    rounded={"5px"}
+                    bg={colorMode === "light" ? "#fff" : "#fff"}
+                    label={transactionType === "RBT" ? "Native RBT transactions which is peer-to-peer." : "SC or Smart Contract are codes that executes the actions multiple parties or entities agree to."}
+                    placement='top-start'>
+                    <Text p={0} display={{ base: "none", md: "block" }} position={"absolute"} top={"2px"} left={"-24px"}>
                       <Icon
+                        cursor={"pointer"}
                         as={MdOutlineErrorOutline}
                         fontSize={"18px"}
-                        display={{ base: "none", md: "block" }}
-                        style={{
-                          marginTop: "1px",
-                          position: "absolute",
-                          top: "2px",
-                          left: "-24px",
-                        }}
                         color="#7B7B7B"
                       />
+                    </Text>
+                  </Tooltip>
+                  {/* <Icon
+                    as={MdOutlineErrorOutline}
+                    fontSize={"18px"}
+                    display={{ base: "none", md: "block" }}
+                    style={{
+                      marginTop: "1px",
+                      position: "absolute",
+                      top: "2px",
+                      left: "-24px",
+                    }}
+                    color="#7B7B7B"
+                  /> */}
 
-                      <VStack fontSize={{ base: "xs", md: "sm" }}>
-                        <HStack w={"100%"} justifyContent={"flex-start"}>
-                          <Text
-                            color={
-                              colorMode === "light" ? "#7B7B7B" : "#E8E8E8"
-                            }
-                          >
-                            Transaction type :
-                          </Text>
-                          <Text
-                            color={
-                              colorMode === "light" ? "#230A79" : "#B09AFF"
-                            }
-                          >
-                            <Text>{transactionType}</Text>
-                          </Text>
-                        </HStack>
-
-                        <HStack w={"100%"} justifyContent={'flex-start'}>
-                          <Text
-                            color={
-                              colorMode === "light" ? "#7B7B7B" : "#E8E8E8"
-                            }
-                          >
-                            {subNetworkId === "MainNet"
-                              ? "Main net"
-                              : "Subnet ID"}{" "}
-                            :
-                          </Text>
-                          <Text
-                            color={
-                              colorMode === "light" ? "#230A79" : "#B09AFF"
-                            }
-                          >
-                          {subNetworkId === "MainNet" ?<Text>{subNetworkId}</Text>:<Link
-                            to={`/subnet-id-overview/${subNetworkId}`}
-                            style={{ fontWeight: "inherit" }}
-                          >
-                            {subNetworkId}
-                          </Link>}
-                          </Text>
-                        </HStack>
-                      </VStack>
+                  <VStack fontSize={{ base: "xs", md: "sm" }}>
+                    <HStack w={"100%"} justifyContent={"flex-start"}>
+                      <Text
+                        color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                      >
+                        Transaction type :
+                      </Text>
+                      <Text
+                        color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                      >
+                        <Text>{transactionType}</Text>
+                      </Text>
                     </HStack>
-                    {/* </Box> */}
-                  </GridItem>
-                </Grid>
+
+                    <HStack w={"100%"} justifyContent={"flex-start"}>
+                      <Text
+                        color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                      >
+                        {subNetworkId === "MainNet" ? "Main net" : "Subnet ID"}:
+                      </Text>
+                      <Text
+                        color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                      >
+                        {subNetworkId === "MainNet" ?<Text>{subNetworkId}</Text>:<Link
+                          to={`/subnet-id-overview/${subNetworkId}`}
+                          style={{ fontWeight: "inherit" }}
+                        >
+                          {subNetworkId}
+                        </Link>}
+                      </Text>
+                    </HStack>
+                  </VStack>
+                </HStack>
+                {/* </Box> */}
+              </GridItem>
+            </Grid>
               )
             )}
           </Box>
diff --git a/src/pages/SubnetIdOverview.jsx b/src/pages/SubnetIdOverview.jsx
index 1856e62..790d43e 100644
--- a/src/pages/SubnetIdOverview.jsx
+++ b/src/pages/SubnetIdOverview.jsx
@@ -1,4 +1,4 @@
-import { Box, Container, Grid, Image,GridItem, Heading, HStack, Icon, Link, Select, Text, useColorMode, useToast, VStack } from "@chakra-ui/react";
+import { Box, Container, Grid, Image,GridItem, Heading, HStack, Icon, Link, Select, Text, useColorMode, useToast, VStack, Tooltip } from "@chakra-ui/react";
 import React, { useContext, useEffect, useState } from "react";
 import GlobalStateContext from "../Contexts/GlobalStateContext";
 import Pagination from "../components/Pagination";
@@ -186,6 +186,14 @@ const SubnetInner = () => {
               amount,
               transactionType,
               subNetworkId,
+
+
+
+              executor,
+              deployer,
+              creator,
+              pledgeAmount,
+              scTokenHash
             },
             index
           ) => (
@@ -245,7 +253,7 @@ const SubnetInner = () => {
                   </Text>
                 </Text>
 
-                <HStack
+                {sender&&<HStack
                   fontSize={{ base: "xs", md: "sm" }}
                   gap={{ base: 2, md: 4 }}
                   mb={2}
@@ -284,8 +292,8 @@ const SubnetInner = () => {
                       <MdContentCopy onClick={() => copyToClipboard(sender)} />
                     </Text>
                   </HStack>
-                </HStack>
-                <HStack
+                </HStack>}
+                {receiver&&<HStack
                   fontSize={{ base: "xs", md: "sm" }}
                   cursor={"pointer"}
                   gap={{ base: 2, md: 4 }}
@@ -298,7 +306,6 @@ const SubnetInner = () => {
                     color={colorMode === "light" ? "#230A79" : "#B09AFF"}
                     textDecoration={"underline"}
                     fontSize={{ base: "xs", md: "sm" }}
-                    isTruncated
                   >
                     <Text
                       cursor={"pointer"}
@@ -324,20 +331,147 @@ const SubnetInner = () => {
                       />
                     </Text>
                   </HStack>
-                </HStack>
+                </HStack>}
+
+
+
+                {creator&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Creator:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${creator}`)}
+                    >
+                      {creator}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(creator)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+                {executor&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Executor:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${executor}`)}
+                    >
+                      {executor}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(executor)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+
+                {deployer&&<HStack
+                  fontSize={{ base: "xs", md: "sm" }}
+                  cursor={"pointer"}
+                  gap={{ base: 2, md: 4 }}
+                  mb={3}
+                >
+                  <Text color={colorMode === "light" ? "#0F0F0F" : "#E8E8E8"}>
+                    Deployer:
+                  </Text>
+                  <HStack
+                    color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    textDecoration={"underline"}
+                    fontSize={{ base: "xs", md: "sm" }}
+                  >
+                    <Text
+                      cursor={"pointer"}
+                      maxW={{ base: "55%", md: "100%" }}
+                      whiteSpace={"nowrap"} // Prevent the text from wrapping
+                      textOverflow={"ellipsis"}
+                      isTruncated
+                      onClick={() => navigate(`/did-info/${deployer}`)}
+                    >
+                      {deployer}
+                    </Text>
+                    <Text
+                      _hover={{ bg: "gray.50" }}
+                      transition={"0.5s"}
+                      rounded={"sm"}
+                      p={1}
+                      as={"span"}
+                      ml={1}
+                      cursor={"pointer"}
+                    >
+                      <MdContentCopy
+                        onClick={() => copyToClipboard(deployer)}
+                      />
+                    </Text>
+                  </HStack>
+                </HStack>}
+
+
+
+
                 <HStack
                   flexDirection={{ base: "column", md: "row" }}
-                  justifyContent={{ base: "", md: "flex-start" }}
-                  gap={{base:4,md:44}}
+                  justifyContent={{ base: "", md: scTokenHash?"space-between" :"flex-start" }}
+                  gap={{base:4,md:scTokenHash ? 4:44}}
                   alignItems={{ base: "flex-start", md: "" }}
                   // flexWrap={'wrap'}
 
                   // w={"80%"}
-                  w={{ base: "100%", md: "80%" }}
+                  w={{ base: "100%", md:scTokenHash?"90%": "80%" }}
                   fontSize={{ base: "xs", md: "sm" }}
                   mb={3}
                 >
-                  {smartContract && (
+                  {scTokenHash && (
                     <Box>
                       <Text
                         mb={2}
@@ -349,10 +483,11 @@ const SubnetInner = () => {
                       <Text
                         color={colorMode === "light" ? "#230A79" : "#B09AFF"}
                       >
-                        <Link to="/smart-contract">{smartContract}</Link>
+                        <Link to="/smart-contract">{scTokenHash}</Link>
                       </Text>
                     </Box>
                   )}
+
                   <Box>
                     <Text
                       mb={2}
@@ -364,7 +499,10 @@ const SubnetInner = () => {
                       {formatUTCToDDMMYYHHMMSS(timestamp)}
                     </Text>
                   </Box>
-                  <Box>
+
+
+
+                  {amount&&<Box>
                     <Text
                       mb={2}
                       color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
@@ -380,7 +518,28 @@ const SubnetInner = () => {
                       <Image w={4} src={rbtLogoOutline} />
                       {amount}
                     </Text>
-                  </Box>
+                  </Box>}
+
+                  
+                  {pledgeAmount&&<Box>
+                    <Text
+                      mb={2}
+                      color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
+                    >
+                      Pledge Amount:
+                    </Text>
+                    <Text
+                      display={"flex"}
+                      gap={2}
+                      alignItems={"center"}
+                      color={colorMode === "light" ? "#230A79" : "#B09AFF"}
+                    >
+                      <Image w={4} src={rbtLogoOutline} />
+                      {pledgeAmount}
+                    </Text>
+                  </Box>}
+
+
                 </HStack>
 
                 <HStack
@@ -388,7 +547,27 @@ const SubnetInner = () => {
                   alignItems={"flex-start"}
                   position={"relative"}
                 >
-                  <Icon
+                  <Tooltip 
+                  p={2}
+                   fontWeight={400}
+                   lineHeight={"18px"}
+                   boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
+                  color={colorMode === "light" ? "#230A79" : "#230A79"}
+                    fontStyle={"xs"}
+                    rounded={"5px"}
+                    bg={colorMode === "light" ? "#fff" : "#fff"}
+                    label={transactionType === "RBT" ? "Native RBT transactions which is peer-to-peer." : "SC or Smart Contract are codes that executes the actions multiple parties or entities agree to."}
+                    placement='top-start'>
+                    <Text p={0} display={{ base: "none", md: "block" }} position={"absolute"} top={"2px"} left={"-24px"}>
+                      <Icon
+                        cursor={"pointer"}
+                        as={MdOutlineErrorOutline}
+                        fontSize={"18px"}
+                        color="#7B7B7B"
+                      />
+                    </Text>
+                  </Tooltip>
+                  {/* <Icon
                     as={MdOutlineErrorOutline}
                     fontSize={"18px"}
                     display={{ base: "none", md: "block" }}
@@ -399,7 +578,7 @@ const SubnetInner = () => {
                       left: "-24px",
                     }}
                     color="#7B7B7B"
-                  />
+                  /> */}
 
                   <VStack fontSize={{ base: "xs", md: "sm" }}>
                     <HStack w={"100%"} justifyContent={"flex-start"}>
@@ -415,32 +594,27 @@ const SubnetInner = () => {
                       </Text>
                     </HStack>
 
-                    
-
-                    <HStack w={"100%"} justifyContent={'flex-start'}>
+                    <HStack w={"100%"} justifyContent={"flex-start"}>
                       <Text
                         color={colorMode === "light" ? "#7B7B7B" : "#E8E8E8"}
                       >
-                        {subNetworkId === "MainNet" ? "Main net" : "Subnet ID"}
-                        :
+                        {subNetworkId === "MainNet" ? "Main net" : "Subnet ID"}:
                       </Text>
                       <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>
                 </HStack>
                 {/* </Box> */}
               </GridItem>
-
-
             </Grid>
           )
         )}