diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-24 07:21:11 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-24 07:21:11 +0800 |
| commit | 16e2f029d8b76e6f1e951d35307d955c2346cd8d (patch) | |
| tree | 645d3b227f6323e0339f68eb1d36529a6efc4761 /app/scripts/background.js | |
| parent | b99b5484fec53629a25e9a3e2b4d43f1b1bc7e34 (diff) | |
| parent | 152419a79bd26d9b6f5af43c2066eb1e6f619716 (diff) | |
| download | tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar.gz tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar.bz2 tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar.lz tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar.xz tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.tar.zst tangerine-wallet-browser-16e2f029d8b76e6f1e951d35307d955c2346cd8d.zip | |
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 652acc113..f05760ac3 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -21,7 +21,7 @@ const controller = new MetamaskController({ setData, loadData, }) -const idStore = controller.idStore +const keyringController = controller.keyringController function triggerUi () { if (!popupIsOpen) notification.show() @@ -82,7 +82,7 @@ function setupControllerConnection (stream) { // push updates to popup controller.ethStore.on('update', controller.sendUpdate.bind(controller)) controller.listeners.push(remote) - idStore.on('update', controller.sendUpdate.bind(controller)) + keyringController.on('update', controller.sendUpdate.bind(controller)) // teardown on disconnect eos(stream, () => { @@ -96,9 +96,9 @@ function setupControllerConnection (stream) { // plugin badge text // -idStore.on('update', updateBadge) +keyringController.on('update', updateBadge) -function updateBadge (state) { +function updateBadge () { var label = '' var unconfTxs = controller.configManager.unconfirmedTxs() var unconfTxLen = Object.keys(unconfTxs).length |