From 3f2b57d4a69c6e59cbc741c20ceee86b990b7b65 Mon Sep 17 00:00:00 2001
From: Yana <yanok87@users.noreply.github.com>
Date: Fri, 20 Dec 2024 16:41:46 +0700
Subject: [PATCH] Rebase onto yana/node-page

---
 .../src/app/account/[address]/page.tsx        |  2 +-
 explorer-nextjs/src/app/account/[id]/page.tsx | 80 -------------------
 .../src/app/nym-node/[id]/page.tsx            |  8 +-
 3 files changed, 6 insertions(+), 84 deletions(-)
 delete mode 100644 explorer-nextjs/src/app/account/[id]/page.tsx

diff --git a/explorer-nextjs/src/app/account/[address]/page.tsx b/explorer-nextjs/src/app/account/[address]/page.tsx
index cfac6556d1..ea8798999f 100644
--- a/explorer-nextjs/src/app/account/[address]/page.tsx
+++ b/explorer-nextjs/src/app/account/[address]/page.tsx
@@ -78,7 +78,7 @@ export default async function Account({
                   {
                     label: "Account",
                     isSelected: true,
-                    link: "/account/1",
+                    link: `/account/${address}`,
                   },
                 ]}
               />
diff --git a/explorer-nextjs/src/app/account/[id]/page.tsx b/explorer-nextjs/src/app/account/[id]/page.tsx
deleted file mode 100644
index b641e82438..0000000000
--- a/explorer-nextjs/src/app/account/[id]/page.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import type { CurrencyRates, IAccountBalancesInfo } from "@/app/api/types";
-import { NYM_ACCOUNT_ADDRESS, NYM_PRICES_API } from "@/app/api/urls";
-import { AccountBalancesCard } from "@/components/accountPageComponents/AccountBalancesCard";
-import { AccountInfoCard } from "@/components/accountPageComponents/AccountInfoCard";
-import { ContentLayout } from "@/components/contentLayout/ContentLayout";
-import SectionHeading from "@/components/headings/SectionHeading";
-import ExplorerButtonGroup from "@/components/toggleButton/ToggleButton";
-import { Box, Grid2 } from "@mui/material";
-
-export default async function Account({
-  params,
-}: {
-  params: Promise<{ address: string }>;
-}) {
-  // const address = (await params).address;
-  console.log("(await params).address :>> ", (await params).address);
-  const address = "n1z0msxu8c098umdhnthpr2ac3ck2n3an97dm8pn";
-
-  const nymAccountAddress = `${NYM_ACCOUNT_ADDRESS}${address}`;
-  const accountData = await fetch(nymAccountAddress, {
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json; charset=utf-8",
-    },
-    next: { revalidate: 60 },
-    // refresh event list cache at given interval
-  });
-  const nymAccountBalancesData: IAccountBalancesInfo = await accountData.json();
-
-  if (!nymAccountBalancesData) {
-    return null;
-  }
-  console.log("nymAccountBalancesData :>> ", nymAccountBalancesData);
-  const nymPrice = await fetch(NYM_PRICES_API, {
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json; charset=utf-8",
-    },
-    next: { revalidate: 60 },
-    // refresh event list cache at given interval
-  });
-
-  const nymPriceData: CurrencyRates = await nymPrice.json();
-
-  console.log("nymPriceData :>> ", nymPriceData);
-
-  console.log("nymAccountData :>> ", nymAccountBalancesData);
-  return (
-    <ContentLayout>
-      <Grid2 container columnSpacing={5} rowSpacing={5}>
-        <Grid2 size={6}>
-          <SectionHeading title="Account Details" />
-        </Grid2>
-        <Grid2 size={6} justifyContent="flex-end">
-          <Box sx={{ display: "flex", justifyContent: "end" }}>
-            <ExplorerButtonGroup
-              options={[
-                { label: "Nym Node", isSelected: false, link: "/nym-node/1" },
-                {
-                  label: "Account",
-                  isSelected: true,
-                  link: "/account/1",
-                },
-              ]}
-            />
-          </Box>
-        </Grid2>
-        <Grid2 size={4}>
-          <AccountInfoCard accountInfo={nymAccountBalancesData} />
-        </Grid2>
-        <Grid2 size={8}>
-          <AccountBalancesCard
-            accountInfo={nymAccountBalancesData}
-            nymPrice={nymPriceData.usd}
-          />
-        </Grid2>
-      </Grid2>
-    </ContentLayout>
-  );
-}
diff --git a/explorer-nextjs/src/app/nym-node/[id]/page.tsx b/explorer-nextjs/src/app/nym-node/[id]/page.tsx
index de3b8496d5..cea8fcfa5e 100644
--- a/explorer-nextjs/src/app/nym-node/[id]/page.tsx
+++ b/explorer-nextjs/src/app/nym-node/[id]/page.tsx
@@ -39,8 +39,6 @@ export default async function NymNode({
     return null;
   }
 
-  const ownerAccount = nodeBondInfo[0].bond_information.owner;
-
   return (
     <ContentLayout>
       <Grid2 container columnSpacing={5} rowSpacing={5}>
@@ -49,7 +47,11 @@ export default async function NymNode({
             <SectionHeading title="Nym Node Details" />
             <ExplorerButtonGroup
               options={[
-                { label: "Nym Node", isSelected: true, link: "/nym-node/1" },
+                {
+                  label: "Nym Node",
+                  isSelected: true,
+                  link: `/nym-node/${id}`,
+                },
                 {
                   label: "Account",
                   isSelected: false,