diff options
| -rw-r--r-- | pages/Receive.qml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index 2c55ef17..dbfa325c 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -65,6 +65,8 @@ Rectangle { } function update() { + const max_tracking = 3; + if (!appWindow.currentWallet || !trackingEnabled.checked) { trackingLineText.text = ""; trackingModel.clear(); @@ -80,10 +82,10 @@ Rectangle { var count = model.rowCount() var totalAmount = 0 var nTransactions = 0 - var blockchainHeight = 0 + var blockchainHeight = null var txs = [] - for (var i = 0; i < count; ++i) { + for (var i = 0; i < count && txs.length < max_tracking; ++i) { var idx = model.index(i, 0) var isout = model.data(idx, TransactionHistoryModel.TransactionIsOutRole); var subaddrAccount = model.data(idx, TransactionHistoryModel.TransactionSubaddrAccountRole); @@ -103,8 +105,8 @@ Rectangle { if (blockHeight == 0) { in_txpool = true; } else { - if (blockchainHeight == 0) - blockchainHeight = walletManager.blockchainHeight() + if (blockchainHeight == null) + blockchainHeight = appWindow.currentWallet.blockChainHeight() confirmations = blockchainHeight - blockHeight - 1 displayAmount = model.data(idx, TransactionHistoryModel.TransactionDisplayAmountRole); } @@ -130,7 +132,6 @@ Rectangle { trackingLineText.text = qsTr("%1 transactions found").arg(nTransactions) + ":" + translationManager.emptyString } - var max_tracking = 3; toReceiveSatisfiedLine.text = ""; var expectedAmount = walletManager.amountFromString(amountToReceiveLine.text) if (expectedAmount && expectedAmount != amount) { @@ -143,11 +144,6 @@ Rectangle { } trackingModel.clear(); - - if (txs.length > 3) { - txs.length = 3; - } - txs.forEach(function(tx){ trackingModel.append({ "amount": tx.amount, |