From: tobtoht Date: Tue, 3 Oct 2023 19:55:10 +0000 (+0200) Subject: Revert "History: add balance column" X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=1bf05f15ff61dd960a3d5e87b7ef7012e10f6942;p=gamesguru%2Ffeather.git Revert "History: add balance column" This reverts commit 9ec53dc7d5b247556c0f6f2e23189511551d5934. --- diff --git a/monero b/monero index 4401b48d..db1ac578 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 4401b48de9067b6af566f0d33e95f769350c85cd +Subproject commit db1ac578a16e678f0778fb37001921f93704f0ed diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp index 19ee06c9..e9fa983b 100644 --- a/src/libwalletqt/TransactionHistory.cpp +++ b/src/libwalletqt/TransactionHistory.cpp @@ -64,22 +64,13 @@ void TransactionHistory::refresh(quint32 accountIndex) m_locked = false; m_minutesToUnlock = 0; - quint64 balance = 0; - m_pimpl->refresh(); for (const auto i : m_pimpl->getAll()) { if (i->subaddrAccount() != accountIndex) { continue; } - if (i->direction() == Monero::TransactionInfo::Direction_In) { - balance += i->amount(); - } - else if (i->direction() == Monero::TransactionInfo::Direction_Out) { - balance -= i->amount() + i->fee(); - } - - m_tinfo.append(new TransactionInfo(i, balance, this)); + m_tinfo.append(new TransactionInfo(i, this)); const TransactionInfo *ti = m_tinfo.back(); // looking for transactions timestamp scope @@ -168,7 +159,7 @@ bool TransactionHistory::writeCSV(const QString &path) { }); for (const auto &tx : transactions) { - TransactionInfo info(tx, 0, this); + TransactionInfo info(tx, this); // collect column data QDateTime timeStamp = info.timestamp(); diff --git a/src/libwalletqt/TransactionInfo.cpp b/src/libwalletqt/TransactionInfo.cpp index cd05ec7a..fe78e916 100644 --- a/src/libwalletqt/TransactionInfo.cpp +++ b/src/libwalletqt/TransactionInfo.cpp @@ -37,11 +37,6 @@ quint64 TransactionInfo::balanceDelta() const return m_amount; } -quint64 TransactionInfo::balance() const -{ - return m_balance; -} - double TransactionInfo::amount() const { // there's no unsigned uint64 for JS, so better use double @@ -172,7 +167,7 @@ QString TransactionInfo::rings_formatted() const return rings; } -TransactionInfo::TransactionInfo(const Monero::TransactionInfo *pimpl, quint64 balance, QObject *parent) +TransactionInfo::TransactionInfo(const Monero::TransactionInfo *pimpl, QObject *parent) : QObject(parent) , m_amount(pimpl->amount()) , m_blockHeight(pimpl->blockHeight()) @@ -189,7 +184,6 @@ TransactionInfo::TransactionInfo(const Monero::TransactionInfo *pimpl, quint64 b , m_timestamp(QDateTime::fromSecsSinceEpoch(pimpl->timestamp())) , m_unlockTime(pimpl->unlockTime()) , m_coinbase(pimpl->isCoinbase()) - , m_balance(balance) { for (auto const &t: pimpl->transfers()) { diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h index 6ea3dad9..9e496c4d 100644 --- a/src/libwalletqt/TransactionInfo.h +++ b/src/libwalletqt/TransactionInfo.h @@ -53,7 +53,6 @@ public: bool isFailed() const; bool isCoinbase() const; quint64 balanceDelta() const; - quint64 balance() const; double amount() const; quint64 atomicAmount() const; QString displayAmount() const; @@ -81,7 +80,7 @@ public: QString rings_formatted() const; private: - explicit TransactionInfo(const Monero::TransactionInfo *pimpl, quint64 balance, QObject *parent = nullptr); + explicit TransactionInfo(const Monero::TransactionInfo *pimpl, QObject *parent = nullptr); private: friend class TransactionHistory; mutable QList m_transfers; @@ -103,7 +102,6 @@ private: QDateTime m_timestamp; quint64 m_unlockTime; bool m_coinbase; - quint64 m_balance; }; #endif // TRANSACTIONINFO_H diff --git a/src/model/HistoryView.cpp b/src/model/HistoryView.cpp index 03ce4c2d..4caefedb 100644 --- a/src/model/HistoryView.cpp +++ b/src/model/HistoryView.cpp @@ -181,7 +181,6 @@ void HistoryView::resetViewToDefaults() header()->showSection(TransactionHistoryModel::Description); header()->showSection(TransactionHistoryModel::Amount); header()->showSection(TransactionHistoryModel::FiatAmount); - header()->hideSection(TransactionHistoryModel::Balance); // Reset column order to logical indices for (int i = 0; i < header()->count(); ++i) { diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 30db1a1f..0d690124 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -67,7 +67,7 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const bool found = m_transactionHistory->transaction(index.row(), [this, &index, &result, &role](const TransactionInfo &tInfo) { if(role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::UserRole) { - result = parseTransactionInfo(tInfo, index.row(), index.column(), role); + result = parseTransactionInfo(tInfo, index.column(), role); } else if (role == Qt::TextAlignmentRole) { switch (index.column()) { @@ -139,14 +139,14 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const return result; } -QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tInfo, int row, int column, int role) const +QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tInfo, int column, int role) const { switch (column) { case Column::Date: { if (role == Qt::UserRole) { - return row; + return tInfo.timestamp(); } return tInfo.timestamp().toString(QString("%1 %2 ").arg(conf()->get(Config::dateFormat).toString(), conf()->get(Config::timeFormat).toString())); @@ -158,7 +158,7 @@ QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tI if (role == Qt::UserRole) { return tInfo.balanceDelta(); } - auto amount = this->formatAmount(tInfo.balanceDelta()); + QString amount = QString::number(tInfo.balanceDelta() / constants::cdiv, 'f', conf()->get(Config::amountPrecision).toInt()); amount = (tInfo.direction() == TransactionInfo::Direction_Out) ? "-" + amount : "+" + amount; return amount; } @@ -188,10 +188,6 @@ QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tI double fiat_rounded = ceil(Utils::roundSignificant(usd_amount, 3) * 100.0) / 100.0; return QString("%1").arg(Utils::amountToCurrencyString(fiat_rounded, preferredFiatCurrency)); } - case Column::Balance: - { - return this->formatAmount(tInfo.balance()); - } default: { qCritical() << "Unimplemented role"; @@ -200,10 +196,6 @@ QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tI } } -QString TransactionHistoryModel::formatAmount(quint64 amount) const { - return QString::number(amount / constants::cdiv, 'f', conf()->get(Config::amountPrecision).toInt()); -} - QVariant TransactionHistoryModel::headerData(int section, Qt::Orientation orientation, int role) const { Q_UNUSED(orientation) if (role != Qt::DisplayRole) { @@ -221,8 +213,6 @@ QVariant TransactionHistoryModel::headerData(int section, Qt::Orientation orient return QString("Txid"); case Column::FiatAmount: return QString("Fiat"); - case Column::Balance: - return QString("Balance"); default: return QVariant(); } diff --git a/src/model/TransactionHistoryModel.h b/src/model/TransactionHistoryModel.h index 2f0d5c45..582c57cc 100644 --- a/src/model/TransactionHistoryModel.h +++ b/src/model/TransactionHistoryModel.h @@ -27,7 +27,6 @@ public: Description, Amount, FiatAmount, - Balance, COUNT }; @@ -48,8 +47,7 @@ signals: void transactionHistoryChanged(); private: - QVariant parseTransactionInfo(const TransactionInfo &tInfo, int row, int column, int role) const; - QString formatAmount(quint64 amount) const; + QVariant parseTransactionInfo(const TransactionInfo &tInfo, int column, int role) const; TransactionHistory * m_transactionHistory; };