aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-03-09 02:36:31 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-03-09 02:37:47 +0800
commit5572345b781ce68178dd4e72d4e56b2dec26a454 (patch)
tree3e29029191d53be605f26370cef0769286fe65f3 /app/scripts
parent4a3288fec9ae7bd717b539d9bfcb8d5ba5b1ef8c (diff)
downloadtangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar.gz
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar.bz2
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar.lz
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar.xz
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.tar.zst
tangerine-wallet-browser-5572345b781ce68178dd4e72d4e56b2dec26a454.zip
fix marking of confirmed transaction as dropped
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/controllers/transactions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index e903c73e8..3dbd424ca 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -317,7 +317,7 @@ module.exports = class TransactionController extends EventEmitter {
if (!sameNonceTxs.length) return
// mark all same nonce transactions as dropped and give i a replacedBy hash
sameNonceTxs.forEach((otherTxMeta) => {
- if (otherTxMeta === txId) return
+ if (otherTxMeta.id === txId) return
otherTxMeta.replacedBy = txMeta.hash
this.txStateManager.updateTx(txMeta, 'transactions/pending-tx-tracker#event: tx:confirmed reference to confirmed txHash with same nonce')
this.txStateManager.setTxStatusDropped(otherTxMeta.id)