aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-09 01:57:31 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-09 01:57:31 +0800
commitc42b37a6e7871525a6dec8c9357b572b048cb221 (patch)
tree0b3c5e08aa485dce595d73ac33ad912c82960ab0 /app/scripts
parentc3dbcb5b02a54bd3772fb768c1b28f2c94a74e58 (diff)
parentd1e91766da90a1d2161fd48fd4f2545f14a7a918 (diff)
downloadtangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.gz
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.bz2
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.lz
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.xz
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.zst
tangerine-wallet-browser-c42b37a6e7871525a6dec8c9357b572b048cb221.zip
Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/background.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 18aaed7bf..21a5eea65 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -86,7 +86,6 @@ function setupControllerConnection (stream) {
stream.pipe(dnode).pipe(stream)
dnode.on('remote', (remote) => {
// push updates to popup
- controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller))
controller.ethStore.on('update', controller.sendUpdate.bind(controller))
controller.listeners.push(remote)
idStore.on('update', controller.sendUpdate.bind(controller))