mempooltxtables:fix Fee column data & detect Status better

Author: RandyMcMillan

src/qt/mempooldetail.cpp

@@ -140,6 +140,7 @@ void MempoolDetail::setClientModel(ClientModel* model)
         connect(model, &ClientModel::numBlocksChanged, this, &MempoolDetail::updateFeeTable);
         connect(model, &ClientModel::mempoolRangeSelected, this, &MempoolDetail::onRangeSelected);
         connect(model, &ClientModel::walletTxChanged, this, &MempoolDetail::updateTxTable); // Connect new signal
+        m_tx_table_model->setClientModel(model);
         MempoolDetail::updateFeeTable();
         MempoolDetail::updateTxTable(); // Initial update for transaction table
     }

src/qt/mempooltxtables.cpp

@@ -4,6 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qt/mempooltxtables.h>
+#include <qt/clientmodel.h>
 
 #include <qt/guiutil.h>
 #include <qt/bitcoinunits.h> // New include for BitcoinUnits
@@ -18,6 +19,11 @@ MempoolTxTableModel::MempoolTxTableModel(QObject* parent)
 
 MempoolTxTableModel::~MempoolTxTableModel() = default;
 
+void MempoolTxTableModel::setClientModel(ClientModel* client_model)
+{
+    m_client_model = client_model;
+}
+
 int MempoolTxTableModel::rowCount(const QModelIndex& parent) const
 {
     if (parent.isValid()) {
@@ -41,6 +47,17 @@ QVariant MempoolTxTableModel::data(const QModelIndex& index, int role) const
 
     const interfaces::WalletTx* wtx = static_cast<const interfaces::WalletTx*>(index.internalPointer());
 
+    // Declare wallets and wallet outside the switch statement
+    std::vector<std::unique_ptr<interfaces::Wallet>> wallets;
+    interfaces::Wallet* wallet = nullptr;
+
+    if (m_client_model) {
+        wallets = m_client_model->node().walletLoader().getWallets();
+        if (!wallets.empty()) {
+            wallet = wallets[0].get();
+        }
+    }
+
     const auto column = static_cast<ColumnIndex>(index.column());
     if (role == Qt::DisplayRole) {
         switch (column) {
@@ -50,12 +67,29 @@ QVariant MempoolTxTableModel::data(const QModelIndex& index, int role) const
             return BitcoinUnits::formatWithUnit(BitcoinUnits::Unit::BTC, wtx->credit - wtx->debit, false, BitcoinUnits::SeparatorStyle::ALWAYS);
         case Fee:
             {
-                CAmount fee = wtx->debit - wtx->credit - wtx->change;
+                CAmount fee = wtx->debit - wtx->credit;
                 return BitcoinUnits::formatWithUnit(BitcoinUnits::Unit::BTC, fee, false, BitcoinUnits::SeparatorStyle::ALWAYS);
             }
         case Status:
-            // For now, we'll just indicate if it's in the mempool. More detailed status can be added later.
-            return tr("In Mempool");
+            if (!wallet) return tr("No active wallet");
+
+            interfaces::WalletTxStatus tx_status;
+            int num_blocks;
+            int64_t block_time;
+
+            if (wallet->tryGetTxStatus(wtx->tx->GetHash(), tx_status, num_blocks, block_time)) {
+                if (tx_status.is_in_main_chain && tx_status.depth_in_main_chain > 0) {
+                    return tr("Confirmed");
+                } else if (tx_status.depth_in_main_chain == 0 && !tx_status.is_in_main_chain && !tx_status.is_abandoned) {
+                    return tr("In Mempool");
+                } else if (tx_status.is_abandoned) {
+                    return tr("Abandoned");
+                } else {
+                    return tr("Not in Mempool");
+                }
+            } else {
+                return tr("Unknown");
+            }
         default:
             return QVariant();
         }

src/qt/mempooltxtables.h

@@ -14,6 +14,8 @@
 
 #include <interfaces/wallet.h>
 
+class ClientModel;
+
 /**
    Qt model providing information about mempool transactions from the active wallet.
  */
@@ -46,6 +48,7 @@ class MempoolTxTableModel : public QAbstractTableModel
 
 public Q_SLOTS:
     void updateModel(const std::set<interfaces::WalletTx>& wallet_transactions, bool has_active_wallet);
+    void setClientModel(ClientModel* client_model);
 
 public:
     QList<interfaces::WalletTx> m_tx_data;
@@ -61,6 +64,8 @@ public Q_SLOTS:
         /*: Title of Mempool Tx Table column which contains the status. */
         tr("Status")
     };
-};
 
+private:
+    ClientModel* m_client_model = nullptr;
+};
 #endif // BITCOIN_QT_MEMPOOLTXTABLES_H