aboutsummaryrefslogtreecommitdiff
path: root/src/libwalletqt/TransactionHistory.cpp
diff options
context:
space:
mode:
authorWojciech GomoĊ‚a <szogun1987@gmail.com>2018-01-28 14:52:53 +0100
committerGitHub <noreply@github.com>2018-01-28 14:52:53 +0100
commit1ad20a1fb3705fcc57569ef71e0145a8d2277f8f (patch)
tree1547832f1258303ee7b51bf98f6d054c9c6a5921 /src/libwalletqt/TransactionHistory.cpp
parent9d22b6ab4da8f310b629f989233c517eb51d301d (diff)
parentbed05a484cd54cf7269c75df2b1446638df26f7f (diff)
downloadmonzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.gz
monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.xz
monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.zip
Merge pull request #1 from monero-project/master
Refresh with source fork
Diffstat (limited to 'src/libwalletqt/TransactionHistory.cpp')
-rw-r--r--src/libwalletqt/TransactionHistory.cpp10
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