diff options
| author | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
| commit | d06c54e0b7eb7803798e31d8d035b648e9da0421 (patch) | |
| tree | 0dc1e906dbc2e460090f86e4e3f8171e8e2960ea /app/scripts/metamask-controller.js | |
| parent | d755b66e204277ac6a904ba432f7b10a340c9288 (diff) | |
| parent | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (diff) | |
| download | tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.gz tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.zst tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.zip | |
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin 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 315b9832c..13008893b 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 () { |