diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-16 04:03:13 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-16 04:03:13 +0800 |
| commit | e61ba93194fe1bfb5fd2644951eebb3f3369f4ad (patch) | |
| tree | df23cb13d13e345bbbc3a904fb9161570bdd2d6d /app/scripts/metamask-controller.js | |
| parent | f8d38f44c2612f0f291063814ec0e98bb4aaf4bb (diff) | |
| parent | 707a10548d4c6f1574395c7d72f432fa65d6fb9a (diff) | |
| download | tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.gz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.bz2 tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.lz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.xz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.zst tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.zip | |
Merge branch 'master' into 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({ |