m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge branch 'master' into SmallerCopiedButton

Browse Source
This commit is contained in:
Frankie 2016-10-04 13:50:16 -07:00 committed by GitHub
commit 4eafb7da2f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
- Fix bug where chosen FIAT exchange rate does no persist when switching networks - Fix bug where chosen FIAT exchange rate does no persist when switching networks
- Fix additional parameters that made MetaMask sometimes receive errors from Parity. - Fix additional parameters that made MetaMask sometimes receive errors from Parity.
- Fix bug where invalid transactions would still open the MetaMask popup. - Fix bug where invalid transactions would still open the MetaMask popup.
- Removed hex prefix from private key export, to increase compatibility with Geth, MyEtherWallet, and Jaxx.
## 2.13.1 2016-09-23 ## 2.13.1 2016-09-23

9
ui/app/components/account-export.js
View File

@ -3,6 +3,7 @@ const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const copyToClipboard = require('copy-to-clipboard') const copyToClipboard = require('copy-to-clipboard')
const actions = require('../actions') const actions = require('../actions')
const ethUtil = require('ethereumjs-util')
module.exports = ExportAccountView module.exports = ExportAccountView
@ -61,7 +62,9 @@ ExportAccountView.prototype.render = function () {
if (accountExported) { if (accountExported) {
return h('div.privateKey', { return h('div.privateKey', {
style: {
margin: '0 20px',
},
}, [ }, [
h('label', 'Your private key (click to copy):'), h('label', 'Your private key (click to copy):'),
h('p.error.cursor-pointer', { h('p.error.cursor-pointer', {
@ -72,9 +75,9 @@ ExportAccountView.prototype.render = function () {
width: '100%', width: '100%',
}, },
onClick: function (event) { onClick: function (event) {
copyToClipboard(accountDetail.privateKey) copyToClipboard(ethUtil.stripHexPrefix(accountDetail.privateKey))
}, },
}, accountDetail.privateKey), }, ethUtil.stripHexPrefix(accountDetail.privateKey)),
h('button', { h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)), onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, 'Done'), }, 'Done'),