Cleanup testnet sorting (#4658)

* Cleanup testnet sorting

* Logo adjustments

* test relays

* Ternoa before Turbulence

* rococo header

packages/apps-config/src/endpoints/index.ts

@@ -7,6 +7,7 @@ import type { LinkOption } from '../settings/types';
 import { createCustom, createDev, createOwn } from './development';
 import { createProduction } from './production';
 import { createTesting } from './testing';
+import { createRococo } from './testingRococo';
 
 export { CUSTOM_ENDPOINT_KEY } from './development';
 
@@ -21,6 +22,14 @@ export function createWsEndpoints (t: TFunction): LinkOption[] {
       value: ''
     },
     ...createProduction(t),
+    {
+      isDisabled: false,
+      isHeader: true,
+      text: t('rpc.header.test.relay', 'Test relays & parachains', { ns: 'apps-config' }),
+      textBy: '',
+      value: ''
+    },
+    ...createRococo(t),
     {
       isDisabled: false,
       isHeader: true,

packages/apps-config/src/endpoints/testing.ts

@@ -4,7 +4,6 @@
 import type { TFunction } from 'i18next';
 import type { LinkOption } from '../settings/types';
 
-import { createRococo } from './testingRococo';
 import { expandEndpoints } from './util';
 
 /* eslint-disable sort-keys */
@@ -17,8 +16,6 @@ import { expandEndpoints } from './util';
 
 export function createTesting (t: TFunction): LinkOption[] {
   return expandEndpoints(t, [
-    // polkadot test relays
-    createRococo(t),
     // alphabetical based on chain name, e.g. Amber, Arcadia, Beresheet, ...
     {
       info: 'centrifuge',
@@ -144,13 +141,7 @@ export function createTesting (t: TFunction): LinkOption[] {
       info: 'jupiter',
       text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
       providers: {
-        Elara: 'wss://jupiter.elara.patract.io'
-      }
-    },
-    {
-      info: 'jupiter',
-      text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
-      providers: {
+        Elara: 'wss://jupiter.elara.patract.io',
         Patract: 'wss://ws.jupiter.patract.cn'
       }
     },
@@ -197,13 +188,6 @@ export function createTesting (t: TFunction): LinkOption[] {
         Interlay: 'wss://alpha.polkabtc.io/api/parachain'
       }
     },
-    {
-      info: 'laminar',
-      text: t('rpc.turbulence', 'Turbulence', { ns: 'apps-config' }),
-      providers: {
-        Laminar: 'wss://testnet-node-1.laminar-chain.laminar.one/ws'
-      }
-    },
     {
       info: 'sora-substrate',
       text: t('rpc.sora-substrate', 'SORA-staging', { ns: 'apps-config' }),
@@ -218,6 +202,13 @@ export function createTesting (t: TFunction): LinkOption[] {
         CapsuleCorp: 'wss://chaos.ternoa.com'
       }
     },
+    {
+      info: 'laminar',
+      text: t('rpc.turbulence', 'Turbulence', { ns: 'apps-config' }),
+      providers: {
+        Laminar: 'wss://testnet-node-1.laminar-chain.laminar.one/ws'
+      }
+    },
     {
       info: 'uniarts',
       text: t('rpc.uniarts', 'Uniarts', { ns: 'apps-config' }),

packages/apps-config/src/endpoints/testingRococo.ts

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { TFunction } from 'i18next';
-import type { EndpointOption } from './types';
+import type { LinkOption } from '../settings/types';
+
+import { expandEndpoints } from './util';
 
 /* eslint-disable sort-keys */
 
@@ -13,8 +15,8 @@ import type { EndpointOption } from './types';
 //   value: The actual hosted secure websocket endpoint
 
 // Based on history, this will expand so keep it as a singular chunk
-export function createRococo (t: TFunction): EndpointOption {
-  return {
+export function createRococo (t: TFunction): LinkOption[] {
+  return expandEndpoints(t, [{
     dnslink: 'rococo',
     genesisHash: '0xe2bcff61f49d41ef837b92331a3f02dee14fa59723bc850697f516c5376cde1c',
     info: 'rococo',
@@ -141,11 +143,19 @@ export function createRococo (t: TFunction): EndpointOption {
         }
       },
       {
-        info: 'rococoPolkabtc',
-        paraId: 21,
-        text: t('rpc.rococo.polkabtc', 'PolkaBTC PC1', { ns: 'apps-config' }),
+        info: 'rococoKilt',
+        paraId: 12623,
+        text: t('rpc.rococo.kilt', 'KILT PC1', { ns: 'apps-config' }),
         providers: {
-          Interlay: 'wss://rococo.polkabtc.io/api/parachain'
+          'KILT Protocol': 'wss://para.rococo-v1.kilt.io'
+        }
+      },
+      {
+        info: 'rococoLitentry',
+        paraId: 1984,
+        text: t('rpc.rocco.litentry', 'Litentry Rostock', { ns: 'apps-config' }),
+        providers: {
+          Litentry: 'wss://rococov1.litentry.io'
         }
       },
       {
@@ -156,14 +166,6 @@ export function createRococo (t: TFunction): EndpointOption {
           Acala: 'wss://rococo-1.acala.laminar.one/ws'
         }
       },
-      {
-        info: 'rococoKilt',
-        paraId: 12623,
-        text: t('rpc.rococo.kilt', 'KILT PC1', { ns: 'apps-config' }),
-        providers: {
-          'KILT Protocol': 'wss://para.rococo-v1.kilt.io'
-        }
-      },
       {
         info: 'rococoPhala',
         paraId: 30,
@@ -180,6 +182,14 @@ export function createRococo (t: TFunction): EndpointOption {
           PlasmNetwork: 'wss://rpc.rococo.plasmnet.io'
         }
       },
+      {
+        info: 'rococoPolkabtc',
+        paraId: 21,
+        text: t('rpc.rococo.polkabtc', 'PolkaBTC PC1', { ns: 'apps-config' }),
+        providers: {
+          Interlay: 'wss://rococo.polkabtc.io/api/parachain'
+        }
+      },
       {
         info: 'rococoRobonomics',
         paraId: 3000,
@@ -188,14 +198,6 @@ export function createRococo (t: TFunction): EndpointOption {
           Airalab: 'wss://rococo.parachain.robonomics.network'
         }
       },
-      {
-        info: 'rococoZenlink',
-        paraId: 188,
-        text: t('rpc.rococo.zenlink', 'Zenlink PC1', { ns: 'apps-config' }),
-        providers: {
-          Zenlink: 'wss://rococo-parachain.zenlink.pro'
-        }
-      },
       {
         info: 'rococoSubDAO',
         paraId: 888,
@@ -213,13 +215,13 @@ export function createRococo (t: TFunction): EndpointOption {
         }
       },
       {
-        info: 'rococoLitentry',
-        paraId: 1984,
-        text: t('rpc.rocco.litentry', 'Litentry Rostock', { ns: 'apps-config' }),
+        info: 'rococoZenlink',
+        paraId: 188,
+        text: t('rpc.rococo.zenlink', 'Zenlink PC1', { ns: 'apps-config' }),
         providers: {
-          Litentry: 'wss://rococov1.litentry.io'
+          Zenlink: 'wss://rococo-parachain.zenlink.pro'
         }
       }
     ]
-  };
+  }]);
 }

packages/apps-config/src/ui/logos/index.ts

@@ -234,6 +234,7 @@ export const namedLogos: Record<string, unknown> = {
   rococoDataHighway: nodeDataHighway,
   rococoEncointer: nodeEncointerNotee,
   rococoHydrate: chainHydrate,
+  rococoIdavoll: nodeIdavoll,
   rococoIntegritee: nodeIntegritee,
   rococoKilt: nodeKilt,
   rococoLaminar: nodeLaminar,