diff --git a/Cargo.lock b/Cargo.lock index 10df3d472..5c71774fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1777,7 +1777,7 @@ dependencies = [ [[package]] name = "parity-ui-precompiled" version = "1.4.0" -source = "git+https://github.com/paritytech/js-precompiled.git#ec0b7ad836a553142ab6e833bb3480f7fc570db7" +source = "git+https://github.com/paritytech/js-precompiled.git#4d50e7bfc3712287e37da1d45fe983f2a6e69ca7" dependencies = [ "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/js/.gitignore b/js/.gitignore index 786a10498..555c4b4bb 100644 --- a/js/.gitignore +++ b/js/.gitignore @@ -8,4 +8,3 @@ docs .happypack .npmjs .eslintcache -yarn.lock diff --git a/js/package.json b/js/package.json index 5bf91363f..fde5dbb02 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "parity.js", - "version": "1.7.59", + "version": "1.7.60", "main": "release/index.js", "jsnext:main": "src/index.js", "author": "Parity Team ", @@ -217,6 +217,7 @@ "validator": "6.2.0", "web3": "0.17.0-beta", "whatwg-fetch": "2.0.1", - "worker-loader": "^0.8.0" + "worker-loader": "^0.8.0", + "yarn": "^0.21.3" } } diff --git a/js/src/modals/ExportAccount/exportAccount.js b/js/src/modals/ExportAccount/exportAccount.js new file mode 100644 index 000000000..48faaaec3 --- /dev/null +++ b/js/src/modals/ExportAccount/exportAccount.js @@ -0,0 +1,177 @@ +// 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 { observer } from 'mobx-react'; +import React, { Component, PropTypes } from 'react'; +import { FormattedMessage } from 'react-intl'; +import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; + +import { newError } from '~/redux/actions'; +import { personalAccountsInfo } from '~/redux/providers/personalActions'; +import { AccountCard, Button, Portal, SelectionList } from '~/ui'; +import { CancelIcon, CheckIcon } from '~/ui/Icons'; +import ExportInput from './exportInput'; +import ExportStore from './exportStore'; + +@observer +class ExportAccount extends Component { + static contextTypes = { + api: PropTypes.object.isRequired + }; + + static propTypes = { + accounts: PropTypes.object.isRequired, + balances: PropTypes.object.isRequired, + newError: PropTypes.func.isRequired, + personalAccountsInfo: PropTypes.func.isRequired, + onClose: PropTypes.func.isRequired + }; + + componentWillMount () { + const { accounts, newError } = this.props; + + this.exportStore = new ExportStore(this.context.api, accounts, newError, null); + } + + render () { + const { canExport } = this.exportStore; + + return ( + } + key='cancel' + label={ + + } + onClick={ this.onClose } + />, +