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

Merge branch 'master' into i238-kovan

Browse Source
This commit is contained in:
Kevin Serrano 2017-03-22 15:51:52 -07:00 committed by GitHub
commit 45cdf6bdea
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/accounts/import/json.js
View File

@ -60,7 +60,7 @@ JsonImportSubview.prototype.render = function () {
},
}, 'Import'),
error ? h('span.warning', error) : null,
error ? h('span.error', error) : null,
])
)
}
@ -95,4 +95,3 @@ JsonImportSubview.prototype.createNewKeychain = function () {
this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ]))
}

3
ui/app/accounts/import/private-key.js
View File

@ -48,7 +48,7 @@ PrivateKeyImportView.prototype.render = function () {
},
}, 'Import'),
error ? h('span.warning', error) : null,
error ? h('span.error', error) : null,
])
)
}
@ -65,4 +65,3 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
const privateKey = input.value
this.props.dispatch(actions.importNewAccount('Private Key', [ privateKey ]))
}

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

@ -52,6 +52,7 @@ ExportAccountView.prototype.render = function () {
}, [
h('p.error', warning),
h('input#exportAccount.sizing-input', {
type: 'password',
placeholder: 'confirm password',
onKeyPress: this.onExportKeyPress.bind(this),
style: {