From cee0474e375a70d55200209bfa2387fd5242dd8f Mon Sep 17 00:00:00 2001 From: kenshi84 Date: Tue, 4 Jul 2017 12:34:09 +0900 Subject: Subaddresses minimal version: supports default account only --- src/libwalletqt/TransactionHistory.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/libwalletqt/TransactionHistory.cpp') diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp index 40b3d3c4..243db642 100644 --- a/src/libwalletqt/TransactionHistory.cpp +++ b/src/libwalletqt/TransactionHistory.cpp @@ -22,7 +22,7 @@ TransactionInfo *TransactionHistory::transaction(int index) // return nullptr; //} -QList TransactionHistory::getAll() const +QList TransactionHistory::getAll(quint32 accountIndex) const { // XXX this invalidates previously saved history that might be used by model emit refreshStarted(); @@ -37,6 +37,10 @@ QList TransactionHistory::getAll() const TransactionHistory * parent = const_cast(this); for (const auto i : m_pimpl->getAll()) { TransactionInfo * ti = new TransactionInfo(i, parent); + if (ti->subaddrAccount() != accountIndex) { + delete ti; + continue; + } m_tinfo.append(ti); // looking for transactions timestamp scope if (ti->timestamp() >= lastDateTime) { @@ -69,12 +73,12 @@ QList TransactionHistory::getAll() const return m_tinfo; } -void TransactionHistory::refresh() +void TransactionHistory::refresh(quint32 accountIndex) { // rebuilding transaction list in wallet_api; m_pimpl->refresh(); // copying list here and keep track on every item to avoid memleaks - getAll(); + getAll(accountIndex); } quint64 TransactionHistory::count() const -- cgit v1.2.3