diff --git a/apps/staking/src/app/api/v1/cmc/supply/route.ts b/apps/staking/src/app/api/v1/cmc/supply/route.ts index 21298dd963..d895a143fb 100644 --- a/apps/staking/src/app/api/v1/cmc/supply/route.ts +++ b/apps/staking/src/app/api/v1/cmc/supply/route.ts @@ -4,19 +4,17 @@ import { clusterApiUrl, Connection } from "@solana/web3.js"; import type { NextRequest } from "next/server"; import { z } from "zod"; -import { IS_MAINNET, RPC } from "../../../../../config/server"; +import { MAINNET_RPC } from "../../../../../config/server"; const querySchema = z.enum(["totalSupply", "circulatingSupply"]); export async function GET(req: NextRequest) { + const isMainnet = req.nextUrl.searchParams.get("devnet") !== "true"; const stakingClient = new PythStakingClient({ connection: new Connection( - RPC ?? - clusterApiUrl( - IS_MAINNET - ? WalletAdapterNetwork.Mainnet - : WalletAdapterNetwork.Devnet, - ), + isMainnet && MAINNET_RPC !== undefined + ? MAINNET_RPC + : clusterApiUrl(WalletAdapterNetwork.Devnet), { httpHeaders: { Origin: req.nextUrl.origin, diff --git a/apps/staking/src/app/api/v1/locked_accounts/route.ts b/apps/staking/src/app/api/v1/locked_accounts/route.ts index 47f2ad9949..cd8817b20b 100644 --- a/apps/staking/src/app/api/v1/locked_accounts/route.ts +++ b/apps/staking/src/app/api/v1/locked_accounts/route.ts @@ -4,7 +4,7 @@ import { clusterApiUrl, Connection, PublicKey } from "@solana/web3.js"; import type { NextRequest } from "next/server"; import { z } from "zod"; -import { IS_MAINNET, RPC } from "../../../../config/server"; +import { MAINNET_RPC } from "../../../../config/server"; import { tokensToString } from "../../../../tokens"; const UnlockScheduleSchema = z.object({ @@ -35,14 +35,12 @@ const isValidPublicKey = (publicKey: string) => { }; export async function GET(req: NextRequest) { + const isMainnet = req.nextUrl.searchParams.get("devnet") !== "true"; const stakingClient = new PythStakingClient({ connection: new Connection( - RPC ?? - clusterApiUrl( - IS_MAINNET - ? WalletAdapterNetwork.Mainnet - : WalletAdapterNetwork.Devnet, - ), + isMainnet && MAINNET_RPC !== undefined + ? MAINNET_RPC + : clusterApiUrl(WalletAdapterNetwork.Devnet), { httpHeaders: { Origin: req.nextUrl.origin, diff --git a/apps/staking/src/components/Menu/index.tsx b/apps/staking/src/components/Menu/index.tsx index 9c71f11b99..752c81dfb5 100644 --- a/apps/staking/src/components/Menu/index.tsx +++ b/apps/staking/src/components/Menu/index.tsx @@ -23,16 +23,13 @@ export const Menu = ({ ...props }: MenuProps) => ( - + ); @@ -51,7 +48,7 @@ export const MenuItem = ({ -
- Show your positions first -
-
-
-
- + preLabel="Show your positions first" + />
diff --git a/apps/staking/src/components/Root/index.tsx b/apps/staking/src/components/Root/index.tsx index 2402fb42ad..cc261b642b 100644 --- a/apps/staking/src/components/Root/index.tsx +++ b/apps/staking/src/components/Root/index.tsx @@ -1,8 +1,7 @@ import { GoogleAnalytics } from "@next/third-parties/google"; -import { WalletAdapterNetwork } from "@solana/wallet-adapter-base"; import clsx from "clsx"; import { Red_Hat_Text, Red_Hat_Mono } from "next/font/google"; -import type { ReactNode, CSSProperties } from "react"; +import type { ReactNode, CSSProperties, HTMLProps } from "react"; import { I18nProvider } from "./i18n-provider"; import { RestrictedRegionBanner } from "./restricted-region-banner"; @@ -11,12 +10,12 @@ import { GOOGLE_ANALYTICS_ID, AMPLITUDE_API_KEY, WALLETCONNECT_PROJECT_ID, - RPC, + MAINNET_RPC, HERMES_URL, - IS_MAINNET, } from "../../config/server"; import { ApiProvider } from "../../hooks/use-api"; import { LoggerProvider } from "../../hooks/use-logger"; +import { NetworkProvider } from "../../hooks/use-network"; import { Amplitude } from "../Amplitude"; import { Footer } from "../Footer"; import { Header } from "../Header"; @@ -40,49 +39,48 @@ type Props = { }; export const Root = ({ children }: Props) => ( + + +
+ + + {children} + +