mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle
Polish Private Key Export UI
This commit is contained in:
Dan Finlay
GitHub
commit
327d18855c
@ -6,6 +6,7 @@
|
||||
- Added an address book functionality that remembers the last 15 unique addresses sent to.
|
||||
- Can now change network to custom RPC URL from lock screen.
|
||||
- Removed support for old, lightwallet based vault. Users who have not opened app in over a month will need to recover with their seed phrase. This will allow Firefox support sooner.
|
||||
- Polish the private key UI.
|
||||
|
||||
## 3.4.0 2017-3-8
|
||||
|
||||
|
||||
70
development/states/private-key-export-success.json
Normal file
70
development/states/private-key-export-success.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"metamask": {
|
||||
"isInitialized": true,
|
||||
"isUnlocked": true,
|
||||
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||
"identities": {
|
||||
"0x07284e146926a4facd0ea60598dc4f001ad620f1": {
|
||||
"address": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
|
||||
"name": "Account 1"
|
||||
}
|
||||
},
|
||||
"unapprovedTxs": {},
|
||||
"noActiveNotices": true,
|
||||
"frequentRpcList": [],
|
||||
"addressBook": [],
|
||||
"network": "3",
|
||||
"accounts": {
|
||||
"0x07284e146926a4facd0ea60598dc4f001ad620f1": {
|
||||
"code": "0x",
|
||||
"nonce": "0x0",
|
||||
"balance": "0x0",
|
||||
"address": "0x07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
}
|
||||
},
|
||||
"transactions": {},
|
||||
"selectedAddressTxList": [],
|
||||
"unapprovedMsgs": {},
|
||||
"unapprovedMsgCount": 0,
|
||||
"unapprovedPersonalMsgs": {},
|
||||
"unapprovedPersonalMsgCount": 0,
|
||||
"keyringTypes": [
|
||||
"Simple Key Pair",
|
||||
"HD Key Tree"
|
||||
],
|
||||
"keyrings": [
|
||||
{
|
||||
"type": "HD Key Tree",
|
||||
"accounts": [
|
||||
"07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
]
|
||||
}
|
||||
],
|
||||
"selectedAddress": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
|
||||
"currentCurrency": "USD",
|
||||
"conversionRate": 43.35903476,
|
||||
"conversionDate": 1490105102,
|
||||
"provider": {
|
||||
"type": "testnet"
|
||||
},
|
||||
"shapeShiftTxList": [],
|
||||
"lostAccounts": [],
|
||||
"seedWords": null
|
||||
},
|
||||
"appState": {
|
||||
"menuOpen": false,
|
||||
"currentView": {
|
||||
"name": "accountDetail",
|
||||
"context": "0x07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
},
|
||||
"accountDetail": {
|
||||
"subview": "export",
|
||||
"accountExport": "completed",
|
||||
"privateKey": "549c9638ad06432568969accacad4a02f8548cc358085938071745138ec134b7"
|
||||
},
|
||||
"transForward": true,
|
||||
"isLoading": false,
|
||||
"warning": null
|
||||
},
|
||||
"identities": {}
|
||||
}
|
||||
69
development/states/private-key-export.json
Normal file
69
development/states/private-key-export.json
Normal file
@ -0,0 +1,69 @@
|
||||
{
|
||||
"metamask": {
|
||||
"isInitialized": true,
|
||||
"isUnlocked": true,
|
||||
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||
"identities": {
|
||||
"0x07284e146926a4facd0ea60598dc4f001ad620f1": {
|
||||
"address": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
|
||||
"name": "Account 1"
|
||||
}
|
||||
},
|
||||
"unapprovedTxs": {},
|
||||
"noActiveNotices": true,
|
||||
"frequentRpcList": [],
|
||||
"addressBook": [],
|
||||
"network": "3",
|
||||
"accounts": {
|
||||
"0x07284e146926a4facd0ea60598dc4f001ad620f1": {
|
||||
"code": "0x",
|
||||
"nonce": "0x0",
|
||||
"balance": "0x0",
|
||||
"address": "0x07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
}
|
||||
},
|
||||
"transactions": {},
|
||||
"selectedAddressTxList": [],
|
||||
"unapprovedMsgs": {},
|
||||
"unapprovedMsgCount": 0,
|
||||
"unapprovedPersonalMsgs": {},
|
||||
"unapprovedPersonalMsgCount": 0,
|
||||
"keyringTypes": [
|
||||
"Simple Key Pair",
|
||||
"HD Key Tree"
|
||||
],
|
||||
"keyrings": [
|
||||
{
|
||||
"type": "HD Key Tree",
|
||||
"accounts": [
|
||||
"07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
]
|
||||
}
|
||||
],
|
||||
"selectedAddress": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
|
||||
"currentCurrency": "USD",
|
||||
"conversionRate": 43.35903476,
|
||||
"conversionDate": 1490105102,
|
||||
"provider": {
|
||||
"type": "testnet"
|
||||
},
|
||||
"shapeShiftTxList": [],
|
||||
"lostAccounts": [],
|
||||
"seedWords": null
|
||||
},
|
||||
"appState": {
|
||||
"menuOpen": false,
|
||||
"currentView": {
|
||||
"name": "accountDetail",
|
||||
"context": "0x07284e146926a4facd0ea60598dc4f001ad620f1"
|
||||
},
|
||||
"accountDetail": {
|
||||
"subview": "export",
|
||||
"accountExport": "requested"
|
||||
},
|
||||
"transForward": true,
|
||||
"isLoading": false,
|
||||
"warning": null
|
||||
},
|
||||
"identities": {}
|
||||
}
|
||||
@ -772,12 +772,19 @@ function requestExportAccount () {
|
||||
}
|
||||
}
|
||||
|
||||
function exportAccount (address) {
|
||||
function exportAccount (password, address) {
|
||||
var self = this
|
||||
|
||||
return function (dispatch) {
|
||||
dispatch(self.showLoadingIndication())
|
||||
|
||||
log.debug(`background.submitPassword`)
|
||||
background.submitPassword(password, function (err) {
|
||||
if (err) {
|
||||
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())
|
||||
@ -789,6 +796,7 @@ function exportAccount (address) {
|
||||
|
||||
dispatch(self.showPrivateKey(result))
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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,12 +35,15 @@ 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', {
|
||||
style: {
|
||||
display: 'inline-block',
|
||||
textAlign: 'center',
|
||||
},
|
||||
},
|
||||
[
|
||||
h('div', {
|
||||
key: 'exporting',
|
||||
style: {
|
||||
@ -41,22 +51,41 @@ ExportAccountView.prototype.render = function () {
|
||||
},
|
||||
}, [
|
||||
h('p.error', warning),
|
||||
h('p', confirmation),
|
||||
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: () => {} }),
|
||||
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))
|
||||
}
|
||||
|
||||
@ -266,8 +266,9 @@ app sections
|
||||
}
|
||||
|
||||
.sizing-input{
|
||||
font-size: 1em;
|
||||
font-size: 14px;
|
||||
height: 30px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
.editable-label{
|
||||
display: flex;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user