Merge pull request #1002 from MetaMask/bug-submitTx

handle tx finalization in controllers instead of provider-engine

1 files changed, 3 insertions, 2 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 3f15488ee..f3837a028 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -22,7 +22,7 @@ const controller = new MetamaskController({
   setData,
   loadData,
 })
-const txManager = controller.txManager
+
 function triggerUi () {
   if (!popupIsOpen) notification.show()
 }
@@ -93,7 +93,8 @@ function setupControllerConnection (stream) {
 // plugin badge text
 //
 
-txManager.on('updateBadge', updateBadge)
+controller.txManager.on('updateBadge', updateBadge)
+updateBadge()
 
 function updateBadge () {
   var label = ''