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 = [
}
+ icon={ }
label={
}
+ icon={ }
label={
- {
- this.renderView('accounts',
- ,
-
- )
- }
- {
- this.renderView('addresses',
- ,
-
- )
- }
{
this.renderView('apps',
)
}
- {
- this.renderView('contracts',
- ,
-
- )
- }
- {
- this.renderView('signer',
- ,
-
- )
- }
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', );
+ proxy = this.renderTab(hash, 'proxy', );
}
return (
@@ -54,8 +53,8 @@ export default class Settings extends Component {
}
>
- { this.renderTab(hash, 'views', ) }
- { this.renderTab(hash, 'background', ) }
+ { this.renderTab(hash, 'views', ) }
+ { this.renderTab(hash, 'background', ) }
{ proxy }
{ this.renderTab(hash, 'parity', ) }
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 {
}
+ icon={ }
/>
);