Merge pull request #1445 from oasisprotocol/csillag/enable-pontusx-on-dev-buils

Un-hide the Pontus-X Testnet layer

Author: csillag

.changelog/1445.trivial.md

@@ -0,0 +1 @@
+Un-hide the Pontus-X testnet in the layer selector

src/app/components/LayerPicker/LayerMenu.tsx

@@ -9,9 +9,9 @@ import Tooltip from '@mui/material/Tooltip'
 import { COLORS } from '../../../styles/theme/colors'
 import { Layer } from '../../../oasis-nexus/api'
 import { getLayerLabels } from '../../utils/content'
-import { RouteUtils } from '../../utils/route-utils'
+import { isLayerHidden, RouteUtils } from '../../utils/route-utils'
 import { Network } from '../../../types/network'
-import { isLayerHidden, orderByLayer } from '../../../types/layers'
+import { orderByLayer } from '../../../types/layers'
 import { useScreenSize } from '../../hooks/useScreensize'
 import { useScopeParam } from '../../hooks/useScopeParam'
 

src/app/pages/ConsensusDashboardPage/ParaTimesCard.tsx

@@ -6,10 +6,9 @@ import CardHeader from '@mui/material/CardHeader'
 import CardContent from '@mui/material/CardContent'
 import { styled } from '@mui/material/styles'
 import { Layer, Runtime } from '../../../oasis-nexus/api'
-import { isNotOnHiddenLayer } from '../../../types/layers'
 import { COLORS } from '../../../styles/theme/colors'
 import { CardHeaderWithCounter } from '../../components/CardHeaderWithCounter'
-import { RouteUtils } from '../../utils/route-utils'
+import { isNotOnHiddenLayer, RouteUtils } from '../../utils/route-utils'
 import { SearchScope } from '../../../types/searchScope'
 import { EnabledRuntimePreview, InactiveRuntimePreview } from './RuntimePreview'
 

src/app/utils/route-utils.ts

@@ -7,7 +7,7 @@ import { Network } from '../../types/network'
 import { SearchScope } from '../../types/searchScope'
 import { isStableDeploy } from '../../config'
 import { getSearchTermFromRequest } from '../components/Search/search-utils'
-import { isLayerHidden } from '../../types/layers'
+import type { HasLayer } from '../../types/layers'
 
 export const fixedNetwork = process.env.REACT_APP_FIXED_NETWORK as Network | undefined
 export const fixedLayer = process.env.REACT_APP_FIXED_LAYER as Layer | undefined
@@ -37,6 +37,12 @@ export type SpecifiedPerEnabledLayer<T = any, ExcludeLayers = never> = {
 
 export type SpecifiedPerEnabledRuntime<T = any> = SpecifiedPerEnabledLayer<T, typeof Layer.consensus>
 
+export const hiddenLayers: Layer[] = [Layer.pontusxdev]
+
+export const isLayerHidden = (layer: Layer): boolean => hiddenLayers.includes(layer)
+
+export const isNotOnHiddenLayer = (item: HasLayer) => !isLayerHidden(item.layer)
+
 export abstract class RouteUtils {
   private static ENABLED_LAYERS_FOR_NETWORK = {
     [Network.mainnet]: {

src/locales/en/translation.json

@@ -580,7 +580,7 @@
   },
   "pontusx": {
     "devnet": "Pontus-X devnet",
-    "testnet": "Pontus-X testnet"
+    "testnet": "Pontus-X"
   },
   "search": {
     "placeholder": "Address, Block, Contract, Transaction hash, Token name, etc.",

src/types/layers.ts

@@ -5,7 +5,7 @@ import { uniq } from '../app/utils/helpers'
 // eslint-disable-next-line no-restricted-imports
 import { Layer } from '../oasis-nexus/generated/api'
 
-interface HasLayer {
+export interface HasLayer {
   layer: Layer
 }
 
@@ -20,8 +20,6 @@ const layerOrder: Record<Layer, number> = {
   [Layer.pontusx]: 6,
 }
 
-const hiddenLayers: Layer[] = [Layer.pontusxdev, Layer.pontusx]
-
 export const orderByLayer = (itemA: HasLayer, itemB: HasLayer): number =>
   layerOrder[itemA.layer] - layerOrder[itemB.layer]
 
@@ -32,7 +30,3 @@ export const doesLayerSupportEncryptedTransactions = (layer: Layer): boolean =>
 
 export const doesAnyOfTheseLayersSupportEncryptedTransactions = (layers: Layer[] | undefined): boolean =>
   uniq(layers).some(doesLayerSupportEncryptedTransactions)
-
-export const isLayerHidden = (layer: Layer): boolean => hiddenLayers.includes(layer)
-
-export const isNotOnHiddenLayer = (item: HasLayer) => !isLayerHidden(item.layer)