diff options
author | Thomas Huang <thomas.b.huang@gmail.com> | 2017-06-28 01:32:28 +0800 |
---|---|---|
committer | Thomas Huang <thomas.b.huang@gmail.com> | 2017-06-28 01:32:28 +0800 |
commit | 1977417017eec00a546ab816fa635ea575e4835d (patch) | |
tree | 77f942810eda1665b4b8974077985f082bfc24c3 /app/scripts/background.js | |
parent | 235cb1f2d790a7bda349ab0d33ad1009751a8536 (diff) | |
parent | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff) | |
download | tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.gz tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.bz2 tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.lz tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.xz tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.zst tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.zip |
Merge branch 'master' into i1473-dappDefaultGasPrice
Diffstat (limited to 'app/scripts/background.js')
-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) } |