From 1d566a85b21713997cb50defc62071ecd0c31e9a Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Mon, 24 Apr 2017 15:15:25 +0200
Subject: [PATCH] Convert missing icons for ~/ui import

---
 js/src/routes.js                              |  4 +-
 js/src/ui/Icons/index.js                      |  3 ++
 js/src/views/Addresses/addresses.js           |  4 +-
 .../{playground => views/Playground}/index.js |  0
 .../Playground}/playground.css                |  0
 .../Playground}/playground.js                 |  0
 .../Playground}/playground.spec.js            |  0
 .../Playground}/playgroundExample.js          |  0
 .../{playground => views/Playground}/store.js |  0
 .../Playground}/store.spec.js                 |  0
 .../views/Settings/Background/background.js   |  4 +-
 js/src/views/Settings/Views/views.js          | 44 -------------------
 js/src/views/Settings/settings.js             | 13 +++---
 js/src/views/Web/AddressBar/addressBar.js     |  5 +--
 14 files changed, 17 insertions(+), 60 deletions(-)
 rename js/src/{playground => views/Playground}/index.js (100%)
 rename js/src/{playground => views/Playground}/playground.css (100%)
 rename js/src/{playground => views/Playground}/playground.js (100%)
 rename js/src/{playground => views/Playground}/playground.spec.js (100%)
 rename js/src/{playground => views/Playground}/playgroundExample.js (100%)
 rename js/src/{playground => views/Playground}/store.js (100%)
 rename js/src/{playground => views/Playground}/store.spec.js (100%)

diff --git a/js/src/routes.js b/js/src/routes.js
index e05e55a84..2ca390347 100644
--- a/js/src/routes.js
+++ b/js/src/routes.js
@@ -71,9 +71,9 @@ const childRoutes = [
   { path: 'web/:url', component: Web }
 ];
 
-// TODO : use ES6 imports when supported
+// TODO: use ES6 imports when supported
 if (process.env.NODE_ENV !== 'production') {
-  const Playground = require('./playground').default;
+  const Playground = require('./views/Playground').default;
 
   childRoutes.push({
     path: 'playground',
diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js
index e637a239a..6478ed019 100644
--- a/js/src/ui/Icons/index.js
+++ b/js/src/ui/Icons/index.js
@@ -19,6 +19,7 @@ export AddressesIcon from 'material-ui/svg-icons/communication/contacts';
 export AddIcon from 'material-ui/svg-icons/content/add';
 export AppsIcon from 'material-ui/svg-icons/navigation/apps';
 export AttachFileIcon from 'material-ui/svg-icons/editor/attach-file';
+export BackgroundIcon from 'material-ui/svg-icons/image/blur-on';
 export CancelIcon from 'material-ui/svg-icons/content/clear';
 export CheckIcon from 'material-ui/svg-icons/navigation/check';
 export CloseIcon from 'material-ui/svg-icons/navigation/close';
@@ -34,6 +35,7 @@ export DoneIcon from 'material-ui/svg-icons/action/done-all';
 export DialIcon from 'material-ui/svg-icons/communication/dialpad';
 export EditIcon from 'material-ui/svg-icons/content/create';
 export ErrorIcon from 'material-ui/svg-icons/alert/error';
+export Ethernet from 'material-ui/svg-icons/action/settings-ethernet';
 export FileDownloadIcon from 'material-ui/svg-icons/file/file-download';
 export FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
 export FileIcon from 'material-ui/svg-icons/editor/insert-drive-file';
@@ -65,6 +67,7 @@ export StarCircleIcon from 'material-ui/svg-icons/action/stars';
 export StarIcon from 'material-ui/svg-icons/toggle/star';
 export StarOutlineIcon from 'material-ui/svg-icons/toggle/star-border';
 export StatusIcon from 'material-ui/svg-icons/action/track-changes';
+export SubdirectoryIcon from 'material-ui/svg-icons/navigation/subdirectory-arrow-left';
 export UnlockedIcon from 'material-ui/svg-icons/action/lock-open';
 export UpdateIcon from 'material-ui/svg-icons/action/system-update-alt';
 export UpdateWaitIcon from 'material-ui/svg-icons/action/update';
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index c02a760f1..41487e5b0 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -18,13 +18,13 @@ import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import ContentAdd from 'material-ui/svg-icons/content/add';
 import { uniq, isEqual } from 'lodash';
 
 import List from '../Accounts/List';
 import Summary from '../Accounts/Summary';
 import { AddAddress } from '~/modals';
 import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
+import { AddIcon } from '~/ui/Icons';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
 import styles from './addresses.css';
@@ -135,7 +135,7 @@ class Addresses extends Component {
     const buttons = [
       <Button
         key='newAddress'
-        icon={ <ContentAdd /> }
+        icon={ <AddIcon /> }
         label={
           <FormattedMessage
             id='addresses.buttons.add'
diff --git a/js/src/playground/index.js b/js/src/views/Playground/index.js
similarity index 100%
rename from js/src/playground/index.js
rename to js/src/views/Playground/index.js
diff --git a/js/src/playground/playground.css b/js/src/views/Playground/playground.css
similarity index 100%
rename from js/src/playground/playground.css
rename to js/src/views/Playground/playground.css
diff --git a/js/src/playground/playground.js b/js/src/views/Playground/playground.js
similarity index 100%
rename from js/src/playground/playground.js
rename to js/src/views/Playground/playground.js
diff --git a/js/src/playground/playground.spec.js b/js/src/views/Playground/playground.spec.js
similarity index 100%
rename from js/src/playground/playground.spec.js
rename to js/src/views/Playground/playground.spec.js
diff --git a/js/src/playground/playgroundExample.js b/js/src/views/Playground/playgroundExample.js
similarity index 100%
rename from js/src/playground/playgroundExample.js
rename to js/src/views/Playground/playgroundExample.js
diff --git a/js/src/playground/store.js b/js/src/views/Playground/store.js
similarity index 100%
rename from js/src/playground/store.js
rename to js/src/views/Playground/store.js
diff --git a/js/src/playground/store.spec.js b/js/src/views/Playground/store.spec.js
similarity index 100%
rename from js/src/playground/store.spec.js
rename to js/src/views/Playground/store.spec.js
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
index 0064cdb50..fd271111a 100644
--- a/js/src/views/Settings/Background/background.js
+++ b/js/src/views/Settings/Background/background.js
@@ -18,9 +18,9 @@ import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
 
 import { Button, Container, ParityBackground } from '~/ui';
+import { RefreshIcon } from '~/ui/Icons';
 
 import { updateBackground } from '~/redux/providers/settings/actions';
 
@@ -78,7 +78,7 @@ class Background extends Component {
             </div>
             <div>
               <Button
-                icon={ <NavigationRefresh /> }
+                icon={ <RefreshIcon /> }
                 label={
                   <FormattedMessage
                     id='settings.background.button_more'
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index def198e14..8a4084feb 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -68,28 +68,6 @@ class Views extends Component {
             </div>
           </div>
           <div className={ layout.details }>
-            {
-              this.renderView('accounts',
-                <FormattedMessage
-                  id='settings.views.accounts.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.accounts.description'
-                  defaultMessage='A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.'
-                />
-              )
-            }
-            {
-              this.renderView('addresses',
-                <FormattedMessage
-                  id='settings.views.addresses.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.addresses.description'
-                  defaultMessage='A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.'
-                />
-              )
-            }
             {
               this.renderView('apps',
                 <FormattedMessage
@@ -101,28 +79,6 @@ class Views extends Component {
                 />
               )
             }
-            {
-              this.renderView('contracts',
-                <FormattedMessage
-                  id='settings.views.contracts.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.contracts.description'
-                  defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
-                />
-              )
-            }
-            {
-              this.renderView('signer',
-                <FormattedMessage
-                  id='settings.views.signer.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.signer.description'
-                  defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.'
-                />
-              )
-            }
           </div>
         </div>
       </Container>
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
index e2485a3ca..01bb82ef0 100644
--- a/js/src/views/Settings/settings.js
+++ b/js/src/views/Settings/settings.js
@@ -17,12 +17,11 @@
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Tab, Tabs } from 'material-ui';
-import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethernet';
-import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
-import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye';
+
+import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
 
 import { Actionbar, Page } from '~/ui';
-import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
+import { BackgroundIcon, Ethernet, VisibleIcon } from '~/ui/Icons';
 
 import styles from './settings.css';
 
@@ -42,7 +41,7 @@ export default class Settings extends Component {
     let proxy = null;
 
     if (!isProxied) {
-      proxy = this.renderTab(hash, 'proxy', <ActionSettingsEthernet />);
+      proxy = this.renderTab(hash, 'proxy', <Ethernet />);
     }
 
     return (
@@ -54,8 +53,8 @@ export default class Settings extends Component {
           }
         >
           <Tabs className={ styles.tabs } value={ hash }>
-            { this.renderTab(hash, 'views', <ImageRemoveRedEye />) }
-            { this.renderTab(hash, 'background', <ImageBlurOn />) }
+            { this.renderTab(hash, 'views', <VisibleIcon />) }
+            { this.renderTab(hash, 'background', <BackgroundIcon />) }
             { proxy }
             { this.renderTab(hash, 'parity', <img src={ imagesEthcoreBlock } className={ styles.imageIcon } />) }
           </Tabs>
diff --git a/js/src/views/Web/AddressBar/addressBar.js b/js/src/views/Web/AddressBar/addressBar.js
index af02f3272..43cc03f9b 100644
--- a/js/src/views/Web/AddressBar/addressBar.js
+++ b/js/src/views/Web/AddressBar/addressBar.js
@@ -16,10 +16,9 @@
 
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
-import Subdirectory from 'material-ui/svg-icons/navigation/subdirectory-arrow-left';
 
 import { Button, DappUrlInput } from '~/ui';
-import { CloseIcon, RefreshIcon } from '~/ui/Icons';
+import { CloseIcon, RefreshIcon, SubdirectoryIcon } from '~/ui/Icons';
 
 @observer
 export default class AddressBar extends Component {
@@ -51,7 +50,7 @@ export default class AddressBar extends Component {
         <Button
           disabled={ isPristine }
           onClick={ this.onGotoUrl }
-          icon={ <Subdirectory /> }
+          icon={ <SubdirectoryIcon /> }
         />
       </div>
     );