diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-06-22 10:52:28 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-06-22 10:52:28 +0800 |
| commit | abbbe1156c03700c4476d0618e65aa2eed2c264e (patch) | |
| tree | d3f45aec5842a5f86e514c01196de543ce4df6aa /app | |
| parent | 92df9965ebd4a833817c32fd32f7e4533ec7fe19 (diff) | |
| parent | 2a429253994a0df2aae27234a7ac11c870bdc713 (diff) | |
| download | tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.gz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.bz2 tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.lz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.xz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.zst tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.zip | |
Merge branch 'master' into nonce-tracker
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/background.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 1dbfb1b98..e8987394f 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -116,13 +116,15 @@ function setupController (initState) { updateBadge() controller.txController.on('updateBadge', updateBadge) controller.messageManager.on('updateBadge', updateBadge) + controller.personalMessageManager.on('updateBadge', updateBadge) // plugin badge text function updateBadge () { var label = '' var unapprovedTxCount = controller.txController.unapprovedTxCount var unapprovedMsgCount = controller.messageManager.unapprovedMsgCount - var count = unapprovedTxCount + unapprovedMsgCount + var unapprovedPersonalMsgs = controller.personalMessageManager.unapprovedPersonalMsgCount + var count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgs if (count) { label = String(count) } |