aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-03-23 06:25:15 +0800
committerGitHub <noreply@github.com>2017-03-23 06:25:15 +0800
commit18414f5cbd49d5ae81602d908c1ff5bef958af51 (patch)
tree3ed9088ac16501f46c9a5b2ddc7937375270d89e /ui
parent77907038ffe0edbe5e3472f98fd10d73b76464b8 (diff)
parent864f8b06f9f2ec56b7ffce0afe83a1d70c3c7843 (diff)
downloadtangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar.gz
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar.bz2
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar.lz
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar.xz
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.tar.zst
tangerine-wallet-browser-18414f5cbd49d5ae81602d908c1ff5bef958af51.zip
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js26
-rw-r--r--ui/app/components/account-export.js92
-rw-r--r--ui/app/css/index.css3
3 files changed, 75 insertions, 46 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index b09021577..9d6676d01 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -698,7 +698,7 @@ function setRpcTarget (newRpc) {
}
}
-// Calls the addressBookController to add a new address.
+// Calls the addressBookController to add a new address.
function addToAddressBook (recipient, nickname) {
log.debug(`background.addToAddressBook`)
return (dispatch) => {
@@ -772,22 +772,30 @@ function requestExportAccount () {
}
}
-function exportAccount (address) {
+function exportAccount (password, address) {
var self = this
return function (dispatch) {
dispatch(self.showLoadingIndication())
- log.debug(`background.exportAccount`)
- background.exportAccount(address, function (err, result) {
- dispatch(self.hideLoadingIndication())
-
+ log.debug(`background.submitPassword`)
+ background.submitPassword(password, function (err) {
if (err) {
- log.error(err)
- return dispatch(self.displayWarning('Had a problem exporting the account.'))
+ log.error('Error in submiting password.')
+ dispatch(self.hideLoadingIndication())
+ return dispatch(self.displayWarning('Incorrect Password.'))
}
+ log.debug(`background.exportAccount`)
+ background.exportAccount(address, function (err, result) {
+ dispatch(self.hideLoadingIndication())
- dispatch(self.showPrivateKey(result))
+ if (err) {
+ log.error(err)
+ return dispatch(self.displayWarning('Had a problem exporting the account.'))
+ }
+
+ dispatch(self.showPrivateKey(result))
+ })
})
}
}
diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js
index 6d8b099a5..38a1d28ef 100644
--- a/ui/app/components/account-export.js
+++ b/ui/app/components/account-export.js
@@ -4,14 +4,21 @@ const inherits = require('util').inherits
const copyToClipboard = require('copy-to-clipboard')
const actions = require('../actions')
const ethUtil = require('ethereumjs-util')
+const connect = require('react-redux').connect
-module.exports = ExportAccountView
+module.exports = connect(mapStateToProps)(ExportAccountView)
inherits(ExportAccountView, Component)
function ExportAccountView () {
Component.call(this)
}
+function mapStateToProps (state) {
+ return {
+ warning: state.appState.warning,
+ }
+}
+
ExportAccountView.prototype.render = function () {
console.log('EXPORT VIEW')
console.dir(this.props)
@@ -28,35 +35,57 @@ ExportAccountView.prototype.render = function () {
if (notExporting) return h('div')
if (exportRequested) {
- var warning = `Exporting your private key is very dangerous,
- and you should only do it if you know what you're doing.`
- var confirmation = `If you're absolutely sure, type "I understand" below and
- submit.`
+ var warning = `Export private keys at your own risk.`
return (
-
h('div', {
- key: 'exporting',
style: {
- margin: '0 20px',
+ display: 'inline-block',
+ textAlign: 'center',
},
- }, [
- h('p.error', warning),
- h('p', confirmation),
- h('input#exportAccount.sizing-input', {
- onKeyPress: this.onExportKeyPress.bind(this),
- style: {
- position: 'relative',
- top: '1.5px',
+ },
+ [
+ h('div', {
+ key: 'exporting',
+ style: {
+ margin: '0 20px',
+ },
+ }, [
+ h('p.error', warning),
+ h('input#exportAccount.sizing-input', {
+ placeholder: 'confirm password',
+ onKeyPress: this.onExportKeyPress.bind(this),
+ style: {
+ position: 'relative',
+ top: '1.5px',
+ marginBottom: '7px',
+ },
+ }),
+ ]),
+ h('div', {
+ key: 'buttons',
+ style: {
+ margin: '0 20px',
+ },
},
- }),
- h('button', {
- onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
- }, 'Submit'),
- h('button', {
- onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
- }, 'Cancel'),
- ])
-
+ [
+ h('button', {
+ onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
+ style: {
+ marginRight: '10px',
+ },
+ }, 'Submit'),
+ h('button', {
+ onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
+ }, 'Cancel'),
+ ]),
+ (this.props.warning) && (
+ h('span.error', {
+ style: {
+ margin: '20px',
+ },
+ }, this.props.warning.split('-'))
+ ),
+ ])
)
}
@@ -89,15 +118,6 @@ ExportAccountView.prototype.onExportKeyPress = function (event) {
if (event.key !== 'Enter') return
event.preventDefault()
- var input = document.getElementById('exportAccount')
- if (input.value === 'I understand') {
- this.props.dispatch(actions.exportAccount(this.props.address))
- } else {
- input.value = ''
- input.placeholder = 'Please retype "I understand" exactly.'
- }
-}
-
-ExportAccountView.prototype.exportAccount = function (address) {
- this.props.dispatch(actions.exportAccount(address))
+ var input = document.getElementById('exportAccount').value
+ this.props.dispatch(actions.exportAccount(input, this.props.address))
}
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 7771ddd99..de8ae0e92 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -266,8 +266,9 @@ app sections
}
.sizing-input{
- font-size: 1em;
+ font-size: 14px;
height: 30px;
+ padding-left: 5px;
}
.editable-label{
display: flex;