- { clientVersion }
+ { clientName } { versionNumber }-{ versionDate } { versionType }
diff --git a/js/src/ui/Tooltips/Tooltip/index.js b/js/src/ui/Tooltips/Tooltip/index.js
deleted file mode 100644
index 7128fc336..000000000
--- a/js/src/ui/Tooltips/Tooltip/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-export default from './tooltip';
diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.js b/js/src/ui/Tooltips/Tooltip/tooltip.js
deleted file mode 100644
index af3b5e0b3..000000000
--- a/js/src/ui/Tooltips/Tooltip/tooltip.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { FlatButton } from 'material-ui';
-
-import { CancelIcon, DoneIcon, NextIcon } from '~/ui/Icons';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import { newTooltip, nextTooltip, closeTooltips } from '../actions';
-
-import styles from '../tooltips.css';
-
-let tooltipId = 0;
-
-class Tooltip extends Component {
- static propTypes = {
- className: PropTypes.string,
- currentId: PropTypes.number,
- maxId: PropTypes.number,
- onNewTooltip: PropTypes.func,
- onNextTooltip: PropTypes.func,
- onCloseTooltips: PropTypes.func,
- right: PropTypes.bool,
- text: nodeOrStringProptype(),
- title: nodeOrStringProptype()
- }
-
- state = {
- id: tooltipId
- }
-
- componentWillMount () {
- const { onNewTooltip } = this.props;
-
- onNewTooltip(tooltipId);
- tooltipId++;
- }
-
- render () {
- const { id } = this.state;
- const { className, currentId, maxId, right, onCloseTooltips, onNextTooltip, text, title } = this.props;
-
- if (id !== currentId) {
- return null;
- }
-
- const buttons = id !== maxId
- ? [
-
}
- key='skipButton'
- label={
-
- }
- onTouchTap={ onCloseTooltips }
- />,
-
}
- key='nextButton'
- label={
-
- }
- onTouchTap={ onNextTooltip }
- />
- ] : (
-
}
- label={
-
- }
- onTouchTap={ onCloseTooltips }
- />
- );
-
- return (
-
-
- { title }
-
-
- { text }
-
-
- { buttons }
-
-
- );
- }
-}
-
-function mapStateToProps (state) {
- const { currentId, maxId } = state.tooltip;
-
- return {
- currentId,
- maxId
- };
-}
-
-function mapDispatchToProps (dispatch) {
- return bindActionCreators({
- onNewTooltip: newTooltip,
- onNextTooltip: nextTooltip,
- onCloseTooltips: closeTooltips
- }, dispatch);
-}
-
-export default connect(
- mapStateToProps,
- mapDispatchToProps
-)(Tooltip);
diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.spec.js b/js/src/ui/Tooltips/Tooltip/tooltip.spec.js
deleted file mode 100644
index 57e820c96..000000000
--- a/js/src/ui/Tooltips/Tooltip/tooltip.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-import sinon from 'sinon';
-
-import Tooltip from './';
-
-let component;
-let store;
-
-function createRedux (currentId = 0) {
- store = {
- dispatch: sinon.stub(),
- subscribe: sinon.stub(),
- getState: () => {
- return {
- tooltip: {
- currentId,
- maxId: 2
- }
- };
- }
- };
-
- return store;
-}
-
-function render () {
- component = shallow(
-
,
- {
- context: {
- store: createRedux()
- }
- }
- ).find('Tooltip').shallow();
-
- return component;
-}
-
-describe('ui/Tooltips/Tooltip', () => {
- beforeEach(() => {
- render();
- });
-
- it('renders defaults', () => {
- expect(component.get(0)).to.be.ok;
- });
-
- it('renders null when id !== currentId', () => {
- expect(render(1).get(0)).to.be.null;
- });
-});
diff --git a/js/src/ui/Tooltips/actions.js b/js/src/ui/Tooltips/actions.js
deleted file mode 100644
index 13fa0172c..000000000
--- a/js/src/ui/Tooltips/actions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-export function newTooltip (newId) {
- return {
- type: 'newTooltip',
- newId
- };
-}
-
-export function nextTooltip () {
- return {
- type: 'nextTooltip'
- };
-}
-
-export function closeTooltips () {
- return {
- type: 'closeTooltips'
- };
-}
diff --git a/js/src/ui/Tooltips/index.js b/js/src/ui/Tooltips/index.js
deleted file mode 100644
index 8918ce14c..000000000
--- a/js/src/ui/Tooltips/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-export default from './tooltips';
-
-export Tooltip from './Tooltip';
-export tooltipReducer from './reducers';
diff --git a/js/src/ui/Tooltips/reducers.js b/js/src/ui/Tooltips/reducers.js
deleted file mode 100644
index 4a294dc4f..000000000
--- a/js/src/ui/Tooltips/reducers.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-import store from 'store';
-
-const LS_KEY = 'tooltips';
-
-let currentId = -1;
-let maxId = 0;
-
-function closeTooltips (state, action) {
- store.set(LS_KEY, '{"state":"off"}');
-
- currentId = -1;
-
- return Object.assign({}, state, {
- currentId
- });
-}
-
-function newTooltip (state, action) {
- const { newId } = action;
-
- maxId = Math.max(newId, maxId);
-
- return Object.assign({}, state, {
- currentId,
- maxId
- });
-}
-
-function nextTooltip (state, action) {
- const hideTips = store.get(LS_KEY);
-
- currentId = hideTips
- ? -1
- : currentId + 1;
-
- return Object.assign({}, state, {
- currentId
- });
-}
-
-export default function tooltipReducer (state = {}, action) {
- switch (action.type) {
- case 'newTooltip':
- return newTooltip(state, action);
-
- case 'nextTooltip':
- return nextTooltip(state, action);
-
- case 'closeTooltips':
- return closeTooltips(state, action);
-
- default:
- return state;
- }
-}
diff --git a/js/src/ui/Tooltips/tooltips.css b/js/src/ui/Tooltips/tooltips.css
deleted file mode 100644
index 940587da7..000000000
--- a/js/src/ui/Tooltips/tooltips.css
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity. If not, see
.
-*/
-.container {
- height: 100%;
- width: 100%;
-}
-
-.overlay {
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- background: rgba(0, 0, 0, 0.25);
- z-index: 499;
-}
-
-.box {
- position: absolute;
- background: #663600; /* rgba(48, 48, 48, 0.95); #88b7d5; */
- border: 4px solid #f80; /* #c2e1f5; */
- max-width: 450px;
- border-radius: 0.5em;
- z-index: 500;
- opacity: 1;
- line-height: 1.618em;
- white-space: normal;
- opacity: 0.95;
-}
-
-.box:after, .box:before {
- bottom: 100%;
- border: solid transparent;
- content: " ";
- height: 0;
- width: 0;
- position: absolute;
- pointer-events: none;
-}
-
-.box:after {
- border-color: rgba(136, 183, 213, 0);
- border-bottom-color: #663600; /* rgba(48, 48, 48, 0.95); #88b7d5; */
- border-width: 20px;
-}
-
-.box:before {
- border-color: rgba(194, 225, 245, 0);
- border-bottom-color: #f80; /* #c2e1f5; */
- border-width: 26px;
-}
-
-.arrowLeft:after, .arrowLeft:before {
- left: 15%;
-}
-
-.arrowLeft:after {
- margin-left: -20px;
-}
-
-.arrowLeft:before {
- margin-left: -26px;
-}
-
-.arrowRight:after, .arrowRight:before {
- right: 15%;
-}
-
-.arrowRight:after {
- margin-right: -20px;
-}
-
-.arrowRight:before {
- margin-right: -26px;
-}
-
-.title {
- text-transform: uppercase;
-}
-
-.text {
- padding: 1em;
-}
-
-.buttons {
- margin: 0;
- padding: 0 0.5em 0.5em 0;
- text-align: right;
-}
diff --git a/js/src/ui/Tooltips/tooltips.js b/js/src/ui/Tooltips/tooltips.js
deleted file mode 100644
index 0647cae37..000000000
--- a/js/src/ui/Tooltips/tooltips.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { nextTooltip } from './actions';
-
-import styles from './tooltips.css';
-
-class Tooltips extends Component {
- static contextTypes = {
- router: PropTypes.object.isRequired
- };
-
- static propTypes = {
- currentId: PropTypes.number,
- onNextTooltip: PropTypes.func
- }
-
- componentDidMount () {
- const { onNextTooltip } = this.props;
-
- onNextTooltip();
- this.redirect();
- }
-
- componentWillReceiveProps (nextProps) {
- if (nextProps.currentId !== this.props.currentId) {
- this.redirect(nextProps);
- }
- }
-
- redirect (props = this.props) {
- const { currentId } = props;
-
- if (currentId !== undefined && currentId !== -1) {
- const viewLink = '/accounts/';
-
- this.context.router.push(viewLink);
- }
- }
-
- render () {
- const { currentId } = this.props;
-
- if (currentId === -1) {
- return null;
- }
-
- return (
-
- );
- }
-}
-
-function mapStateToProps (state) {
- const { currentId } = state.tooltip;
-
- return {
- currentId
- };
-}
-
-function mapDispatchToProps (dispatch) {
- return bindActionCreators({
- onNextTooltip: nextTooltip
- }, dispatch);
-}
-
-export default connect(
- mapStateToProps,
- mapDispatchToProps
-)(Tooltips);
diff --git a/js/src/ui/Tooltips/tooltips.spec.js b/js/src/ui/Tooltips/tooltips.spec.js
deleted file mode 100644
index b52153f8e..000000000
--- a/js/src/ui/Tooltips/tooltips.spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see
.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Tooltips from './';
-
-let component;
-let router;
-let store;
-
-function createRedux () {
- store = {
- dispatch: sinon.stub(),
- subscribe: sinon.stub(),
- getState: () => {
- return {
- tooltip: {
- currentId: 1
- }
- };
- }
- };
-
- return store;
-}
-
-function createRouter () {
- router = {
- push: sinon.stub()
- };
-
- return router;
-}
-
-function render () {
- component = shallow(
-
,
- {
- context: {
- store: createRedux()
- }
- }
- ).find('Tooltips').shallow({
- context: {
- router: createRouter()
- }
- });
-
- return component;
-}
-
-describe('ui/Tooltips', () => {
- beforeEach(() => {
- render();
- });
-
- it('renders defaults', () => {
- expect(component.get(0)).to.be.ok;
- });
-});
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
index aa88d94ec..3d24d98ca 100644
--- a/js/src/ui/index.js
+++ b/js/src/ui/index.js
@@ -58,7 +58,6 @@ export ShortenedHash from './ShortenedHash';
export SignerIcon from './SignerIcon';
export Tags from './Tags';
export Title from './Title';
-export Tooltips, { Tooltip } from './Tooltips';
export TxHash from './TxHash';
export TxList from './TxList';
export VaultCard from './VaultCard';
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index ee3340d3a..cfafb05d6 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -23,7 +23,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import HardwareStore from '~/mobx/hardwareStore';
-import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
+import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
import { AddIcon, FileDownloadIcon } from '~/ui/Icons';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
@@ -102,16 +102,6 @@ class Accounts extends Component {
{ this.renderActionbar() }
-
- }
- />
-
{ this.renderExternalAccounts() }
{ this.renderWallets() }
{ this.renderAccounts() }
@@ -295,18 +285,7 @@ class Accounts extends Component {
/>
}
buttons={ buttons }
- >
-
- }
- />
-
+ />
);
}
diff --git a/js/src/views/Home/home.js b/js/src/views/Home/home.js
index 8079ce0a8..a9e8dfa00 100644
--- a/js/src/views/Home/home.js
+++ b/js/src/views/Home/home.js
@@ -22,8 +22,9 @@ import HistoryStore from '~/mobx/historyStore';
import { Page } from '~/ui';
import WebStore from '~/views/Web/store';
+// FIXME: Don't really want to import from ~/shell
import DappsStore from '~/shell/Dapps/dappsStore';
-import ExtensionStore from '~/shell/Application/Extension/store';
+import ExtensionStore from '~/shell/Extension/store';
import Accounts from './Accounts';
import Dapps from './Dapps';