1 files changed, 10 insertions, 12 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 7cb25d8bf..f3837a028 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -17,18 +17,16 @@ const controller = new MetamaskController({
   // User confirmation callbacks:
   showUnconfirmedMessage: triggerUi,
   unlockAccountMessage: triggerUi,
-  showUnconfirmedTx: triggerUi,
+  showUnapprovedTx: triggerUi,
   // Persistence Methods:
   setData,
   loadData,
 })
-const keyringController = controller.keyringController
 
 function triggerUi () {
   if (!popupIsOpen) notification.show()
 }
 // On first install, open a window to MetaMask website to how-it-works.
-
 extension.runtime.onInstalled.addListener(function (details) {
   if ((details.reason === 'install') && (!METAMASK_DEBUG)) {
     extension.tabs.create({url: 'https://metamask.io/#how-it-works'})
@@ -81,13 +79,11 @@ function setupControllerConnection (stream) {
   stream.pipe(dnode).pipe(stream)
   dnode.on('remote', (remote) => {
     // push updates to popup
-    controller.ethStore.on('update', controller.sendUpdate.bind(controller))
-    controller.listeners.push(remote)
-    keyringController.on('update', controller.sendUpdate.bind(controller))
-
+    var sendUpdate = remote.sendUpdate.bind(remote)
+    controller.on('update', sendUpdate)
     // teardown on disconnect
     eos(stream, () => {
-      controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller))
+      controller.removeListener('update', sendUpdate)
       popupIsOpen = false
     })
   })
@@ -97,15 +93,15 @@ function setupControllerConnection (stream) {
 // plugin badge text
 //
 
-keyringController.on('update', updateBadge)
+controller.txManager.on('updateBadge', updateBadge)
+updateBadge()
 
 function updateBadge () {
   var label = ''
-  var unconfTxs = controller.configManager.unconfirmedTxs()
-  var unconfTxLen = Object.keys(unconfTxs).length
+  var unapprovedTxCount = controller.txManager.unapprovedTxCount
   var unconfMsgs = messageManager.unconfirmedMsgs()
   var unconfMsgLen = Object.keys(unconfMsgs).length
-  var count = unconfTxLen + unconfMsgLen
+  var count = unapprovedTxCount + unconfMsgLen
   if (count) {
     label = String(count)
   }
@@ -113,6 +109,8 @@ function updateBadge () {
   extension.browserAction.setBadgeBackgroundColor({ color: '#506F8B' })
 }
 
+// data :: setters/getters
+
 function loadData () {
   var oldData = getOldStyleData()
   var newData