aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-01-19 05:14:27 +0800
committerGitHub <noreply@github.com>2017-01-19 05:14:27 +0800
commit25e57939920d4685a20b4e7b3a14060e9d3314c7 (patch)
treefa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /app/scripts/keyring-controller.js
parent9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff)
parent0e01abdf7154067ca50bf279340b868aefd8343f (diff)
downloadtangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.gz
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.bz2
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.lz
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.xz
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.zst
tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.zip
Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0
Version 3.1.0
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 79cfe6fbd..e609403cc 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -234,7 +234,10 @@ module.exports = class KeyringController extends EventEmitter {
addNewKeyring (type, opts) {
const Keyring = this.getKeyringClassForType(type)
const keyring = new Keyring(opts)
- return keyring.getAccounts()
+ return keyring.deserialize(opts)
+ .then(() => {
+ return keyring.getAccounts()
+ })
.then((accounts) => {
this.keyrings.push(keyring)
return this.setupAccounts(accounts)
@@ -397,6 +400,7 @@ module.exports = class KeyringController extends EventEmitter {
}).then((rawSig) => {
cb(null, rawSig)
approvalCb(null, true)
+ messageManager.confirmMsg(msgId)
return rawSig
})
} catch (e) {