diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-01-26 14:29:40 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-01-26 14:29:40 -0500 |
| commit | ef6a6ed6519104f27777f8e508d8eeaf402cff30 (patch) | |
| tree | 0f34b050893c914520d4f00fee0e3c5a14631332 /src/libwalletqt/TransactionHistory.cpp | |
| parent | b137f73440ccb1c848e88afbb3515d2ab771a7f4 (diff) | |
| parent | a6a7b56d730f9a0be9e7d24b0b589cb69cf5bd56 (diff) | |
| download | monzero-gui-ef6a6ed6519104f27777f8e508d8eeaf402cff30.tar.gz monzero-gui-ef6a6ed6519104f27777f8e508d8eeaf402cff30.tar.xz monzero-gui-ef6a6ed6519104f27777f8e508d8eeaf402cff30.zip | |
Merge pull request #977
cee0474 Subaddresses minimal version: supports default account only
a6a7b56 ditch payment ID from the Receive page
Diffstat (limited to 'src/libwalletqt/TransactionHistory.cpp')
| -rw-r--r-- | src/libwalletqt/TransactionHistory.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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<TransactionInfo *> TransactionHistory::getAll() const +QList<TransactionInfo *> TransactionHistory::getAll(quint32 accountIndex) const { // XXX this invalidates previously saved history that might be used by model emit refreshStarted(); @@ -37,6 +37,10 @@ QList<TransactionInfo *> TransactionHistory::getAll() const TransactionHistory * parent = const_cast<TransactionHistory*>(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<TransactionInfo *> 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 |