diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-19 14:04:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 14:04:54 +0800 |
| commit | 776e8241f0464939cc3049f7155c150e3375c623 (patch) | |
| tree | 017600778515e74eaf15bf4f889e5b26638c56d7 /app/scripts/background.js | |
| parent | de1da7d1b215ade650fc644adf63384a401dc240 (diff) | |
| parent | a8bba2f4b7ca714d46b2e1ca405aec3135aa23b2 (diff) | |
| download | tangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.tar.gz tangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.tar.zst tangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.zip | |
Merge pull request #2402 from chikeichan/merge
[NewUI] Merge master into NewUI-flat
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) } |