Merge branch 'dev' into notice-management

3 files changed, 2 insertions, 1 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index e2752831a..d1d706165 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -82,7 +82,6 @@ class KeyringController extends EventEmitter {
       keyrings: memState.keyrings,
       // configManager
       seedWords: this.configManager.getSeedWords(),
-      isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
     }
     return result
   }
diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
index 4a0017342..18bf54ae1 100644
--- a/app/scripts/lib/message-manager.js
+++ b/app/scripts/lib/message-manager.js
@@ -103,6 +103,7 @@ module.exports = class MessageManager extends EventEmitter{
   }
 
   _saveMsgList (msgList) {
+    this.emit('updateBadge')
     this.memStore.updateState({ messages: msgList })
   }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb5234c24..a56203a88 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
         currentFiat: this.configManager.getCurrentFiat(),
         conversionRate: this.configManager.getConversionRate(),
         conversionDate: this.configManager.getConversionDate(),
+        isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
       }
     )
   }