aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-30 07:54:00 +0800
committerkumavis <aaron@kumavis.me>2018-03-30 07:54:00 +0800
commitb49ad750dd87232553a72663af94bb2840c2f2ad (patch)
tree71e4002e6bc28c42ea227299752814d6f1f10486 /app/scripts
parent93c123c6f52b28b525658492ce93fbcc30fc1e7c (diff)
parent9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff)
downloadtangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.gz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.bz2
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.lz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.xz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.zst
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/lib/nonce-tracker.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/lib/nonce-tracker.js b/app/scripts/lib/nonce-tracker.js
index ed9dd3f11..5b1cd7f43 100644
--- a/app/scripts/lib/nonce-tracker.js
+++ b/app/scripts/lib/nonce-tracker.js
@@ -31,14 +31,13 @@ class NonceTracker {
const networkNonceResult = await this._getNetworkNextNonce(address)
const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
const nextNetworkNonce = networkNonceResult.nonce
- const highestLocalNonce = highestLocallyConfirmed
- const highestSuggested = Math.max(nextNetworkNonce, highestLocalNonce)
+ const highestSuggested = Math.max(nextNetworkNonce, highestLocallyConfirmed)
const pendingTxs = this.getPendingTransactions(address)
const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestSuggested) || 0
nonceDetails.params = {
- highestLocalNonce,
+ highestLocallyConfirmed,
highestSuggested,
nextNetworkNonce,
}