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

3 files changed, 3 insertions, 10 deletions

diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index 353401099..90b4ec094 100644
--- a/ui/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
@@ -15,15 +15,9 @@ TransactionIcon.prototype.render = function () {
   const { transaction, txParams, isMsg } = this.props
   switch (transaction.status) {
     case 'unapproved':
-      return h('.unapproved-tx', {
+      return h( !isMsg ? '.unapproved-tx-icon' : 'i.fa.fa-certificate.fa-lg', {
         style: {
           width: '24px',
-          height: '24px',
-          background: '#4dffff',
-          border: 'solid',
-          borderColor: '#AEAEAE',
-          borderWidth: '0.5px',
-          borderRadius: '13px',
         },
       })
 
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 95e850264..44d2dc587 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -33,7 +33,6 @@ TransactionListItem.prototype.render = function () {
   var isMsg = ('msgParams' in transaction)
   var isTx = ('txParams' in transaction)
   var isPending = transaction.status === 'unapproved'
-
   let txParams
   if (isTx) {
     txParams = transaction.txParams
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index b055ca9d5..3ae953637 100644
--- a/ui/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
@@ -13,13 +13,13 @@ function TransactionList () {
 }
 
 TransactionList.prototype.render = function () {
-  const { transactions, network, unconfMsgs } = this.props
+  const { transactions, network, unapprovedMsgs } = this.props
 
   var shapeShiftTxList
   if (network === '1') {
     shapeShiftTxList = this.props.shapeShiftTxList
   }
-  const txsToRender = !shapeShiftTxList ? transactions.concat(unconfMsgs) : transactions.concat(unconfMsgs, shapeShiftTxList)
+  const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
   .sort((a, b) => b.time - a.time)
 
   return (