diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-05-12 01:13:44 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-05-12 01:13:44 +0800 |
| commit | 3632ea29cc0a21448d904d985ae70ee0c13484a4 (patch) | |
| tree | 59ae2bcde6349b735a0ae542a9207a06c48ab2b9 /app/scripts | |
| parent | d9d528753dbd17ab4cc6796def4d429dfb33f2f8 (diff) | |
| parent | bfc19e403b6b1612d60a9e191e250e5a794df4cf (diff) | |
| download | tangerine-wallet-browser-3632ea29cc0a21448d904d985ae70ee0c13484a4.tar.gz tangerine-wallet-browser-3632ea29cc0a21448d904d985ae70ee0c13484a4.tar.zst tangerine-wallet-browser-3632ea29cc0a21448d904d985ae70ee0c13484a4.zip | |
Merge branch 'develop' into e2e-tests
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index a1588cfef..3886db104 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -114,7 +114,7 @@ class TransactionController extends EventEmitter { /** Check if a txMeta in the list with the same nonce has been confirmed in a block if the txParams dont have a nonce will return false - @returns {boolean} weather the nonce has been used in a transaction confirmed in a block + @returns {boolean} whether the nonce has been used in a transaction confirmed in a block @param {object} txMeta - the txMeta object */ async isNonceTaken (txMeta) { |