From 3d0eb4e8c19e9f3e828da8dede11f5d96724975a Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 2 Mar 2020 09:13:22 +0100
Subject: [PATCH] Pull in prefix settings in apps-config (#2322)

---
 packages/apps-config/src/settings/index.ts    |  6 ++-
 .../apps-config/src/settings/languages.ts     |  8 +---
 packages/apps-config/src/settings/ss58.ts     | 38 +++++++++++++++++++
 packages/page-settings/src/General.tsx        |  4 +-
 4 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 packages/apps-config/src/settings/ss58.ts

diff --git a/packages/apps-config/src/settings/index.ts b/packages/apps-config/src/settings/index.ts
index 8c3395274d..a1da174a2d 100644
--- a/packages/apps-config/src/settings/index.ts
+++ b/packages/apps-config/src/settings/index.ts
@@ -2,10 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import availableLanguages from './languages';
 import availableEndpoints from './endpoints';
+import availableLanguages from './languages';
+import availableSs58 from './ss58';
 
 export {
   availableEndpoints,
-  availableLanguages
+  availableLanguages,
+  availableSs58
 };
diff --git a/packages/apps-config/src/settings/languages.ts b/packages/apps-config/src/settings/languages.ts
index 5179bcbfdc..d6d244126e 100644
--- a/packages/apps-config/src/settings/languages.ts
+++ b/packages/apps-config/src/settings/languages.ts
@@ -18,10 +18,4 @@ export default [
     text: '汉语',
     value: 'zh'
   }
-  // For ja, we only have the settings page, remove until comprehensive
-  // ,
-  // {
-  //   text: '日本語',
-  //   value: 'ja'
-  // }
-] as Option[];
+].map((option): Option => ({ ...option, withI18n: false }));
diff --git a/packages/apps-config/src/settings/ss58.ts b/packages/apps-config/src/settings/ss58.ts
new file mode 100644
index 0000000000..5d0d425af5
--- /dev/null
+++ b/packages/apps-config/src/settings/ss58.ts
@@ -0,0 +1,38 @@
+// Copyright 2017-2020 @polkadot/ui-settings authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { Option } from './types';
+
+export default [
+  {
+    info: 'default',
+    text: 'Default for the connected node',
+    value: -1
+  },
+  {
+    info: 'substrate',
+    text: 'Substrate (generic)',
+    value: 42
+  },
+  {
+    info: 'polkadot',
+    text: 'Polkadot (live)',
+    value: 0
+  },
+  {
+    info: 'kusama',
+    text: 'Kusama (canary)',
+    value: 2
+  },
+  {
+    info: 'edgeware',
+    text: 'Edgeware (live)',
+    value: 7
+  },
+  {
+    info: 'centrifuge',
+    text: 'Centrifuge (live)',
+    value: 36
+  }
+].map((option): Option => ({ ...option, withI18n: true }));
diff --git a/packages/page-settings/src/General.tsx b/packages/page-settings/src/General.tsx
index 04739a4a89..d072d50979 100644
--- a/packages/page-settings/src/General.tsx
+++ b/packages/page-settings/src/General.tsx
@@ -5,7 +5,7 @@
 import { Option } from '@polkadot/apps-config/settings/types';
 
 import React, { useEffect, useState, useMemo } from 'react';
-import { availableLanguages } from '@polkadot/apps-config/settings';
+import { availableLanguages, availableSs58 } from '@polkadot/apps-config/settings';
 import { isLedgerCapable } from '@polkadot/react-api';
 import { Button, ButtonCancel, Dropdown } from '@polkadot/react-components';
 import uiSettings, { SettingsStruct } from '@polkadot/ui-settings';
@@ -31,7 +31,7 @@ export default function General ({ className, isModalContent, onClose }: Props):
     return uiSettings.availableIcons.map((o): Option => createIdenticon(t, o, ['default']));
   }, [t]);
   const prefixOptions = useMemo((): Option[] => {
-    return uiSettings.availablePrefixes.map((o): Option => createOption(t, o, ['default']));
+    return availableSs58.map((o): Option => createOption(t, o, ['default']));
   }, [t]);
   const translateLanguages = useMemo((): Option[] => {
     return availableLanguages.map(({ text, value, withI18n }) => ({