aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-16 09:13:33 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-11-16 09:13:33 +0800
commit592b64a19fd7001d965aa1a1c329b24f55d2ea90 (patch)
tree62c7c141949040c5c65ade9dd4bdf7c24b5a74b0
parent5bfb700fa833a415a541a959736d6184d3c07753 (diff)
downloadtangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar.gz
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar.bz2
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar.lz
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar.xz
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.tar.zst
tangerine-wallet-browser-592b64a19fd7001d965aa1a1c329b24f55d2ea90.zip
Revert one cb to previous state.
-rw-r--r--app/scripts/keyring-controller.js2
-rw-r--r--ui/app/actions.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 280b332a0..8ceb2b1ce 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -186,7 +186,7 @@ module.exports = class KeyringController extends EventEmitter {
this.keyrings = keyrings
this.setupAccounts()
this.emit('update')
- cb()
+ cb(null, this.getState())
})
.catch((err) => {
console.error(err)
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 12ba8fffa..e69b743e9 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -161,7 +161,7 @@ function tryUnlockMetamask (password) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
dispatch(actions.unlockInProgress())
- background.submitPassword(password, (err) => {
+ background.submitPassword(password, (err, newState) => {
dispatch(actions.hideLoadingIndication())
if (err) {
dispatch(actions.unlockFailed(err.message))