Merge branch 'master' into i#563forgotPassword

1 files changed, 8 insertions, 2 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 6f5cb3a4a..715efb42e 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -5,6 +5,7 @@ const rp = require('request-promise')
 
 const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
+const txLimit = 40
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -15,6 +16,8 @@ const MAINNET_RPC = MetamaskConfig.network.mainnet
  */
 module.exports = ConfigManager
 function ConfigManager (opts) {
+  this.txLimit = txLimit
+
   // ConfigManager is observable and will emit updates
   this._subs = []
 
@@ -181,6 +184,9 @@ ConfigManager.prototype._saveTxList = function (txList) {
 
 ConfigManager.prototype.addTx = function (tx) {
   var transactions = this.getTxList()
+  while (transactions.length > this.txLimit - 1) {
+    transactions.shift()
+  }
   transactions.push(tx)
   this._saveTxList(transactions)
 }
@@ -294,9 +300,10 @@ ConfigManager.prototype.updateConversionRate = function () {
     this.setConversionPrice(0)
     this.setConversionDate('N/A')
   })
+
 }
 
-ConfigManager.prototype.setConversionPrice = function(price) {
+ConfigManager.prototype.setConversionPrice = function (price) {
   var data = this.getData()
   data.conversionRate = Number(price)
   this.setData(data)
@@ -366,4 +373,3 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy
   }
   this.setData(data)
 }
-