Merge pull request #1644 from MetaMask/i1630-badgefix

Fix badge number to include personal_sign

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d3e86342..c040b630c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Add a warning to JSON file import.
 - Fix bug where slowly mined txs would sometimes be incorrectly marked as failed.
+- Fix bug where badge count did not reflect personal_sign pending messages.
 
 ## 3.7.8 2017-6-12
 
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)
     }