Clean up message manger includes:

Provider egine bump
Remove presence of message manger in keyring controller
Change the status wording fom conf to approved
make Message manager a class
fix messages not being apart of the badge
re write message manger to better reflect controller pattern

1 files changed, 5 insertions, 5 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 1bd69f7d9..f4fea03e9 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -20,8 +20,8 @@ function mapStateToProps (state) {
     identities: state.metamask.identities,
     accounts: state.metamask.accounts,
     selectedAccount: state.metamask.selectedAccount,
-    unconfTxs: state.metamask.unconfTxs,
-    unconfMsgs: state.metamask.unconfMsgs,
+    unapprovedTxs: state.metamask.unapprovedTxs,
+    unapprovedMsgs: state.metamask.unapprovedMsgs,
     index: state.appState.currentView.context,
     warning: state.appState.warning,
     network: state.metamask.network,
@@ -39,10 +39,10 @@ ConfirmTxScreen.prototype.render = function () {
 
   var network = state.network
   var provider = state.provider
-  var unconfTxs = state.unconfTxs
-  var unconfMsgs = state.unconfMsgs
+  var unapprovedTxs = state.unapprovedTxs
+  var unapprovedMsgs = state.unapprovedMsgs
 
-  var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
+  var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network)
   var index = state.index !== undefined && unconfTxList[index] ? state.index : 0
   var txData = unconfTxList[index] || {}
   var txParams = txData.params || {}