aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-08-24 11:11:37 +0800
committerDan Finlay <dan@danfinlay.com>2017-08-24 11:11:37 +0800
commit04d40b114dd12237710f605fe2f0a5f2c337d2cb (patch)
tree04f9ffebaa325a816289b2c5fe52f251936979b2 /app
parent221575a191a0a8b8c4c17465a0530561e1905297 (diff)
downloadtangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar.gz
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar.bz2
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar.lz
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar.xz
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.tar.zst
tangerine-wallet-browser-04d40b114dd12237710f605fe2f0a5f2c337d2cb.zip
Got all tests but one passing
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/nonce-tracker.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/lib/nonce-tracker.js b/app/scripts/lib/nonce-tracker.js
index 4f2473cf5..6fcd716f2 100644
--- a/app/scripts/lib/nonce-tracker.js
+++ b/app/scripts/lib/nonce-tracker.js
@@ -30,6 +30,7 @@ class NonceTracker {
const nonceDetails = {}
const networkNonceResult = await this._getNetworkNextNonce(address)
const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
+
const highestConfirmed = Math.max(networkNonceResult.nonce, highestLocallyConfirmed)
const pendingTxs = this.getPendingTransactions(address)
const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestConfirmed) || 0