Merge pull request #1304 from DzhideX/edvin/iznik-fixes

Pioneer: Sidebar renaming and moving of items

pioneer/packages/apps-routing/src/accounts.ts

@@ -12,9 +12,9 @@ export default function create (t: <T = string> (key: string, text: string, opti
     display: {
       needsApi: []
     },
-    icon: 'users',
+    icon: 'key',
     name: 'accounts',
-    text: t<string>('nav.accounts', 'Accounts', { ns: 'apps-routing' }),
+    text: t<string>('nav.accounts', 'My Keys', { ns: 'apps-routing' }),
     useCounter
   };
 }

pioneer/packages/apps-routing/src/index.ts

@@ -18,7 +18,7 @@ import storage from './storage';
 import sudo from './sudo';
 import toolbox from './toolbox';
 import transfer from './transfer';
-import memo from './memo';
+// import memo from './memo';
 // Joy packages
 import members from './joy-members';
 import { terms, privacyPolicy } from './joy-pages';
@@ -41,7 +41,6 @@ export default function create (t: <T = string> (key: string, text: string, opti
       null,
       transfer(t),
       accounts(t),
-      memo(t),
       settings(t),
       // Those are hidden
       terms(t),
@@ -58,7 +57,6 @@ export default function create (t: <T = string> (key: string, text: string, opti
       null,
       transfer(t),
       accounts(t),
-      memo(t),
       settings(t),
       null,
       explorer(t),

pioneer/packages/apps-routing/src/staking.ts

@@ -16,6 +16,6 @@ export default function create (t: <T = string> (key: string, text: string, opti
     },
     icon: 'certificate',
     name: 'staking',
-    text: t<string>('nav.staking', 'Staking', { ns: 'apps-routing' })
+    text: t<string>('nav.staking', 'Validators', { ns: 'apps-routing' })
   };
 }

pioneer/packages/apps/public/locales/en/app-accounts.json

@@ -75,6 +75,7 @@
   "Multisig approvals": "Multisig approvals",
   "Multisig approvals pending": "Multisig approvals pending",
   "Multisig message with call (for final approval)": "Multisig message with call (for final approval)",
+  "My Memo": "My Memo",
   "My On-Chain Name": "My On-Chain Name",
   "My accounts": "My accounts",
   "My contacts": "My contacts",

pioneer/packages/page-accounts/src/index.tsx

@@ -8,6 +8,7 @@ import React, { useMemo } from 'react';
 import { Route, Switch } from 'react-router';
 import { useAccounts, useIpfs } from '@polkadot/react-hooks';
 import { HelpOverlay, Tabs } from '@polkadot/react-components';
+import { MemoForm } from '@polkadot/joy-utils/react/components/Memo';
 
 import basicMd from './md/basic.md';
 import { useTranslation } from './translate';
@@ -35,6 +36,10 @@ function AccountsApp ({ basePath, onStatusChange }: Props): React.ReactElement<P
     {
       name: 'vanity',
       text: t<string>('Vanity generator')
+    },
+    {
+      name: 'memo',
+      text: t<string>('My Memo')
     }
   ], [t]);
   const hidden = useMemo(
@@ -65,6 +70,9 @@ function AccountsApp ({ basePath, onStatusChange }: Props): React.ReactElement<P
             onStatusChange={onStatusChange}
           />
         </Route>
+        <Route path={`${basePath}/memo`}>
+          <MemoForm />
+        </Route>
         <Route>
           <Accounts
             basePath={basePath}