aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-28 08:17:04 +0800
committerkumavis <aaron@kumavis.me>2018-03-28 08:17:04 +0800
commit5290570c8fc635856823e8f66b8f810f07b7948a (patch)
treecb98ac01c290f0c9786fc285469bb37e6a851910 /app/scripts/lib
parent4ee48acf5672f00d59c49ec68452cd1dd57afa31 (diff)
parentb6b18339e2de92afd2fb5364ec5bc4c29b4d10a3 (diff)
downloadtangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar.gz
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar.bz2
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar.lz
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar.xz
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.tar.zst
tangerine-wallet-browser-5290570c8fc635856823e8f66b8f810f07b7948a.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/tx-state-manager.js7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index ad07c813f..ab344ae9b 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -38,11 +38,6 @@ module.exports = class TransactionStateManager extends EventEmitter {
}, opts)
}
- // Returns the number of txs for the current network.
- getTxCount () {
- return this.getTxList().length
- }
-
getTxList () {
const network = this.getNetwork()
const fullTxList = this.getFullTxList()
@@ -88,7 +83,7 @@ module.exports = class TransactionStateManager extends EventEmitter {
txMeta.history.push(snapshot)
const transactions = this.getFullTxList()
- const txCount = this.getTxCount()
+ const txCount = transactions.length
const txHistoryLimit = this.txHistoryLimit
// checks if the length of the tx history is