1 files changed, 18 insertions, 1 deletions
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index 91271cc4a..378ea38ab 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -23,7 +23,25 @@ module.exports = class TransactionStateManger extends ObservableStore {
     return this.getState().transactions
   }
 
+  // Returns the tx list
+
+  getUnapprovedTxList () {
+    const txList = this.getTxsByMetaData('status', 'unapproved')
+    return txList.reduce((result, tx) => {
+      result[tx.id] = tx
+      return result
+    }, {})
+  }
+
+
   addTx (txMeta) {
+    this.once(`${txMeta.id}:signed`, function (txId) {
+      this.removeAllListeners(`${txMeta.id}:rejected`)
+    })
+    this.once(`${txMeta.id}:rejected`, function (txId) {
+      this.removeAllListeners(`${txMeta.id}:signed`)
+    })
+
     const transactions = this.getFullTxList()
     const txCount = this.getTxCount()
     const txHistoryLimit = this.txHistoryLimit
@@ -38,7 +56,6 @@ module.exports = class TransactionStateManger extends ObservableStore {
       transactions.splice(index, 1)
     }
     transactions.push(txMeta)
-    transactions.push(txMeta)
     this._saveTxList(transactions)
   }
   // gets tx by Id and returns it