diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -27,40 +27,44 @@ int sourceRow, const QModelIndex &sourceParent) const { QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); - int type = index.data(TransactionTableModel::TypeRole).toInt(); - QDateTime datetime = - index.data(TransactionTableModel::DateRole).toDateTime(); - bool involvesWatchAddress = - index.data(TransactionTableModel::WatchonlyRole).toBool(); - QString address = index.data(TransactionTableModel::AddressRole).toString(); - QString label = index.data(TransactionTableModel::LabelRole).toString(); - QString txid = index.data(TransactionTableModel::TxIDRole).toString(); - Amount amount( - int64_t( - llabs(index.data(TransactionTableModel::AmountRole).toLongLong())) * - SATOSHI); int status = index.data(TransactionTableModel::StatusRole).toInt(); - if (!showInactive && status == TransactionStatus::Conflicted) { return false; } + + int type = index.data(TransactionTableModel::TypeRole).toInt(); if (!(TYPE(type) & typeFilter)) { return false; } + + bool involvesWatchAddress = + index.data(TransactionTableModel::WatchonlyRole).toBool(); if (involvesWatchAddress && watchOnlyFilter == WatchOnlyFilter_No) { return false; } if (!involvesWatchAddress && watchOnlyFilter == WatchOnlyFilter_Yes) { return false; } + + QDateTime datetime = + index.data(TransactionTableModel::DateRole).toDateTime(); if (datetime < dateFrom || datetime > dateTo) { return false; } + + QString address = index.data(TransactionTableModel::AddressRole).toString(); + QString label = index.data(TransactionTableModel::LabelRole).toString(); + QString txid = index.data(TransactionTableModel::TxHashRole).toString(); if (!address.contains(m_search_string, Qt::CaseInsensitive) && !label.contains(m_search_string, Qt::CaseInsensitive) && !txid.contains(m_search_string, Qt::CaseInsensitive)) { return false; } + + Amount amount( + int64_t( + llabs(index.data(TransactionTableModel::AmountRole).toLongLong())) * + SATOSHI); if (amount < minAmount) { return false; }