diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-14 03:39:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 03:39:32 +0800 |
| commit | c1253016fcd678445e860a666ee8c4e04506f01a (patch) | |
| tree | 61eca62f325ca5594ffe4c5bbe597e7b4141b0e1 /app/scripts/metamask-controller.js | |
| parent | cc5e9aca4fa2a1e78c49be680405d93ac918bccf (diff) | |
| parent | 1ffaab1d9b4baa85348f2a366bfff4380b598ce5 (diff) | |
| download | tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar.gz tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar.bz2 tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar.lz tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar.xz tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.tar.zst tangerine-wallet-browser-c1253016fcd678445e860a666ee8c4e04506f01a.zip | |
Merge pull request #997 from MetaMask/integrateTxManagerUI
Integrate tx manager ui
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1fc97e81d..c0b9b753c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -65,6 +65,7 @@ module.exports = class MetamaskController extends EventEmitter { this.ethStore.on('update', this.sendUpdate.bind(this)) this.keyringController.on('update', this.sendUpdate.bind(this)) + this.txManager.on('update', this.sendUpdate.bind(this)) } getState () { |