diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-19 05:14:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 05:14:27 +0800 |
| commit | 25e57939920d4685a20b4e7b3a14060e9d3314c7 (patch) | |
| tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /app/scripts/metamask-controller.js | |
| parent | 9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff) | |
| parent | 0e01abdf7154067ca50bf279340b868aefd8343f (diff) | |
| download | tangerine-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/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index b94b98eac..629216e42 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -115,7 +115,12 @@ module.exports = class MetamaskController extends EventEmitter { .then((newState) => { cb(null, newState) }) .catch((reason) => { cb(reason) }) }, - addNewKeyring: nodeify(keyringController.addNewKeyring).bind(keyringController), + addNewKeyring: (type, opts, cb) => { + keyringController.addNewKeyring(type, opts) + .then(() => keyringController.fullUpdate()) + .then((newState) => { cb(null, newState) }) + .catch((reason) => { cb(reason) }) + }, addNewAccount: nodeify(keyringController.addNewAccount).bind(keyringController), setSelectedAccount: nodeify(keyringController.setSelectedAccount).bind(keyringController), saveAccountLabel: nodeify(keyringController.saveAccountLabel).bind(keyringController), |