diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
| commit | 1816eca9144b13b3e869e2c3c95476b27c3e3aba (patch) | |
| tree | 356cc6269f6920bc20585e455811a43253fff777 /app/scripts/background.js | |
| parent | 24a55cf7770a6154fe723cf13cdc9998e1759f3b (diff) | |
| parent | f18615a82abafee1a648e8de6f60ecc54e1aabb4 (diff) | |
| download | tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.gz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.bz2 tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.lz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.xz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.zst tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.zip | |
Merge branch 'master' into version-debugging
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 195881e15..3e560d302 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -124,7 +124,8 @@ function setupController (initState) { var unapprovedTxCount = controller.txController.getUnapprovedTxCount() var unapprovedMsgCount = controller.messageManager.unapprovedMsgCount var unapprovedPersonalMsgs = controller.personalMessageManager.unapprovedPersonalMsgCount - var count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgs + var unapprovedTypedMsgs = controller.typedMessageManager.unapprovedTypedMessagesCount + var count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgs + unapprovedTypedMsgs if (count) { label = String(count) } |