diff --git a/explorer-v2/src/app/(pages)/account/[address]/page.tsx b/explorer-v2/src/app/(pages)/account/[address]/page.tsx index d426de30bf..283494e74f 100644 --- a/explorer-v2/src/app/(pages)/account/[address]/page.tsx +++ b/explorer-v2/src/app/(pages)/account/[address]/page.tsx @@ -1,5 +1,5 @@ -import { fetchNodes } from "@/app/api"; -import type { NodeData } from "@/app/api/types"; +import { fetchObservatoryNodes } from "@/app/api"; +import type { IObservatoryNode } from "@/app/api/types"; import { Box, Typography } from "@mui/material"; import Grid from "@mui/material/Grid2"; import { AccountBalancesCard } from "../../../../components/accountPageComponents/AccountBalancesCard"; @@ -16,10 +16,10 @@ export default async function Account({ try { const address = (await params).address; - const nymNodes: NodeData[] = await fetchNodes(); + const nymNodes: IObservatoryNode[] = await fetchObservatoryNodes(); const nymNode = nymNodes.find( - (node) => node.bond_information.owner === address, + (node) => node.bonding_address === address, ); return ( diff --git a/explorer-v2/src/app/api/index.tsx b/explorer-v2/src/app/api/index.tsx index a89b17bc49..c9e0dbf757 100644 --- a/explorer-v2/src/app/api/index.tsx +++ b/explorer-v2/src/app/api/index.tsx @@ -7,7 +7,6 @@ import type { IAccountBalancesInfo, IObservatoryNode, IPacketsAndStakingData, - NodeData, NodeRewardDetails, NymTokenomics, ObservatoryBalance, @@ -16,11 +15,9 @@ import { CURRENT_EPOCH, CURRENT_EPOCH_REWARDS, DATA_OBSERVATORY_BALANCES_URL, - DATA_OBSERVATORY_NODES_DELEGATIONS_URL, DATA_OBSERVATORY_NODES_URL, NS_API_MIXNODES_STATS, NYM_ACCOUNT_ADDRESS, - NYM_NODES, NYM_PRICES_API, OBSERVATORY_GATEWAYS_URL, } from "./urls"; @@ -76,7 +73,7 @@ export const fetchNodeDelegations = async ( id: number, ): Promise => { const response = await fetch( - `${DATA_OBSERVATORY_NODES_DELEGATIONS_URL}/${id}/delegations`, + `${DATA_OBSERVATORY_NODES_URL}/${id}/delegations`, { headers: { Accept: "application/json", @@ -206,20 +203,7 @@ export const fetchAccountBalance = async ( return data; }; -// 🔹 Fetch Nodes -export const fetchNodes = async (): Promise => { - const res = await fetch(NYM_NODES, { - headers: { - Accept: "application/json", - "Content-Type": "application/json; charset=utf-8", - }, - }); - if (!res.ok) { - throw new Error("Failed to fetch nodes"); - } - const data: NodeData[] = await res.json(); - return data; -}; + export const fetchObservatoryNodes = async (): Promise => { const allNodes: IObservatoryNode[] = []; diff --git a/explorer-v2/src/app/api/urls.ts b/explorer-v2/src/app/api/urls.ts index 0eb0630bef..6f6aaa0066 100644 --- a/explorer-v2/src/app/api/urls.ts +++ b/explorer-v2/src/app/api/urls.ts @@ -1,10 +1,6 @@ -export const NYM_NODES = - "https://explorer.nymtech.net/api/v1/tmp/unstable/nym-nodes"; -export const HARBOURMASTER_API_MIXNODES_STATS = - "https://harbourmaster.nymtech.net/v2/mixnodes/stats"; + export const NS_API_MIXNODES_STATS = "https://staging-node-status-api.nymte.ch/v2/mixnodes/stats"; - export const CURRENT_EPOCH = "https://validator.nymtech.net/api/v1/epoch/current"; export const CURRENT_EPOCH_REWARDS = @@ -18,8 +14,7 @@ export const VALIDATOR_BASE_URL = process.env.NEXT_PUBLIC_VALIDATOR_URL || "https://rpc.nymtech.net"; export const DATA_OBSERVATORY_NODES_URL = "https://api.nym.spectredao.net/api/v1/nodes"; -export const DATA_OBSERVATORY_NODES_DELEGATIONS_URL = - "https://api.nym.spectredao.net/api/v1/nodes"; + export const DATA_OBSERVATORY_DELEGATIONS_URL = "https://api.nym.spectredao.net/api/v1/delegations"; export const DATA_OBSERVATORY_BALANCES_URL = diff --git a/explorer-v2/src/app/page.tsx b/explorer-v2/src/app/page.tsx index cc6f1e26ab..d5f4ed2218 100644 --- a/explorer-v2/src/app/page.tsx +++ b/explorer-v2/src/app/page.tsx @@ -15,14 +15,12 @@ export default async function Home() { return ( - - Mixnet in your hands - + - + diff --git a/explorer-v2/src/components/footer/index.tsx b/explorer-v2/src/components/footer/index.tsx index c671c71f8a..b7497ba45d 100644 --- a/explorer-v2/src/components/footer/index.tsx +++ b/explorer-v2/src/components/footer/index.tsx @@ -15,7 +15,7 @@ export async function Footer() { const locale = "en"; const footerData = await getFooter(locale); const legalContent1 = - "Nym Noise Generating Mixnet Explorer, V 2.1.0 Public Beta release."; + "Nym Noise Generating Network Explorer, V 2.1.0 Public Beta release."; const legalContent2 = footerData?.attributes?.legalContent2 || false; const footerLinkBlocks = footerData?.attributes?.linkBlocks || []; diff --git a/explorer-v2/src/components/header/menuItems.ts b/explorer-v2/src/components/header/menuItems.ts index 7697dcb031..e201f0987d 100644 --- a/explorer-v2/src/components/header/menuItems.ts +++ b/explorer-v2/src/components/header/menuItems.ts @@ -19,7 +19,8 @@ const MENU_DATA: MenuItem[] = [ id: 3, title: "Onboarding", url: "/onboarding", - }, + } + ]; export default MENU_DATA;