diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-05-17 02:56:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 02:56:56 +0800 |
| commit | 855453987ab3f925de030e3c2bb360c39bd35cd3 (patch) | |
| tree | 666bfc0f257f5c9b76827084caf5f3290e051791 /app/scripts/background.js | |
| parent | 44148d6135d17184194bbde2c074f07d90fa8179 (diff) | |
| parent | 68d6ea44a0c9f3d75415ccadefe182f9a0872db1 (diff) | |
| download | tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar.gz tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar.bz2 tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar.lz tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar.xz tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.tar.zst tangerine-wallet-browser-855453987ab3f925de030e3c2bb360c39bd35cd3.zip | |
Merge pull request #1438 from MetaMask/TxController
Rename tx manager to tx controller
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index e738a9712..63c8a7252 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -114,13 +114,13 @@ function setupController (initState) { // updateBadge() - controller.txManager.on('updateBadge', updateBadge) + controller.txController.on('updateBadge', updateBadge) controller.messageManager.on('updateBadge', updateBadge) // plugin badge text function updateBadge () { var label = '' - var unapprovedTxCount = controller.txManager.unapprovedTxCount + var unapprovedTxCount = controller.txController.unapprovedTxCount var unapprovedMsgCount = controller.messageManager.unapprovedMsgCount var count = unapprovedTxCount + unapprovedMsgCount if (count) { |