From 9dd4c5d871d9a12abe0b5aa22eb595d84ce43265 Mon Sep 17 00:00:00 2001 From: Gala Date: Thu, 22 Dec 2022 14:20:21 +0100 Subject: [PATCH] Revert "NE: Switch button to change the explorer network" --- explorer/src/api/index.ts | 7 ------ explorer/src/components/MobileNav.tsx | 29 ++++++------------------- explorer/src/components/Nav.tsx | 21 ++---------------- explorer/src/components/Switch.tsx | 2 +- explorer/src/components/UptimeChart.tsx | 2 +- explorer/src/context/main.tsx | 11 ++-------- explorer/src/typeDefs/explorer-api.ts | 2 -- 7 files changed, 13 insertions(+), 61 deletions(-) diff --git a/explorer/src/api/index.ts b/explorer/src/api/index.ts index be0af90cb6..37e68b8096 100644 --- a/explorer/src/api/index.ts +++ b/explorer/src/api/index.ts @@ -1,5 +1,4 @@ import { - API_BASE_URL, BLOCK_API, COUNTRY_DATA_API, GATEWAYS_API, @@ -28,7 +27,6 @@ import { StatusResponse, SummaryOverviewResponse, ValidatorsResponse, - Environment, } from '../typeDefs/explorer-api'; function getFromCache(key: string) { @@ -145,8 +143,3 @@ export class Api { static fetchUptimeStoryById = async (id: string): Promise => (await fetch(`${UPTIME_STORY_API}/${id}/history`)).json(); } - -export const getEnvironment = (): Environment => { - const matchEnv = (env: Environment) => API_BASE_URL?.toLocaleLowerCase().includes(env) && env; - return matchEnv('sandbox') || matchEnv('qa') || 'mainnet'; -}; diff --git a/explorer/src/components/MobileNav.tsx b/explorer/src/components/MobileNav.tsx index e3515dff7f..cb44210e9d 100644 --- a/explorer/src/components/MobileNav.tsx +++ b/explorer/src/components/MobileNav.tsx @@ -31,18 +31,11 @@ type MobileNavProps = { export const MobileNav: React.FC<{ children: React.ReactNode }> = ({ children }: MobileNavProps) => { const theme = useTheme(); - const { navState, updateNavState, environment } = useMainContext(); + const { navState, updateNavState } = useMainContext(); const [drawerOpen, setDrawerOpen] = React.useState(false); // Set maintenance banner to false by default to don't display it const [openMaintenance, setOpenMaintenance] = React.useState(false); - const explorerName = - `${environment && environment.charAt(0).toUpperCase() + environment.slice(1)} Explorer` || 'Mainnet Explorer'; - - const switchNetworkText = environment === 'mainnet' ? 'Switch to Testnet' : 'Switch to Mainnet'; - const switchNetworkLink = - environment === 'mainnet' ? 'https://sandbox-explorer.nymtech.net' : 'https://explorer.nymtech.net'; - const toggleDrawer = () => { setDrawerOpen(!drawerOpen); }; @@ -83,7 +76,7 @@ export const MobileNav: React.FC<{ children: React.ReactNode }> = ({ children }: }} > - + = ({ children }: color: theme.palette.nym.networkExplorer.nav.text, fontSize: '18px', fontWeight: 600, + ml: 2, }} > - - {explorerName} + + Network Explorer - - + - diff --git a/explorer/src/components/Nav.tsx b/explorer/src/components/Nav.tsx index 93ea445a33..e2808871a0 100644 --- a/explorer/src/components/Nav.tsx +++ b/explorer/src/components/Nav.tsx @@ -2,7 +2,6 @@ import * as React from 'react'; import { Link } from 'react-router-dom'; import { ExpandLess, ExpandMore, Menu } from '@mui/icons-material'; import { CSSObject, styled, Theme, useTheme } from '@mui/material/styles'; -import Button from '@mui/material/Button'; import MuiLink from '@mui/material/Link'; import Box from '@mui/material/Box'; import ListItem from '@mui/material/ListItem'; @@ -232,20 +231,13 @@ ExpandableButton.defaultProps = { }; export const Nav: React.FC = ({ children }) => { - const { updateNavState, navState, environment } = useMainContext(); + const { updateNavState, navState } = useMainContext(); const [drawerIsOpen, setDrawerToOpen] = React.useState(false); const [fixedOpen, setFixedOpen] = React.useState(false); // Set maintenance banner to false by default to don't display it const [openMaintenance, setOpenMaintenance] = React.useState(false); const theme = useTheme(); - const explorerName = - `${environment && environment.charAt(0).toUpperCase() + environment.slice(1)} Explorer` || 'Mainnet Explorer'; - - const switchNetworkText = environment === 'mainnet' ? 'Switch to Testnet' : 'Switch to Mainnet'; - const switchNetworkLink = - environment === 'mainnet' ? 'https://sandbox-explorer.nymtech.net' : 'https://explorer.nymtech.net'; - const setToActive = (id: number) => { updateNavState(id); }; @@ -310,17 +302,8 @@ export const Nav: React.FC = ({ children }) => { }} > - {explorerName} + Network Explorer - ({ export const DarkLightSwitchMobile: React.FC = () => { const { toggleMode } = useMainContext(); return ( - ); diff --git a/explorer/src/components/UptimeChart.tsx b/explorer/src/components/UptimeChart.tsx index c5b4c0a402..51f2c9b62b 100644 --- a/explorer/src/components/UptimeChart.tsx +++ b/explorer/src/components/UptimeChart.tsx @@ -55,7 +55,7 @@ export const UptimeChart: React.FC = ({ title, xLabel, yLabel, uptim uptimeStory.data ? formattedChartData : [ - ['Date', 'Uptime'], + ['Date', 'Routing Score'], [format(new Date(Date.now()), 'MMM dd'), 0], ] } diff --git a/explorer/src/context/main.tsx b/explorer/src/context/main.tsx index 7d9287d0bf..42e89b32ee 100644 --- a/explorer/src/context/main.tsx +++ b/explorer/src/context/main.tsx @@ -9,10 +9,9 @@ import { MixnodeStatus, SummaryOverviewResponse, ValidatorsResponse, - Environment, } from '../typeDefs/explorer-api'; import { EnumFilterKey } from '../typeDefs/filters'; -import { Api, getEnvironment } from '../api'; +import { Api } from '../api'; import { NavOptionType, originalNavOptions } from './nav'; interface StateData { @@ -25,7 +24,6 @@ interface StateData { mode: PaletteMode; navState: NavOptionType[]; validators?: ApiState; - environment?: Environment; } interface StateApi { @@ -49,9 +47,6 @@ export const MainContext = React.createContext({ export const useMainContext = (): React.ContextType => React.useContext(MainContext); export const MainContextProvider: React.FC = ({ children }) => { - // network explorer environment - const [environment, setEnvironment] = React.useState('mainnet'); - // light/dark mode const [mode, setMode] = React.useState('dark'); @@ -171,12 +166,10 @@ export const MainContextProvider: React.FC = ({ children }) => { React.useEffect(() => { Promise.all([fetchOverviewSummary(), fetchGateways(), fetchValidators(), fetchBlock(), fetchCountryData()]); - setEnvironment(getEnvironment()); }, []); const state = React.useMemo( () => ({ - environment, block, countryData, fetchMixnodes, @@ -191,7 +184,7 @@ export const MainContextProvider: React.FC = ({ children }) => { updateNavState, validators, }), - [environment, block, countryData, gateways, globalError, mixnodes, mode, navState, summaryOverview, validators], + [block, countryData, gateways, globalError, mixnodes, mode, navState, summaryOverview, validators], ); return {children}; diff --git a/explorer/src/typeDefs/explorer-api.ts b/explorer/src/typeDefs/explorer-api.ts index 0f832b9f59..f8350775c4 100644 --- a/explorer/src/typeDefs/explorer-api.ts +++ b/explorer/src/typeDefs/explorer-api.ts @@ -224,5 +224,3 @@ export type MixNodeEconomicDynamicsStatsResponse = { estimated_delegators_reward: number; current_interval_uptime: number; }; - -export type Environment = 'mainnet' | 'sandbox' | 'qa';