diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-18 04:08:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 04:08:47 +0800 |
| commit | c53932a19a77516110a45d7b201b85dc6ea71a47 (patch) | |
| tree | 4b53230af166215f932b0d5c3ac17888946c85ca /app/scripts/background.js | |
| parent | 79040c2e681012c98869b7e4d49a9e0ed406c52f (diff) | |
| parent | a245fb7d22a5fe08c4fc8c2c1c64d406805018a8 (diff) | |
| download | tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar.gz tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar.bz2 tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar.lz tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar.xz tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.tar.zst tangerine-wallet-browser-c53932a19a77516110a45d7b201b85dc6ea71a47.zip | |
Merge branch 'dev' into conversion-api-err
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 6b7926526..f3837a028 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -22,12 +22,11 @@ const controller = new MetamaskController({ setData, loadData, }) -const txManager = controller.txManager + function triggerUi () { if (!popupIsOpen) notification.show() } // On first install, open a window to MetaMask website to how-it-works. - extension.runtime.onInstalled.addListener(function (details) { if ((details.reason === 'install') && (!METAMASK_DEBUG)) { extension.tabs.create({url: 'https://metamask.io/#how-it-works'}) @@ -94,7 +93,8 @@ function setupControllerConnection (stream) { // plugin badge text // -txManager.on('updateBadge', updateBadge) +controller.txManager.on('updateBadge', updateBadge) +updateBadge() function updateBadge () { var label = '' |