(fix) Fix chain info for zq2 and currency symbol

Zilliqa · Dec 9, 2024 · 6745eeb · 6745eeb
1 parent bc5d6a0
commit 6745eeb
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 43 deletions.
diff --git a/src/execution/ChainInfo.tsx b/src/execution/ChainInfo.tsx
@@ -6,25 +6,31 @@ import ChainInfoItem from "../components/ChainInfoItem";
 import ContentFrame from "../components/ContentFrame";
 import { PendingChainInfoResults } from "../search/PendingResults";
 import { useBCInfoStateInfo, useLatestBlockChainInfo } from "../useLatestBlock";
+import { useQuirks } from "../useQuirks";
 import { RuntimeContext } from "../useRuntime";
 
 const ChainInfo: FC = () => {
-  const { zilliqa } = useContext(RuntimeContext);
+  const { zilliqa, provider } = useContext(RuntimeContext);
+  const quirks = useQuirks(provider);
 
   const latestBlockChainInfo = useLatestBlockChainInfo(zilliqa);
 
   const BCInfo = useBCInfoStateInfo(latestBlockChainInfo);
 
+  let gridValues = "grid-rows-2 grid-cols-4";
+  if (quirks?.isZilliqa1) {
+    gridValues = "grid-rows-3 grid-cols-4";
+  }
+  gridValues =
+    "grid items-baseline gap-x-1 border-t border-b border-gray-200 bg-gray-100 text-sm " +
+    gridValues;
   // Return a table with rows containing the basic information of the most recent RECENT_SIZE blocks
   return (
     <ContentFrame isLoading={latestBlockChainInfo === undefined}>
       <div className="pb-3">
         <ChainInfoHeader isLoading={latestBlockChainInfo === undefined} />
         {latestBlockChainInfo ? (
-          <div
-            className="grid grid-rows-3 grid-cols-4 items-baseline gap-x-1 border-t 
-        border-b border-gray-200 bg-gray-100 text-sm"
-          >
+          <div className={gridValues}>
             <span>
               <ChainInfoItem
                 title="Current Tx Epoch:"
@@ -37,30 +43,38 @@ const ChainInfo: FC = () => {
                 data={latestBlockChainInfo.NumTransactions}
               />
             </span>
-            <span>
-              <ChainInfoItem
-                title="Peers:"
-                data={latestBlockChainInfo.NumPeers}
-              />
-            </span>
-            <span>
-              <ChainInfoItem
-                title="Sharding Structure:"
-                data={`[${latestBlockChainInfo.ShardingStructure.NumPeers.toString()}]`}
-              />
-            </span>
-            <span>
-              <ChainInfoItem
-                title="Current DS Epoch:"
-                data={latestBlockChainInfo.CurrentDSEpoch}
-              />
-            </span>
-            <span>
-              <ChainInfoItem
-                title="DS Block Rate:"
-                data={latestBlockChainInfo.DSBlockRate.toFixed(5)}
-              />
-            </span>
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="Peers:"
+                  data={latestBlockChainInfo.NumPeers}
+                />
+              </span>
+            )}
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="Sharding Structure:"
+                  data={`[${latestBlockChainInfo.ShardingStructure.NumPeers.toString()}]`}
+                />
+              </span>
+            )}
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="Current DS Epoch:"
+                  data={latestBlockChainInfo.CurrentDSEpoch}
+                />
+              </span>
+            )}
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="DS Block Rate:"
+                  data={latestBlockChainInfo.DSBlockRate.toFixed(5)}
+                />
+              </span>
+            )}
             <span>
               <ChainInfoItem
                 title="Tx Block Rate:"
@@ -73,18 +87,22 @@ const ChainInfo: FC = () => {
                 data={latestBlockChainInfo.TransactionRate.toFixed(5)}
               />
             </span>
-            <span>
-              <ChainInfoItem
-                title="Number of Txns in DS Epoch:"
-                data={latestBlockChainInfo.NumTxnsDSEpoch}
-              />
-            </span>
-            <span>
-              <ChainInfoItem
-                title="Number of Txns in Txn Epoch:"
-                data={latestBlockChainInfo.NumTxnsTxEpoch}
-              />
-            </span>
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="Number of Txns in DS Epoch:"
+                  data={latestBlockChainInfo.NumTxnsDSEpoch}
+                />
+              </span>
+            )}
+            {quirks?.isZilliqa1 && (
+              <span>
+                <ChainInfoItem
+                  title="Number of Txns in Txn Epoch:"
+                  data={latestBlockChainInfo.NumTxnsTxEpoch}
+                />
+              </span>
+            )}
             <span>
               <ChainInfoItem
                 title={

diff --git a/src/useConfig.ts b/src/useConfig.ts
@@ -97,8 +97,8 @@ export const defaultChainInfo: ChainInfo = {
   name: "",
   faucets: [],
   nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
+    name: "Zilliqa",
+    symbol: "ZIL",
     decimals: 18,
   },
 };