diff options
| author | Keksoj <herrbosquet@gmail.com> | 2017-09-15 23:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 23:01:11 +0200 |
| commit | c712444e174e57aa083973ac91f458ce499787cf (patch) | |
| tree | 70df5c9c70773f7f9721c2270bf34e83c04a5e1c /src/libwalletqt/TransactionHistory.cpp | |
| parent | 3e90c3d8251a418387307f24fa039c739124ff05 (diff) | |
| parent | 4066cb22ea9e17c831f0f751911814d6fabefcdb (diff) | |
| download | monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.gz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.xz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.zip | |
Merge pull request #1 from erciccione/fix
Fix conflicts and rebase.
Diffstat (limited to 'src/libwalletqt/TransactionHistory.cpp')
| -rw-r--r-- | src/libwalletqt/TransactionHistory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp index 9cd22bee..31e8952e 100644 --- a/src/libwalletqt/TransactionHistory.cpp +++ b/src/libwalletqt/TransactionHistory.cpp @@ -45,11 +45,12 @@ QList<TransactionInfo *> TransactionHistory::getAll() const if (ti->timestamp() <= firstDateTime) { firstDateTime = ti->timestamp(); } + quint64 requiredConfirmations = (ti->blockHeight() < ti->unlockTime()) ? ti->unlockTime() - ti->blockHeight() : 0; // store last tx height - if (ti->confirmations() < 10 && ti->blockHeight() >= lastTxHeight ){ + if (ti->confirmations() < requiredConfirmations && ti->blockHeight() >= lastTxHeight) { lastTxHeight = ti->blockHeight(); // TODO: Fetch block time and confirmations needed from wallet2? - m_minutesToUnlock = (10 - ti->confirmations()) * 2; + m_minutesToUnlock = (requiredConfirmations - ti->confirmations()) * 2; m_locked = true; } |