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

Revert one cb to previous state.

Browse Source
This commit is contained in:
Kevin Serrano 2016-11-15 17:13:33 -08:00
parent 5bfb700fa8
commit 592b64a19f
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/keyring-controller.js
View File

@ -186,7 +186,7 @@ module.exports = class KeyringController extends EventEmitter {
this.keyrings = keyrings this.keyrings = keyrings
this.setupAccounts() this.setupAccounts()
this.emit('update') this.emit('update')
cb() cb(null, this.getState())
}) })
.catch((err) => { .catch((err) => {
console.error(err) console.error(err)

2
ui/app/actions.js
View File

@ -161,7 +161,7 @@ function tryUnlockMetamask (password) {
return (dispatch) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
dispatch(actions.unlockInProgress()) dispatch(actions.unlockInProgress())
background.submitPassword(password, (err) => { background.submitPassword(password, (err, newState) => {
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
if (err) { if (err) {
dispatch(actions.unlockFailed(err.message)) dispatch(actions.unlockFailed(err.message))