diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-14 05:26:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 05:26:57 +0800 |
| commit | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (patch) | |
| tree | ef7323e51a8c80e76471cce2a745ca6a937bc2e5 /app/scripts/metamask-controller.js | |
| parent | 29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb (diff) | |
| parent | c1253016fcd678445e860a666ee8c4e04506f01a (diff) | |
| download | tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.gz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.bz2 tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.lz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.xz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.zst tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.zip | |
Merge branch 'dev' into bug-submitTx
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 67c35dd67..0eb57ffc7 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -66,6 +66,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 () { |