From b773bd9ad2409a3a4ae6b794aaa040025dacd062 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 8 Jan 2021 09:38:25 +0100
Subject: [PATCH] Config alphabetical updates (#4344)

---
 packages/apps-config/src/endpoints/testing.ts | 29 +++++++++----------
 packages/apps-config/src/ui/colors.ts         | 10 +++----
 packages/apps-config/src/ui/logos/index.ts    |  4 +--
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts
index 81d1b53890..46bda1ef91 100644
--- a/packages/apps-config/src/endpoints/testing.ts
+++ b/packages/apps-config/src/endpoints/testing.ts
@@ -103,6 +103,18 @@ export function createTesting (t: TFunction): LinkOption[] {
       textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'MathWallet' } }),
       value: 'wss://galois.maiziqianbao.net/ws'
     },
+    {
+      info: 'jupiter',
+      text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
+      textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Elara' } }),
+      value: 'wss://jupiter.elara.patract.io'
+    },
+    {
+      info: 'jupiter',
+      text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
+      textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Patract' } }),
+      value: 'wss://ws.jupiter.patract.cn'
+    },
     {
       info: 'acala',
       text: t('rpc.mandala', 'Mandala', { ns: 'apps-config' }),
@@ -159,25 +171,10 @@ export function createTesting (t: TFunction): LinkOption[] {
       value: 'wss://westend-rpc.polkadot.io'
     },
     {
-      dnslink: 'zero',
       info: 'zero',
-      text: t('rpc.zero', 'zero', { ns: 'apps-config' }),
+      text: t('rpc.zero', 'Zero', { ns: 'apps-config' }),
       textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'ZERO' } }),
       value: 'wss://alphaville-0.zero.io'
-    },
-    {
-      dnslink: 'jupiter',
-      info: 'jupiter',
-      text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
-      textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Elara' } }),
-      value: 'wss://jupiter.elara.patract.io'
-    },
-    {
-      dnslink: 'jupiter',
-      info: 'jupiter',
-      text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
-      textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Patract' } }),
-      value: 'wss://ws.jupiter.patract.cn'
     }
   ];
 }
diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts
index 1f64c39f95..db48e93c7e 100644
--- a/packages/apps-config/src/ui/colors.ts
+++ b/packages/apps-config/src/ui/colors.ts
@@ -41,6 +41,7 @@ const nodeEdgeware = '#0a95df';
 const nodeEncointerNotee = '#cc0000';
 const nodeEncointerTeeproxy = '#0000cc';
 const nodeEquilibrium = '#1792ff';
+const nodeJupiter = '#7143ff';
 const nodeMoonbeam = '#53cbc9';
 const nodeNodle = '#1ab394';
 const nodeKilt = '#eb5b2a';
@@ -49,7 +50,6 @@ const nodeSora = '#2D2926';
 const nodeStafi = '#00F3AB';
 const nodeSubsocial = '#b9018c';
 const nodeZero = '#0099cc';
-const nodeJupiter = '#7143ff';
 
 export { emptyColor };
 
@@ -62,6 +62,7 @@ export const chainColors: Record<string, any> = [
   ['darwinia cc1', chainDarwinia],
   ['darwinia parachain', chainRoccoDarwinia],
   ['hanonycash', chainHanonycash],
+  ['Jupiter Testnet', chainJupiter],
   ['Kulupu', chainKulupu],
   ['Kusama', chainKusama],
   ['Kusama CC1', chainKusama],
@@ -81,8 +82,7 @@ export const chainColors: Record<string, any> = [
   ['Trick', chainRoccoTrick],
   ['Westend', chainWestend],
   ['Galois', chainGalois],
-  ['ZΞRO Alphaville', chainZero],
-  ['Jupiter Testnet', chainJupiter]
+  ['ZΞRO Alphaville', chainZero]
 ].reduce((colors, [chain, color]): Record<string, any> => ({
   ...colors,
   [chain.toLowerCase()]: color
@@ -100,14 +100,14 @@ export const nodeColors: Record<string, any> = [
   ['Encointer Node noTEE', nodeEncointerNotee],
   ['Encointer Node TEE proxy', nodeEncointerTeeproxy],
   ['Equilibrium node', nodeEquilibrium],
+  ['Jupiter Node', nodeJupiter],
   ['kilt node', nodeKilt],
   ['nodle chain node', nodeNodle],
   ['Polkadex Node', nodePolkadex],
   ['SORA-staging Node', nodeSora],
   ['Stafi node', nodeStafi],
   ['subsocial node', nodeSubsocial],
-  ['SUBZΞRO', nodeZero],
-  ['Jupiter Node', nodeJupiter]
+  ['SUBZΞRO', nodeZero]
   // ['node template', emptyColor],
   // ['parity polkadot', emptyColor],
   // ['substrate node', emptyColor]
diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts
index 9fec02db3b..ec90487af0 100644
--- a/packages/apps-config/src/ui/logos/index.ts
+++ b/packages/apps-config/src/ui/logos/index.ts
@@ -96,6 +96,7 @@ export const nodeLogos: Record<string, unknown> = [
   ['Encointer Node TEE proxy', nodeEncointerTeeproxy],
   ['Galois', nodeMath],
   ['hanonycash', nodeHanonycash],
+  ['Jupiter Node', nodeJupiter],
   ['KILT Node', nodeKilt],
   ['kulupu', nodeKulupu],
   ['node-template', nodeSubstrate],
@@ -113,8 +114,7 @@ export const nodeLogos: Record<string, unknown> = [
   ['substrate-node', nodeSubstrate],
   ['Equilibrium Node', nodeEquilibrium],
   ['Equilibrium', nodeEquilibrium],
-  ['SUBZΞRO', nodeZero],
-  ['Jupiter Node', nodeJupiter]
+  ['SUBZΞRO', nodeZero]
 ].reduce((logos, [node, logo]): Record<string, unknown> => ({
   ...logos,
   [(node as string).toLowerCase().replace(/-/g, ' ')]: logo