Merge pull request #293 from pshenmic/fix/network-selector

Fix network selector
pshenmic · Oct 25, 2024 · 3580ee9 · 3580ee9
2 parents 980b4d2 + 0df1586
commit 3580ee9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/packages/frontend/src/app/validator/[hash]/Validator.js b/packages/frontend/src/app/validator/[hash]/Validator.js
@@ -33,7 +33,7 @@ function Validator ({ hash }) {
   const [withdrawals, setWithdrawals] = useState({ data: {}, props: { currentPage: 0 }, loading: true, error: false })
   const [activeChartTab, setActiveChartTab] = useState(0)
   const baseUrl = process.env.NEXT_PUBLIC_BASE_URL
-  const activeNetwork = networks.find(network => network.apiBaseUrl === baseUrl)
+  const activeNetwork = networks.find(network => network.explorerBaseUrl === baseUrl)
   const l1explorerBaseUrl = activeNetwork?.l1explorerBaseUrl || null
 
   const poseStatusColor = (validator.data?.proTxInfo?.state?.PoSeBanHeight > 0 &&

diff --git a/packages/frontend/src/components/layout/navbar/Dropdown.js b/packages/frontend/src/components/layout/navbar/Dropdown.js
@@ -6,8 +6,8 @@ import './NetworkSelect.scss'
 // props.data - The data array [{ name: '', subname: '', disabled: boolean, link: '' }]
 function Dropdown ({ active, data }) {
   const ButtonContainer = ({ item, children }) => item.name !== active
-    ? <a href={item.link} rel={'noopener noreferrer'}>{children}</a>
-    : <>{children}</>
+    ? <a href={item.explorerBaseUrl} rel={'noopener noreferrer'}>{children}</a>
+    : children
 
   return (
     <div className={'InternalNavigation'}>

diff --git a/packages/frontend/src/components/layout/navbar/Navbar.js b/packages/frontend/src/components/layout/navbar/Navbar.js
@@ -61,7 +61,7 @@ function Navbar () {
         <IconButton
           className={'Navbar__Burger'}
           size={'md'}
-          icon={isOpen ? <CloseIcon /> : <HamburgerIcon />}
+          icon={isOpen ? <CloseIcon/> : <HamburgerIcon/>}
           aria-label={'Open Menu'}
           display={{ lg: 'none' }}
           onClick={isOpen ? onClose : onOpen}

diff --git a/packages/frontend/src/components/layout/navbar/NetworkSelect.js b/packages/frontend/src/components/layout/navbar/NetworkSelect.js
@@ -7,7 +7,7 @@ import { networks } from '../../../constants/networks'
 
 function NetworkSelect () {
   const baseUrl = process.env.NEXT_PUBLIC_BASE_URL
-  const activeNetwork = networks.find(network => network.apiBaseUrl === baseUrl)
+  const activeNetwork = networks.find(network => network.explorerBaseUrl === baseUrl)
   const [showDropdown, setShowDropdown] = useState(false)
 
   return (

diff --git a/packages/frontend/src/constants/networks.js b/packages/frontend/src/constants/networks.js
@@ -3,14 +3,14 @@ export const networks = [
     name: 'mainnet',
     subname: '',
     disabled: false,
-    apiBaseUrl: 'https://platform-explorer.com',
+    explorerBaseUrl: 'https://platform-explorer.com',
     l1explorerBaseUrl: 'https://insight.dash.org/insight'
   },
   {
     name: 'testnet',
     subname: '',
     disabled: false,
-    apiBaseUrl: 'https://testnet.platform-explorer.com',
+    explorerBaseUrl: 'https://testnet.platform-explorer.com',
     l1explorerBaseUrl: 'http://insight.testnet.networks.dash.org:3001/insight'
   }
 ]