diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-19 04:15:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 04:15:58 +0800 |
| commit | 28212d167cbd201f78e0253cf9c6fb676d71cb7a (patch) | |
| tree | d278415f35a74e26459ca47f10798368e8b91403 /app/scripts/metamask-controller.js | |
| parent | 4a0f330a066ed2a557b4622163221b410b6b6e40 (diff) | |
| parent | 3273f507f7a9cf33cfdbb4fffa243d75fde98b10 (diff) | |
| download | tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.gz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.bz2 tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.lz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.xz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.zst tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.zip | |
Merge pull request #1022 from MetaMask/i715-AddImportMenu
Add ability to import private keys
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), |