diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-16 04:39:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 04:39:34 +0800 |
| commit | fbd04a6af6e9eda22eebaae27d712ae08272c131 (patch) | |
| tree | bbb643e10e42d8113fe2d67d78efccd56b92322c /app/scripts/metamask-controller.js | |
| parent | f8d38f44c2612f0f291063814ec0e98bb4aaf4bb (diff) | |
| parent | 03968ffafe27e64dcdf58764057cee1d67aa4168 (diff) | |
| download | tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.gz tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.zst tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.zip | |
Merge pull request #2590 from MetaMask/merge-master
Merge master
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a8a10e106..bd71da8e0 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -128,7 +128,7 @@ module.exports = class MetamaskController extends EventEmitter { blockTracker: this.blockTracker, ethQuery: this.ethQuery, }) - this.txController.on('newUnaprovedTx', opts.showUnapprovedTx.bind(opts)) + this.txController.on('newUnapprovedTx', opts.showUnapprovedTx.bind(opts)) // computed balances (accounting for pending transactions) this.balancesController = new BalancesController({ |