From a773635a3a434a3988840d70fc04a6068fd628fe Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:16:59 +0530
Subject: [PATCH 01/30] qt: move masternode list fetch logic to thread and use
 debounce timer

---
 src/qt/masternodelist.cpp | 179 +++++++++++++++++++++-----------------
 src/qt/masternodelist.h   |  39 +++++----
 2 files changed, 119 insertions(+), 99 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 700fdabc6782..d6368fa0ce58 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -8,17 +8,19 @@
 #include <coins.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
+#include <saltedhasher.h>
 
 #include <qt/clientmodel.h>
 #include <qt/descriptiondialog.h>
 #include <qt/guiutil.h>
 #include <qt/guiutil_font.h>
-#include <qt/masternodemodel.h>
 #include <qt/walletmodel.h>
 
 #include <QApplication>
 #include <QClipboard>
 #include <QHeaderView>
+#include <QMetaObject>
+#include <QThread>
 
 #include <set>
 
@@ -62,7 +64,7 @@ bool MasternodeListSortFilterProxyModel::filterAcceptsRow(int source_row, const
     if (m_show_owned_only) {
         QModelIndex idx = sourceModel()->index(source_row, MasternodeModel::PROTX_HASH, source_parent);
         QString proTxHash = sourceModel()->data(idx, Qt::DisplayRole).toString();
-        if (!m_my_mn_hashes.contains(proTxHash)) {
+        if (!m_owned_mns.contains(proTxHash)) {
             return false;
         }
     }
@@ -73,8 +75,11 @@ bool MasternodeListSortFilterProxyModel::filterAcceptsRow(int source_row, const
 MasternodeList::MasternodeList(QWidget* parent) :
     QWidget(parent),
     ui(new Ui::MasternodeList),
+    m_proxy_model(new MasternodeListSortFilterProxyModel(this)),
     m_model(new MasternodeModel(this)),
-    m_proxy_model(new MasternodeListSortFilterProxyModel(this))
+    m_worker(new QObject),
+    m_thread{new QThread(this)},
+    m_timer{new QTimer(this)}
 {
     ui->setupUi(this);
 
@@ -126,15 +131,24 @@ MasternodeList::MasternodeList(QWidget* parent) :
     connect(m_proxy_model, &QSortFilterProxyModel::modelReset, this, &MasternodeList::updateFilteredCount);
     connect(m_proxy_model, &QSortFilterProxyModel::layoutChanged, this, &MasternodeList::updateFilteredCount);
 
-    timer = new QTimer(this);
-    connect(timer, &QTimer::timeout, this, &MasternodeList::updateDIP3ListScheduled);
-
     GUIUtil::updateFonts();
+
+    // Background thread for calculating masternode list
+    m_worker->moveToThread(m_thread);
+    // Make sure executor object is deleted in its own thread
+    connect(m_thread, &QThread::finished, m_worker, &QObject::deleteLater);
+    m_thread->start();
+
+    // Debounce timer to apply masternode list changes
+    m_timer->setSingleShot(true);
+    connect(m_timer, &QTimer::timeout, this, &MasternodeList::updateDIP3ListScheduled);
 }
 
 MasternodeList::~MasternodeList()
 {
-    timer->stop();
+    m_timer->stop();
+    m_thread->quit();
+    m_thread->wait();
     delete ui;
 }
 
@@ -150,11 +164,10 @@ void MasternodeList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
     if (model) {
-        // try to update list when masternode count changes
         connect(clientModel, &ClientModel::masternodeListChanged, this, &MasternodeList::handleMasternodeListChanged);
-        timer->start(1000);
+        m_timer->start(0);
     } else {
-        timer->stop();
+        m_timer->stop();
     }
 }
 
@@ -174,7 +187,17 @@ void MasternodeList::showContextMenuDIP3(const QPoint& point)
 
 void MasternodeList::handleMasternodeListChanged()
 {
-    m_mn_list_changed.store(true, std::memory_order_relaxed);
+    if (!clientModel || m_timer->isActive()) {
+        // Too early or already processing, nothing to do
+        return;
+    }
+
+    int delay{MASTERNODELIST_UPDATE_SECONDS * 1000};
+    if (!clientModel->masternodeSync().isBlockchainSynced()) {
+        // Currently syncing, reduce refreshes
+        delay *= 10;
+    }
+    m_timer->start(delay);
 }
 
 void MasternodeList::updateDIP3ListScheduled()
@@ -183,62 +206,63 @@ void MasternodeList::updateDIP3ListScheduled()
         return;
     }
 
-    if (m_mn_list_changed.load(std::memory_order_relaxed)) {
-        int64_t nMnListUpdateSecods = clientModel->masternodeSync().isBlockchainSynced() ? MASTERNODELIST_UPDATE_SECONDS : MASTERNODELIST_UPDATE_SECONDS * 10;
-        int64_t nSecondsToWait = nTimeUpdatedDIP3 - GetTime() + nMnListUpdateSecods;
+    if (m_in_progress.exchange(true)) {
+        // Already applying, re-arm for next attempt
+        handleMasternodeListChanged();
+        return;
+    }
 
-        if (nSecondsToWait <= 0) {
-            if (updateDIP3List()) {
-                m_mn_list_changed.store(false, std::memory_order_relaxed);
+    QMetaObject::invokeMethod(m_worker, [this] {
+        auto result = std::make_shared<CalcMnList>(calcMasternodeList());
+        m_in_progress.store(false);
+        QTimer::singleShot(0, this, [this, result] {
+            if (result->m_valid) {
+                setMasternodeList(std::move(*result));
+            } else {
+                // Something went wrong, try again
+                handleMasternodeListChanged();
             }
-        }
-    }
+        });
+    });
 }
 
-bool MasternodeList::updateDIP3List()
+MasternodeList::CalcMnList MasternodeList::calcMasternodeList() const
 {
+    CalcMnList ret;
     if (!clientModel || clientModel->node().shutdownRequested()) {
-        return false;
+        return ret;
     }
 
     auto [mnList, pindex] = clientModel->getMasternodeList();
-    if (!pindex) return false;
+    if (!pindex) return ret;
     auto projectedPayees = mnList->getProjectedMNPayees(pindex);
 
     if (projectedPayees.empty() && mnList->getValidMNsCount() > 0) {
         // GetProjectedMNPayees failed to provide results for a list with valid mns.
         // Keep current list and let it try again later.
-        return false;
-    }
-
-    std::map<uint256, CTxDestination> mapCollateralDests;
-
-    {
-        // Get all UTXOs for each MN collateral in one go so that we can reduce locking overhead for cs_main
-        // We also do this outside of the below Qt list update loop to reduce cs_main locking time to a minimum
-        mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
-            CTxDestination collateralDest;
-            Coin coin;
-            if (clientModel->node().getUnspentOutput(dmn.getCollateralOutpoint(), coin) &&
-                ExtractDestination(coin.out.scriptPubKey, collateralDest)) {
-                mapCollateralDests.emplace(dmn.getProTxHash(), collateralDest);
-            }
-        });
+        return ret;
     }
 
-    ui->countLabel->setText(tr("Updating…"));
+    ret.m_list_height = mnList->getHeight();
 
-    nTimeUpdatedDIP3 = GetTime();
+    Uint256HashMap<CTxDestination> mapCollateralDests;
+    mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
+        CTxDestination collateralDest;
+        Coin coin;
+        if (clientModel->node().getUnspentOutput(dmn.getCollateralOutpoint(), coin) &&
+            ExtractDestination(coin.out.scriptPubKey, collateralDest)) {
+            mapCollateralDests.emplace(dmn.getProTxHash(), collateralDest);
+        }
+    });
 
-    std::map<uint256, int> nextPayments;
+    Uint256HashMap<int> nextPayments;
     for (size_t i = 0; i < projectedPayees.size(); i++) {
         const auto& dmn = projectedPayees[i];
-        nextPayments.emplace(dmn->getProTxHash(), mnList->getHeight() + (int)i + 1);
+        nextPayments.emplace(dmn->getProTxHash(), ret.m_list_height + (int)i + 1);
     }
 
-    MasternodeEntryList entries;
     mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
-        QString collateralStr = tr("UNKNOWN");
+        QString collateralStr = QObject::tr("UNKNOWN");
         auto collateralDestIt = mapCollateralDests.find(dmn.getProTxHash());
         if (collateralDestIt != mapCollateralDests.end()) {
             collateralStr = QString::fromStdString(EncodeDestination(collateralDestIt->second));
@@ -250,47 +274,45 @@ bool MasternodeList::updateDIP3List()
             nNextPayment = nextPaymentIt->second;
         }
 
-        entries.push_back(std::make_unique<MasternodeEntry>(dmn, collateralStr, nNextPayment));
+        ret.m_entries.push_back(std::make_unique<MasternodeEntry>(dmn, collateralStr, nNextPayment));
     });
 
-    // Update model
-    m_model->setCurrentHeight(mnList->getHeight());
-    m_model->reconcile(std::move(entries));
+    // Compute "owned" masternode hashes for the filter
+    if (walletModel) {
+        std::set<COutPoint> setOutpts;
+        for (const auto& outpt : walletModel->wallet().listProTxCoins()) {
+            setOutpts.emplace(outpt);
+        }
 
-    // Update filters
-    if (walletModel && ui->checkBoxOwned->isChecked()) {
-        updateMyMasternodeHashes(mnList);
+        mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
+            bool fMyMasternode = setOutpts.count(dmn.getCollateralOutpoint()) ||
+                                 walletModel->wallet().isSpendable(PKHash(dmn.getKeyIdOwner())) ||
+                                 walletModel->wallet().isSpendable(PKHash(dmn.getKeyIdVoting())) ||
+                                 walletModel->wallet().isSpendable(dmn.getScriptPayout()) ||
+                                 walletModel->wallet().isSpendable(dmn.getScriptOperatorPayout());
+            if (fMyMasternode) {
+                ret.m_owned_mns.insert(QString::fromStdString(dmn.getProTxHash().ToString()));
+            }
+        });
     }
 
-    updateFilteredCount();
-    return true;
+    ret.m_valid = true;
+    return ret;
 }
 
-void MasternodeList::updateMyMasternodeHashes(const interfaces::MnListPtr& mnList)
+void MasternodeList::setMasternodeList(CalcMnList&& list)
 {
-    if (!walletModel || !mnList) {
-        return;
-    }
-
-    std::set<COutPoint> setOutpts;
-    for (const auto& outpt : walletModel->wallet().listProTxCoins()) {
-        setOutpts.emplace(outpt);
-    }
+    m_model->setCurrentHeight(list.m_list_height);
+    m_model->reconcile(std::move(list.m_entries));
 
-    QSet<QString> myHashes;
-    mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
-        bool fMyMasternode = setOutpts.count(dmn.getCollateralOutpoint()) ||
-                             walletModel->wallet().isSpendable(PKHash(dmn.getKeyIdOwner())) ||
-                             walletModel->wallet().isSpendable(PKHash(dmn.getKeyIdVoting())) ||
-                             walletModel->wallet().isSpendable(dmn.getScriptPayout()) ||
-                             walletModel->wallet().isSpendable(dmn.getScriptOperatorPayout());
-        if (fMyMasternode) {
-            myHashes.insert(QString::fromStdString(dmn.getProTxHash().ToString()));
+    if (walletModel) {
+        m_proxy_model->setMyMasternodeHashes(std::move(list.m_owned_mns));
+        if (ui->checkBoxOwned->isChecked()) {
+            m_proxy_model->forceInvalidateFilter();
         }
-    });
+    }
 
-    m_proxy_model->setMyMasternodeHashes(std::move(myHashes));
-    m_proxy_model->forceInvalidateFilter();
+    updateFilteredCount();
 }
 
 void MasternodeList::updateFilteredCount()
@@ -320,14 +342,7 @@ void MasternodeList::on_comboBoxType_currentIndexChanged(int index)
 void MasternodeList::on_checkBoxOwned_stateChanged(int state)
 {
     m_proxy_model->setShowOwnedOnly(state == Qt::Checked);
-    if (clientModel && state == Qt::Checked) {
-        auto [mnList, pindex] = clientModel->getMasternodeList();
-        if (mnList) {
-            updateMyMasternodeHashes(mnList);
-        }
-    } else {
-        m_proxy_model->forceInvalidateFilter();
-    }
+    m_proxy_model->forceInvalidateFilter();
     updateFilteredCount();
 }
 
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index 2a940c14538a..ce07082cd9f0 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_MASTERNODELIST_H
 #define BITCOIN_QT_MASTERNODELIST_H
 
-#include <util/system.h>
+#include <qt/masternodemodel.h>
 
 #include <QMenu>
 #include <QSet>
@@ -26,8 +26,7 @@ class MasternodeList;
 } // namespace Ui
 
 class ClientModel;
-class MasternodeEntry;
-class MasternodeModel;
+class QThread;
 class WalletModel;
 
 QT_BEGIN_NAMESPACE
@@ -51,7 +50,7 @@ class MasternodeListSortFilterProxyModel : public QSortFilterProxyModel
 
     void forceInvalidateFilter() { invalidateFilter(); }
     void setHideBanned(bool hide) { m_hide_banned = hide; }
-    void setMyMasternodeHashes(QSet<QString> hashes) { m_my_mn_hashes = std::move(hashes); }
+    void setMyMasternodeHashes(QSet<QString>&& hashes) { m_owned_mns = std::move(hashes); }
     void setShowOwnedOnly(bool show) { m_show_owned_only = show; }
     void setTypeFilter(TypeFilter type) { m_type_filter = type; }
 
@@ -61,7 +60,7 @@ class MasternodeListSortFilterProxyModel : public QSortFilterProxyModel
 private:
     bool m_hide_banned{true};
     bool m_show_owned_only{false};
-    QSet<QString> m_my_mn_hashes;
+    QSet<QString> m_owned_mns;
     TypeFilter m_type_filter{TypeFilter::All};
 };
 
@@ -70,9 +69,11 @@ class MasternodeList : public QWidget
 {
     Q_OBJECT
 
+    Ui::MasternodeList* ui;
+
 public:
     explicit MasternodeList(QWidget* parent = nullptr);
-    ~MasternodeList();
+    ~MasternodeList() override;
 
     void setClientModel(ClientModel* clientModel);
     void setWalletModel(WalletModel* walletModel);
@@ -81,24 +82,28 @@ class MasternodeList : public QWidget
     void changeEvent(QEvent* event) override;
 
 private:
-    QMenu* contextMenuDIP3;
-    int64_t nTimeUpdatedDIP3{0};
+    struct CalcMnList {
+        int m_list_height{0};
+        MasternodeEntryList m_entries;
+        QSet<QString> m_owned_mns;
+        bool m_valid{false};
+    };
 
-    QTimer* timer;
-    Ui::MasternodeList* ui;
     ClientModel* clientModel{nullptr};
-    WalletModel* walletModel{nullptr};
-
-    MasternodeModel* m_model{nullptr};
     MasternodeListSortFilterProxyModel* m_proxy_model{nullptr};
+    MasternodeModel* m_model{nullptr};
+    QMenu* contextMenuDIP3{nullptr};
+    QObject* m_worker{nullptr};
+    QThread* m_thread{nullptr};
+    QTimer* m_timer{nullptr};
+    std::atomic<bool> m_in_progress{false};
+    WalletModel* walletModel{nullptr};
 
-    std::atomic<bool> m_mn_list_changed{true};
+    CalcMnList calcMasternodeList() const;
+    void setMasternodeList(CalcMnList&& data);
 
     const MasternodeEntry* GetSelectedEntry();
 
-    bool updateDIP3List();
-    void updateMyMasternodeHashes(const interfaces::MnListPtr& mnList);
-
 Q_SIGNALS:
     void doubleClicked(const QModelIndex&);
 

From 5af2bb9ef11a8181d31ae769af5f6f64bd738b5a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 16:43:06 +0530
Subject: [PATCH 02/30] qt: expose `NotifyGovernanceChanged` signal to UI code

---
 src/governance/governance.cpp | 2 ++
 src/governance/object.cpp     | 2 ++
 src/interfaces/node.h         | 4 ++++
 src/node/interface_ui.cpp     | 3 +++
 src/node/interface_ui.h       | 3 +++
 src/node/interfaces.cpp       | 4 ++++
 src/qt/clientmodel.cpp        | 4 ++++
 src/qt/clientmodel.h          | 1 +
 8 files changed, 23 insertions(+)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 43741675c9a4..31d1a864c23d 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -15,6 +15,7 @@
 #include <governance/validators.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
+#include <node/interface_ui.h>
 #include <protocol.h>
 #include <shutdown.h>
 #include <spork.h>
@@ -318,6 +319,7 @@ void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_o
 
     // SEND NOTIFICATION TO SCRIPT/ZMQ
     GetMainSignals().NotifyGovernanceObject(std::make_shared<const Governance::Object>(govobj->Object()), nHash.ToString());
+    uiInterface.NotifyGovernanceChanged();
 }
 
 void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index fb4f75548d05..956f209b4292 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -15,6 +15,7 @@
 #include <core_io.h>
 #include <index/txindex.h>
 #include <logging.h>
+#include <node/interface_ui.h>
 #include <timedata.h>
 #include <util/time.h>
 #include <validation.h>
@@ -155,6 +156,7 @@ bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceM
     // SEND NOTIFICATION TO SCRIPT/ZMQ
     GetMainSignals().NotifyGovernanceVote(std::make_shared<CDeterministicMNList>(tip_mn_list),
                                           std::make_shared<const CGovernanceVote>(vote), vote.GetHash().ToString());
+    uiInterface.NotifyGovernanceChanged();
     return true;
 }
 
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index b6fbef3de525..f73f4ce6df12 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -466,6 +466,10 @@ class Node
         std::function<void(SynchronizationState, interfaces::BlockTip tip, double verification_progress)>;
     virtual std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) = 0;
 
+    //! Register handler for governance data messages.
+    using NotifyGovernanceChangedFn = std::function<void()>;
+    virtual std::unique_ptr<Handler> handleNotifyGovernanceChanged(NotifyGovernanceChangedFn fn) = 0;
+
     //! Register handler for masternode list update messages.
     using NotifyMasternodeListChangedFn =
         std::function<void(const CDeterministicMNList& newList,
diff --git a/src/node/interface_ui.cpp b/src/node/interface_ui.cpp
index ed4e4dea45f2..1faf4512207f 100644
--- a/src/node/interface_ui.cpp
+++ b/src/node/interface_ui.cpp
@@ -23,6 +23,7 @@ struct UISignals {
     boost::signals2::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip;
     boost::signals2::signal<CClientUIInterface::NotifyChainLockSig> NotifyChainLock;
     boost::signals2::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip;
+    boost::signals2::signal<CClientUIInterface::NotifyGovernanceChangedSig> NotifyGovernanceChanged;
     boost::signals2::signal<CClientUIInterface::NotifyMasternodeListChangedSig> NotifyMasternodeListChanged;
     boost::signals2::signal<CClientUIInterface::NotifyAdditionalDataSyncProgressChangedSig> NotifyAdditionalDataSyncProgressChanged;
     boost::signals2::signal<CClientUIInterface::BannedListChangedSig> BannedListChanged;
@@ -46,6 +47,7 @@ ADD_SIGNALS_IMPL_WRAPPER(ShowProgress);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyChainLock);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip);
+ADD_SIGNALS_IMPL_WRAPPER(NotifyGovernanceChanged);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyMasternodeListChanged);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyAdditionalDataSyncProgressChanged);
 ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged);
@@ -61,6 +63,7 @@ void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, b
 void CClientUIInterface::NotifyBlockTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyBlockTip(s, i); }
 void CClientUIInterface::NotifyChainLock(const std::string& bestChainLockHash, int bestChainLockHeight) { return g_ui_signals.NotifyChainLock(bestChainLockHash, bestChainLockHeight); }
 void CClientUIInterface::NotifyHeaderTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyHeaderTip(s, i); }
+void CClientUIInterface::NotifyGovernanceChanged() { return g_ui_signals.NotifyGovernanceChanged(); }
 void CClientUIInterface::NotifyMasternodeListChanged(const CDeterministicMNList& list, const CBlockIndex* i) { return g_ui_signals.NotifyMasternodeListChanged(list, i); }
 void CClientUIInterface::NotifyAdditionalDataSyncProgressChanged(double nSyncProgress) { return g_ui_signals.NotifyAdditionalDataSyncProgressChanged(nSyncProgress); }
 void CClientUIInterface::BannedListChanged() { return g_ui_signals.BannedListChanged(); }
diff --git a/src/node/interface_ui.h b/src/node/interface_ui.h
index a2e5ab62301d..7d7856eef9dc 100644
--- a/src/node/interface_ui.h
+++ b/src/node/interface_ui.h
@@ -115,6 +115,9 @@ class CClientUIInterface
     /** Masternode list has changed */
     ADD_SIGNALS_DECL_WRAPPER(NotifyMasternodeListChanged, void, const CDeterministicMNList&, const CBlockIndex*);
 
+    /** Governance data changed */
+    ADD_SIGNALS_DECL_WRAPPER(NotifyGovernanceChanged, void);
+
     /** Additional data sync progress changed */
     ADD_SIGNALS_DECL_WRAPPER(NotifyAdditionalDataSyncProgressChanged, void, double nSyncProgress);
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 018739f399da..aa001c8434be 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -858,6 +858,10 @@ class NodeImpl : public Node
                     /* verification progress is unused when a header was received */ 0);
             }));
     }
+    std::unique_ptr<Handler> handleNotifyGovernanceChanged(NotifyGovernanceChangedFn fn) override
+    {
+        return MakeHandler(::uiInterface.NotifyGovernanceChanged_connect(fn));
+    }
     std::unique_ptr<Handler> handleNotifyMasternodeListChanged(NotifyMasternodeListChangedFn fn) override
     {
         return MakeHandler(
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 81978e0da16f..be899166bebc 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -321,6 +321,10 @@ void ClientModel::subscribeToCoreSignals()
         [this](const CDeterministicMNList& newList, const CBlockIndex* pindex) {
             setMasternodeList(interfaces::MakeMNList(newList), pindex);
         }));
+    m_event_handlers.emplace_back(m_node.handleNotifyGovernanceChanged(
+        [this]() {
+            Q_EMIT governanceChanged();
+        }));
 }
 
 void ClientModel::unsubscribeFromCoreSignals()
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index fbf325fbd8b4..279d49195ae3 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -128,6 +128,7 @@ class ClientModel : public QObject
 
 Q_SIGNALS:
     void numConnectionsChanged(int count);
+    void governanceChanged();
     void masternodeListChanged() const;
     void chainLockChanged(const QString& bestChainLockHash, int bestChainLockHeight);
     void numBlocksChanged(int count, const QDateTime& blockDate, const QString& blockHash, double nVerificationProgress, bool header, SynchronizationState sync_state);

From c85e5cb13326cfa9fa99e20b816f00c7285a78b9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:19:30 +0530
Subject: [PATCH 03/30] qt: move proposal list fetch to thread and use debounce
 timer

We also reduce the refresh rate to when the chain is syncing to prevent
contention.

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/qt/governancelist.cpp | 171 +++++++++++++++++++++++++-------------
 src/qt/governancelist.h   |  44 ++++++----
 2 files changed, 139 insertions(+), 76 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index ae560bc8ca32..827c7afa3ea7 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -26,18 +26,20 @@
 
 #include <QAbstractItemView>
 #include <QMessageBox>
+#include <QMetaObject>
 
 //
 // Governance Tab main widget.
 //
-
 GovernanceList::GovernanceList(QWidget* parent) :
     QWidget(parent),
-    ui(std::make_unique<Ui::GovernanceList>()),
-    proposalModel(new ProposalModel(this)),
-    proposalModelProxy(new QSortFilterProxyModel(this)),
-    proposalContextMenu(new QMenu(this)),
-    timer(new QTimer(this))
+    ui{new Ui::GovernanceList},
+    proposalModel{new ProposalModel(this)},
+    proposalContextMenu{new QMenu(this)},
+    m_worker(new QObject),
+    proposalModelProxy{new QSortFilterProxyModel(this)},
+    m_thread{new QThread(this)},
+    m_timer{new QTimer(this)}
 {
     ui->setupUi(this);
 
@@ -77,31 +79,49 @@ GovernanceList::GovernanceList(QWidget* parent) :
     connect(ui->btnCreateProposal, &QPushButton::clicked, this, &GovernanceList::showCreateProposalDialog);
     connect(ui->govTableView, &QTableView::doubleClicked, this, &GovernanceList::showAdditionalInfo);
 
-    connect(timer, &QTimer::timeout, this, &GovernanceList::updateProposalList);
-
     // Initialize masternode count to 0
     ui->mnCountLabel->setText("0");
 
     GUIUtil::updateFonts();
+
+    // Background thread for calculating proposal list
+    m_worker->moveToThread(m_thread);
+    // Make sure executor object is deleted in its own thread
+    connect(m_thread, &QThread::finished, m_worker, &QObject::deleteLater);
+    m_thread->start();
+
+    // Debounce timer to apply proposal list changes
+    m_timer->setSingleShot(true);
+    connect(m_timer, &QTimer::timeout, this, &GovernanceList::updateProposalList);
 }
 
-GovernanceList::~GovernanceList() = default;
+GovernanceList::~GovernanceList()
+{
+    m_timer->stop();
+    m_thread->quit();
+    m_thread->wait();
+    delete ui;
+}
 
 void GovernanceList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
-    if (model != nullptr) {
-        connect(model->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
-
-        updateProposalList();
+    if (clientModel) {
+        connect(clientModel, &ClientModel::governanceChanged, this, &GovernanceList::handleProposalListChanged);
+        connect(clientModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
+        m_timer->start(0);
+    } else {
+        m_timer->stop();
     }
 }
 
 void GovernanceList::setWalletModel(WalletModel* model)
 {
     this->walletModel = model;
-    if (model && clientModel) {
-        updateVotingCapability();
+    if (walletModel && clientModel) {
+        m_timer->start(0);
+    } else {
+        m_timer->stop();
     }
 }
 
@@ -113,35 +133,88 @@ void GovernanceList::updateDisplayUnit()
     }
 }
 
+void GovernanceList::handleProposalListChanged()
+{
+    if (!clientModel || m_timer->isActive()) {
+        // Too early or already processing, nothing to do
+        return;
+    }
+    int delay{GOVERNANCELIST_UPDATE_SECONDS * 1000};
+    if (!clientModel->masternodeSync().isBlockchainSynced()) {
+        // Currently syncing, reduce refreshes
+        delay *= 6;
+    }
+    m_timer->start(delay);
+}
+
 void GovernanceList::updateProposalList()
 {
-    if (this->clientModel) {
-        // A proposal is considered passing if (YES votes - NO votes) >= (Total Weight of Masternodes / 10),
-        // count total valid (ENABLED) masternodes to determine passing threshold.
-        // Need to query number of masternodes here with access to clientModel.
-        const int nWeightedMnCount = clientModel->getMasternodeList().first->getValidWeightedMNsCount();
-        const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
-        proposalModel->setVotingParams(nAbsVoteReq);
-
-        std::vector<CGovernanceObject> govObjList;
-        clientModel->getAllGovernanceObjects(govObjList);
-        ProposalList newProposals;
-        for (const auto& govObj : govObjList) {
-            if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
-                continue; // Skip triggers.
-            }
-            newProposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj));
-        }
-        proposalModel->reconcile(std::move(newProposals));
+    if (!clientModel || clientModel->node().shutdownRequested()) {
+        return;
+    }
 
-        // Update voting capability if we now have both client and wallet models
-        if (walletModel) {
-            updateVotingCapability();
+    if (m_in_progress.exchange(true)) {
+        // Already applying, re-arm for next attempt
+        handleProposalListChanged();
+        return;
+    }
+
+    QMetaObject::invokeMethod(m_worker, [this] {
+        auto result = std::make_shared<CalcProposalList>(calcProposalList());
+        m_in_progress.store(false);
+        QTimer::singleShot(0, this, [this, result] {
+            setProposalList(std::move(*result));
+        });
+    });
+}
+
+GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
+{
+    CalcProposalList ret;
+    if (!clientModel || clientModel->node().shutdownRequested()) {
+        return ret;
+    }
+
+    const auto [dmn, pindex] = clientModel->getMasternodeList();
+    if (!dmn || !pindex) {
+        return ret;
+    }
+
+    // A proposal is considered passing if (YES votes - NO votes) >= (Total Weight of Masternodes / 10),
+    // count total valid (ENABLED) masternodes to determine passing threshold.
+    // Need to query number of masternodes here with access to clientModel.
+    const int nWeightedMnCount = dmn->getValidWeightedMNsCount();
+    ret.m_abs_vote_req = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
+
+    std::vector<CGovernanceObject> govObjList;
+    clientModel->getAllGovernanceObjects(govObjList);
+    for (const auto& govObj : govObjList) {
+        if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
+            continue; // Skip triggers.
         }
+        ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj));
     }
 
-    // Schedule next update.
-    timer->start(GOVERNANCELIST_UPDATE_SECONDS * 1000);
+    // Discover voting capability if we now have both client and wallet models
+    if (walletModel) {
+        dmn->forEachMN(/*only_valid=*/true, [&](const auto& dmn) {
+            // Check if wallet owns the voting key using the same logic as RPC
+            const auto script = GetScriptForDestination(PKHash(dmn.getKeyIdVoting()));
+            if (walletModel->wallet().isSpendable(script)) {
+                ret.m_votable_masternodes[dmn.getProTxHash()] = dmn.getKeyIdVoting();
+            }
+        });
+    }
+
+    return ret;
+}
+
+void GovernanceList::setProposalList(CalcProposalList&& data)
+{
+    proposalModel->setVotingParams(data.m_abs_vote_req);
+    proposalModel->reconcile(std::move(data.m_proposals));
+    votableMasternodes = std::move(data.m_votable_masternodes);
+    updateMasternodeCount();
 }
 
 void GovernanceList::updateProposalCount() const
@@ -213,26 +286,6 @@ void GovernanceList::showAdditionalInfo(const QModelIndex& index)
     QMessageBox::information(this, windowTitle, json);
 }
 
-void GovernanceList::updateVotingCapability()
-{
-    if (!walletModel || !clientModel) return;
-
-    auto [mn_list, pindex] = clientModel->getMasternodeList();
-    if (!pindex) return;
-
-    votableMasternodes.clear();
-    mn_list->forEachMN(/*only_valid=*/true, [&](const auto& dmn) {
-        // Check if wallet owns the voting key using the same logic as RPC
-        const CScript script = GetScriptForDestination(PKHash(dmn.getKeyIdVoting()));
-        if (walletModel->wallet().isSpendable(script)) {
-            votableMasternodes[dmn.getProTxHash()] = dmn.getKeyIdVoting();
-        }
-    });
-
-    // Update masternode count display
-    updateMasternodeCount();
-}
-
 void GovernanceList::updateMasternodeCount() const
 {
     if (ui && ui->mnCountLabel) {
@@ -340,5 +393,5 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
     QMessageBox::information(this, tr("Voting Results"), message);
 
     // Update proposal list to show new vote counts
-    updateProposalList();
+    handleProposalListChanged();
 }
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 40114453c1b8..83465ca75b9a 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -7,34 +7,38 @@
 
 #include <primitives/transaction.h>
 #include <pubkey.h>
+#include <saltedhasher.h>
+
+#include <qt/proposalmodel.h>
 
 #include <QMenu>
 #include <QSortFilterProxyModel>
 #include <QTimer>
+#include <QThread>
 #include <QWidget>
 
+#include <atomic>
 #include <map>
-#include <memory>
 
 inline constexpr int GOVERNANCELIST_UPDATE_SECONDS = 10;
 
-namespace Ui {
-class GovernanceList;
-}
-
 class ClientModel;
 class ProposalModel;
 class WalletModel;
 class ProposalWizard;
-
 class CDeterministicMNList;
 enum vote_outcome_enum_t : int;
+namespace Ui {
+class GovernanceList;
+} // namespace Ui
 
 /** Governance Manager page widget */
 class GovernanceList : public QWidget
 {
     Q_OBJECT
 
+    Ui::GovernanceList* ui;
+
 public:
     explicit GovernanceList(QWidget* parent = nullptr);
     ~GovernanceList() override;
@@ -42,21 +46,27 @@ class GovernanceList : public QWidget
     void setWalletModel(WalletModel* walletModel);
 
 private:
+    struct CalcProposalList {
+        int m_abs_vote_req{0};
+        ProposalList m_proposals;
+        Uint256HashMap<CKeyID> m_votable_masternodes;
+    };
+
     ClientModel* clientModel{nullptr};
+    ProposalModel* proposalModel{nullptr};
+    QMenu* proposalContextMenu{nullptr};
+    QObject* m_worker{nullptr};
+    QSortFilterProxyModel* proposalModelProxy{nullptr};
+    QThread* m_thread{nullptr};
+    QTimer* m_timer{nullptr};
+    std::atomic<bool> m_in_progress{false};
+    Uint256HashMap<CKeyID> votableMasternodes;
     WalletModel* walletModel{nullptr};
 
-    std::unique_ptr<Ui::GovernanceList> ui;
-    ProposalModel* proposalModel;
-    QSortFilterProxyModel* proposalModelProxy;
-
-    QMenu* proposalContextMenu;
-    QTimer* timer;
-
-    // Voting-related members
-    std::map<uint256, CKeyID> votableMasternodes; // proTxHash -> voting keyID
-
-    void updateVotingCapability();
     bool canVote() const { return !votableMasternodes.empty(); }
+    CalcProposalList calcProposalList() const;
+    void handleProposalListChanged();
+    void setProposalList(CalcProposalList&& data);
     void voteForProposal(vote_outcome_enum_t outcome);
 
 private Q_SLOTS:

From a7328e9b5d929e83a6ba76a85cf32ec1bec92983 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 12 Feb 2026 07:27:26 +0530
Subject: [PATCH 04/30] qt: add moon phase icons for governance cycle indicator

---
 contrib/devtools/gen_moon_icons.py | 126 +++++++++++++++++++++++++++++
 src/Makefile.qt.include            |   8 ++
 src/qt/dash.qrc                    |   8 ++
 src/qt/res/icons/moon_0.png        | Bin 0 -> 705 bytes
 src/qt/res/icons/moon_1.png        | Bin 0 -> 692 bytes
 src/qt/res/icons/moon_2.png        | Bin 0 -> 622 bytes
 src/qt/res/icons/moon_3.png        | Bin 0 -> 752 bytes
 src/qt/res/icons/moon_4.png        | Bin 0 -> 677 bytes
 src/qt/res/icons/moon_5.png        | Bin 0 -> 753 bytes
 src/qt/res/icons/moon_6.png        | Bin 0 -> 624 bytes
 src/qt/res/icons/moon_7.png        | Bin 0 -> 692 bytes
 11 files changed, 142 insertions(+)
 create mode 100755 contrib/devtools/gen_moon_icons.py
 create mode 100644 src/qt/res/icons/moon_0.png
 create mode 100644 src/qt/res/icons/moon_1.png
 create mode 100644 src/qt/res/icons/moon_2.png
 create mode 100644 src/qt/res/icons/moon_3.png
 create mode 100644 src/qt/res/icons/moon_4.png
 create mode 100644 src/qt/res/icons/moon_5.png
 create mode 100644 src/qt/res/icons/moon_6.png
 create mode 100644 src/qt/res/icons/moon_7.png

diff --git a/contrib/devtools/gen_moon_icons.py b/contrib/devtools/gen_moon_icons.py
new file mode 100755
index 000000000000..cc3ef499a361
--- /dev/null
+++ b/contrib/devtools/gen_moon_icons.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+# Copyright (c) 2026 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import math
+import os
+import struct
+import zlib
+
+OUTPUT_PX = 64
+CENTER = OUTPUT_PX / 2
+RADIUS = 26
+STROKE_WIDTH = 2.0
+INNER_GAP_INSET = 3.0
+
+
+def make_png(pixels):
+    """Encode RGBA pixel data as a PNG file."""
+    raw = bytearray()
+    for y in range(OUTPUT_PX):
+        raw.append(0)  # filter byte: None
+        for x in range(OUTPUT_PX):
+            raw.extend(pixels[y][x])
+
+    def chunk(chunk_type, data):
+        c = chunk_type + data
+        return struct.pack('>I', len(data)) + c + struct.pack('>I', zlib.crc32(c) & 0xFFFFFFFF)
+
+    ihdr = struct.pack('>IIBBBBB', OUTPUT_PX, OUTPUT_PX, 8, 6, 0, 0, 0)  # 8-bit RGBA
+    idat = zlib.compress(bytes(raw), 9)
+
+    out = b'\x89PNG\r\n\x1a\n'
+    out += chunk(b'IHDR', ihdr)
+    out += chunk(b'IDAT', idat)
+    out += chunk(b'IEND', b'')
+    return out
+
+
+def moon_frame(frame):
+    """
+    frame 0 = new moon        (filled disc + thin inner outline gap)
+    frame 1 = waxing crescent (small sliver on right)
+    frame 2 = first quarter   (right half illuminated)
+    frame 3 = waxing gibbous  (mostly illuminated)
+    frame 4 = full moon       (outline only)
+    frame 5 = waning gibbous  (mostly illuminated, from left)
+    frame 6 = last quarter    (left half illuminated)
+    frame 7 = waning crescent (small sliver on left)
+    """
+    if frame > 4:
+        # Waning: horizontal mirror of the corresponding waxing frame
+        pixels = moon_frame(8 - frame)
+        for y in range(OUTPUT_PX):
+            pixels[y] = pixels[y][::-1]
+        return pixels
+
+    # Precompute frame-specific parameters
+    if frame == 0:
+        gap_outer = RADIUS - INNER_GAP_INSET
+        gap_inner = gap_outer - STROKE_WIDTH
+    else:
+        frame_angle = frame * math.pi / 4
+
+    pixels = [[(0, 0, 0, 0)] * OUTPUT_PX for _ in range(OUTPUT_PX)]
+    for y in range(OUTPUT_PX):
+        for x in range(OUTPUT_PX):
+            dx = x - CENTER + 0.5
+            dy = y - CENTER + 0.5
+            dist = math.sqrt(dx * dx + dy * dy)
+            if dist > RADIUS + 1:
+                continue
+            disc_alpha = min(1.0, RADIUS + 1 - dist)
+            if frame == 0:
+                # New moon: filled disc with a thin inner outline gap
+                if dist < gap_inner - 0.5:
+                    fill = 1.0
+                elif dist < gap_inner + 0.5:
+                    fill = gap_inner + 0.5 - dist
+                elif dist < gap_outer - 0.5:
+                    fill = 0.0
+                elif dist < gap_outer + 0.5:
+                    fill = dist - (gap_outer - 0.5)
+                else:
+                    fill = 1.0
+            else:
+                # Frames 1-4: terminator (shadow boundary) + outline
+                if abs(dy) >= RADIUS:
+                    terminator_x = 0
+                else:
+                    half_chord = math.sqrt(RADIUS * RADIUS - dy * dy)
+                    terminator_x = math.cos(frame_angle) * half_chord
+                edge_dist = terminator_x - dx
+                if edge_dist > 1:
+                    dark_alpha = 1.0
+                elif edge_dist < -1:
+                    dark_alpha = 0.0
+                else:
+                    dark_alpha = (edge_dist + 1) / 2
+                outline_alpha = 0.0
+                inner_edge = RADIUS - STROKE_WIDTH
+                if dist > inner_edge:
+                    outline_alpha = min(1.0, (dist - inner_edge) / STROKE_WIDTH)
+                fill = max(dark_alpha, outline_alpha)
+            alpha = int(max(0, min(255, disc_alpha * fill * 255)))
+            if alpha > 0:
+                pixels[y][x] = (0, 0, 0, alpha)
+    return pixels
+
+
+def main():
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    repo_root = os.path.join(script_dir, '..', '..')
+    icon_dir = os.path.join(repo_root, 'src', 'qt', 'res', 'icons')
+    for frame in range(8):
+        pixels = moon_frame(frame)
+        png_data = make_png(pixels)
+        filename = f'moon_{frame}.png'
+        filepath = os.path.join(icon_dir, filename)
+        with open(filepath, 'wb') as f:
+            f.write(png_data)
+        print(f'  {filename} ({len(png_data)} bytes)')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 3dc81d225e5b..5a0dbd946702 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -211,6 +211,14 @@ QT_RES_ICONS = \
   qt/res/icons/hd_enabled.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_open.png \
+  qt/res/icons/moon_0.png \
+  qt/res/icons/moon_1.png \
+  qt/res/icons/moon_2.png \
+  qt/res/icons/moon_3.png \
+  qt/res/icons/moon_4.png \
+  qt/res/icons/moon_5.png \
+  qt/res/icons/moon_6.png \
+  qt/res/icons/moon_7.png \
   qt/res/icons/proxy.png \
   qt/res/icons/remove.png \
   qt/res/icons/synced.png \
diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc
index e6cd77ad8549..c572e93185cf 100644
--- a/src/qt/dash.qrc
+++ b/src/qt/dash.qrc
@@ -27,6 +27,14 @@
         <file alias="hd_enabled">res/icons/hd_enabled.png</file>
         <file alias="fontbigger">res/icons/fontbigger.png</file>
         <file alias="fontsmaller">res/icons/fontsmaller.png</file>
+        <file alias="moon_0">res/icons/moon_0.png</file>
+        <file alias="moon_1">res/icons/moon_1.png</file>
+        <file alias="moon_2">res/icons/moon_2.png</file>
+        <file alias="moon_3">res/icons/moon_3.png</file>
+        <file alias="moon_4">res/icons/moon_4.png</file>
+        <file alias="moon_5">res/icons/moon_5.png</file>
+        <file alias="moon_6">res/icons/moon_6.png</file>
+        <file alias="moon_7">res/icons/moon_7.png</file>
         <file alias="proxy">res/icons/proxy.png</file>
     </qresource>
     <qresource prefix="/css">
diff --git a/src/qt/res/icons/moon_0.png b/src/qt/res/icons/moon_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..9abbcab9e74c2ef100255877c8b52193b860b0fe
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007rNkl<Zc-rk-
zt&YM#5C(mH02HPkU$CXGaQY0UiliEWImZK#oJV2SV9~XZ;IIv@572OP$!xNj?Dmds
zDcjqb<TK0u&9F1`O}iZoSXfwCSUQt2AO?H@GQbLvVOxxS{*}ThU=Jt&_dlY*F=<~7
z@(wsWpzv=v;GE9O&oMr?s5r$L*Kkf|fMd<ZZ-5<O377*yKmZsb0&JUOpB;`d&3D8#
zosd<{M!!(0rZUGlO!Kc^srVZPD&59D0VC2s0jvQ6Z~>Hn3Q=O4z&;5XJHk12Ywd9_
zok#avvzZ+pWhqm@78QKd-%A`jRptwE4ca&FGFyxdfo?$*7cB-qK@71l1jun0$DaQ4
zS3son**q}|Y?O5(T$`SRr@906`IB<wCkD4@8#%5eUE-vP37tgytD=0;(9fHqR03tF
zISH+2hnZ#*k)nLnq4E-yVuVQZd#gO*Xb5<dj{kYxNthS{<FQS8OH-Yc{DsP^F+mDV
zk*&~Xn)1R9qJ7is5NcARbyY_hp3L)i#~^tEWsFu;BrRzry%i1`Kq$1CmeP$GA1!QL
z{rBl9paoPThM1B`WL39y*Z^Clid5TETh@0|+DnHGP%8Vp*|Nhzlll^em6u2~DY3Bi
z|0TAsdtiVy?saJs2V#T&iyjz27~()|!~P`sx%9vQ7XvAJh!tjJaL|JQNCRO&+B2Kd
zcZls(4-8P@UWYa%viAn?-UYl5g5IY=?}?E2RG5n)E{FMn2tN|zhobygoL`Lat1*5#
z%CE=yf&^cY(J@4CFG;CJ@b;RV>JHvsl&s4R-dvTXJi*(`(v&uPd0k#tMSA(cgf3fn
n`N>S3LA?5CiiL%R#cBBl=FEbo6h^Th00000NkvXXu0mjfi>W>_

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_1.png b/src/qt/res/icons/moon_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..39edf76874e8cf23f4f5303ae0e49b48e94b387a
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007eNkl<Zc-rlo
zKWp1i6vgeuOPaxRz>vjc^y0}&2764iv;@+@DYyjJA<dxKU!chs=+q8{f<biXV45Kq
zx;g34B1j8{E(s<SN*8ZIIf5flgw$HGEWhV>FZ`BZ$M;;`pL3s{aybbJ2?>eJq6F&T
zIj}&NSo~X^pIIuw9bkhoaR0*y{N-nDepkza?126hg5&rGdf+RV@PF;-Alw_q&J4oC
z*qkCgjt+;vp<L9!AVuLpeu7=l2Jcvi0e@48=*~%akQ?w4RKOwl$f?m?r0^9EQ8y#5
z!9K`?1~>ti%wc5_tNSoR@jl<d6XsCn_W6aml(H1>EI_=^Cs1WBMbHADnNul?VLx1;
zc%Rqc5pyblCW|nf_jIro5byDWJ3}r|gchfRt@CQ1gtuTlkYAB&!sR@6hniyIJ$`|`
zP@ZM(4wJNf!a%_Sc)S5?p<EmE34=84t*a<rudp4;H&3%PO3OAo3K!ruX1-Two1HYe
zI#+Q%fQ^XU+Z+Wmb&-7y3UC1)N90~*7ulc1@wpoC2fT{Nzrg7+d8k9|Xi@-=W3U>b
z;VBo&j?S)c8s5_bL@kEBhq}YDMg=&HF+N2aqw%uNf1h)(6{E%CL2IIQpsrZ~ykoOx
zF<P434(rR}{-U@7FJiQ8b0JLR3N6hF@EaV&XlbxbwsdZNr||+uF<LgkS<)8S_yQO|
z1&m(=jo${1H$ui+VQGe>9hL(TITDjYQ8^Zu2P5)mOdgKP<8iqlaW9O&BI7$mV=qYs
zi(u?Ex!`m#_M&9gyMvNfWy3zf*vryk+ic`@`KT_^$QLG}b_*k4nfX^ijCyHGLPA19
a>9_;T>7jnG`xzAg0000<MNUMnLSTZ>Vm|@^

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_2.png b/src/qt/res/icons/moon_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29f769ebafc8d0650a4d50bfeb75887638d798b
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006tNkl<Zc-rk-
zv5LY#5RHwEl|Nv4wT+d<S;X4vuoS`O5Uxs{Kky^0g<vVy9D<!-7r4gW*2XqB3vVGv
zxVt2qWG6chUL!HtdF;%-*=#&dAP@)ywP8T?iA!QY48Z`u`M9Q40k4S>@kUIZ_ywMb
z7vhz8$F&ju%Tkaz@sJU4mH-ptlsF?UFdH_+9YlHHUULqCt7#nnBk;5UuNn906Nkh%
zq{t4lBgQkV!<cx?5%^yMq|qggi0{NLggD}vRv;`8cpd@LP_yELxJPP)O$OdWp-O5L
zK%s-0q3Xmp#?Wh`x}Qr1UsM2%7Zl7B#xkfg_}D=3Wd+d1az*^am<DxB`?I0oO$eZi
z<N_j`t4@c=VDP2{&?2mm4v~%3zG?w<Is_<;##e`N1;LvZKo`ahmPn&M;mAY)4@=}8
zV>V`Q6Gj4bV3w|?Y;(*^0PPsJ7<=iiE@3Euhu+~@wu?M47GQ)f@=(U{C5#2=VmW*i
zb%<-`0(jU@xFD9sU0)Ld43P$f+~KVS0`y^wZZ_tB9Rhf;$M?K-z;BTN3oM7eE$**w
z0cI$K%e>R3Edor@CI?NozD)@*!E-_pKvF=8pe%!8gv1I<GbHV>Y>3E~m~4v5wzw^>
zkj0A;1*cz)DLDUfw5k@F&Fk^1+##z25(>^Ak<kv(*+Wuk5u80Hmre&~4@#O^9atZg
zef9~?9+rN#%}ySd&*~zb{9qz$wQ%y2ncoC)>Z2)vKp?OhKg+DZr*2~&%>V!Z07*qo
IM6N<$f@%;E>;M1&

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_3.png b/src/qt/res/icons/moon_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfde845e091e33d58d0170937dc133376d3a5921
GIT binary patch
literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008FNkl<Zc-rlo
zy=xmm5XH}p8W%w(h0~~t-MCQ#uG|<RHECQaCQXDPjS-}<Rg3%sP9OwAnn18C8yve6
zZi28H69{Q8s8N+hZDLR>zrjy%h|>w#tJ7X)9{d{VK6d7IXJ+^Ig1}@lnM|pv07_s7
z)Io#P`CEy{{8t9oz$xf~YtRKhK^uH0ZT=?z{pGQzJU5dL*#=E8ASd8}Pr3@WKpAY3
zGJmV`m;;_8PU-Vn+gUJNx^WmW{1>QzBFIm1ojlK}aEP3+cZ9r$ciI50h~dH!c<kWX
zIj|0P!B;w>#d~_8#)#p<NAPe4_mW=m2ApwdH0EjeA_LW^@t?r*4DY+Zm?3eZ!!|6=
zBf9^HG5#2=rPPL12Fy0wQb^PIFvj>R@I2)QA;I!BxL}(KX>|LzC;t!Z&uJ*;m_9Gq
zwwVrxxG_JB_$zaaM>+O{Hrtq5v>z}nz49O%<rxz?v&aq`V~iKRcvP;gGCTBL*9omL
z#{Xg0^GRja2`!i9?YO7^jm3#iT41r%byYTp2@ZJ68~Uaq%jVF<tZtm~zrhQSCuY0s
z1^1doHWM5m<LrsY4p`?bvU#71Z;-%y@W5jS<d_cocg<3@1mk7ZW-kNl6BRD1)Ld45
z0~Q-EGvI(Chryky!(M^|F2S=5I3Ul$sONh8pM$4CHdN=3ohlBLCOF_QaI@T%hN?`5
zC0Es-@EJVHhy%752zRFKHc1Zn0G2Z1fHJ4abr)0LA@4k|0ixOrZePAM%mFq8EC^Z}
zv_i;AVVexubl4U|rjY6-F_HR3QIYCp@kv#oiWegy)vv}x>R*l~O_5c+9-mYls@NbQ
zQoluJSRtz2Bo%dn+HG>t;h=V-<fQDNVyo<EouGEJ^k~_va=U!oEK=nM6LHx><tH;q
i4pH^dl*wc=d9537Zr=b)0@NG;0000<MNUMnLSTa2a$bx8

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_4.png b/src/qt/res/icons/moon_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdb1eb6e5d24f3f2d59aa4245dfebe16d7d5d9b2
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007PNkl<Zc-rlo
zv5LY#5Qbx8b5&lz^6E5JHWpf2$(7;2Mue-ZeS<v2)d8^-n?pz^TqoG1x4q`-n}tsZ
zBFDvxG3(3^e-o13naS?#KbuVu7z_r3p*D1c1L3Q1E?mGl*9P44P!7+8OW{%YCCr7N
z!c6!9Gp^;_bL5$suK{@xu7%$?mI@QzbSxYRhr&J_axLbbgl9f!V@;clha1Lw-ek(~
z9t$I3SfZVfXU4RV(&nB%8i$^6i;?fbsjw?-SI~Bwwx+b5(^s!4&Mz3IE8!b&?pBEC
zV@02fdpiC^qB<~V-8^p9&~J;r68c_ZOYPZxNA`9}>-i2Z;F-QNZ0XeLyh}zK;iP18
zs~RCTY_O?Q$FSegVO&v?t0GCp*tEO#bXYRvCJk}E7=#J7EpM6a56rtTXdXgrJKSP*
z=&|f1cS?9=5@Uj`mFk2oYwyqlH9ExBZI$viM}V|E2tW&4^QvU?9tj!+{vg8UeHB$*
zjt=(?Q*8fN6}hGo>v|Y~F1D}#qxen*N87^yv<rpWRSI#&hQv7V7h`;wU90+1&ywGz
zWSCy74v&b6(BlAv_;9>t{(m7Yea9SMO67q8OGx|x0f_NsP*(l9<S}}H0F3bEwd}CT
zJkkDtsSUES)7h<`?t?}D0Rqs+mxTqurhp|uTLw)CnH08S$jV{c5GeuGTVf9CH$@#(
zZ;PK)q3RDK4yr$mIjH|QdMc6CejYEXL$wDa9Mm6?IVnW7hop)@P<u?SI33g;lssP@
zR34Q**9mG5OP|YTmB-~TRgo%xn7FiBsQhK-w}7bnY06+Q7#fWqY<2F56N@8900000
LNkvXXu0mjf&tp4W

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_5.png b/src/qt/res/icons/moon_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd458685f315792d185d12725539a63751a0645
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008GNkl<Zc-rk-
zv1=1i98Q-k9VFtQODA=4sY0hL1(U_4QxzA3(4_<%YUbcS5Csv$MG&0~MBPFc3GE_<
z(&b8*OfFe#q3ikm;0qkb-Nj2^F7N#PKKPc)-Mzf;-tYJO-n(~|ioswo7z)E0*Z`k{
z9k5Gwc&x#5{;LkR!2vh{&%rTx3?70%$wMBK-!6FWfY+8%kSE{}yky7vV2@9_1#W>&
zaFcBESc~WMcuhzSc~9>l!#LoR>~nZ;gX>@|$9-zNMy@@H2obOi?@$Lv?D!{e7u*1=
z4(@#${1Oo%WLtG#I^X3`{|>(3lXHz5;JcUzA=_RWR+*^I7_$<`D+_GzCip%<gaQ9c
z;o1F&*;|s<-GbV^2YyWu;i$-JvBqSy5ANhlZZ7Z${FNX=P=pApRC}K#tGcA{dkOwY
z83_vwhXIHE&JsH>xRX#BqB&t<+5U_%U#l!1&scWDBC123rLI?C!uyw8^f5(%(6vt(
zvCcO=Ghh;mzf%MlxwN-qnw%BS1Q65pEn^fovCRSP?Rv#O$OCzmAwb|_RyU@%_Z5%9
z(+m-=G>aT^R=44?0QZ@n(gYY@CCgs2q*Of?;2QWQLx6BzhuG#~#&!wTA@;c1lqNuX
zUf0+6H2KBxlqM~7=?*6}KD81E@DM!65MVM-{GZeImH`jIA1?DigXOPP5&>k{?DGr(
z8hPEHB*3kb2yhGhFhhV`uCT*tZ?hx<TnFFI5Fl4LOYN5z7MmpzK)k@~83J@o01E+2
zf>s922$>bO$&gKlZ9yalR4<7M)Gvw(R4<E9U7_k1BLda0#sunLj!vh@YG02>-J#kI
z5(4#GWTvsFc9T?81hw1bqT!%+qh!1~sN5<W_X%n@OUG@q%I)$=vq+U6Oe9qcm7mOH
j38LzwDTBda@EU&sJ6+!ZmLPyu00000NkvXXu0mjf7Rgl1

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_6.png b/src/qt/res/icons/moon_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..c74f3d87ea988cc50fcf08ebb6ab51d4c2a4b0dc
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006vNkl<Zc-rk-
zv5LY#5RHwEl|Nv4wT+d<S;YD(xl#^nj=)vc`2#=VYC*0HHb>w(!7gB9pVr1UH-Wbx
zLGMhmyCysH;5Cx0*_YkfH@g$h69@zXfi(<>KJksXB!=J;zxlYvsSXFk4KXF2h)3d{
z_(S{#vjS7x6SP&3S7JmwqqA$`3U7K&d?8MWlN$mQ8KKR_BOk^I-trp5dqx}*`&X`i
zzEc3j1pm=EjEONi{z-f%j)>iV?kg*RVvPT61VRk;FX9K@_PwYofMWQ_j`t9#4w&Eh
zobHrtqpkoMo}u@M=)OZF&jZ_2#ddTEkl|SdHanjOqb+f9Be>ZXKn2KwjbXn-=jV3>
zIhz8gkzjN>Y%uH>8ai)602LFAMf(Hhd|y+WCIm3DI*hT@t!e~3n*wCIeL{?NeyUkm
zlLEv#?d=gJr_&+<GF`SgfxR6Xh%2TANOWX%M|gX$g#u)Cv&aZp-KfO^M0FhB8B0pH
z#R6ni9b$mZjF~}WWlMmds_R=D3VyZ)sN@b)7@xia0;E;u{|UC&b3lO7alps&H+M(?
zzpVS)WB1k-0ZO^TCDPuhLjshV&LJLb;*bEL2q05Hf}kveVuZvBOEM(suxyCPmY8gc
z%C>k}SIGKcBnRuGu^j9VM^%c<_IUi#9kMNu$icouMma>bMN*d{uq~6joDOUYC5x*A
z%Tn2*PheXtU9`<C%jK_Skt{!$xVBob{AA`YL0Ek>B@hS%jm9tWnZTz{>dBk{0000<
KMNUMnLSTY;*cCYd

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/moon_7.png b/src/qt/res/icons/moon_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..393bb7184f868774ab33d2470d9342bf8c3dd5b9
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007eNkl<Zc-rlo
zu}dRC6vks?qZX-!fQ?w%SlL)4<!Pe`TBx9iM((aioqs^{4_Ij-2!UW>5wwtiUDQGe
zL?K{vN05WV#!l8R@GXqXuA0s6X2y9R{F)gxdC!?Q-^|XYQX-K^BuY#fkOga?0E(o*
zwk&_<TLqj470?FHpaq;yX!CdSrY2+&RKW|l0cCLeg}{TT@^5Od&M<E9zg*_<uJjPN
zmj*vWJ57Tc13v^?U<o`#7`#f2pQ(k49O@_FCzu4=;3=lyRf_!#e2Bxl2}&Rb2EZox
zn?Ud`6@Hh*t9u<>atRw}`#iWyFnE`GlB-3A#pn#IgEZTxz-b?XR|{k&iD6%7@GD@D
z?ZaTVkHM=WA=c?o;jmv<f={vH-)oQnw<g3^?VFtQX{CJ(9B2}JY^%dGm%5Tt@La8e
zN6ix8MC}u5T<3G1_EE5}Veqb5ip<`&XmSQTeRK5sj;2Inn;W#ZlL2+%RpSISqS)27
z=<U6l0LK~!@6yvQvdUfEluzF*xHcdG)m|Lm3y1ljPya9Q-+%--VI5+g1#ZEoZv^Za
z61>A$Lb<+jK=JE%fg^(w5Xv34X?)TF#^~Ij1hm7<|7Y4>Km7n#1|^{DI*{e^w-V65
z9OH3UTx7d-e>Ze`e%b(k3`;;)uCTyuZ!VyJ2mCWE0flb2z87F7p#Qf)9w5{f+4=-n
zKLxBWg4QpC)*B(~t*~r{WIHSeB61`qhoW*UE)PcJ(U?3OmB-_9LE@dPzary0L~Ace
zsY$T*nw&Zvti34dT^+2vD(m$L)?SwO+GZ=S%lqvjt$bm^Z?&-Um6?wcV%1AiB9Ta>
awcY^ENuhpbj4jvz0000<MNUMnLSTZAUP1-{

literal 0
HcmV?d00001


From 662703e054bd836357f5bcbb683bd9f9eb3615a5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:26:01 +0530
Subject: [PATCH 05/30] qt: add governance cycle status bar icon

---
 src/interfaces/node.h   |   2 +
 src/node/interfaces.cpp |  36 ++++++++++
 src/qt/bitcoingui.cpp   | 142 +++++++++++++++++++++++++++++++++++++++-
 src/qt/bitcoingui.h     |  23 +++++++
 src/qt/guiconstants.h   |   3 +
 5 files changed, 205 insertions(+), 1 deletion(-)

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index f73f4ce6df12..99dc38522bf7 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -151,6 +151,7 @@ class GOV
         int requiredConfs{6};
     };
     virtual GovernanceInfo getGovernanceInfo() = 0;
+    virtual CAmount getAllocatedBudget() = 0;
     virtual std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                                 const std::string& data_hex, std::string& error) = 0;
     virtual bool submitProposal(const uint256& parent, int32_t revision, int64_t created_time, const std::string& data_hex,
@@ -175,6 +176,7 @@ class Sync
 public:
     virtual ~Sync() {}
     virtual bool isBlockchainSynced() = 0;
+    virtual bool isGovernanceSynced() = 0;
     virtual bool isSynced() = 0;
     virtual std::string getSyncStatus() =  0;
     virtual void setContext(node::NodeContext* context) {}
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index aa001c8434be..c43b5dd018d7 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -293,6 +293,35 @@ class GOVImpl : public GOV
         }
         return info;
     }
+    CAmount getAllocatedBudget() override
+    {
+        if (context().govman != nullptr && context().chainman != nullptr && context().dmnman != nullptr) {
+            const auto tip_mn_list{context().dmnman->GetListAtChainTip()};
+            if (const auto proposals{context().govman->GetApprovedProposals(tip_mn_list)}; !proposals.empty()) {
+                int32_t last_sb{0}, next_sb{0};
+                CSuperblock::GetNearestSuperblocksHeights(context().chainman->ActiveHeight(), last_sb, next_sb);
+                const CAmount budget{CSuperblock::GetPaymentsLimit(context().chainman->ActiveChain(), next_sb)};
+
+                CAmount allocated{0};
+                for (const auto& proposal : proposals) {
+                    UniValue json = proposal->GetJSONObject();
+                    CAmount payment_amount{0};
+                    try {
+                        payment_amount = ParsePaymentAmount(json["payment_amount"].getValStr());
+                    } catch (...) {
+                        continue;
+                    }
+                    if (allocated + payment_amount > budget) {
+                        // Budget is saturated, cannot fulfill proposal
+                        continue;
+                    }
+                    allocated += payment_amount;
+                }
+                return allocated;
+            }
+        }
+        return 0;
+    }
     std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                         const std::string& data_hex, std::string& error) override
     {
@@ -402,6 +431,13 @@ class MasternodeSyncImpl : public Masternode::Sync
         }
         return false;
     }
+    bool isGovernanceSynced() override
+    {
+        if (context().mn_sync != nullptr) {
+            return context().mn_sync->GetAssetID() > MASTERNODE_SYNC_GOVERNANCE;
+        }
+        return false;
+    }
     std::string getSyncStatus() override
     {
         if (context().mn_sync != nullptr) {
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index dc5055a089c5..55b8cb315dd4 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -42,6 +42,7 @@
 #include <qt/masternodelist.h>
 #include <util/system.h>
 #include <util/translation.h>
+#include <util/underlying.h>
 #include <validation.h>
 
 #include <QAction>
@@ -52,12 +53,14 @@
 #include <QCursor>
 #include <QDateTime>
 #include <QDragEnterEvent>
+#include <QElapsedTimer>
 #include <QInputDialog>
 #include <QKeySequence>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QMimeData>
+#include <QPixmap>
 #include <QProgressDialog>
 #include <QScreen>
 #include <QSettings>
@@ -69,6 +72,19 @@
 #include <QVBoxLayout>
 #include <QWindow>
 
+namespace {
+// Total governance clock frames. Frame 0 is reserved for the superblock
+// maturity window; frames 1 through GOV_CYCLE_FRAME_COUNT-1 are used for the
+// voting cycle and sync animation.
+constexpr int GOV_CYCLE_FRAME_COUNT{8};
+
+// Per-frame interval for the governance sync animation. Divided by 2 because
+// the moon phases represent a cycle (wax + wane), not a single rotation.
+constexpr int GOV_CYCLE_FRAME_MS{STATUSBAR_ICON_CYCLE_MS / (GOV_CYCLE_FRAME_COUNT - 1) / 2};
+
+// Per-frame interval for the spinner animation
+constexpr int SPINNER_FRAME_MS{STATUSBAR_ICON_CYCLE_MS / SPINNER_FRAMES};
+} // anonymous namespace
 
 const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
 #if defined(Q_OS_MACOS)
@@ -164,6 +180,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const NetworkStyle* networkStyle,
     labelWalletEncryptionIcon = new QLabel();
     labelWalletHDStatusIcon = new QLabel();
     labelConnectionsIcon = new GUIUtil::ClickableLabel();
+    labelGovernanceCycleIcon = new GUIUtil::ClickableLabel();
     labelProxyIcon = new GUIUtil::ClickableLabel();
     labelBlocksIcon = new GUIUtil::ClickableLabel();
     if(enableWallet)
@@ -180,9 +197,16 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const NetworkStyle* networkStyle,
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelConnectionsIcon);
     frameBlocksLayout->addStretch();
+    frameBlocksLayout->addWidget(labelGovernanceCycleIcon);
+    frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelBlocksIcon);
     frameBlocksLayout->addStretch();
 
+    // Hidden until governance sync completes
+    // Pre-cache pixmaps for all color/frame combos
+    labelGovernanceCycleIcon->hide();
+    refreshGovernanceCycleIcons();
+
     // Hide the spinner/synced icon by default to avoid
     // that the spinner starts before we have any connections
     labelBlocksIcon->hide();
@@ -224,6 +248,9 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const NetworkStyle* networkStyle,
     modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
     connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
     connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
+#ifdef ENABLE_WALLET
+    connect(labelGovernanceCycleIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::gotoGovernancePage);
+#endif
 
 #ifdef Q_OS_MACOS
     m_app_nap_inhibitor = new CAppNapInhibitor;
@@ -294,7 +321,7 @@ void BitcoinGUI::startSpinner()
         }
         labelBlocksIcon->setPixmap(getNextFrame());
     });
-    timerSpinner->start(40);
+    timerSpinner->start(SPINNER_FRAME_MS);
 }
 
 void BitcoinGUI::stopSpinner()
@@ -866,6 +893,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
         rpcConsole->setClientModel(_clientModel, tip_info->block_height, tip_info->block_time, tip_info->block_hash, tip_info->verification_progress);
 
         updateProxyIcon();
+        updateGovernanceCycleIcon();
 
 #ifdef ENABLE_WALLET
         if(walletFrame)
@@ -879,6 +907,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
             unitDisplayControl->setOptionsModel(optionsModel);
             m_mask_values_action->setChecked(optionsModel->getOption(OptionsModel::OptionID::MaskValues).toBool());
 
+            connect(optionsModel, &OptionsModel::displayUnitChanged, this, &BitcoinGUI::updateGovernanceCycleIcon);
             connect(optionsModel, &OptionsModel::showCoinJoinChanged, this, &BitcoinGUI::updateCoinJoinVisibility);
             connect(optionsModel, &OptionsModel::showGovernanceChanged, this, &BitcoinGUI::updateGovernanceVisibility);
             connect(optionsModel, &OptionsModel::showMasternodesChanged, this, &BitcoinGUI::updateMasternodesVisibility);
@@ -1383,6 +1412,7 @@ void BitcoinGUI::updateNetworkState()
 void BitcoinGUI::setNumConnections(int count)
 {
     updateNetworkState();
+    updateGovernanceCycleIcon();
 }
 
 void BitcoinGUI::setNetworkActive(bool network_active)
@@ -1485,6 +1515,7 @@ void BitcoinGUI::updateGovernanceVisibility()
         governanceButton->setVisible(fShow);
     }
 
+    updateGovernanceCycleIcon();
     GUIUtil::updateButtonGroupShortcuts(tabGroup);
     updateWidth();
 }
@@ -1567,6 +1598,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, const QStri
         return;
 
     updateProgressBarVisibility();
+    updateGovernanceCycleIcon();
 
     // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbled text)
     statusBar()->clearMessage();
@@ -1684,6 +1716,7 @@ void BitcoinGUI::setAdditionalDataSyncProgress(double nSyncProgress)
 #endif // ENABLE_WALLET
 
     updateProgressBarVisibility();
+    updateGovernanceCycleIcon();
 
     if(m_node.masternodeSync().isSynced()) {
         stopSpinner();
@@ -1706,6 +1739,111 @@ void BitcoinGUI::setAdditionalDataSyncProgress(double nSyncProgress)
     progressBar->setToolTip(tooltip);
 }
 
+void BitcoinGUI::startGovernanceSyncAnimation()
+{
+    if (labelGovernanceCycleIcon == nullptr || m_timer_governance_sync != nullptr) {
+        return;
+    }
+
+    auto elapsed = std::make_shared<QElapsedTimer>();
+    elapsed->start();
+    m_timer_governance_sync = new QTimer(this);
+    QObject::connect(m_timer_governance_sync, &QTimer::timeout, [this, elapsed]() {
+        if (m_timer_governance_sync == nullptr) {
+            return;
+        }
+        // Derive frame from wall-clock time so queued timer events don't cause speed-up
+        const auto frame{static_cast<int>((elapsed->elapsed() / GOV_CYCLE_FRAME_MS) % (GOV_CYCLE_FRAME_COUNT - 1) + 1)};
+        labelGovernanceCycleIcon->setPixmap(m_gov_cycle_pixmaps.at({ToUnderlying(GUIUtil::ThemedColor::ORANGE), frame}));
+    });
+    m_timer_governance_sync->start(GOV_CYCLE_FRAME_MS);
+}
+
+void BitcoinGUI::stopGovernanceSyncAnimation()
+{
+    if (m_timer_governance_sync == nullptr) {
+        return;
+    }
+    m_timer_governance_sync->deleteLater();
+    m_timer_governance_sync = nullptr;
+}
+
+void BitcoinGUI::refreshGovernanceCycleIcons()
+{
+    stopGovernanceSyncAnimation();
+    m_gov_cycle_pixmaps.clear();
+    for (auto color : {GUIUtil::ThemedColor::ORANGE, GUIUtil::ThemedColor::GREEN, GUIUtil::ThemedColor::BLUE}) {
+        for (int i = 0; i < GOV_CYCLE_FRAME_COUNT; ++i) {
+            m_gov_cycle_pixmaps[{ToUnderlying(color), i}] =
+                GUIUtil::getIcon(QString("moon_%1").arg(i), color).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE);
+        }
+    }
+}
+
+void BitcoinGUI::updateGovernanceCycleIcon()
+{
+    if (!labelGovernanceCycleIcon || !clientModel || !clientModel->getOptionsModel()) {
+        return;
+    }
+
+    const auto& options_model{*clientModel->getOptionsModel()};
+    if (!m_node.gov().isEnabled() || !options_model.getShowGovernanceTab() || clientModel->getNumConnections() == 0) {
+        stopGovernanceSyncAnimation();
+        labelGovernanceCycleIcon->hide();
+        m_last_gov_cycle_height.reset();
+        return;
+    }
+
+    if (!m_node.masternodeSync().isGovernanceSynced()) {
+        if (!m_node.masternodeSync().isBlockchainSynced()) {
+            labelGovernanceCycleIcon->setToolTip(tr("Waiting for blockchain sync…"));
+        } else {
+            labelGovernanceCycleIcon->setToolTip(tr("Synchronizing governance data…"));
+        }
+        labelGovernanceCycleIcon->show();
+        startGovernanceSyncAnimation();
+        m_last_gov_cycle_height.reset();
+        return;
+    }
+
+    const int current_height{m_node.getNumBlocks()};
+    if (current_height == m_last_gov_cycle_height) {
+        // Governance clock only changes with new blocks; skip redundant updates
+        // triggered by connection changes, sync progress, or display unit signals.
+        return;
+    } else {
+        m_last_gov_cycle_height = current_height;
+    }
+    stopGovernanceSyncAnimation();
+
+    const auto gov_info{m_node.gov().getGovernanceInfo()};
+    const auto remaining_blocks{std::max<int>(0, gov_info.nextsuperblock - current_height)};
+    const auto days{static_cast<int>(static_cast<int64_t>(remaining_blocks) * gov_info.targetSpacing / (24*60*60))};
+    const bool awaiting_superblock{current_height % gov_info.superblockcycle >= gov_info.superblockcycle - gov_info.superblockmaturitywindow};
+
+    QString tooltip1{};
+    if (awaiting_superblock) {
+        labelGovernanceCycleIcon->setPixmap(m_gov_cycle_pixmaps.at({ToUnderlying(GUIUtil::ThemedColor::BLUE), 0}));
+        tooltip1 = tr("~%n day(s) (%1 blocks) left for superblock", "", days).arg(remaining_blocks);
+    } else {
+        const auto cycle_blocks{gov_info.superblockcycle - gov_info.superblockmaturitywindow};
+        const auto blocks_elapsed{gov_info.superblockcycle - remaining_blocks - gov_info.superblockmaturitywindow};
+        const auto progress{static_cast<double>(std::max(0, blocks_elapsed)) / static_cast<double>(std::max(1, cycle_blocks))};
+        const auto frame{std::clamp<int>(static_cast<int>(progress * (GOV_CYCLE_FRAME_COUNT - 1)), 0, GOV_CYCLE_FRAME_COUNT - 2) + 1};
+        labelGovernanceCycleIcon->setPixmap(m_gov_cycle_pixmaps.at({ToUnderlying(GUIUtil::ThemedColor::GREEN), frame}));
+        tooltip1 = tr("~%n day(s) (%1 blocks) left for voting", "", days).arg(remaining_blocks);
+    }
+
+    const auto allocated_budget{m_node.gov().getAllocatedBudget()};
+    const auto budget_pct{gov_info.governancebudget > 0
+        ? static_cast<int>(static_cast<double>(allocated_budget) / static_cast<double>(gov_info.governancebudget) * 100.0)
+        : 0};
+    const auto unit{options_model.getDisplayUnit()};
+    const auto tooltip2{tr("~%1% of budget committed (%2 %3).").arg(budget_pct).arg(allocated_budget / BitcoinUnits::factor(unit)).arg(BitcoinUnits::name(unit))};
+    labelGovernanceCycleIcon->setToolTip(QString("<nobr>%1<br>%2</nobr>").arg(tooltip1).arg(tooltip2));
+    labelGovernanceCycleIcon->show();
+}
+
 void BitcoinGUI::message(const QString& title, QString message, unsigned int style, bool* ret, const QString& detailed_message)
 {
     // Default title. On macOS, the window title is ignored (as required by the macOS Guidelines).
@@ -1798,6 +1936,8 @@ void BitcoinGUI::changeEvent(QEvent *e)
         if (m_node.masternodeSync().isSynced()) {
             labelBlocksIcon->setPixmap(GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
         }
+        refreshGovernanceCycleIcons();
+        updateGovernanceCycleIcon();
     }
 }
 
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 7c8af4f63386..db820e46b1f3 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -18,10 +18,13 @@
 #include <QLabel>
 #include <QMainWindow>
 #include <QMenu>
+#include <QPixmap>
 #include <QPoint>
 #include <QSystemTrayIcon>
 
+#include <map>
 #include <memory>
+#include <optional>
 
 #ifdef Q_OS_MACOS
 #include <qt/macos_appnap.h>
@@ -126,6 +129,7 @@ class BitcoinGUI : public QMainWindow
     QLabel* labelWalletEncryptionIcon = nullptr;
     QLabel* labelWalletHDStatusIcon = nullptr;
     GUIUtil::ClickableLabel* labelConnectionsIcon = nullptr;
+    GUIUtil::ClickableLabel* labelGovernanceCycleIcon = nullptr;
     GUIUtil::ClickableLabel* labelProxyIcon = nullptr;
     GUIUtil::ClickableLabel* labelBlocksIcon = nullptr;
     QLabel* progressBarLabel = nullptr;
@@ -230,6 +234,13 @@ class BitcoinGUI : public QMainWindow
     QTimer* timerCustomCss = nullptr;
     const NetworkStyle* const m_network_style;
 
+    /** Last block height of icon update. Used to skip redundant updates from non-block signals. */
+    std::optional<int> m_last_gov_cycle_height;
+    /** Timer to animate the governance clock while syncing. */
+    QTimer* m_timer_governance_sync{nullptr};
+    /** Pre-cached governance clock pixmaps keyed by {ThemedColor, frame}. */
+    std::map<std::pair<int, int>, QPixmap> m_gov_cycle_pixmaps;
+
     /** Create the main UI actions. */
     void createActions();
     /** Create the menu bar and sub-menus. */
@@ -250,6 +261,18 @@ class BitcoinGUI : public QMainWindow
     /** Update UI with latest network info from model. */
     void updateNetworkState();
 
+    /** Regenerate all pre-cached governance clock pixmaps (e.g. after a theme change). */
+    void refreshGovernanceCycleIcons();
+
+    /** Recompute the governance clock state, pixmap and tooltip. */
+    void updateGovernanceCycleIcon();
+
+    /** Start the moon-phase animation while governance data is syncing. */
+    void startGovernanceSyncAnimation();
+
+    /** Stop the governance sync animation. */
+    void stopGovernanceSyncAnimation();
+
     void updateHeadersSyncProgressLabel();
 
     void updateProgressBarVisibility();
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 4dd734b4d4d4..c612b45593d8 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -41,6 +41,9 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80;
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 90
 
+/* Duration of one full status-bar icon animation cycle in milliseconds. */
+static constexpr int STATUSBAR_ICON_CYCLE_MS{3600};
+
 #define QAPP_ORG_NAME "Dash"
 #define QAPP_ORG_DOMAIN "dash.org"
 #define QAPP_APP_NAME_DEFAULT "Dash-Qt"

From 8257eac054a0527e7d07ae71280cdfa44c0500f2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 12 Feb 2026 05:28:15 +0530
Subject: [PATCH 06/30] qt: decouple chain sync indicator from governance sync

---
 src/qt/bitcoingui.cpp | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 55b8cb315dd4..c52c0a5afa7b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1468,11 +1468,11 @@ void BitcoinGUI::updateProgressBarVisibility()
         return;
     }
     // Show the progress bar label if the network is active + we are out of sync or we have no connections.
-    bool fShowProgressBarLabel = m_node.getNetworkActive() && (!m_node.masternodeSync().isSynced() || clientModel->getNumConnections() == 0);
+    bool fShowProgressBarLabel = m_node.getNetworkActive() && (!m_node.masternodeSync().isBlockchainSynced() || clientModel->getNumConnections() == 0);
     // Show the progress bar only if the the network active + we are not synced + we have any connection. Unlike with the label
     // which gives an info text about the connecting phase there is no reason to show the progress bar if we don't have connections
     // since it will not get any updates in this case.
-    bool fShowProgressBar = m_node.getNetworkActive() && !m_node.masternodeSync().isSynced() && clientModel->getNumConnections() > 0;
+    bool fShowProgressBar = m_node.getNetworkActive() && !m_node.masternodeSync().isBlockchainSynced() && clientModel->getNumConnections() > 0;
     progressBarLabel->setVisible(fShowProgressBarLabel);
     progressBar->setVisible(fShowProgressBar);
 }
@@ -1670,7 +1670,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, const QStri
         tooltip += tr("Last received block was generated %1 ago.").arg(timeBehindText);
         tooltip += QString("<br>");
         tooltip += tr("Transactions after this will not yet be visible.");
-    } else if (!m_node.gov().isEnabled()) {
+    } else {
         setAdditionalDataSyncProgress(1);
     }
 
@@ -1704,11 +1704,7 @@ void BitcoinGUI::setAdditionalDataSyncProgress(double nSyncProgress)
     // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text)
     statusBar()->clearMessage();
 
-    QString tooltip;
-
-    // Set icon state: spinning if catching up, tick otherwise
-    QString strSyncStatus;
-    tooltip = tr("Up to date") + QString(".<br>") + tooltip;
+    QString tooltip{tr("Up to date")};
 
 #ifdef ENABLE_WALLET
     if(walletFrame)
@@ -1718,18 +1714,8 @@ void BitcoinGUI::setAdditionalDataSyncProgress(double nSyncProgress)
     updateProgressBarVisibility();
     updateGovernanceCycleIcon();
 
-    if(m_node.masternodeSync().isSynced()) {
-        stopSpinner();
-        labelBlocksIcon->setPixmap(GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
-    } else {
-        progressBar->setFormat(tr("Synchronizing additional data: %p%"));
-        progressBar->setMaximum(1000000000);
-        progressBar->setValue(nSyncProgress * 1000000000.0 + 0.5);
-    }
-
-    strSyncStatus = QString(m_node.masternodeSync().getSyncStatus().c_str());
-    progressBarLabel->setText(strSyncStatus);
-    tooltip = strSyncStatus + QString("<br>") + tooltip;
+    stopSpinner();
+    labelBlocksIcon->setPixmap(GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
 
     // Don't word-wrap this (fixed-width) tooltip
     tooltip = QString("<nobr>") + tooltip + QString("</nobr>");

From 9bb7b0a5cb88e1def5a86a7267e763fae8228d34 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 22 Jan 2026 17:55:14 +0530
Subject: [PATCH 07/30] qt: reorder columns in "Governance" tab, make width
 elastic for key cols

---
 src/qt/governancelist.cpp | 87 +++++++++++++++++++++++++++++++--------
 src/qt/governancelist.h   |  8 +++-
 src/qt/proposalmodel.cpp  | 20 ---------
 src/qt/proposalmodel.h    |  7 ++--
 4 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 827c7afa3ea7..0e34c18e0200 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -27,6 +27,12 @@
 #include <QAbstractItemView>
 #include <QMessageBox>
 #include <QMetaObject>
+#include <QResizeEvent>
+#include <QShowEvent>
+
+namespace {
+constexpr int TITLE_MIN_WIDTH{220};
+} // anonymous namespace
 
 //
 // Governance Tab main widget.
@@ -47,22 +53,19 @@ GovernanceList::GovernanceList(QWidget* parent) :
                      {GUIUtil::FontWeight::Bold, 14});
     GUIUtil::setFont({ui->label_filter_2}, {GUIUtil::FontWeight::Normal, 15});
 
-    proposalModelProxy->setSourceModel(proposalModel);
+    ui->govTableView->setContextMenuPolicy(Qt::CustomContextMenu);
     ui->govTableView->setModel(proposalModelProxy);
     ui->govTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    ui->govTableView->horizontalHeader()->setStretchLastSection(true);
-    ui->govTableView->verticalHeader()->setVisible(false);
-
-    for (int i = 0; i < proposalModel->columnCount(); ++i) {
-        ui->govTableView->setColumnWidth(i, proposalModel->columnWidth(i));
-    }
-
-    // Set up sorting.
-    proposalModelProxy->setSortRole(Qt::EditRole);
     ui->govTableView->setSortingEnabled(true);
-    ui->govTableView->sortByColumn(ProposalModel::Column::START_DATE, Qt::DescendingOrder);
+    ui->govTableView->sortByColumn(ProposalModel::Column::TITLE, Qt::AscendingOrder);
+    ui->govTableView->verticalHeader()->setVisible(false);
+    connect(ui->govTableView, &QTableView::customContextMenuRequested, this, &GovernanceList::showProposalContextMenu);
+    connect(ui->govTableView, &QTableView::doubleClicked, this, &GovernanceList::showAdditionalInfo);
+    connect(ui->govTableView->horizontalHeader(), &QHeaderView::sectionResized, this, &GovernanceList::refreshColumnWidths);
 
     // Set up filtering.
+    proposalModelProxy->setSourceModel(proposalModel);
+    proposalModelProxy->setSortRole(Qt::EditRole);
     proposalModelProxy->setFilterKeyColumn(ProposalModel::Column::TITLE); // filter by title column...
     connect(ui->filterLineEdit, &QLineEdit::textChanged, proposalModelProxy, &QSortFilterProxyModel::setFilterFixedString);
 
@@ -71,13 +74,8 @@ GovernanceList::GovernanceList(QWidget* parent) :
     connect(proposalModelProxy, &QSortFilterProxyModel::rowsRemoved, this, &GovernanceList::updateProposalCount);
     connect(proposalModelProxy, &QSortFilterProxyModel::layoutChanged, this, &GovernanceList::updateProposalCount);
 
-    // Enable CustomContextMenu on the table to make the view emit customContextMenuRequested signal.
-    ui->govTableView->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui->govTableView, &QTableView::customContextMenuRequested, this, &GovernanceList::showProposalContextMenu);
-
     // Create Proposal button
     connect(ui->btnCreateProposal, &QPushButton::clicked, this, &GovernanceList::showCreateProposalDialog);
-    connect(ui->govTableView, &QTableView::doubleClicked, this, &GovernanceList::showAdditionalInfo);
 
     // Initialize masternode count to 0
     ui->mnCountLabel->setText("0");
@@ -217,9 +215,10 @@ void GovernanceList::setProposalList(CalcProposalList&& data)
     updateMasternodeCount();
 }
 
-void GovernanceList::updateProposalCount() const
+void GovernanceList::updateProposalCount()
 {
     ui->countLabel->setText(QString::number(proposalModelProxy->rowCount()));
+    refreshColumnWidths();
 }
 
 void GovernanceList::showCreateProposalDialog()
@@ -395,3 +394,57 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
     // Update proposal list to show new vote counts
     handleProposalListChanged();
 }
+
+void GovernanceList::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+    refreshColumnWidths();
+}
+
+void GovernanceList::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    refreshColumnWidths();
+}
+
+void GovernanceList::refreshColumnWidths()
+{
+    // Bail out if resize in progress or viewport is too small
+    const int tableWidth = ui->govTableView->viewport()->width();
+    if (m_col_refresh || tableWidth <= 0) {
+        return;
+    } else {
+        m_col_refresh = true;
+    }
+
+    auto* header = ui->govTableView->horizontalHeader();
+    header->setMinimumSectionSize(0);
+    header->setSectionResizeMode(ProposalModel::Column::PAYMENT_AMOUNT, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(ProposalModel::Column::START_DATE, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(ProposalModel::Column::END_DATE, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(ProposalModel::Column::IS_ACTIVE, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(ProposalModel::Column::VOTING_STATUS, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(ProposalModel::Column::HASH, QHeaderView::ResizeToContents);
+
+    // Calculate width used by ResizeToContents columns
+    const int availableWidth = [&header, &tableWidth](){
+        int fixedWidth = 0;
+        for (int idx = 0; idx < ProposalModel::Column::_COUNT; idx++) {
+            if (idx != ProposalModel::Column::TITLE && idx != ProposalModel::Column::HASH) {
+                fixedWidth += header->sectionSize(idx);
+            }
+        }
+        return std::max(0, tableWidth - fixedWidth);
+    }();
+
+    // Hash gets what's left after Title takes its minimum, clamped to [0, hashContentWidth]
+    const int hashContentWidth = header->sectionSize(ProposalModel::Column::HASH);
+    const int hashWidth = std::clamp<int>(availableWidth - TITLE_MIN_WIDTH, 0, hashContentWidth);
+    const int titleWidth = availableWidth - hashWidth;
+    header->setSectionResizeMode(ProposalModel::Column::TITLE, QHeaderView::Interactive);
+    header->setSectionResizeMode(ProposalModel::Column::HASH, QHeaderView::Interactive);
+    header->resizeSection(ProposalModel::Column::TITLE, titleWidth);
+    header->resizeSection(ProposalModel::Column::HASH, hashWidth);
+
+    m_col_refresh = false;
+}
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 83465ca75b9a..bb03f2bff35f 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -59,6 +59,7 @@ class GovernanceList : public QWidget
     QSortFilterProxyModel* proposalModelProxy{nullptr};
     QThread* m_thread{nullptr};
     QTimer* m_timer{nullptr};
+    std::atomic<bool> m_col_refresh{false};
     std::atomic<bool> m_in_progress{false};
     Uint256HashMap<CKeyID> votableMasternodes;
     WalletModel* walletModel{nullptr};
@@ -66,13 +67,18 @@ class GovernanceList : public QWidget
     bool canVote() const { return !votableMasternodes.empty(); }
     CalcProposalList calcProposalList() const;
     void handleProposalListChanged();
+    void refreshColumnWidths();
     void setProposalList(CalcProposalList&& data);
     void voteForProposal(vote_outcome_enum_t outcome);
 
+protected:
+    void showEvent(QShowEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+
 private Q_SLOTS:
     void updateDisplayUnit();
     void updateProposalList();
-    void updateProposalCount() const;
+    void updateProposalCount();
     void updateMasternodeCount() const;
     void showProposalContextMenu(const QPoint& pos);
     void showAdditionalInfo(const QModelIndex& index);
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index ea0ccbff362a..a5abfce03291 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -187,26 +187,6 @@ QVariant ProposalModel::headerData(int section, Qt::Orientation orientation, int
     }
 }
 
-int ProposalModel::columnWidth(int section)
-{
-    switch (section) {
-    case Column::HASH:
-        return 80;
-    case Column::TITLE:
-        return 220;
-    case Column::START_DATE:
-    case Column::END_DATE:
-    case Column::PAYMENT_AMOUNT:
-        return 110;
-    case Column::IS_ACTIVE:
-        return 80;
-    case Column::VOTING_STATUS:
-        return 220;
-    default:
-        return 80;
-    }
-}
-
 void ProposalModel::append(std::unique_ptr<Proposal>&& proposal)
 {
     beginInsertRows({}, rowCount(), rowCount());
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index e2918298d9bf..3dda518631f0 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -63,13 +63,13 @@ class ProposalModel : public QAbstractTableModel
         QAbstractTableModel(parent){};
 
     enum Column : int {
-        HASH = 0,
-        TITLE,
+        TITLE = 0,
+        PAYMENT_AMOUNT,
         START_DATE,
         END_DATE,
-        PAYMENT_AMOUNT,
         IS_ACTIVE,
         VOTING_STATUS,
+        HASH,
         _COUNT // for internal use only
     };
 
@@ -78,7 +78,6 @@ class ProposalModel : public QAbstractTableModel
     QVariant data(const QModelIndex& index, int role) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-    static int columnWidth(int section);
     void append(std::unique_ptr<Proposal>&& proposal);
     void remove(int row);
     void reconcile(ProposalList&& proposals);

From b2b9aa19b0d171113fda8dc594cca93c7c3c35f7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 24 Jan 2026 14:29:16 +0530
Subject: [PATCH 08/30] qt: change layout of "Governance" tab controls for
 readability

Review with `git log -p -n1 --ignore-space-change --color-moved=dimmed_zebra`.
---
 src/qt/forms/governancelist.ui | 168 ++++++++++++---------------------
 src/qt/governancelist.cpp      |   1 -
 2 files changed, 60 insertions(+), 109 deletions(-)

diff --git a/src/qt/forms/governancelist.ui b/src/qt/forms/governancelist.ui
index 58fad21b9106..2094d9815899 100644
--- a/src/qt/forms/governancelist.ui
+++ b/src/qt/forms/governancelist.ui
@@ -32,91 +32,70 @@
       <number>0</number>
      </property>
      <item>
-      <spacer name="horizontalSpacer0">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <layout class="QHBoxLayout" name="horizontalLayout_top">
+       <property name="bottomMargin">
+        <number>0</number>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+       <item>
+        <widget class="QLineEdit" name="filterLineEdit">
+         <property name="toolTip">
+          <string>Filter proposal list</string>
+         </property>
+         <property name="placeholderText">
+          <string>Filter by Title</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_mn_count">
+         <property name="text">
+          <string>Masternode Count:</string>
+         </property>
+         <property name="toolTip">
+          <string>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="mnCountLabel">
+         <property name="text">
+          <string notr="true">0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="0" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <property name="bottomMargin">
-          <number>0</number>
+      <widget class="QTableView" name="govTableView">
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_bottom">
+       <item>
+        <widget class="QPushButton" name="btnCreateProposal">
+         <property name="text">
+          <string>Create Proposal</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_bottom">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_count">
+         <property name="spacing">
+          <number>3</number>
          </property>
-         <item>
-          <widget class="QLabel" name="label_filter_2">
-           <property name="text">
-            <string>Filter List:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="filterLineEdit">
-           <property name="toolTip">
-            <string>Filter proposal list</string>
-           </property>
-           <property name="placeholderText">
-            <string>Filter by Title</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_4">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_mn_count">
-           <property name="text">
-            <string>Masternode Count:</string>
-           </property>
-           <property name="toolTip">
-            <string>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mnCountLabel">
-           <property name="text">
-            <string notr="true">0</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_5">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item>
           <widget class="QLabel" name="label_count_2">
            <property name="text">
@@ -131,35 +110,8 @@
            </property>
           </widget>
          </item>
-         <item>
-          <spacer name="horizontalSpacer_create">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnCreateProposal">
-           <property name="text">
-            <string>Create Proposal</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
-       <item row="1" column="0">
-        <widget class="QTableView" name="govTableView">
-        </widget>
-       </item>
       </layout>
      </item>
     </layout>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 0e34c18e0200..447fc79b3be7 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -51,7 +51,6 @@ GovernanceList::GovernanceList(QWidget* parent) :
 
     GUIUtil::setFont({ui->label_count_2, ui->countLabel, ui->label_mn_count, ui->mnCountLabel},
                      {GUIUtil::FontWeight::Bold, 14});
-    GUIUtil::setFont({ui->label_filter_2}, {GUIUtil::FontWeight::Normal, 15});
 
     ui->govTableView->setContextMenuPolicy(Qt::CustomContextMenu);
     ui->govTableView->setModel(proposalModelProxy);

From c0d8454f10422363e66ee61e0678f7c59c358a30 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 19:47:37 +0530
Subject: [PATCH 09/30] qt: report compact voting status and expanded details
 in tooltip

---
 src/interfaces/node.h    |  7 +++++-
 src/node/interfaces.cpp  | 10 +++++---
 src/qt/proposalmodel.cpp | 53 +++++++++++++++++++++-------------------
 src/qt/proposalmodel.h   |  8 ++++--
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 99dc38522bf7..7482ceb1e411 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -134,7 +134,12 @@ class GOV
 public:
     virtual ~GOV() {}
     virtual void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime) = 0;
-    virtual int32_t getObjAbsYesCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
+    struct Votes {
+        int32_t m_abs{0};
+        int32_t m_no{0};
+        int32_t m_yes{0};
+    };
+    virtual Votes getObjVotes(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
     virtual bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) = 0;
     virtual bool isEnabled() = 0;
     virtual bool processVoteAndRelay(const CGovernanceVote& vote, std::string& error) = 0;
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index c43b5dd018d7..5027b98bb4d2 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -229,12 +229,16 @@ class GOVImpl : public GOV
             context().govman->GetAllNewerThan(objs, nMoreThanTime);
         }
     }
-    int32_t getObjAbsYesCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
+    Votes getObjVotes(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
     {
+        Votes ret;
         if (context().govman != nullptr && context().dmnman != nullptr) {
-            return obj.GetAbsoluteYesCount(context().dmnman->GetListAtChainTip(), vote_signal);
+            const auto& tip_mn_list{context().dmnman->GetListAtChainTip()};
+            ret.m_abs = obj.GetAbstainCount(tip_mn_list, vote_signal);
+            ret.m_no = obj.GetNoCount(tip_mn_list, vote_signal);
+            ret.m_yes = obj.GetYesCount(tip_mn_list, vote_signal);
         }
-        return 0;
+        return ret;
     }
     bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) override
     {
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index a5abfce03291..dd2d8e0e1b2d 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -28,6 +28,10 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
         return;
     }
 
+    if (clientModel) {
+        m_votes = clientModel->node().gov().getObjVotes(govObj, VOTE_SIGNAL_FUNDING);
+    }
+
     if (const UniValue& titleValue = prop_data.find_value("name"); titleValue.isStr()) {
         m_title = QString::fromStdString(titleValue.get_str());
     }
@@ -57,29 +61,13 @@ QString Proposal::toJson() const
 
 bool Proposal::isActive() const
 {
+    if (!clientModel) {
+        return false;
+    }
     std::string strError;
     return clientModel->node().gov().getObjLocalValidity(govObj, strError, false);
 }
 
-int Proposal::GetAbsoluteYesCount() const
-{
-    return clientModel->node().gov().getObjAbsYesCount(govObj, VOTE_SIGNAL_FUNDING);
-}
-
-QString Proposal::votingStatus(const int nAbsVoteReq) const
-{
-    // Voting status...
-    // TODO: determine if voting is in progress vs. funded or not funded for past proposals.
-    // see CSuperblock::GetNearestSuperblocksHeights(nBlockHeight, nLastSuperblock, nNextSuperblock);
-    const int absYesCount = clientModel->node().gov().getObjAbsYesCount(govObj, VOTE_SIGNAL_FUNDING);
-    if (absYesCount >= nAbsVoteReq) {
-        // Could use govObj.IsSetCachedFunding here, but need nAbsVoteReq to display numbers anyway.
-        return QObject::tr("Passing +%1").arg(absYesCount - nAbsVoteReq);
-    } else {
-        return QObject::tr("Needs additional %1 votes").arg(nAbsVoteReq - absYesCount);
-    }
-}
-
 void Proposal::openUrl() const
 {
     QDesktopServices::openUrl(QUrl(m_url));
@@ -104,7 +92,7 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
     if (!index.isValid() || !isValidRow(index.row())) {
         return {};
     }
-    if (role != Qt::DisplayRole && role != Qt::EditRole) {
+    if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ToolTipRole) {
         return {};
     }
 
@@ -127,8 +115,13 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
         }
         case Column::IS_ACTIVE:
             return proposal->isActive() ? tr("Yes") : tr("No");
-        case Column::VOTING_STATUS:
-            return proposal->votingStatus(nAbsVoteReq);
+        case Column::VOTING_STATUS: {
+            const int margin = proposal->getAbsoluteYesCount() - nAbsVoteReq;
+            return QString("%1Y, %2N, %3A (%4%5)").arg(proposal->getYesCount()).arg(proposal->getNoCount())
+                                                  .arg(proposal->getAbstainCount()).arg(margin > 0 ? "+" : "")
+                                                  .arg(margin);
+
+        }
         default:
             return {};
         };
@@ -151,12 +144,22 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
         case Column::IS_ACTIVE:
             return proposal->isActive();
         case Column::VOTING_STATUS:
-            return proposal->GetAbsoluteYesCount();
+            return proposal->getAbsoluteYesCount();
         default:
             return {};
         };
         break;
     }
+    case Qt::ToolTipRole:
+    {
+        if (index.column() == Column::VOTING_STATUS) {
+            const int margin = proposal->getAbsoluteYesCount() - nAbsVoteReq;
+            return tr("%1 Yes, %2 No, %3 Abstain, %4").arg(proposal->getYesCount()).arg(proposal->getNoCount())
+                                                      .arg(proposal->getAbstainCount())
+                                                      .arg((margin >= 0 ? tr("passing with %1 votes") : tr("needs %1 more votes")).arg(std::abs(margin)));
+        }
+        return {};
+    }
     };
     return {};
 }
@@ -181,7 +184,7 @@ QVariant ProposalModel::headerData(int section, Qt::Orientation orientation, int
     case Column::IS_ACTIVE:
         return tr("Active");
     case Column::VOTING_STATUS:
-        return tr("Status");
+        return tr("Votes");
     default:
         return {};
     }
@@ -219,7 +222,7 @@ void ProposalModel::reconcile(ProposalList&& proposals)
         if (it != m_data.end()) {
             const auto idx{static_cast<int>(std::distance(m_data.begin(), it))};
             keep_index[static_cast<size_t>(idx)] = true;
-            if ((*it)->GetAbsoluteYesCount() != proposal->GetAbsoluteYesCount()) {
+            if ((*it)->getAbsoluteYesCount() != proposal->getAbsoluteYesCount()) {
                 // Replace proposal to update vote count
                 *it = std::move(proposal);
                 Q_EMIT dataChanged(createIndex(idx, Column::VOTING_STATUS), createIndex(idx, Column::VOTING_STATUS));
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index 3dda518631f0..9ce38d6b0752 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_QT_PROPOSALMODEL_H
 #define BITCOIN_QT_PROPOSALMODEL_H
 
+#include <interfaces/node.h>
 #include <governance/object.h>
 
 #include <qt/bitcoinunits.h>
@@ -24,6 +25,7 @@ class Proposal
     const CGovernanceObject govObj;
 
     CAmount m_paymentAmount{0};
+    interfaces::GOV::Votes m_votes;
     QDateTime m_endDate{};
     QDateTime m_startDate{};
     QString m_hash{};
@@ -35,14 +37,16 @@ class Proposal
 
     bool isActive() const;
     CAmount paymentAmount() const { return m_paymentAmount; }
-    int GetAbsoluteYesCount() const;
+    int32_t getAbsoluteYesCount() const { return m_votes.m_yes - m_votes.m_no; }
+    int32_t getAbstainCount() const { return m_votes.m_abs; }
+    int32_t getNoCount() const { return m_votes.m_no; }
+    int32_t getYesCount() const { return m_votes.m_yes; }
     QDateTime endDate() const { return m_endDate; }
     QDateTime startDate() const { return m_startDate; }
     QString hash() const { return m_hash; }
     QString title() const { return m_title; }
     QString toJson() const;
     QString url() const { return m_url; }
-    QString votingStatus(int nAbsVoteReq) const;
 
     void openUrl() const;
 };

From f45fe8551972ade6a9395e39fff76cd173e55d36 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 22 Jan 2026 07:53:20 +0530
Subject: [PATCH 10/30] qt: use monospace font for hashes in "Governance" tab

---
 src/qt/proposalmodel.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index dd2d8e0e1b2d..95beeb2b8b0c 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -6,9 +6,12 @@
 
 #include <governance/vote.h>
 
+#include <qt/guiutil_font.h>
+
 #include <interfaces/node.h>
 
 #include <qt/clientmodel.h>
+#include <qt/guiutil.h>
 
 #include <QDesktopServices>
 #include <QUrl>
@@ -92,6 +95,14 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
     if (!index.isValid() || !isValidRow(index.row())) {
         return {};
     }
+    if (index.column() == Column::HASH) {
+        if (role == Qt::FontRole) {
+            return GUIUtil::fixedPitchFont();
+        }
+        if (role == Qt::ForegroundRole) {
+            return QVariant::fromValue(GUIUtil::getThemedQColor(GUIUtil::ThemedColor::UNCONFIRMED));
+        }
+    }
     if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ToolTipRole) {
         return {};
     }

From 4295471d99d4e07b6389866d2797408e3a90ddc7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 6 Feb 2026 23:36:08 +0530
Subject: [PATCH 11/30] qt: report proposal info using QTextEdit instead of an
 alert with JSON

This is closer to how we report details for transactions and more
translation-friendly and easier to copy.
---
 src/qt/governancelist.cpp | 16 ++++++++++------
 src/qt/proposalmodel.cpp  | 18 ++++++++++++++++++
 src/qt/proposalmodel.h    |  2 ++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 447fc79b3be7..afe3e7a366e9 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -8,6 +8,7 @@
 #include <governance/governance.h>
 #include <governance/vote.h>
 
+#include <qt/descriptiondialog.h>
 #include <qt/governancelist.h>
 #include <qt/guiutil_font.h>
 #include <qt/proposalmodel.h>
@@ -269,19 +270,22 @@ void GovernanceList::showProposalContextMenu(const QPoint& pos)
 
 void GovernanceList::showAdditionalInfo(const QModelIndex& index)
 {
-    if (!index.isValid()) {
+    if (!index.isValid() || !clientModel) {
         return;
     }
 
     const auto proposal = proposalModel->getProposalAt(proposalModelProxy->mapToSource(index));
-    if (proposal == nullptr) {
+    if (!proposal) {
         return;
     }
 
-    const auto windowTitle = tr("Proposal Info: %1").arg(proposal->title());
-    const auto json = proposal->toJson();
-
-    QMessageBox::information(this, windowTitle, json);
+    DescriptionDialog* dialog = new DescriptionDialog(
+        tr("Details for %1").arg(proposal->title()),
+        proposal->toHtml(clientModel->getOptionsModel()->getDisplayUnit()),
+        /*parent=*/this);
+    dialog->resize(800, 380);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
 }
 
 void GovernanceList::updateMasternodeCount() const
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index 95beeb2b8b0c..3a35deaf0546 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -56,6 +56,24 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
     }
 }
 
+QString Proposal::toHtml(const BitcoinUnit& unit) const
+{
+    QString ret;
+    ret.reserve(4000);
+    ret += "<html>";
+    ret += "<b>" + QObject::tr("Title") + ":</b> " + GUIUtil::HtmlEscape(m_title) + "<br>";
+    if (!m_url.isEmpty()) {
+        ret += "<b>" + QObject::tr("URL") + ":</b> " + GUIUtil::HtmlEscape(m_url) + "<br>";
+    }
+    ret += "<b>" + QObject::tr("Payment Amount") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, m_paymentAmount) + "<br>";
+    ret += "<b>" + QObject::tr("Payment Start") + ":</b> " + GUIUtil::dateTimeStr(m_startDate) + "<br>";
+    ret += "<b>" + QObject::tr("Payment End") + ":</b> " + GUIUtil::dateTimeStr(m_endDate) + "<br>";
+    ret += "<b>" + QObject::tr("Object Hash") + ":</b> " + m_hash + "<br>";
+    ret += "<br>";
+    ret += "</html>";
+    return ret;
+}
+
 QString Proposal::toJson() const
 {
     const auto json = govObj.GetInnerJson();
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index 9ce38d6b0752..a6071b65ade7 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -12,6 +12,7 @@
 
 #include <QAbstractTableModel>
 #include <QDateTime>
+#include <QString>
 
 #include <memory>
 #include <vector>
@@ -45,6 +46,7 @@ class Proposal
     QDateTime startDate() const { return m_startDate; }
     QString hash() const { return m_hash; }
     QString title() const { return m_title; }
+    QString toHtml(const BitcoinUnit& unit) const;
     QString toJson() const;
     QString url() const { return m_url; }
 

From 552f591a58adbb09216ccd04d6f4063edf61d9e9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 22 Jan 2026 07:52:42 +0530
Subject: [PATCH 12/30] qt: report more proposal information in description,
 calculate payments

---
 src/qt/proposalmodel.cpp | 29 +++++++++++++++++++++++++++--
 src/qt/proposalmodel.h   | 13 +++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index 3a35deaf0546..4e83da748b40 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -4,10 +4,12 @@
 
 #include <qt/proposalmodel.h>
 
+#include <governance/classes.h>
 #include <governance/vote.h>
 
 #include <qt/guiutil_font.h>
 
+#include <chainparams.h>
 #include <interfaces/node.h>
 
 #include <qt/clientmodel.h>
@@ -24,7 +26,10 @@
 Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj) :
     clientModel{_clientModel},
     govObj{_govObj},
-    m_hash{QString::fromStdString(govObj.GetHash().ToString())}
+    m_date_collateral{QDateTime::fromSecsSinceEpoch(govObj.GetCreationTime())},
+    m_hash_collateral{QString::fromStdString(govObj.GetCollateralHash().ToString())},
+    m_hash_object{QString::fromStdString(govObj.GetHash().ToString())},
+    m_hash_parent{QString::fromStdString(govObj.Object().hashParent.ToString())}
 {
     UniValue prop_data;
     if (!prop_data.read(govObj.GetDataAsPlainString())) {
@@ -47,6 +52,10 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
         m_endDate = QDateTime::fromSecsSinceEpoch(paymentEndValue.getInt<int64_t>());
     }
 
+    if (const UniValue& addressValue = prop_data.find_value("payment_address"); addressValue.isStr()) {
+        m_address = QString::fromStdString(addressValue.get_str());
+    }
+
     if (const UniValue& amountValue = prop_data.find_value("payment_amount"); amountValue.isNum()) {
         m_paymentAmount = llround(amountValue.get_real() * COIN);
     }
@@ -56,6 +65,17 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
     }
 }
 
+int Proposal::paymentsRequested() const
+{
+    if (!m_startDate.isValid() || !m_endDate.isValid()) {
+        return 1;
+    }
+    const auto& consensus_params = Params().GetConsensus();
+    const int64_t superblock_cycle = consensus_params.nPowTargetSpacing * consensus_params.nSuperblockCycle;
+    const int64_t proposal_duration = m_endDate.toSecsSinceEpoch() - m_startDate.toSecsSinceEpoch();
+    return std::max<int>(1, ((proposal_duration + superblock_cycle - 1) / superblock_cycle));
+}
+
 QString Proposal::toHtml(const BitcoinUnit& unit) const
 {
     QString ret;
@@ -65,10 +85,15 @@ QString Proposal::toHtml(const BitcoinUnit& unit) const
     if (!m_url.isEmpty()) {
         ret += "<b>" + QObject::tr("URL") + ":</b> " + GUIUtil::HtmlEscape(m_url) + "<br>";
     }
+    ret += "<b>" + QObject::tr("Destination Address") + ":</b> " + GUIUtil::HtmlEscape(m_address) + "<br>";
     ret += "<b>" + QObject::tr("Payment Amount") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, m_paymentAmount) + "<br>";
+    ret += "<b>" + QObject::tr("Payments Requested") + ":</b> " + QString::number(paymentsRequested()) + "<br>";
     ret += "<b>" + QObject::tr("Payment Start") + ":</b> " + GUIUtil::dateTimeStr(m_startDate) + "<br>";
     ret += "<b>" + QObject::tr("Payment End") + ":</b> " + GUIUtil::dateTimeStr(m_endDate) + "<br>";
-    ret += "<b>" + QObject::tr("Object Hash") + ":</b> " + m_hash + "<br>";
+    ret += "<b>" + QObject::tr("Object Hash") + ":</b> " + m_hash_object + "<br>";
+    ret += "<b>" + QObject::tr("Parent Hash") + ":</b> " + m_hash_parent + "<br>";
+    ret += "<b>" + QObject::tr("Collateral Date") + ":</b> " + GUIUtil::dateTimeStr(m_date_collateral) + "<br>";
+    ret += "<b>" + QObject::tr("Collateral Hash") + ":</b> " + m_hash_collateral + "<br>";
     ret += "<br>";
     ret += "</html>";
     return ret;
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index a6071b65ade7..4bb6decfde5d 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -27,9 +27,13 @@ class Proposal
 
     CAmount m_paymentAmount{0};
     interfaces::GOV::Votes m_votes;
+    QDateTime m_date_collateral{};
     QDateTime m_endDate{};
     QDateTime m_startDate{};
-    QString m_hash{};
+    QString m_address{};
+    QString m_hash_collateral{};
+    QString m_hash_object{};
+    QString m_hash_parent{};
     QString m_title{};
     QString m_url{};
 
@@ -38,13 +42,18 @@ class Proposal
 
     bool isActive() const;
     CAmount paymentAmount() const { return m_paymentAmount; }
+    int paymentsRequested() const;
     int32_t getAbsoluteYesCount() const { return m_votes.m_yes - m_votes.m_no; }
     int32_t getAbstainCount() const { return m_votes.m_abs; }
     int32_t getNoCount() const { return m_votes.m_no; }
     int32_t getYesCount() const { return m_votes.m_yes; }
+    QDateTime collateralDate() const { return m_date_collateral; }
     QDateTime endDate() const { return m_endDate; }
     QDateTime startDate() const { return m_startDate; }
-    QString hash() const { return m_hash; }
+    QString collateralHash() const { return m_hash_collateral; }
+    QString hash() const { return m_hash_object; }
+    QString parentHash() const { return m_hash_parent; }
+    QString paymentAddress() const { return m_address; }
     QString title() const { return m_title; }
     QString toHtml(const BitcoinUnit& unit) const;
     QString toJson() const;

From af65c0eda45ae4030ebbf098f505ef8906d054ce Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 12 Feb 2026 02:22:54 +0530
Subject: [PATCH 13/30] qt: cleanup proposal context menu, add copy JSON and
 visit URL options

Visiting URLs could be dangerous, add a warning before we open a link in
someone's browser.
---
 src/qt/governancelist.cpp | 65 ++++++++++++++++++++++++++++++++++-----
 src/qt/governancelist.h   |  2 ++
 src/qt/proposalmodel.cpp  |  8 -----
 src/qt/proposalmodel.h    |  2 --
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index afe3e7a366e9..92957329f5b2 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -26,10 +26,14 @@
 #include <qt/walletmodel.h>
 
 #include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QDesktopServices>
 #include <QMessageBox>
 #include <QMetaObject>
 #include <QResizeEvent>
 #include <QShowEvent>
+#include <QUrl>
 
 namespace {
 constexpr int TITLE_MIN_WIDTH{220};
@@ -246,16 +250,15 @@ void GovernanceList::showProposalContextMenu(const QPoint& pos)
     }
 
     const auto proposal = proposalModel->getProposalAt(proposalModelProxy->mapToSource(index));
-    if (proposal == nullptr) {
+    if (!proposal) {
         return;
     }
 
-    // right click menu with option to open proposal url
-    QString proposal_url = proposal->url();
-    proposal_url.replace(QChar('&'), QString("&&"));
-
     proposalContextMenu->clear();
-    proposalContextMenu->addAction(proposal_url, [proposal]() { proposal->openUrl(); });
+    proposalContextMenu->addAction(tr("Copy Raw JSON"), this, &GovernanceList::copyProposalJson);
+    if (!proposal->url().isEmpty()) {
+        proposalContextMenu->addAction(tr("Open Proposal URL…"), this, &GovernanceList::openProposalUrl);
+    }
 
     // Add voting options if wallet is available and has voting capability
     if (walletModel && canVote()) {
@@ -301,6 +304,54 @@ void GovernanceList::voteNo() { voteForProposal(VOTE_OUTCOME_NO); }
 
 void GovernanceList::voteAbstain() { voteForProposal(VOTE_OUTCOME_ABSTAIN); }
 
+void GovernanceList::openProposalUrl()
+{
+    const auto selection = ui->govTableView->selectionModel()->selectedRows();
+    if (selection.isEmpty()) {
+        return;
+    }
+
+    const auto proposal = proposalModel->getProposalAt(proposalModelProxy->mapToSource(selection.first()));
+    if (!proposal || proposal->url().isEmpty()) {
+        return;
+    }
+
+    const QUrl url{QUrl(proposal->url())};
+    if (const QString scheme = url.isValid() ? url.scheme().toLower() : QString();
+        scheme != QLatin1String("http") && scheme != QLatin1String("https")) {
+        QMessageBox::critical(this, tr("Error"), tr("Cannot validate URL, potentially malformed or unknown protocol."));
+        return;
+    }
+    QMessageBox::StandardButton reply = QMessageBox::warning(
+        this,
+        tr("External Link Warning"),
+        tr("You are about to open the following URL in your default browser\n\n%1\n\n"
+           "This content was submitted by a user. It may not match what is described in the title.\n\n"
+           "Do you wish to continue?").arg(proposal->url()),
+        QMessageBox::Yes | QMessageBox::No,
+        QMessageBox::No
+    );
+
+    if (reply == QMessageBox::Yes) {
+        QDesktopServices::openUrl(url);
+    }
+}
+
+void GovernanceList::copyProposalJson()
+{
+    const auto selection = ui->govTableView->selectionModel()->selectedRows();
+    if (selection.isEmpty()) {
+        return;
+    }
+
+    const auto proposal = proposalModel->getProposalAt(proposalModelProxy->mapToSource(selection.first()));
+    if (!proposal) {
+        return;
+    }
+
+    QApplication::clipboard()->setText(proposal->toJson());
+}
+
 void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
 {
     if (!walletModel) {
@@ -322,7 +373,7 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
 
     const auto index = selection.first();
     const auto proposal = proposalModel->getProposalAt(proposalModelProxy->mapToSource(index));
-    if (proposal == nullptr) return;
+    if (!proposal) return;
 
     const uint256 proposalHash(uint256S(proposal->hash().toStdString()));
 
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index bb03f2bff35f..2c22281d7a17 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -83,6 +83,8 @@ private Q_SLOTS:
     void showProposalContextMenu(const QPoint& pos);
     void showAdditionalInfo(const QModelIndex& index);
     void showCreateProposalDialog();
+    void openProposalUrl();
+    void copyProposalJson();
 
     // Voting slots
     void voteYes();
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index 4e83da748b40..56668c2171b2 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -15,9 +15,6 @@
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
 
-#include <QDesktopServices>
-#include <QUrl>
-
 #include <univalue.h>
 
 #include <algorithm>
@@ -114,11 +111,6 @@ bool Proposal::isActive() const
     return clientModel->node().gov().getObjLocalValidity(govObj, strError, false);
 }
 
-void Proposal::openUrl() const
-{
-    QDesktopServices::openUrl(QUrl(m_url));
-}
-
 ///
 /// Proposal Model
 ///
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index 4bb6decfde5d..5d7f4d48262c 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -58,8 +58,6 @@ class Proposal
     QString toHtml(const BitcoinUnit& unit) const;
     QString toJson() const;
     QString url() const { return m_url; }
-
-    void openUrl() const;
 };
 
 using ProposalList = std::vector<std::unique_ptr<Proposal>>;

From 5f95737441924af03c99097af64d91cada935bf2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 12 Feb 2026 07:27:50 +0530
Subject: [PATCH 14/30] qt: add voting ballot icon

---
 src/Makefile.qt.include     |   1 +
 src/qt/dash.qrc             |   1 +
 src/qt/res/icons/voting.png | Bin 0 -> 679 bytes
 src/qt/res/src/voting.svg   |  13 +++++++++++++
 4 files changed, 15 insertions(+)
 create mode 100644 src/qt/res/icons/voting.png
 create mode 100644 src/qt/res/src/voting.svg

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 5a0dbd946702..83ff5e97a413 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -230,6 +230,7 @@ QT_RES_ICONS = \
   qt/res/icons/transaction5.png \
   qt/res/icons/transaction_abandoned.png \
   qt/res/icons/transaction_locked.png \
+  qt/res/icons/voting.png \
   qt/res/icons/warning.png
 
 BITCOIN_QT_BASE_CPP = \
diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc
index c572e93185cf..9edc2a2e734d 100644
--- a/src/qt/dash.qrc
+++ b/src/qt/dash.qrc
@@ -36,6 +36,7 @@
         <file alias="moon_6">res/icons/moon_6.png</file>
         <file alias="moon_7">res/icons/moon_7.png</file>
         <file alias="proxy">res/icons/proxy.png</file>
+        <file alias="voting">res/icons/voting.png</file>
     </qresource>
     <qresource prefix="/css">
         <file alias="general">res/css/general.css</file>
diff --git a/src/qt/res/icons/voting.png b/src/qt/res/icons/voting.png
new file mode 100644
index 0000000000000000000000000000000000000000..b79b43dbe83b9a723df0530e7c28c72ba40b5f12
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0007RNkl<Zc-rk)
zO-NKx6#lFUilmH~MYN0pmr0;7Dn(G65-MmpsNl|l7P*lp2rY#IX;q65S`7r&s=#O?
zIS{xLAsE~^iX&6>tCTOj<DB<9^WJ^u_2$0KJ!f&@@SStM@80(g_dOt<ok0guvU7Ne
zKiJ22Ea4dnxQ4ST+n>gYXzuq4-eCrL^x$~A35>UB@Akh~MG*#u+C}9(HToqXvX3tq
zZU=#FDt`gzaT61m!!mXQDE!0i<R8FB=^r@aie}J_`*?(TltoiFg~g-^+@QjxKtv~c
zF@~pvt0qn0Ar*cu!CfTWX3_-asBl4oyGyu*qzNoj;j0qdG~u2k+dhLGDx8%dUlDHf
zf7;y=^UeEOm1*6O=6)vRiajaWFXSovjd%Pbt#2i{C$M*jGx5{Tt%-^(Gg=Im546rm
za<33>&692L^w(MtDAAgiWRDPT$&=06gDFb-iY`~wdIl~_vL6#}+9$@~>vyM|6lYqG
z?TIrEw*|_+7b=IXzmKA;()=w#UJ4b&)DJP?8_}X9KTEjZI4Y6E(htm1d`gmkop7Hb
zh+^o6xO6q*cO(@a5bi}JSrPR&Per+Z6Itv%2!gG%+t+=azXw5}BnU*<gJ4LUBdB<e
zAkrSN2S$h;V+o8qGT9a?F-iUWLsp_cRHh33AwpH@50q*J%~<a{*Ue_J8%i4c-F3OG
zrb1xbAy7(%fa?p>8nihje_8tNVQrhmNtHGA(*!gDO+XXS1T+CnKoigeQYT<tO8e8g
zl)g#jT0ZX($kG38m2P6ty)Bc9z6+i9lm3$#!0Q-)g5r2ZbQ**<vI9&Zkv~kl=2HLw
N002ovPDHLkV1ku{G#>x}

literal 0
HcmV?d00001

diff --git a/src/qt/res/src/voting.svg b/src/qt/res/src/voting.svg
new file mode 100644
index 000000000000..76c33d167312
--- /dev/null
+++ b/src/qt/res/src/voting.svg
@@ -0,0 +1,13 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <clipPath id="bc"><rect x="0" y="0" width="64" height="24"/></clipPath>
+    <mask id="bm">
+      <rect x="0" y="0" width="64" height="64" fill="white"/>
+      <rect x="22" y="4" width="20" height="28" rx="2" transform="rotate(10 32 24)" fill="black" stroke="black" stroke-width="4"/>
+    </mask>
+  </defs>
+  <path d="M14 14 H50 L60 34 M14 14 L4 34" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none" mask="url(#bm)"/>
+  <path d="M20 24 H44" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+  <rect x="22" y="4" width="20" height="28" rx="2" transform="rotate(10 32 24)" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none" clip-path="url(#bc)"/>
+  <rect x="4" y="34" width="56" height="26" rx="3" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+</svg>

From 28b67d3ca0ce207eb6ef14191ea38def405b1a69 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:38:45 +0530
Subject: [PATCH 15/30] qt: replace "Active" column with icons that reflect
 voting status

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/Makefile.qt.include           |   1 +
 src/interfaces/node.h             |   9 +-
 src/node/interfaces.cpp           |  37 +++++---
 src/qt/bitcoingui.cpp             |   2 +-
 src/qt/dash.qrc                   |   1 +
 src/qt/governancelist.cpp         |  19 +++-
 src/qt/governancelist.h           |   2 +
 src/qt/proposalmodel.cpp          | 152 +++++++++++++++++++++++++++---
 src/qt/proposalmodel.h            |  51 ++++++++--
 src/qt/res/icons/transaction6.png | Bin 0 -> 1083 bytes
 10 files changed, 233 insertions(+), 41 deletions(-)
 create mode 100644 src/qt/res/icons/transaction6.png

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 83ff5e97a413..18e92b926e04 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -228,6 +228,7 @@ QT_RES_ICONS = \
   qt/res/icons/transaction3.png \
   qt/res/icons/transaction4.png \
   qt/res/icons/transaction5.png \
+  qt/res/icons/transaction6.png \
   qt/res/icons/transaction_abandoned.png \
   qt/res/icons/transaction_locked.png \
   qt/res/icons/voting.png \
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 7482ceb1e411..f7ea7d7cfcb4 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -10,6 +10,7 @@
 #include <net_types.h>                 // For banmap_t
 #include <netaddress.h>                // For Network
 #include <netbase.h>                   // For ConnectionDirection
+#include <saltedhasher.h>              // For StaticSaltedHasher
 #include <support/allocators/secure.h> // For SecureString
 #include <uint256.h>
 #include <util/settings.h>             // For util::SettingsValue
@@ -23,6 +24,7 @@
 #include <stdint.h>
 #include <string>
 #include <tuple>
+#include <unordered_set>
 #include <vector>
 
 class BanMan;
@@ -156,7 +158,12 @@ class GOV
         int requiredConfs{6};
     };
     virtual GovernanceInfo getGovernanceInfo() = 0;
-    virtual CAmount getAllocatedBudget() = 0;
+    virtual std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) = 0;
+    struct FundableResult {
+        std::unordered_set<uint256, StaticSaltedHasher> hashes;
+        CAmount allocated{0};
+    };
+    virtual FundableResult getFundableProposalHashes() = 0;
     virtual std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                                 const std::string& data_hex, std::string& error) = 0;
     virtual bool submitProposal(const uint256& parent, int32_t revision, int64_t created_time, const std::string& data_hex,
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 5027b98bb4d2..1f55d7c487d4 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -275,13 +275,7 @@ class GOVImpl : public GOV
         const Consensus::Params& consensusParams = Params().GetConsensus();
 
         if (ctx.chainman) {
-            const CBlockIndex* tip = WITH_LOCK(::cs_main, return ctx.chainman->ActiveChain().Tip());
-            int last = 0;
-            int next = 0;
-            const int height = tip ? tip->nHeight : 0;
-            CSuperblock::GetNearestSuperblocksHeights(height, last, next);
-            info.lastsuperblock = last;
-            info.nextsuperblock = next;
+            CSuperblock::GetNearestSuperblocksHeights(ctx.chainman->ActiveHeight(), info.lastsuperblock, info.nextsuperblock);
         }
         info.proposalfee = GOVERNANCE_PROPOSAL_FEE_TX;
         info.superblockcycle = consensusParams.nSuperblockCycle;
@@ -297,16 +291,30 @@ class GOVImpl : public GOV
         }
         return info;
     }
-    CAmount getAllocatedBudget() override
+    std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) override
     {
+        if (context().govman != nullptr && context().chainman != nullptr) {
+            const int32_t nTipHeight = context().chainman->ActiveHeight();
+            for (const auto& trigger : context().govman->GetActiveTriggers()) {
+                if (!trigger || trigger->GetBlockHeight() > nTipHeight) continue;
+                for (const auto& hash : trigger->GetProposalHashes()) {
+                    if (hash == proposal_hash) {
+                        return trigger->GetBlockHeight();
+                    }
+                }
+            }
+        }
+        return std::nullopt;
+    }
+    FundableResult getFundableProposalHashes() override
+    {
+        FundableResult result;
         if (context().govman != nullptr && context().chainman != nullptr && context().dmnman != nullptr) {
             const auto tip_mn_list{context().dmnman->GetListAtChainTip()};
             if (const auto proposals{context().govman->GetApprovedProposals(tip_mn_list)}; !proposals.empty()) {
                 int32_t last_sb{0}, next_sb{0};
                 CSuperblock::GetNearestSuperblocksHeights(context().chainman->ActiveHeight(), last_sb, next_sb);
                 const CAmount budget{CSuperblock::GetPaymentsLimit(context().chainman->ActiveChain(), next_sb)};
-
-                CAmount allocated{0};
                 for (const auto& proposal : proposals) {
                     UniValue json = proposal->GetJSONObject();
                     CAmount payment_amount{0};
@@ -315,16 +323,17 @@ class GOVImpl : public GOV
                     } catch (...) {
                         continue;
                     }
-                    if (allocated + payment_amount > budget) {
+                    if (result.allocated + payment_amount > budget) {
                         // Budget is saturated, cannot fulfill proposal
                         continue;
                     }
-                    allocated += payment_amount;
+                    result.allocated += payment_amount;
+                    result.hashes.insert(proposal->GetHash());
                 }
-                return allocated;
+                return result;
             }
         }
-        return 0;
+        return result;
     }
     std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                         const std::string& data_hex, std::string& error) override
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index c52c0a5afa7b..6dced4fd4b41 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1820,7 +1820,7 @@ void BitcoinGUI::updateGovernanceCycleIcon()
         tooltip1 = tr("~%n day(s) (%1 blocks) left for voting", "", days).arg(remaining_blocks);
     }
 
-    const auto allocated_budget{m_node.gov().getAllocatedBudget()};
+    const auto allocated_budget{m_node.gov().getFundableProposalHashes().allocated};
     const auto budget_pct{gov_info.governancebudget > 0
         ? static_cast<int>(static_cast<double>(allocated_budget) / static_cast<double>(gov_info.governancebudget) * 100.0)
         : 0};
diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc
index 9edc2a2e734d..20621ba996b9 100644
--- a/src/qt/dash.qrc
+++ b/src/qt/dash.qrc
@@ -13,6 +13,7 @@
         <file alias="transaction_3">res/icons/transaction3.png</file>
         <file alias="transaction_4">res/icons/transaction4.png</file>
         <file alias="transaction_5">res/icons/transaction5.png</file>
+        <file alias="transaction_6">res/icons/transaction6.png</file>
         <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
         <file alias="transaction_locked">res/icons/transaction_locked.png</file>
         <file alias="eye">res/icons/eye.png</file>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 92957329f5b2..3c8876ee74d8 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -29,6 +29,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QDesktopServices>
+#include <QEvent>
 #include <QMessageBox>
 #include <QMetaObject>
 #include <QResizeEvent>
@@ -105,6 +106,14 @@ GovernanceList::~GovernanceList()
     delete ui;
 }
 
+void GovernanceList::changeEvent(QEvent* event)
+{
+    QWidget::changeEvent(event);
+    if (event->type() == QEvent::StyleChange) {
+        QTimer::singleShot(0, proposalModel, &ProposalModel::refreshIcons);
+    }
+}
+
 void GovernanceList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
@@ -188,15 +197,19 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
     const int nWeightedMnCount = dmn->getValidWeightedMNsCount();
     ret.m_abs_vote_req = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
 
+    const auto gov_info{clientModel->node().gov().getGovernanceInfo()};
     std::vector<CGovernanceObject> govObjList;
     clientModel->getAllGovernanceObjects(govObjList);
     for (const auto& govObj : govObjList) {
         if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
             continue; // Skip triggers.
         }
-        ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj));
+        ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, gov_info.requiredConfs));
     }
 
+    auto fundable{clientModel->node().gov().getFundableProposalHashes()};
+    ret.m_fundable_hashes = std::move(fundable.hashes);
+
     // Discover voting capability if we now have both client and wallet models
     if (walletModel) {
         dmn->forEachMN(/*only_valid=*/true, [&](const auto& dmn) {
@@ -214,7 +227,7 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
 void GovernanceList::setProposalList(CalcProposalList&& data)
 {
     proposalModel->setVotingParams(data.m_abs_vote_req);
-    proposalModel->reconcile(std::move(data.m_proposals));
+    proposalModel->reconcile(std::move(data.m_proposals), std::move(data.m_fundable_hashes));
     votableMasternodes = std::move(data.m_votable_masternodes);
     updateMasternodeCount();
 }
@@ -473,10 +486,10 @@ void GovernanceList::refreshColumnWidths()
 
     auto* header = ui->govTableView->horizontalHeader();
     header->setMinimumSectionSize(0);
+    header->setSectionResizeMode(ProposalModel::Column::STATUS, QHeaderView::ResizeToContents);
     header->setSectionResizeMode(ProposalModel::Column::PAYMENT_AMOUNT, QHeaderView::ResizeToContents);
     header->setSectionResizeMode(ProposalModel::Column::START_DATE, QHeaderView::ResizeToContents);
     header->setSectionResizeMode(ProposalModel::Column::END_DATE, QHeaderView::ResizeToContents);
-    header->setSectionResizeMode(ProposalModel::Column::IS_ACTIVE, QHeaderView::ResizeToContents);
     header->setSectionResizeMode(ProposalModel::Column::VOTING_STATUS, QHeaderView::ResizeToContents);
     header->setSectionResizeMode(ProposalModel::Column::HASH, QHeaderView::ResizeToContents);
 
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 2c22281d7a17..0d26270721ef 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -50,6 +50,7 @@ class GovernanceList : public QWidget
         int m_abs_vote_req{0};
         ProposalList m_proposals;
         Uint256HashMap<CKeyID> m_votable_masternodes;
+        Uint256HashSet m_fundable_hashes;
     };
 
     ClientModel* clientModel{nullptr};
@@ -72,6 +73,7 @@ class GovernanceList : public QWidget
     void voteForProposal(vote_outcome_enum_t outcome);
 
 protected:
+    void changeEvent(QEvent* event) override;
     void showEvent(QShowEvent* event) override;
     void resizeEvent(QResizeEvent* event) override;
 
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index 56668c2171b2..bee4d2896174 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -20,13 +20,18 @@
 #include <algorithm>
 #include <cmath>
 
-Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj) :
+Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj,
+                   const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs) :
     clientModel{_clientModel},
     govObj{_govObj},
+    m_block_height{_clientModel ? _clientModel->getNumBlocks() : 0},
+    m_collateral_confs{collateral_confs},
+    m_gov_info{govInfo},
     m_date_collateral{QDateTime::fromSecsSinceEpoch(govObj.GetCreationTime())},
     m_hash_collateral{QString::fromStdString(govObj.GetCollateralHash().ToString())},
     m_hash_object{QString::fromStdString(govObj.GetHash().ToString())},
-    m_hash_parent{QString::fromStdString(govObj.Object().hashParent.ToString())}
+    m_hash_parent{QString::fromStdString(govObj.Object().hashParent.ToString())},
+    m_objHash{govObj.GetHash()}
 {
     UniValue prop_data;
     if (!prop_data.read(govObj.GetDataAsPlainString())) {
@@ -34,6 +39,7 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
     }
 
     if (clientModel) {
+        m_funded_height = clientModel->node().gov().getProposalFundedHeight(govObj.GetHash());
         m_votes = clientModel->node().gov().getObjVotes(govObj, VOTE_SIGNAL_FUNDING);
     }
 
@@ -102,6 +108,44 @@ QString Proposal::toJson() const
     return QString::fromStdString(json.write(2));
 }
 
+int Proposal::blocksUntilSuperblock() const
+{
+    return m_gov_info.nextsuperblock - m_block_height;
+}
+
+int Proposal::collateralConfs() const
+{
+    return m_collateral_confs;
+}
+
+int Proposal::requiredConfs() const
+{
+    return m_gov_info.requiredConfs;
+}
+
+ProposalStatus Proposal::status(bool is_fundable) const
+{
+    if (getFundedHeight().has_value()) {
+        return ProposalStatus::Funded;
+    }
+    if (QDateTime::currentDateTime() >= endDate()) {
+        return ProposalStatus::Lapsed;
+    }
+    if (m_collateral_confs < m_gov_info.requiredConfs) {
+        return ProposalStatus::Confirming;
+    }
+    if (m_gov_info.superblockcycle <= 0) {
+        return ProposalStatus::Voting;
+    }
+    if (m_block_height % m_gov_info.superblockcycle >= m_gov_info.superblockcycle - m_gov_info.superblockmaturitywindow) {
+        return is_fundable ? ProposalStatus::Passing : ProposalStatus::Failing;
+    }
+    if (getAbsoluteYesCount() < m_gov_info.fundingthreshold) {
+        return ProposalStatus::Voting;
+    }
+    return is_fundable ? ProposalStatus::Passing : ProposalStatus::Unfunded;
+}
+
 bool Proposal::isActive() const
 {
     if (!clientModel) {
@@ -115,6 +159,29 @@ bool Proposal::isActive() const
 /// Proposal Model
 ///
 
+ProposalModel::ProposalModel(QObject* parent) :
+    QAbstractTableModel(parent)
+{
+    refreshIcons();
+}
+
+void ProposalModel::refreshIcons()
+{
+    m_icon_confirming = {
+        GUIUtil::getIcon("transaction_0", GUIUtil::ThemedColor::ORANGE),
+        GUIUtil::getIcon("transaction_1", GUIUtil::ThemedColor::ORANGE),
+        GUIUtil::getIcon("transaction_2", GUIUtil::ThemedColor::ORANGE),
+        GUIUtil::getIcon("transaction_3", GUIUtil::ThemedColor::ORANGE),
+        GUIUtil::getIcon("transaction_4", GUIUtil::ThemedColor::ORANGE),
+        GUIUtil::getIcon("transaction_5", GUIUtil::ThemedColor::ORANGE)
+    };
+    m_icon_failing = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::RED);
+    m_icon_lapsed = GUIUtil::getIcon("transaction_6", GUIUtil::ThemedColor::RED);
+    m_icon_passing = GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN);
+    m_icon_unfunded = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::RED);
+    m_icon_voting = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::ORANGE);
+}
+
 int ProposalModel::rowCount(const QModelIndex& index) const
 {
     return static_cast<int>(m_data.size());
@@ -138,15 +205,18 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
             return QVariant::fromValue(GUIUtil::getThemedQColor(GUIUtil::ThemedColor::UNCONFIRMED));
         }
     }
-    if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ToolTipRole) {
+    if (role != Qt::DisplayRole && role != Qt::DecorationRole && role != Qt::EditRole && role != Qt::ToolTipRole) {
         return {};
     }
 
     const auto* proposal = m_data[index.row()].get();
+    const bool isFundable = m_fundable_hashes.count(proposal->objHash()) > 0;
     switch(role) {
     case Qt::DisplayRole:
     {
         switch (index.column()) {
+        case Column::STATUS:
+            return {};
         case Column::HASH:
             return proposal->hash();
         case Column::TITLE:
@@ -159,8 +229,6 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
             return BitcoinUnits::floorWithUnit(m_display_unit, proposal->paymentAmount(), false,
                                                BitcoinUnits::SeparatorStyle::ALWAYS);
         }
-        case Column::IS_ACTIVE:
-            return proposal->isActive() ? tr("Yes") : tr("No");
         case Column::VOTING_STATUS: {
             const int margin = proposal->getAbsoluteYesCount() - nAbsVoteReq;
             return QString("%1Y, %2N, %3A (%4%5)").arg(proposal->getYesCount()).arg(proposal->getNoCount())
@@ -177,6 +245,8 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
     {
         // Edit role is used for sorting, so return the raw values where possible
         switch (index.column()) {
+        case Column::STATUS:
+            return static_cast<int>(proposal->status(isFundable));
         case Column::HASH:
             return proposal->hash();
         case Column::TITLE:
@@ -187,8 +257,6 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
             return proposal->endDate();
         case Column::PAYMENT_AMOUNT:
             return qlonglong(proposal->paymentAmount());
-        case Column::IS_ACTIVE:
-            return proposal->isActive();
         case Column::VOTING_STATUS:
             return proposal->getAbsoluteYesCount();
         default:
@@ -198,6 +266,34 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
     }
     case Qt::ToolTipRole:
     {
+        if (index.column() == Column::STATUS) {
+            switch (proposal->status(isFundable)) {
+            case ProposalStatus::Confirming: {
+                return tr("Pending, %1 of %2 confirmations").arg(proposal->collateralConfs()).arg(proposal->requiredConfs());
+            }
+            case ProposalStatus::Voting: {
+                const int margin = nAbsVoteReq - proposal->getAbsoluteYesCount();
+                return tr("Voting, needs %1 more votes for funding").arg(std::max(0, margin));
+            }
+            case ProposalStatus::Passing: {
+                return tr("Passing with %1 votes").arg(proposal->getAbsoluteYesCount());
+            }
+            case ProposalStatus::Unfunded: {
+                return tr("Passing with %1 votes but budget saturated, may not be funded").arg(proposal->getAbsoluteYesCount());
+            }
+            case ProposalStatus::Failing: {
+                const int margin = nAbsVoteReq - proposal->getAbsoluteYesCount();
+                return tr("Failed, needed %1 more votes").arg(std::max(0, margin));
+            }
+            case ProposalStatus::Funded: {
+                const auto height{proposal->getFundedHeight()};
+                return height.has_value() ? tr("Funded at block %1").arg(height.value()) : tr("Funded");
+            }
+            case ProposalStatus::Lapsed: {
+                return tr("Lapsed, past proposal end date");
+            }
+            } // no default case, so the compiler can warn about missing cases
+        }
         if (index.column() == Column::VOTING_STATUS) {
             const int margin = proposal->getAbsoluteYesCount() - nAbsVoteReq;
             return tr("%1 Yes, %2 No, %3 Abstain, %4").arg(proposal->getYesCount()).arg(proposal->getNoCount())
@@ -206,7 +302,28 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
         }
         return {};
     }
-    };
+    case Qt::DecorationRole:
+    {
+        if (index.column() == Column::STATUS) {
+            switch (proposal->status(isFundable)) {
+            case ProposalStatus::Confirming:
+                return m_icon_confirming[std::clamp<int>(proposal->collateralConfs(), 0, 5)];
+            case ProposalStatus::Voting:
+                return m_icon_voting;
+            case ProposalStatus::Unfunded:
+                return m_icon_unfunded;
+            case ProposalStatus::Failing:
+                return m_icon_failing;
+            case ProposalStatus::Passing:
+            case ProposalStatus::Funded:
+                return m_icon_passing;
+            case ProposalStatus::Lapsed:
+                return m_icon_lapsed;
+            } // no default case, so the compiler can warn about missing cases
+        }
+        return {};
+    }
+    }
     return {};
 }
 
@@ -217,6 +334,8 @@ QVariant ProposalModel::headerData(int section, Qt::Orientation orientation, int
     }
 
     switch (section) {
+    case Column::STATUS:
+        return {};
     case Column::HASH:
         return tr("Hash");
     case Column::TITLE:
@@ -227,8 +346,6 @@ QVariant ProposalModel::headerData(int section, Qt::Orientation orientation, int
         return tr("End");
     case Column::PAYMENT_AMOUNT:
         return tr("Amount");
-    case Column::IS_ACTIVE:
-        return tr("Active");
     case Column::VOTING_STATUS:
         return tr("Votes");
     default:
@@ -253,8 +370,10 @@ void ProposalModel::remove(int row)
     endRemoveRows();
 }
 
-void ProposalModel::reconcile(ProposalList&& proposals)
+void ProposalModel::reconcile(ProposalList&& proposals, std::unordered_set<uint256, StaticSaltedHasher>&& fundable_hashes)
 {
+    m_fundable_hashes = std::move(fundable_hashes);
+
     // Track which existing proposals to keep. After processing new proposals,
     // remove any existing proposals that weren't found in the new set.
     const int original_sz{rowCount()};
@@ -268,10 +387,10 @@ void ProposalModel::reconcile(ProposalList&& proposals)
         if (it != m_data.end()) {
             const auto idx{static_cast<int>(std::distance(m_data.begin(), it))};
             keep_index[static_cast<size_t>(idx)] = true;
-            if ((*it)->getAbsoluteYesCount() != proposal->getAbsoluteYesCount()) {
-                // Replace proposal to update vote count
+            if ((*it)->getAbsoluteYesCount() != proposal->getAbsoluteYesCount() || (*it)->collateralConfs() != proposal->collateralConfs()) {
+                // Replace proposal to update vote count or confirmation depth
                 *it = std::move(proposal);
-                Q_EMIT dataChanged(createIndex(idx, Column::VOTING_STATUS), createIndex(idx, Column::VOTING_STATUS));
+                Q_EMIT dataChanged(createIndex(idx, Column::STATUS), createIndex(idx, Column::VOTING_STATUS));
             }
             // else: no changes, proposal unique_ptr goes out of scope and gets deleted
         } else {
@@ -285,6 +404,11 @@ void ProposalModel::reconcile(ProposalList&& proposals)
             remove(idx);
         }
     }
+
+    // Fundable set may have changed; refresh all status icons
+    if (!m_data.empty()) {
+        Q_EMIT dataChanged(createIndex(0, Column::STATUS), createIndex(rowCount() - 1, Column::STATUS));
+    }
 }
 
 void ProposalModel::setDisplayUnit(const BitcoinUnit& display_unit)
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index 5d7f4d48262c..a5dd412b6cf3 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -7,23 +7,42 @@
 
 #include <interfaces/node.h>
 #include <governance/object.h>
+#include <saltedhasher.h>
+#include <uint256.h>
 
 #include <qt/bitcoinunits.h>
 
 #include <QAbstractTableModel>
 #include <QDateTime>
+#include <QIcon>
 #include <QString>
 
+#include <array>
 #include <memory>
+#include <optional>
+#include <unordered_set>
 #include <vector>
 
 class ClientModel;
 
+enum class ProposalStatus : uint8_t {
+    Confirming,
+    Failing,
+    Funded,
+    Lapsed,
+    Passing,
+    Unfunded,
+    Voting,
+};
+
 class Proposal
 {
 private:
     ClientModel* clientModel;
     const CGovernanceObject govObj;
+    int m_block_height{0};
+    int m_collateral_confs{0};
+    interfaces::GOV::GovernanceInfo m_gov_info;
 
     CAmount m_paymentAmount{0};
     interfaces::GOV::Votes m_votes;
@@ -36,17 +55,25 @@ class Proposal
     QString m_hash_parent{};
     QString m_title{};
     QString m_url{};
+    std::optional<int> m_funded_height{};
+    uint256 m_objHash{};
 
 public:
-    explicit Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj);
+    explicit Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj,
+                      const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs);
 
     bool isActive() const;
     CAmount paymentAmount() const { return m_paymentAmount; }
+    const uint256& objHash() const { return m_objHash; }
+    int blocksUntilSuperblock() const;
+    int collateralConfs() const;
     int paymentsRequested() const;
+    int requiredConfs() const;
     int32_t getAbsoluteYesCount() const { return m_votes.m_yes - m_votes.m_no; }
     int32_t getAbstainCount() const { return m_votes.m_abs; }
     int32_t getNoCount() const { return m_votes.m_no; }
     int32_t getYesCount() const { return m_votes.m_yes; }
+    ProposalStatus status(bool is_fundable) const;
     QDateTime collateralDate() const { return m_date_collateral; }
     QDateTime endDate() const { return m_endDate; }
     QDateTime startDate() const { return m_startDate; }
@@ -58,6 +85,7 @@ class Proposal
     QString toHtml(const BitcoinUnit& unit) const;
     QString toJson() const;
     QString url() const { return m_url; }
+    std::optional<int> getFundedHeight() const { return m_funded_height; }
 };
 
 using ProposalList = std::vector<std::unique_ptr<Proposal>>;
@@ -67,20 +95,26 @@ class ProposalModel : public QAbstractTableModel
     Q_OBJECT
 
 private:
-    ProposalList m_data;
-    int nAbsVoteReq = 0;
     BitcoinUnit m_display_unit{BitcoinUnit::DASH};
+    int nAbsVoteReq{0};
+    ProposalList m_data;
+    QIcon m_icon_failing;
+    QIcon m_icon_lapsed;
+    QIcon m_icon_passing;
+    QIcon m_icon_unfunded;
+    QIcon m_icon_voting;
+    std::array<QIcon, 6> m_icon_confirming;
+    Uint256HashSet m_fundable_hashes;
 
 public:
-    explicit ProposalModel(QObject* parent = nullptr) :
-        QAbstractTableModel(parent){};
+    explicit ProposalModel(QObject* parent = nullptr);
 
     enum Column : int {
-        TITLE = 0,
+        STATUS = 0,
+        TITLE,
         PAYMENT_AMOUNT,
         START_DATE,
         END_DATE,
-        IS_ACTIVE,
         VOTING_STATUS,
         HASH,
         _COUNT // for internal use only
@@ -93,7 +127,8 @@ class ProposalModel : public QAbstractTableModel
 
     void append(std::unique_ptr<Proposal>&& proposal);
     void remove(int row);
-    void reconcile(ProposalList&& proposals);
+    void reconcile(ProposalList&& proposals, Uint256HashSet&& fundable_hashes);
+    void refreshIcons();
     void setDisplayUnit(const BitcoinUnit& display_unit);
     void setVotingParams(int nAbsVoteReq);
     const Proposal* getProposalAt(const QModelIndex& index) const;
diff --git a/src/qt/res/icons/transaction6.png b/src/qt/res/icons/transaction6.png
new file mode 100644
index 0000000000000000000000000000000000000000..a57bbf7f1443b393fc68975a6941dee93cdb1459
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ000C6Nkl<Zc%03d
z&ubKC7{@<jvH_uDgfM9fhE!-a4Xp)FrUjv)iZ_#6`zQ2J1dm=M2t5kLgCU559@^e&
zukoZT_R__gmL@7`3#BBR%Ist}iSDdEJ?!jc-gkB~GdnYm?|Yf|d7k%qzVp1#`|EiP
zq1ZCmUpM0@lZ-LUA)rB>e^`?zeQ8SO0b`n3KIbD^IFu+c1hjB)7~mj}xXX|7AdyOm
zSsCXV7FML7g~bBnvGv9hnxsM_HdaAsP+>9?0GL$SN@ToSx2R&K2XMJB<K22WN+2=_
z4U>&TL8X>asqHUtAWDPOxE;!T!8Y5x2<6|7G9Nk(jd?Dx&ZklX!{m2He9StBdCado
zVUq@Mh!H0Em<eo#eR9v3a{E_!n=5jur>UOfew`fz;Z-MyFliwOb(-8{CNy4VxIvRT
zg3$8%c9=U{j~RrFy5<F8#ig12%?fjI;*N7H^H(?iS@9S<jK%<f$*!+i=S0%LSG1jQ
z{n4qr!D$&Z-_}T0Dgc&7aC8XDEHF$~8PI|xa-Qs4^xlK48fIt^vJm)%9!^W-0d+t-
zbunZJyjb6>J;Np;1b;|(YRmsqe$ih7y}wUuUJ&>$K&titKsm7G{F%=Eo@SFZjkLA5
zQ|^h~3-rvyybD1m-PZtcl%^&!pOtw*U|u6M8B+mV)dV)O`+wI5>l*2*3Sd)V)|t)H
zydW^Etck*=4*(~%6>B?d^Mb&((zKWsx+~$FvW>zIsaC(RqG}yx&RYqoYS_-?;(;@o
zpR0m<Br_c4f+7q_J9`HhgS0Sw1V@J802mYODw0q0Fb~q^sX}NOW1ZdV7%vsZA9<MX
zq1mB~8v`}p=wz?~g+_sYW3pKHVgQV@oOE$rlQhThh+>TLmHSzdB}jZZ&Ay~N?_^Ni
z=~vtk6dr^KoYhvSJGlY4qckl}clLrc?Iip`ZX=*-F0slRu@nQ#ilog<_U3`lu$A_2
z&;_uhFoyXe7XV*soBmzEodwgy9Z0%N6~OB_lDT)zE?d8pWq&B$&`1j^fcFAvxO|W0
z4UQ=Q1Rex><#{pr+2eU1Q`nkNepfS_sQ>_hhk?F%T}~hRxC+u@ujhp)C<M$N*>F1*
z06ne*OZ_F~L?kuJ=-be%RLie^;%igZvZoPFd);X|A(KSqqZElsLEwf5p;xN*RH*4w
z$y2pq$?9)7&%Y7L>c{+t4IE~K_c_kwKFR8L`BpB5L`kGeZ-ug+)1blgQ2woG?Qi~r
z1z)EyAE$TZ02KXbB^3N@=LwFph#l+U(q=LK!)4N^+fO*hX+ETd!yqL}fP+Ju0S>av
z5<f{Lk;eY6=f)Ui-r)#u0ZlA6S(DYiG!>m6_#Z9#rv4~Zs=@#O002ovPDHLkV1nFB
B`t$$*

literal 0
HcmV?d00001


From 1a1d56e3e61cf6fdb734ae12ccb9a29d86e3967b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 21:46:25 +0530
Subject: [PATCH 16/30] qt: list locally recorded proposals in "Governance" tab

---
 src/interfaces/node.h          |   1 +
 src/interfaces/wallet.h        |   4 ++
 src/node/interfaces.cpp        |  19 +++++-
 src/qt/forms/governancelist.ui |  13 ++++
 src/qt/governancelist.cpp      | 105 ++++++++++++++++++++++++++++-----
 src/qt/governancelist.h        |  14 +++++
 src/wallet/interfaces.cpp      |   9 +++
 7 files changed, 146 insertions(+), 19 deletions(-)

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index f7ea7d7cfcb4..22e2c45c0743 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -143,6 +143,7 @@ class GOV
     };
     virtual Votes getObjVotes(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
     virtual bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) = 0;
+    virtual bool existsObj(const uint256& hash) = 0;
     virtual bool isEnabled() = 0;
     virtual bool processVoteAndRelay(const CGovernanceVote& vote, std::string& error) = 0;
     struct GovernanceInfo {
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 11e1cda99978..dd4e53dac764 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -7,6 +7,7 @@
 
 #include <consensus/amount.h>          // For CAmount
 #include <fs.h>
+#include <governance/common.h>
 #include <interfaces/chain.h>          // For ChainClient
 #include <pubkey.h>                    // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
 #include <script/standard.h>           // For CTxDestination
@@ -351,6 +352,9 @@ class Wallet
     using CanGetAddressesChangedFn = std::function<void()>;
     virtual std::unique_ptr<Handler> handleCanGetAddressesChanged(CanGetAddressesChangedFn fn) = 0;
 
+    //! Get governance objects stored in the wallet.
+    virtual std::vector<Governance::Object> getGovernanceObjects() = 0;
+
     //! Prepare a governance proposal (burns fee).
     virtual bool prepareProposal(const uint256& govobj_hash, CAmount fee, int32_t revision, int64_t created_time,
                                  const std::string& data_hex, const COutPoint& outpoint,
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 1f55d7c487d4..8c9b50051931 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -234,12 +234,25 @@ class GOVImpl : public GOV
         Votes ret;
         if (context().govman != nullptr && context().dmnman != nullptr) {
             const auto& tip_mn_list{context().dmnman->GetListAtChainTip()};
-            ret.m_abs = obj.GetAbstainCount(tip_mn_list, vote_signal);
-            ret.m_no = obj.GetNoCount(tip_mn_list, vote_signal);
-            ret.m_yes = obj.GetYesCount(tip_mn_list, vote_signal);
+            if (auto govobj{context().govman->FindGovernanceObject(obj.GetHash())}) {
+                ret.m_abs = govobj->GetAbstainCount(tip_mn_list, vote_signal);
+                ret.m_no = govobj->GetNoCount(tip_mn_list, vote_signal);
+                ret.m_yes = govobj->GetYesCount(tip_mn_list, vote_signal);
+            } else {
+                ret.m_abs = obj.GetAbstainCount(tip_mn_list, vote_signal);
+                ret.m_no = obj.GetNoCount(tip_mn_list, vote_signal);
+                ret.m_yes = obj.GetYesCount(tip_mn_list, vote_signal);
+            }
         }
         return ret;
     }
+    bool existsObj(const uint256& hash) override
+    {
+        if (context().govman != nullptr) {
+            return context().govman->HaveObjectForHash(hash);
+        }
+        return false;
+    }
     bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) override
     {
         if (context().govman != nullptr && context().chainman != nullptr && context().dmnman != nullptr) {
diff --git a/src/qt/forms/governancelist.ui b/src/qt/forms/governancelist.ui
index 2094d9815899..e20c4187b748 100644
--- a/src/qt/forms/governancelist.ui
+++ b/src/qt/forms/governancelist.ui
@@ -36,8 +36,21 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
+       <item>
+        <widget class="QComboBox" name="proposalSourceCombo">
+         <property name="toolTip">
+          <string>Select proposals to display</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QLineEdit" name="filterLineEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="toolTip">
           <string>Filter proposal list</string>
          </property>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 3c8876ee74d8..949ae9ad385a 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -7,6 +7,7 @@
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
 #include <governance/vote.h>
+#include <util/underlying.h>
 
 #include <qt/descriptiondialog.h>
 #include <qt/governancelist.h>
@@ -68,6 +69,10 @@ GovernanceList::GovernanceList(QWidget* parent) :
     connect(ui->govTableView, &QTableView::doubleClicked, this, &GovernanceList::showAdditionalInfo);
     connect(ui->govTableView->horizontalHeader(), &QHeaderView::sectionResized, this, &GovernanceList::refreshColumnWidths);
 
+    ui->proposalSourceCombo->addItem(tr("Active Proposals"), ToUnderlying(ProposalSource::Active));
+    ui->proposalSourceCombo->setMinimumWidth(250);
+    connect(ui->proposalSourceCombo, qOverload<int>(&QComboBox::activated), this, &GovernanceList::setProposalSource);
+
     // Set up filtering.
     proposalModelProxy->setSourceModel(proposalModel);
     proposalModelProxy->setSortRole(Qt::EditRole);
@@ -117,23 +122,65 @@ void GovernanceList::changeEvent(QEvent* event)
 void GovernanceList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
-    if (clientModel) {
-        connect(clientModel, &ClientModel::governanceChanged, this, &GovernanceList::handleProposalListChanged);
-        connect(clientModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
-        m_timer->start(0);
-    } else {
+    if (!clientModel) {
         m_timer->stop();
+        return;
+    }
+    connect(clientModel, &ClientModel::governanceChanged, this, &GovernanceList::handleProposalListChanged);
+    connect(clientModel, &ClientModel::numBlocksChanged, this, &GovernanceList::handleProposalListChanged);
+    connect(clientModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
+    if (walletModel && ui->proposalSourceCombo->findData(ToUnderlying(ProposalSource::Local)) == -1) {
+        ui->proposalSourceCombo->addItem(tr("My Proposals"), ToUnderlying(ProposalSource::Local));
     }
+    m_timer->start(0);
+}
+
+std::vector<Governance::Object> GovernanceList::getWalletProposals(std::optional<bool> pending) const
+{
+    if (!clientModel || !walletModel) {
+        return {};
+    }
+
+    const auto wallet_objs = walletModel->wallet().getGovernanceObjects();
+
+    const int64_t now{GetTime()};
+    std::vector<Governance::Object> result{};
+    for (const auto& obj : wallet_objs) {
+        const bool is_broadcast{clientModel->node().gov().existsObj(obj.GetHash())};
+        bool is_stale{false};
+        try {
+            UniValue json_data;
+            json_data.read(obj.GetDataAsPlainString());
+            if (json_data.exists("type") && json_data["type"].getInt<int>() != 1) {
+                // Not a voting proposal
+                continue;
+            }
+            if (json_data.exists("end_epoch")) {
+                is_stale = json_data["end_epoch"].getInt<int64_t>() < now;
+            }
+        } catch (const std::exception&) {
+            // Unparsable objects are skipped
+            continue;
+        }
+        if (!pending.has_value() || *pending != (is_broadcast || is_stale)) {
+            result.push_back(obj);
+        }
+    }
+
+    return result;
 }
 
 void GovernanceList::setWalletModel(WalletModel* model)
 {
     this->walletModel = model;
-    if (walletModel && clientModel) {
-        m_timer->start(0);
-    } else {
+    if (!walletModel || !clientModel) {
         m_timer->stop();
+        return;
     }
+    if (clientModel && ui->proposalSourceCombo->findData(ToUnderlying(ProposalSource::Local)) == -1) {
+        ui->proposalSourceCombo->addItem(tr("My Proposals"), ToUnderlying(ProposalSource::Local));
+    }
+    m_timer->start(0);
 }
 
 void GovernanceList::updateDisplayUnit()
@@ -158,6 +205,18 @@ void GovernanceList::handleProposalListChanged()
     m_timer->start(delay);
 }
 
+int GovernanceList::queryCollateralDepth(const uint256& collateralHash) const
+{
+    if (!walletModel) return 0;
+    interfaces::WalletTxStatus tx_status;
+    int num_blocks{};
+    int64_t block_time{};
+    if (walletModel->wallet().tryGetTxStatus(collateralHash, tx_status, num_blocks, block_time)) {
+        return tx_status.depth_in_main_chain;
+    }
+    return 0;
+}
+
 void GovernanceList::updateProposalList()
 {
     if (!clientModel || clientModel->node().shutdownRequested()) {
@@ -198,13 +257,20 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
     ret.m_abs_vote_req = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
 
     const auto gov_info{clientModel->node().gov().getGovernanceInfo()};
-    std::vector<CGovernanceObject> govObjList;
-    clientModel->getAllGovernanceObjects(govObjList);
-    for (const auto& govObj : govObjList) {
-        if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
-            continue; // Skip triggers.
+    if (m_proposal_source == ProposalSource::Active) {
+        std::vector<CGovernanceObject> govObjList;
+        clientModel->getAllGovernanceObjects(govObjList);
+        for (const auto& govObj : govObjList) {
+            if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
+                continue; // Skip triggers.
+            }
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, gov_info.requiredConfs));
+        }
+    } else if (m_proposal_source == ProposalSource::Local) {
+        for (const auto& obj : getWalletProposals(/*pending=*/std::nullopt)) {
+            CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, queryCollateralDepth(obj.collateralHash)));
         }
-        ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, gov_info.requiredConfs));
     }
 
     auto fundable{clientModel->node().gov().getFundableProposalHashes()};
@@ -311,6 +377,13 @@ void GovernanceList::updateMasternodeCount() const
     }
 }
 
+void GovernanceList::setProposalSource(int index)
+{
+    m_proposal_source = static_cast<ProposalSource>(ui->proposalSourceCombo->itemData(index).toInt());
+    ui->govTableView->setColumnHidden(ProposalModel::Column::VOTING_STATUS, m_proposal_source == ProposalSource::Local);
+    m_timer->start(0);
+}
+
 void GovernanceList::voteYes() { voteForProposal(VOTE_OUTCOME_YES); }
 
 void GovernanceList::voteNo() { voteForProposal(VOTE_OUTCOME_NO); }
@@ -494,10 +567,10 @@ void GovernanceList::refreshColumnWidths()
     header->setSectionResizeMode(ProposalModel::Column::HASH, QHeaderView::ResizeToContents);
 
     // Calculate width used by ResizeToContents columns
-    const int availableWidth = [&header, &tableWidth](){
+    const int availableWidth = [this, &header, &tableWidth](){
         int fixedWidth = 0;
         for (int idx = 0; idx < ProposalModel::Column::_COUNT; idx++) {
-            if (idx != ProposalModel::Column::TITLE && idx != ProposalModel::Column::HASH) {
+            if (idx != ProposalModel::Column::TITLE && idx != ProposalModel::Column::HASH && !ui->govTableView->isColumnHidden(idx)) {
                 fixedWidth += header->sectionSize(idx);
             }
         }
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 0d26270721ef..40066e8f72af 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -19,6 +19,8 @@
 
 #include <atomic>
 #include <map>
+#include <optional>
+#include <vector>
 
 inline constexpr int GOVERNANCELIST_UPDATE_SECONDS = 10;
 
@@ -28,10 +30,18 @@ class WalletModel;
 class ProposalWizard;
 class CDeterministicMNList;
 enum vote_outcome_enum_t : int;
+namespace Governance {
+class Object;
+} // namespace Governance
 namespace Ui {
 class GovernanceList;
 } // namespace Ui
 
+enum class ProposalSource : uint8_t {
+    Active,
+    Local
+};
+
 /** Governance Manager page widget */
 class GovernanceList : public QWidget
 {
@@ -55,6 +65,7 @@ class GovernanceList : public QWidget
 
     ClientModel* clientModel{nullptr};
     ProposalModel* proposalModel{nullptr};
+    ProposalSource m_proposal_source{ProposalSource::Active};
     QMenu* proposalContextMenu{nullptr};
     QObject* m_worker{nullptr};
     QSortFilterProxyModel* proposalModelProxy{nullptr};
@@ -67,6 +78,8 @@ class GovernanceList : public QWidget
 
     bool canVote() const { return !votableMasternodes.empty(); }
     CalcProposalList calcProposalList() const;
+    int queryCollateralDepth(const uint256& collateralHash) const;
+    std::vector<Governance::Object> getWalletProposals(std::optional<bool> pending) const;
     void handleProposalListChanged();
     void refreshColumnWidths();
     void setProposalList(CalcProposalList&& data);
@@ -82,6 +95,7 @@ private Q_SLOTS:
     void updateProposalList();
     void updateProposalCount();
     void updateMasternodeCount() const;
+    void setProposalSource(int index);
     void showProposalContextMenu(const QPoint& pos);
     void showAdditionalInfo(const QModelIndex& index);
     void showCreateProposalDialog();
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index fc6f621d7a2b..340d29a35c9e 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -647,6 +647,15 @@ class WalletImpl : public Wallet
     {
         return MakeHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));
     }
+    std::vector<Governance::Object> getGovernanceObjects() override
+    {
+        LOCK(m_wallet->cs_wallet);
+        std::vector<Governance::Object> result;
+        for (const auto* obj : m_wallet->GetGovernanceObjects()) {
+            result.push_back(*obj);
+        }
+        return result;
+    }
     bool prepareProposal(const uint256& govobj_hash, CAmount fee, int32_t revision, int64_t created_time,
                          const std::string& data_hex, const COutPoint& outpoint,
                          std::string& out_fee_txid, std::string& error) override

From 2d8cffef52634b508f30523700f68675c3b0d846 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 23 Jan 2026 00:28:28 +0530
Subject: [PATCH 17/30] qt: add blank canvas if there's no proposals to display

---
 src/qt/forms/governancelist.ui | 44 +++++++++++++++++++++++++++++++++-
 src/qt/governancelist.cpp      | 30 +++++++++++++++++++++++
 src/qt/governancelist.h        |  2 ++
 3 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/qt/forms/governancelist.ui b/src/qt/forms/governancelist.ui
index e20c4187b748..54045fe1d642 100644
--- a/src/qt/forms/governancelist.ui
+++ b/src/qt/forms/governancelist.ui
@@ -79,7 +79,49 @@
       </layout>
      </item>
      <item>
-      <widget class="QTableView" name="govTableView">
+      <widget class="QStackedWidget" name="proposalStack">
+       <widget class="QTableView" name="govTableView">
+       </widget>
+       <widget class="QWidget" name="emptyPage">
+        <layout class="QVBoxLayout" name="emptyLayout">
+         <item>
+          <spacer name="emptySpacerTop">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="emptyLabel">
+           <property name="text">
+            <string>No active proposals on the network.</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="emptySpacerBottom">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
       </widget>
      </item>
      <item>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 949ae9ad385a..a18f47a5481d 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -69,6 +69,9 @@ GovernanceList::GovernanceList(QWidget* parent) :
     connect(ui->govTableView, &QTableView::doubleClicked, this, &GovernanceList::showAdditionalInfo);
     connect(ui->govTableView->horizontalHeader(), &QHeaderView::sectionResized, this, &GovernanceList::refreshColumnWidths);
 
+    ui->emptyPage->setAutoFillBackground(true);
+    updateEmptyPagePalette();
+
     ui->proposalSourceCombo->addItem(tr("Active Proposals"), ToUnderlying(ProposalSource::Active));
     ui->proposalSourceCombo->setMinimumWidth(250);
     connect(ui->proposalSourceCombo, qOverload<int>(&QComboBox::activated), this, &GovernanceList::setProposalSource);
@@ -116,9 +119,17 @@ void GovernanceList::changeEvent(QEvent* event)
     QWidget::changeEvent(event);
     if (event->type() == QEvent::StyleChange) {
         QTimer::singleShot(0, proposalModel, &ProposalModel::refreshIcons);
+        QTimer::singleShot(0, this, &GovernanceList::updateEmptyPagePalette);
     }
 }
 
+void GovernanceList::updateEmptyPagePalette()
+{
+    QPalette emptyPalette = ui->emptyPage->palette();
+    emptyPalette.setColor(QPalette::Window, ui->govTableView->palette().color(QPalette::Base));
+    ui->emptyPage->setPalette(emptyPalette);
+}
+
 void GovernanceList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
@@ -302,6 +313,25 @@ void GovernanceList::updateProposalCount()
 {
     ui->countLabel->setText(QString::number(proposalModelProxy->rowCount()));
     refreshColumnWidths();
+    updateEmptyState();
+}
+
+void GovernanceList::updateEmptyState()
+{
+    const bool hasProposals = proposalModelProxy->rowCount() > 0;
+    if (hasProposals) {
+        ui->proposalStack->setCurrentWidget(ui->govTableView);
+    } else {
+        switch (m_proposal_source) {
+        case ProposalSource::Active:
+            ui->emptyLabel->setText(tr("No active proposals on the network."));
+            break;
+        case ProposalSource::Local:
+            ui->emptyLabel->setText(tr("No proposals recorded in wallet file."));
+            break;
+        } // no default case, so the compiler can warn about missing cases
+        ui->proposalStack->setCurrentWidget(ui->emptyPage);
+    }
 }
 
 void GovernanceList::showCreateProposalDialog()
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 40066e8f72af..30aae729f2dd 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -83,6 +83,8 @@ class GovernanceList : public QWidget
     void handleProposalListChanged();
     void refreshColumnWidths();
     void setProposalList(CalcProposalList&& data);
+    void updateEmptyPagePalette();
+    void updateEmptyState();
     void voteForProposal(vote_outcome_enum_t outcome);
 
 protected:

From 16314e7af7c5c2b6536bab55391a776cafe8c70f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 6 Feb 2026 23:32:52 +0530
Subject: [PATCH 18/30] qt: adjust layout of details page of proposal wizard to
 resemble DGT

Dash Governance Tools' budget generator is a much more visually friendly
design and we can model our wizard after it.
---
 src/qt/forms/proposalwizard.ui | 475 ++++++++++++++++++---------------
 src/qt/proposalwizard.cpp      |  43 +--
 2 files changed, 271 insertions(+), 247 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index 992929f64ed3..ccbe57f5dac3 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -6,12 +6,18 @@
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>640</width>
-      <height>420</height>
+      <width>860</width>
+      <height>300</height>
      </rect>
   </property>
-   <property name="windowTitle">
-   <string>Create Governance Proposal</string>
+  <property name="minimumSize">
+    <size>
+      <width>860</width>
+      <height>300</height>
+    </size>
+  </property>
+  <property name="windowTitle">
+   <string>New proposal</string>
   </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <property name="leftMargin">
@@ -34,264 +40,288 @@
      <widget class="QWidget" name="pageDetails">
       <layout class="QVBoxLayout" name="detailsLayout">
        <item>
-        <widget class="QLabel" name="labelHeader">
-         <property name="text">
-          <string>Enter proposal details</string>
-         </property>
-         <property name="margin">
-          <number>0</number>
+        <layout class="QVBoxLayout" name="nameFieldLayout">
+         <property name="leftMargin">
+          <number>4</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignHCenter|Qt::AlignVCenter</set>
+         <property name="rightMargin">
+          <number>4</number>
          </property>
-         <property name="wordWrap">
-          <bool>true</bool>
+         <property name="spacing">
+          <number>4</number>
          </property>
-        </widget>
+         <item>
+          <widget class="QLabel" name="labelName">
+           <property name="text">
+            <string>Proposal &amp;name</string>
+           </property>
+           <property name="buddy">
+            <cstring>editName</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="editName">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="placeholderText">
+            <string notr="true">short-unique-name</string>
+           </property>
+           <property name="maximumHeight">
+            <number>24</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
-        <widget class="QLabel" name="labelSubheader">
-         <property name="text">
-          <string>A fee will be burned when you prepare the proposal.</string>
+        <layout class="QVBoxLayout" name="urlFieldLayout">
+         <property name="leftMargin">
+          <number>4</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignHCenter|Qt::AlignVCenter</set>
+         <property name="rightMargin">
+          <number>4</number>
          </property>
-         <property name="wordWrap">
-          <bool>true</bool>
+         <property name="spacing">
+          <number>4</number>
          </property>
-        </widget>
+         <item>
+          <widget class="QLabel" name="labelUrl">
+           <property name="text">
+            <string>&amp;Description URL</string>
+           </property>
+           <property name="buddy">
+            <cstring>editUrl</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="editUrl">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="placeholderText">
+            <string notr="true">https://example.com/my-proposal</string>
+           </property>
+           <property name="maximumHeight">
+            <number>24</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
-         <layout class="QFormLayout" name="formLayout">
+        <layout class="QGridLayout" name="fieldsGridLayout" columnstretch="2,1,2,0">
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
          <property name="horizontalSpacing">
-          <number>8</number>
+          <number>12</number>
          </property>
          <property name="verticalSpacing">
-          <number>6</number>
-         </property>
-          <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::ExpandingFieldsGrow</enum>
-          </property>
-         <property name="labelAlignment">
-          <set>Qt::AlignRight|Qt::AlignVCenter</set>
+          <number>4</number>
          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelName">
-            <property name="text">
-             <string>Proposal &amp;name</string>
-            </property>
-            <property name="buddy">
-             <cstring>editName</cstring>
-            </property>
-           </widget>
-          </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="labelFirstPayment">
+           <property name="text">
+            <string>&amp;Payment date</string>
+           </property>
+           <property name="buddy">
+            <cstring>comboFirstPayment</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="1">
-           <widget class="QLineEdit" name="editName">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           <property name="placeholderText">
-            <string notr="true">short-unique-name</string>
+          <widget class="QLabel" name="labelPaymentsInline">
+           <property name="text">
+            <string>Pa&amp;yments</string>
+           </property>
+           <property name="buddy">
+            <cstring>spinPayments</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2" colspan="2">
+          <widget class="QLabel" name="labelPayAddr">
+           <property name="text">
+            <string>Payment &amp;address</string>
+           </property>
+           <property name="buddy">
+            <cstring>editPayAddr</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QComboBox" name="comboFirstPayment">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumWidth">
+            <number>140</number>
+           </property>
+           <property name="maximumHeight">
+            <number>24</number>
            </property>
-            <property name="maximumHeight">
-             <number>24</number>
-            </property>
           </widget>
          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelUrl">
-            <property name="text">
-             <string>&amp;Description URL</string>
-            </property>
-            <property name="buddy">
-             <cstring>editUrl</cstring>
-            </property>
-           </widget>
-          </item>
          <item row="1" column="1">
-           <widget class="QLineEdit" name="editUrl">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           <property name="placeholderText">
-            <string notr="true">https://example.com/my-proposal</string>
+          <widget class="QSpinBox" name="spinPayments">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumWidth">
+            <number>80</number>
+           </property>
+           <property name="maximumHeight">
+            <number>24</number>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>12</number>
+           </property>
+           <property name="value">
+            <number>1</number>
            </property>
-            <property name="maximumHeight">
-             <number>24</number>
-            </property>
           </widget>
          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPayAddr">
-            <property name="text">
-             <string>Payment &amp;address</string>
-            </property>
-            <property name="buddy">
-             <cstring>editPayAddr</cstring>
-            </property>
-           </widget>
-          </item>
-           <item row="2" column="1">
-           <widget class="QValidatedLineEdit" name="editPayAddr">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumHeight">
-             <number>24</number>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="labelPayAmt">
-            <property name="text">
-             <string>Payment &amp;amount</string>
-            </property>
-            <property name="buddy">
-             <cstring>paymentAmount</cstring>
-            </property>
-           </widget>
-          </item>
-         <item row="3" column="1">
-           <widget class="BitcoinAmountField" name="paymentAmount">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>The amount to request in a single payment</string>
-            </property>
+         <item row="1" column="2" colspan="2">
+          <widget class="QValidatedLineEdit" name="editPayAddr">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumWidth">
+            <number>200</number>
+           </property>
+           <property name="maximumHeight">
+            <number>24</number>
+           </property>
           </widget>
          </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="labelFirstPayment">
-             <property name="text">
-              <string>&amp;First payment</string>
-             </property>
-             <property name="buddy">
-              <cstring>comboFirstPayment</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <layout class="QHBoxLayout" name="firstAndPaymentsLayout">
-             <property name="spacing">
-              <number>8</number>
-             </property>
-             <item>
-              <widget class="QComboBox" name="comboFirstPayment">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumHeight">
-                <number>24</number>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelPaymentsInline">
-               <property name="text">
-                <string>Pa&amp;yments</string>
-               </property>
-               <property name="buddy">
-                <cstring>comboPayments</cstring>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="comboPayments">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumHeight">
-                <number>24</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="6" column="0">
-           <widget class="QLabel" name="labelTotal">
-            <property name="text">
-             <string>To&amp;tal amount</string>
-            </property>
-            <property name="buddy">
-             <cstring>labelTotalValue</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QLabel" name="labelTotalValue">
-            <property name="text">
-             <string notr="true">0</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-          <widget class="QLabel" name="labelFee">
+         <item row="2" column="0" colspan="4">
+          <spacer name="gridRowSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>4</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="labelPayAmt">
            <property name="text">
-            <string>Proposal &amp;fee</string>
+            <string>Payment &amp;amount</string>
            </property>
            <property name="buddy">
-            <cstring>labelFeeValue</cstring>
+            <cstring>paymentAmount</cstring>
            </property>
           </widget>
          </item>
-          <item row="7" column="1">
-           <widget class="QLabel" name="labelFeeValue">
+         <item row="3" column="2">
+          <widget class="QLabel" name="labelTotal">
            <property name="text">
-            <string notr="true">-</string>
+            <string>To&amp;tal amount</string>
+           </property>
+           <property name="buddy">
+            <cstring>labelTotalValue</cstring>
            </property>
-            <property name="maximumHeight">
-             <number>20</number>
-            </property>
           </widget>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="detailsButtons">
-         <property name="spacing">
-          <number>8</number>
-         </property>
-         <item>
-          <spacer name="spacer1">
+         <item row="4" column="0">
+          <widget class="BitcoinAmountField" name="paymentAmount">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumWidth">
+            <number>140</number>
+           </property>
+           <property name="toolTip">
+            <string>The amount to request in a single payment</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <spacer name="row4Spacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Ignored</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>20</width>
-             <height>10</height>
+             <width>0</width>
+             <height>0</height>
             </size>
            </property>
           </spacer>
          </item>
-         <item>
+         <item row="4" column="2">
+          <widget class="QLabel" name="labelTotalValue">
+           <property name="text">
+            <string notr="true">0</string>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumWidth">
+            <number>190</number>
+           </property>
+           <property name="minimumHeight">
+            <number>24</number>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="3">
           <widget class="QPushButton" name="btnNext1">
            <property name="text">
-            <string>Next</string>
+            <string>Create Proposal</string>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>0</width>
+             <width>120</width>
              <height>28</height>
             </size>
            </property>
@@ -299,6 +329,19 @@
          </item>
         </layout>
        </item>
+       <item>
+        <spacer name="detailsVerticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="pageReview">
@@ -732,10 +775,10 @@
   <tabstops>
    <tabstop>editName</tabstop>
    <tabstop>editUrl</tabstop>
+   <tabstop>comboFirstPayment</tabstop>
+   <tabstop>spinPayments</tabstop>
    <tabstop>editPayAddr</tabstop>
    <tabstop>paymentAmount</tabstop>
-   <tabstop>comboFirstPayment</tabstop>
-   <tabstop>comboPayments</tabstop>
    <tabstop>btnNext1</tabstop>
    <tabstop>plainJson</tabstop>
    <tabstop>editHex</tabstop>
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 4e96f0a81b23..3af3b8569557 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -24,6 +24,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
+#include <QSpinBox>
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QTimer>
@@ -43,28 +44,16 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     m_ui(new Ui::ProposalWizard)
 {
     m_ui->setupUi(this);
+    m_ui->labelTotalValue->setFont(
+        GUIUtil::getScaledFont(GUIUtil::FontRegistry::DEFAULT_FONT_SIZE, /*bold=*/true, /*multiplier=*/1.05));
 
-    GUIUtil::setFont({m_ui->labelHeader}, {GUIUtil::FontWeight::Bold, 16});
-    GUIUtil::disableMacFocusRect(this);
-    GUIUtil::updateFonts();
-
-    // Prefer the minimum vertical size needed for current content
-    if (this->layout()) {
-        this->layout()->setSizeConstraint(QLayout::SetMinimumSize);
+    // Allow payment amount field to stretch horizontally
+    if (auto* lineEdit = m_ui->paymentAmount->findChild<QLineEdit*>()) {
+        lineEdit->setMaximumWidth(QWIDGETSIZE_MAX);
     }
-    this->adjustSize();
-    this->setMinimumHeight(this->sizeHint().height());
 
     // Attach address validators
     GUIUtil::setupAddressWidget(static_cast<QValidatedLineEdit*>(m_ui->editPayAddr), this, /*fAllowURI=*/false);
-
-    // Initialize fields
-    // Populate payments dropdown (mainnet 1..12 by default; adjust by network later if needed)
-    for (int i = 1; i <= 12; ++i) {
-        m_ui->comboPayments->addItem(QString().setNum(i), i);
-    }
-    m_ui->comboPayments->setCurrentIndex(0);
-
     {
         // Load governance parameters
         const auto info = m_walletModel->node().gov().getGovernanceInfo();
@@ -89,7 +78,7 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     updateDisplayUnit();
 
     // First payment options are populated on load. No separate suggest-times button.
-    connect(m_ui->comboPayments, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ProposalWizard::updateLabels);
+    connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalWizard::updateLabels);
     connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
     connect(m_ui->btnNext1, &QPushButton::clicked, this, &ProposalWizard::onNextFromDetails);
     connect(m_ui->btnBack1, &QPushButton::clicked, this, &ProposalWizard::onBackToDetails);
@@ -118,11 +107,9 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
                 &ProposalWizard::updateDisplayUnit);
     }
 
-    // Re-compute minimum vertical size when switching pages
-    connect(m_ui->stackedWidget, &QStackedWidget::currentChanged, this, [this](int) {
-        this->adjustSize();
-        this->setMinimumHeight(this->sizeHint().height());
-    });
+    GUIUtil::disableMacFocusRect(this);
+    GUIUtil::updateFonts();
+    setFixedSize(size());
 }
 
 ProposalWizard::~ProposalWizard()
@@ -139,7 +126,7 @@ void ProposalWizard::buildJsonAndHex()
     int64_t start_epoch = 0;
     int64_t end_epoch = 0;
     const int64_t first_sb = m_ui->comboFirstPayment->currentData().toInt();
-    const int64_t payments = m_ui->comboPayments->currentData().toInt();
+    const int64_t payments = m_ui->spinPayments->value();
     if (first_sb > 0 && payments > 0) {
         if (m_superblock_cycle > 0) {
             const int64_t prev_sb{first_sb - m_superblock_cycle};
@@ -340,7 +327,7 @@ void ProposalWizard::updateLabels()
     if (m_walletModel && m_walletModel->getOptionsModel()) {
         const auto unit = m_walletModel->getOptionsModel()->getDisplayUnit();
         const CAmount per_payment = m_ui->paymentAmount->value();
-        const int payments = m_ui->comboPayments->currentData().toInt();
+        const int payments = m_ui->spinPayments->value();
         CAmount total{0};
         if (payments > 0 && per_payment > 0 && per_payment <= MAX_MONEY / payments) {
             total = per_payment * payments;
@@ -351,12 +338,6 @@ void ProposalWizard::updateLabels()
             BitcoinUnits::formatWithUnit(unit, total, /*plussign=*/false, BitcoinUnits::SeparatorStyle::ALWAYS));
         m_fee_formatted = BitcoinUnits::formatWithUnit(unit, GOVERNANCE_PROPOSAL_FEE_TX, /*plussign=*/false,
                                                        BitcoinUnits::SeparatorStyle::ALWAYS);
-        m_ui->labelFeeValue->setText(m_fee_formatted.isEmpty() ? QString("-") : m_fee_formatted);
-        // Dynamic header/subheader and prepare text
-        if (m_ui->labelSubheader) {
-            m_ui->labelSubheader->setText(
-                tr("A fee of %1 will be burned when you prepare the proposal.").arg(m_fee_formatted));
-        }
         if (m_ui->labelPrepare) {
             m_ui->labelPrepare->setText(
                 tr("Prepare (burn %1) and wait for %2 confirmations.").arg(m_fee_formatted).arg(m_requiredConfs));

From 3ca061fc3b1017489efe32e9bd1155e445cebc65 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 21 Jan 2026 06:44:27 +0530
Subject: [PATCH 19/30] qt: drop JSON/hex confirmation page, use description
 dialogs instead

The JSON and payload hex means little for the vast majority of users,
what matters is the error messages, so we responsively validate contents
and drop an extra panel in the process.
---
 src/qt/forms/proposalwizard.ui | 161 +++++++++++++++------------------
 src/qt/proposalwizard.cpp      | 105 ++++++++++++++-------
 src/qt/proposalwizard.h        |  10 +-
 src/qt/res/css/dark.css        |  16 +++-
 src/qt/res/css/light.css       |  16 +++-
 5 files changed, 172 insertions(+), 136 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index ccbe57f5dac3..b89852930e2a 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -7,13 +7,13 @@
       <x>0</x>
       <y>0</y>
       <width>860</width>
-      <height>300</height>
+      <height>380</height>
      </rect>
   </property>
   <property name="minimumSize">
     <size>
       <width>860</width>
-      <height>300</height>
+      <height>380</height>
     </size>
   </property>
   <property name="windowTitle">
@@ -308,25 +308,6 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="3">
-          <widget class="QPushButton" name="btnNext1">
-           <property name="text">
-            <string>Create Proposal</string>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>28</height>
-            </size>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -342,89 +323,95 @@
          </property>
         </spacer>
        </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="pageReview">
-      <layout class="QVBoxLayout" name="reviewLayout">
+       <!-- Button row: [View JSON] [View Payload] ... [Create Proposal] -->
        <item>
-        <widget class="QLabel" name="labelReview">
-         <property name="text">
-          <string>Review proposal JSON and validate.</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPlainTextEdit" name="plainJson">
-         <property name="maximumHeight">
-          <number>120</number>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="editHex">
-         <property name="placeholderText">
-          <string>Hex-encoded JSON</string>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelValidateStatus">
-         <property name="text">
-          <string notr="true">-</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="reviewButtons">
+        <layout class="QHBoxLayout" name="detailsButtonsLayout">
          <property name="spacing">
           <number>8</number>
          </property>
          <item>
-           <spacer name="spacer2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+          <widget class="QPushButton" name="btnViewJson">
+           <property name="text">
+            <string>View JSON</string>
            </property>
-           <property name="sizeHint" stdset="0">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
             <size>
-              <width>20</width>
-              <height>10</height>
+             <width>100</width>
+             <height>28</height>
             </size>
            </property>
-          </spacer>
+           <property name="autoDefault">
+            <bool>false</bool>
+           </property>
+          </widget>
          </item>
          <item>
-           <widget class="QPushButton" name="btnBack1">
+          <widget class="QPushButton" name="btnViewPayload">
            <property name="text">
-            <string>Back</string>
+            <string>View Payload</string>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>28</height>
+            </size>
+           </property>
+           <property name="autoDefault">
+            <bool>false</bool>
            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
           </widget>
          </item>
          <item>
-           <widget class="QPushButton" name="btnNext2">
+          <widget class="QLabel" name="labelError">
            <property name="text">
-            <string>Next</string>
+            <string notr="true"/>
            </property>
-           <property name="enabled">
-            <bool>false</bool>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>1</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="styleSheet">
+            <string>margin-left: 8px;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnNext1">
+           <property name="text">
+            <string>Create Proposal</string>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>28</height>
+            </size>
+           </property>
+           <property name="default">
+            <bool>true</bool>
            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
           </widget>
          </item>
         </layout>
@@ -780,10 +767,6 @@
    <tabstop>editPayAddr</tabstop>
    <tabstop>paymentAmount</tabstop>
    <tabstop>btnNext1</tabstop>
-   <tabstop>plainJson</tabstop>
-   <tabstop>editHex</tabstop>
-   <tabstop>btnBack1</tabstop>
-   <tabstop>btnNext2</tabstop>
    <tabstop>editTxid</tabstop>
    <tabstop>btnCopyTxid</tabstop>
    <tabstop>btnBack2</tabstop>
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 3af3b8569557..4bd1ba83fba4 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -3,18 +3,20 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qt/proposalwizard.h>
-
 #include <qt/forms/ui_proposalwizard.h>
 
 #include <governance/object.h>
 #include <governance/validators.h>
+#include <interfaces/node.h>
 #include <util/moneystr.h>
+#include <util/strencodings.h>
+
+#include <qt/descriptiondialog.h>
+#include <qt/guiutil_font.h>
 
-#include <interfaces/node.h>
 #include <qt/bitcoinamountfield.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
-#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
 #include <qt/rpcconsole.h>
@@ -33,17 +35,13 @@
 
 #include <algorithm>
 
-namespace {
-// Minimal helper to encode plain ASCII JSON to hex for RPC
-static QString toHex(const QByteArray& bytes) { return QString(bytes.toHex()); }
-} // namespace
-
 ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     QDialog(parent),
     m_walletModel(walletModel),
     m_ui(new Ui::ProposalWizard)
 {
     m_ui->setupUi(this);
+    m_ui->labelError->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
     m_ui->labelTotalValue->setFont(
         GUIUtil::getScaledFont(GUIUtil::FontRegistry::DEFAULT_FONT_SIZE, /*bold=*/true, /*multiplier=*/1.05));
 
@@ -78,12 +76,16 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     updateDisplayUnit();
 
     // First payment options are populated on load. No separate suggest-times button.
+    connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalWizard::onViewJson);
+    connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalWizard::onViewPayload);
+    connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
+    connect(m_ui->editUrl, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
+    connect(m_ui->editPayAddr, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
     connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalWizard::updateLabels);
     connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
+    connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::validateFields);
     connect(m_ui->btnNext1, &QPushButton::clicked, this, &ProposalWizard::onNextFromDetails);
-    connect(m_ui->btnBack1, &QPushButton::clicked, this, &ProposalWizard::onBackToDetails);
-    connect(m_ui->btnNext2, &QPushButton::clicked, this, &ProposalWizard::onNextFromReview);
-    connect(m_ui->btnBack2, &QPushButton::clicked, this, &ProposalWizard::onBackToReview);
+    connect(m_ui->btnBack2, &QPushButton::clicked, this, &ProposalWizard::onBackToDetails);
     connect(m_ui->btnPrepare, &QPushButton::clicked, this, &ProposalWizard::onPrepare);
     connect(m_ui->btnCopyTxid, &QPushButton::clicked, this, [this]() {
         if (m_ui->editTxid) {
@@ -156,10 +158,31 @@ void ProposalWizard::buildJsonAndHex()
     if (start_epoch > 0) o.pushKV("start_epoch", start_epoch);
     if (end_epoch > 0) o.pushKV("end_epoch", end_epoch);
     o.pushKV("type", 1);
-    const auto json{QByteArray::fromStdString(o.write())};
-    m_ui->plainJson->setPlainText(QString::fromUtf8(json));
-    m_hex = toHex(json);
-    m_ui->editHex->setText(m_hex);
+    const auto json{o.write()};
+    m_json = QString::fromStdString(json);
+    m_hex = QString::fromStdString(HexStr(json));
+}
+
+void ProposalWizard::onViewJson()
+{
+    buildJsonAndHex();
+    const QString html = QString("<code style=\"white-space: pre-wrap;\">%1</code>").arg(m_json.toHtmlEscaped());
+    DescriptionDialog* dlg = new DescriptionDialog("", html, this);
+    dlg->resize(700, 300);
+    dlg->setWindowModality(Qt::WindowModal);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    dlg->show();
+}
+
+void ProposalWizard::onViewPayload()
+{
+    buildJsonAndHex();
+    const QString html = QString("<code style=\"word-wrap: break-word;\">%1</code>").arg(m_hex.toHtmlEscaped());
+    DescriptionDialog* dlg = new DescriptionDialog("", html, this);
+    dlg->resize(700, 300);
+    dlg->setWindowModality(Qt::WindowModal);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    dlg->show();
 }
 
 int ProposalWizard::queryConfirmations(const QString& txid)
@@ -176,29 +199,17 @@ int ProposalWizard::queryConfirmations(const QString& txid)
 
 void ProposalWizard::onNextFromDetails()
 {
-    buildJsonAndHex();
-    m_ui->stackedWidget->setCurrentIndex(1);
-    onValidateJson(); // Automatically validate when entering the review page
-}
-
-void ProposalWizard::onBackToDetails() { m_ui->stackedWidget->setCurrentIndex(0); }
+    // Validate fields first
+    validateFields();
+    if (!m_ui->labelError->text().isEmpty()) {
+        return; // Don't proceed if there are errors
+    }
 
-void ProposalWizard::onValidateJson()
-{
     buildJsonAndHex();
-    CProposalValidator validator(m_hex.toStdString());
-    if (validator.Validate()) {
-        m_ui->labelValidateStatus->setText(tr("Valid"));
-        m_ui->btnNext2->setEnabled(true);
-    } else {
-        m_ui->labelValidateStatus->setText(tr("Invalid: %1").arg(QString::fromStdString(validator.GetErrorMessages())));
-        m_ui->btnNext2->setEnabled(false);
-    }
+    m_ui->stackedWidget->setCurrentIndex(1); // Go to pagePrepare
 }
 
-void ProposalWizard::onNextFromReview() { m_ui->stackedWidget->setCurrentIndex(2); }
-
-void ProposalWizard::onBackToReview() { m_ui->stackedWidget->setCurrentIndex(1); }
+void ProposalWizard::onBackToDetails() { m_ui->stackedWidget->setCurrentIndex(0); }
 
 void ProposalWizard::onPrepare()
 {
@@ -319,7 +330,7 @@ void ProposalWizard::onGoToSubmit()
     // Only allow entering the submit step if we have a prepared txid and at least relay confirmations
     if (m_txid.isEmpty()) return;
     if (m_lastConfs < m_relayRequiredConfs) return;
-    m_ui->stackedWidget->setCurrentIndex(3);
+    m_ui->stackedWidget->setCurrentIndex(2); // Go to pageSubmit
 }
 
 void ProposalWizard::updateLabels()
@@ -352,3 +363,27 @@ void ProposalWizard::updateDisplayUnit()
     }
     updateLabels();
 }
+
+void ProposalWizard::validateFields()
+{
+    if (m_ui->editName->text().trimmed().isEmpty() && m_ui->editUrl->text().trimmed().isEmpty() &&
+        m_ui->editPayAddr->text().trimmed().isEmpty() && m_ui->paymentAmount->value() == 0)
+    {
+        // If all fields are empty, clear the error label
+        m_ui->labelError->clear();
+        return;
+    }
+
+    buildJsonAndHex();
+    CProposalValidator validator(m_hex.toStdString());
+    if (validator.Validate()) {
+        m_ui->labelError->clear();
+    } else {
+        // Show first error only
+        QString errors = QString::fromStdString(validator.GetErrorMessages());
+        if (int semicolon = errors.indexOf(';'); semicolon > 0) {
+            errors = errors.left(semicolon);
+        }
+        m_ui->labelError->setText(errors);
+    }
+}
diff --git a/src/qt/proposalwizard.h b/src/qt/proposalwizard.h
index d38998d58d8d..9a12d48b35cc 100644
--- a/src/qt/proposalwizard.h
+++ b/src/qt/proposalwizard.h
@@ -7,6 +7,7 @@
 
 #include <qt/forms/ui_proposalwizard.h>
 
+#include <QByteArray>
 #include <QCloseEvent>
 #include <QDialog>
 #include <QObject>
@@ -31,25 +32,26 @@ class ProposalWizard : public QDialog
 private Q_SLOTS:
     void onNextFromDetails();
     void onBackToDetails();
-    void onValidateJson();
-    void onNextFromReview();
-    void onBackToReview();
     void onPrepare();
     void onMaybeAdvanceAfterConfirmations();
     void onSubmit();
     void onGoToSubmit();
+    void onViewJson();
+    void onViewPayload();
 
     void updateLabels();
     void updateDisplayUnit();
+    void validateFields();
 
 private:
     WalletModel* m_walletModel;
     Ui::ProposalWizard* m_ui;
 
     // State
+    QString m_fee_formatted;
     QString m_hex;
+    QString m_json;
     QString m_txid;
-    QString m_fee_formatted;
     qint64 m_prepareTime{0};
     int64_t m_superblock_cycle{0};
     int64_t m_target_spacing{0};
diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css
index 7ca493e4d3db..d7bd456895d3 100644
--- a/src/qt/res/css/dark.css
+++ b/src/qt/res/css/dark.css
@@ -405,7 +405,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
+QDialog#ProposalWizard QPushButton#btnViewJson,
+QDialog#ProposalWizard QPushButton#btnViewPayload {
     background-color: #c7c7c7;
     color: #333;
 }
@@ -423,7 +425,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
+QDialog#ProposalWizard QPushButton#btnViewJson:hover,
+QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
     background-color: #818181;
     color: #2d2d2e;
 }
@@ -441,7 +445,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
+QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
+QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
     background-color: #f6f6f6;
     color: #585858;
 }
@@ -459,7 +465,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disable
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
+QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
+QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
     background-color: #39393b;
     border-color: #585858;
     color: #585858;
diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css
index e8889ca1fec2..1e896944c0eb 100644
--- a/src/qt/res/css/light.css
+++ b/src/qt/res/css/light.css
@@ -388,7 +388,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
+QDialog#ProposalWizard QPushButton#btnViewJson,
+QDialog#ProposalWizard QPushButton#btnViewPayload {
     background-color: #c7c7c7;
     color: #555;
 }
@@ -406,7 +408,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
+QDialog#ProposalWizard QPushButton#btnViewJson:hover,
+QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
     background-color: #a7a7a7;
     color: #555;
 }
@@ -424,7 +428,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
+QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
+QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
     background-color: #c7c7c7;
     color: #555;
 }
@@ -442,7 +448,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disable
 QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
-QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled {
+QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
+QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
+QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
     background-color: #eaeaec;
     border-color: #d2d2d2;
     color: #d2d2d2;

From 90e0375ce62e8434c6cbc144583ea640736b97f1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:57:35 +0530
Subject: [PATCH 20/30] qt: use `SendConfirmationDialog` instead of
 `QMessageBox` for confirm

The visual language should match other coin-spending activities, also
warn that that you don't get the fee back.
---
 src/qt/proposalwizard.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 4bd1ba83fba4..d1e4e06da517 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -20,6 +20,7 @@
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
 #include <qt/rpcconsole.h>
+#include <qt/sendcoinsdialog.h>
 #include <qt/walletmodel.h>
 
 #include <QDateTime>
@@ -217,11 +218,15 @@ void ProposalWizard::onPrepare()
     WalletModel::UnlockContext ctx(m_walletModel->requestUnlock());
     if (!ctx.isValid()) return;
 
-    // Confirm burn
-    if (QMessageBox::question(this, tr("Burn %1").arg(m_fee_formatted),
-                              tr("Burn %1 to create the fee transaction?").arg(m_fee_formatted),
-                              QMessageBox::StandardButton::Cancel | QMessageBox::StandardButton::Yes,
-                              QMessageBox::StandardButton::Cancel) != QMessageBox::StandardButton::Yes) {
+    SendConfirmationDialog diag_confirm(
+        /*title=*/tr("Confirm Proposal"),
+        /*text=*/tr("Are you sure you want to create this proposal?"),
+        /*informative_text=*/tr("Creating a proposal pays %1 to the network. This fee is non-refundable regardless of outcome.").arg(m_fee_formatted),
+        /*detailed_text=*/"", SEND_CONFIRM_DELAY,
+        /*enable_send=*/true, /*always_show_unsigned=*/false, /*parent=*/this);
+    diag_confirm.setWindowModality(Qt::WindowModal);
+    diag_confirm.exec();
+    if (diag_confirm.result() != QMessageBox::Yes) {
         return;
     }
 

From 2883527e4bad23eb2ff870fd9b4ad70fdea1cf65 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 7 Feb 2026 01:45:21 +0530
Subject: [PATCH 21/30] qt: remove remaining pages from proposal wizard

The proposal creation process can be interrupted for reasons beyond our
control, since submitting the actual proposal is different from spending
the collateral, it should have its own page.

Right now this removes the old code but doesn't create a new layout, we
will do that in the next commit.
---
 src/qt/forms/proposalwizard.ui | 337 +--------------------------------
 src/qt/proposalwizard.cpp      | 161 ++--------------
 src/qt/proposalwizard.h        |  30 +--
 3 files changed, 21 insertions(+), 507 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index b89852930e2a..3f8ce3ad0823 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -393,7 +393,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="btnNext1">
+          <widget class="QPushButton" name="btnCreate">
            <property name="text">
             <string>Create Proposal</string>
            </property>
@@ -418,330 +418,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="pagePrepare">
-      <layout class="QVBoxLayout" name="prepareLayout">
-       <item>
-        <widget class="QLabel" name="labelPrepare">
-         <property name="text">
-          <string>Prepare (burn fee) and wait for confirmations.</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-         <layout class="QHBoxLayout" name="txidLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-         <item>
-          <widget class="QLabel" name="labelTxidCaption">
-           <property name="text">
-            <string notr="true">TxID:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QLineEdit" name="editTxid">
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-           <property name="placeholderText">
-            <string notr="true">-</string>
-           </property>
-            <property name="maximumHeight">
-             <number>24</number>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnCopyTxid">
-           <property name="text">
-            <string>Copy</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="confirmationsLayout">
-         <item>
-           <widget class="QLabel" name="labelConfStatus">
-           <property name="text">
-            <string></string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="labelRelayHint">
-           <property name="text">
-            <string>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QProgressBar" name="progressConfirmations">
-           <property name="minimum">
-            <number>0</number>
-           </property>
-           <property name="maximum">
-            <number>6</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="textVisible">
-             <bool>false</bool>
-           </property>
-            <property name="maximumHeight">
-             <number>10</number>
-            </property>
-            <property name="accessibleName">
-             <string>Confirmations progress</string>
-            </property>
-            <property name="accessibleDescription">
-             <string>Shows progress toward the required number of confirmations for the proposal fee transaction.</string>
-            </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="labelEta">
-           <property name="text">
-            <string>Estimated time remaining: -</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="prepareButtons">
-         <property name="spacing">
-          <number>8</number>
-         </property>
-         <item>
-           <spacer name="spacer3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-              <width>20</width>
-              <height>10</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnBack2">
-           <property name="text">
-            <string>Back</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnPrepare">
-           <property name="text">
-            <string>Prepare Proposal</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnNext3">
-           <property name="text">
-            <string>Next</string>
-           </property>
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="pageSubmit">
-      <layout class="QVBoxLayout" name="submitLayout">
-       <item>
-         <widget class="QLabel" name="labelSubmit">
-          <property name="text">
-           <string>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</string>
-          </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="confirmationsLayoutSubmit">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item>
-           <widget class="QLabel" name="labelConfStatus2">
-            <property name="text">
-             <string></string>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QProgressBar" name="progressConfirmations2">
-           <property name="minimum">
-            <number>0</number>
-           </property>
-           <property name="maximum">
-            <number>6</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="textVisible">
-             <bool>false</bool>
-           </property>
-            <property name="maximumHeight">
-             <number>10</number>
-            </property>
-            <property name="accessibleName">
-             <string>Confirmations progress</string>
-            </property>
-            <property name="accessibleDescription">
-             <string>Shows progress toward the required number of confirmations for the proposal fee transaction.</string>
-            </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="labelEta2">
-           <property name="text">
-            <string>Estimated time remaining: -</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-         <layout class="QHBoxLayout" name="govidLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-         <item>
-          <widget class="QLabel" name="labelGovObjCaption">
-           <property name="text">
-            <string>Proposal ID:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QLineEdit" name="editGovObjId">
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-           <property name="placeholderText">
-            <string notr="true">-</string>
-           </property>
-            <property name="maximumHeight">
-             <number>24</number>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnCopyGovId">
-           <property name="text">
-            <string>Copy</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="submitButtons">
-         <property name="spacing">
-          <number>8</number>
-         </property>
-         <item>
-           <spacer name="spacer4">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-              <width>20</width>
-              <height>10</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnSubmit">
-           <property name="text">
-            <string>Submit Proposal</string>
-           </property>
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-         <item>
-           <widget class="QPushButton" name="btnClose">
-           <property name="text">
-            <string>Close</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
   </layout>
@@ -766,16 +442,7 @@
    <tabstop>spinPayments</tabstop>
    <tabstop>editPayAddr</tabstop>
    <tabstop>paymentAmount</tabstop>
-   <tabstop>btnNext1</tabstop>
-   <tabstop>editTxid</tabstop>
-   <tabstop>btnCopyTxid</tabstop>
-   <tabstop>btnBack2</tabstop>
-   <tabstop>btnPrepare</tabstop>
-   <tabstop>btnNext3</tabstop>
-   <tabstop>editGovObjId</tabstop>
-   <tabstop>btnCopyGovId</tabstop>
-   <tabstop>btnSubmit</tabstop>
-   <tabstop>btnClose</tabstop>
+   <tabstop>btnCreate</tabstop>
   </tabstops>
  <resources/>
  <connections/>
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index d1e4e06da517..a3fddfde263e 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -19,18 +19,13 @@
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
-#include <qt/rpcconsole.h>
 #include <qt/sendcoinsdialog.h>
 #include <qt/walletmodel.h>
 
 #include <QDateTime>
-#include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QSpinBox>
-#include <QPushButton>
-#include <QStackedWidget>
-#include <QTimer>
 
 #include <univalue.h>
 
@@ -56,10 +51,9 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     {
         // Load governance parameters
         const auto info = m_walletModel->node().gov().getGovernanceInfo();
+        m_relay_confs = info.relayRequiredConfs;
         m_superblock_cycle = info.superblockcycle;
         m_target_spacing = info.targetSpacing;
-        m_relayRequiredConfs = info.relayRequiredConfs;
-        m_requiredConfs = info.requiredConfs;
 
         // Populate first-payment options by default using governance info
         m_ui->comboFirstPayment->clear();
@@ -76,7 +70,6 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     // Initialize total amount display (formatted with current unit)
     updateDisplayUnit();
 
-    // First payment options are populated on load. No separate suggest-times button.
     connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalWizard::onViewJson);
     connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalWizard::onViewPayload);
     connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
@@ -85,24 +78,7 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalWizard::updateLabels);
     connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
     connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::validateFields);
-    connect(m_ui->btnNext1, &QPushButton::clicked, this, &ProposalWizard::onNextFromDetails);
-    connect(m_ui->btnBack2, &QPushButton::clicked, this, &ProposalWizard::onBackToDetails);
-    connect(m_ui->btnPrepare, &QPushButton::clicked, this, &ProposalWizard::onPrepare);
-    connect(m_ui->btnCopyTxid, &QPushButton::clicked, this, [this]() {
-        if (m_ui->editTxid) {
-            m_ui->editTxid->selectAll();
-            m_ui->editTxid->copy();
-        }
-    });
-    connect(m_ui->btnNext3, &QPushButton::clicked, this, &ProposalWizard::onGoToSubmit);
-    connect(m_ui->btnSubmit, &QPushButton::clicked, this, &ProposalWizard::onSubmit);
-    connect(m_ui->btnCopyGovId, &QPushButton::clicked, this, [this]() {
-        if (m_ui->editGovObjId) {
-            m_ui->editGovObjId->selectAll();
-            m_ui->editGovObjId->copy();
-        }
-    });
-    connect(m_ui->btnClose, &QPushButton::clicked, this, &QDialog::accept);
+    connect(m_ui->btnCreate, &QPushButton::clicked, this, &ProposalWizard::onCreate);
 
     // Update fee labels on display unit change
     if (m_walletModel && m_walletModel->getOptionsModel()) {
@@ -117,7 +93,6 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
 
 ProposalWizard::~ProposalWizard()
 {
-    delete m_confirmTimer;
     delete m_ui;
 }
 
@@ -186,19 +161,7 @@ void ProposalWizard::onViewPayload()
     dlg->show();
 }
 
-int ProposalWizard::queryConfirmations(const QString& txid)
-{
-    if (!m_walletModel) return -1;
-    interfaces::WalletTxStatus tx_status;
-    int num_blocks{};
-    int64_t block_time{};
-    if (!m_walletModel->wallet().tryGetTxStatus(uint256S(txid.toStdString()), tx_status, num_blocks, block_time)) {
-        return -1;
-    }
-    return tx_status.depth_in_main_chain;
-}
-
-void ProposalWizard::onNextFromDetails()
+void ProposalWizard::onCreate()
 {
     // Validate fields first
     validateFields();
@@ -207,13 +170,7 @@ void ProposalWizard::onNextFromDetails()
     }
 
     buildJsonAndHex();
-    m_ui->stackedWidget->setCurrentIndex(1); // Go to pagePrepare
-}
-
-void ProposalWizard::onBackToDetails() { m_ui->stackedWidget->setCurrentIndex(0); }
 
-void ProposalWizard::onPrepare()
-{
     // Unlock wallet if necessary
     WalletModel::UnlockContext ctx(m_walletModel->requestUnlock());
     if (!ctx.isValid()) return;
@@ -235,107 +192,23 @@ void ProposalWizard::onPrepare()
     std::string error;
     COutPoint none; // null by default
 
-    // TODO: VALIDATE HERE IF blockchain synced
-    // instead
-    // do something like clientModel->masternodeSync().isBlockchainSynced()
     auto govobj = m_walletModel->node().gov().createProposal(1, now, m_hex.toStdString(), error);
-    if (!govobj) {
-        QMessageBox::critical(this, tr("Prepare failed"), QString::fromStdString(error));
-        return;
-    }
-    if (!m_walletModel->wallet().prepareProposal(govobj->GetHash(), govobj->GetMinCollateralFee(), 1, now,
-                                                 m_hex.toStdString(), none, txid_str, error)) {
-        QMessageBox::critical(this, tr("Prepare failed"), QString::fromStdString(error));
-        return;
-    }
-    m_txid = QString::fromStdString(txid_str);
-    m_ui->editTxid->setText(m_txid);
-    m_ui->btnPrepare->setEnabled(false);
-    m_prepareTime = now;
-
-    // Start polling confirmations every 10s
-    if (!m_confirmTimer) {
-        m_confirmTimer = new QTimer(this);
-        connect(m_confirmTimer, &QTimer::timeout, this, &ProposalWizard::onMaybeAdvanceAfterConfirmations);
-    }
-    m_confirmTimer->start(10000);
-    // Update labels right away too
-    onMaybeAdvanceAfterConfirmations();
-}
-
-void ProposalWizard::onMaybeAdvanceAfterConfirmations()
-{
-    if (m_txid.isEmpty()) return;
-    const int confs = queryConfirmations(m_txid);
-    if (confs >= 0 && confs != m_lastConfs) {
-        m_lastConfs = confs;
-        const int bounded = std::min(confs, m_requiredConfs);
-        m_ui->progressConfirmations->setMaximum(m_requiredConfs);
-        m_ui->progressConfirmations->setValue(bounded);
-        m_ui->labelConfStatus->setText(tr("Confirmations: %1 / %2 required").arg(bounded).arg(m_requiredConfs));
-        // Mirror to submit page
-        m_ui->progressConfirmations2->setMaximum(m_requiredConfs);
-        m_ui->progressConfirmations2->setValue(bounded);
-        m_ui->labelConfStatus2->setText(tr("Confirmations: %1 / %2 required").arg(bounded).arg(m_requiredConfs));
-        // Simple ETA: 2.5 min per block remaining
-        const int remaining = std::max(0, m_requiredConfs - bounded);
-        const int secs = remaining * 150;
-        if (remaining == 0) {
-            m_ui->labelEta->setText(tr("Estimated time remaining: Ready"));
-            m_ui->labelEta2->setText(tr("Estimated time remaining: Ready"));
-            if (m_confirmTimer) m_confirmTimer->stop();
-        } else {
-            const auto mins = (secs + 59) / 60;
-            m_ui->labelEta->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
-            m_ui->labelEta2->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
-        }
-    }
-    // Allow submitting (relay/postpone) at 1 confirmation and enable Next to proceed
-    if (confs >= m_relayRequiredConfs) {
-        m_ui->btnSubmit->setEnabled(true);
-        m_ui->btnNext3->setEnabled(true);
-    }
-    // No auto-advance; user controls when to proceed
-}
-
-void ProposalWizard::onSubmit()
-{
-    // Submit with same parent/revision/time and hex, including fee txid
-    const int64_t now = (m_prepareTime > 0 ? m_prepareTime : QDateTime::currentSecsSinceEpoch());
-    std::string res;
-    if (m_submitted) {
-        QMessageBox::information(this, tr("Already submitted"), tr("This proposal has already been submitted."));
-        return;
-    }
-    std::string error;
-    std::string obj_hash;
-    if (!m_walletModel->node().gov().submitProposal(uint256(), 1, now, m_hex.toStdString(),
-                                                    uint256S(m_txid.toStdString()), obj_hash, error)) {
-        QMessageBox::critical(this, tr("Submission failed"), QString::fromStdString(error));
+    if (!govobj || !m_walletModel->wallet().prepareProposal(govobj->GetHash(), govobj->GetMinCollateralFee(), 1, now,
+                                                            m_hex.toStdString(), none, txid_str, error))
+    {
+        QMessageBox::critical(this, tr("Creation failed"), QString::fromStdString(error));
         return;
     }
-    const QString govId = QString::fromStdString(obj_hash);
-    m_ui->editGovObjId->setText(govId);
-    QMessageBox::information(this, tr("Proposal submitted"),
-                             tr("Your proposal was submitted successfully.") +
-                             QString("\nID: %1").arg(govId));
-    m_submitted = true;
-    m_ui->btnSubmit->setEnabled(false);
-    // When 6 confs are reached show a final success message
-}
 
-void ProposalWizard::closeEvent(QCloseEvent* event)
-{
-    if (m_confirmTimer) m_confirmTimer->stop();
-    QDialog::closeEvent(event);
-}
+    QMessageBox::information(this, tr("Proposal Created"),
+        tr("%1 successfully sent for your proposal \"%2\".\n\nIt takes %3 confirmation(s) before "
+           "you can broadcast your proposal to the network.\n\nThis may take some time, you can monitor "
+           "progress and continue with publishing your proposal by clicking \"Resume Proposal\".")
+            .arg(m_fee_formatted)
+            .arg(m_ui->editName->text())
+            .arg(m_relay_confs));
 
-void ProposalWizard::onGoToSubmit()
-{
-    // Only allow entering the submit step if we have a prepared txid and at least relay confirmations
-    if (m_txid.isEmpty()) return;
-    if (m_lastConfs < m_relayRequiredConfs) return;
-    m_ui->stackedWidget->setCurrentIndex(2); // Go to pageSubmit
+    accept(); // Close the wizard
 }
 
 void ProposalWizard::updateLabels()
@@ -354,10 +227,6 @@ void ProposalWizard::updateLabels()
             BitcoinUnits::formatWithUnit(unit, total, /*plussign=*/false, BitcoinUnits::SeparatorStyle::ALWAYS));
         m_fee_formatted = BitcoinUnits::formatWithUnit(unit, GOVERNANCE_PROPOSAL_FEE_TX, /*plussign=*/false,
                                                        BitcoinUnits::SeparatorStyle::ALWAYS);
-        if (m_ui->labelPrepare) {
-            m_ui->labelPrepare->setText(
-                tr("Prepare (burn %1) and wait for %2 confirmations.").arg(m_fee_formatted).arg(m_requiredConfs));
-        }
     }
 }
 
diff --git a/src/qt/proposalwizard.h b/src/qt/proposalwizard.h
index 9a12d48b35cc..d4b48f994caa 100644
--- a/src/qt/proposalwizard.h
+++ b/src/qt/proposalwizard.h
@@ -8,19 +8,10 @@
 #include <qt/forms/ui_proposalwizard.h>
 
 #include <QByteArray>
-#include <QCloseEvent>
 #include <QDialog>
-#include <QObject>
 #include <QString>
 
-class QTimer;
-
-namespace Ui {
-class SendCoinsEntry;
-}
-
 class WalletModel;
-// The UI header is included above for complete type to satisfy unique_ptr deleter
 
 class ProposalWizard : public QDialog
 {
@@ -30,12 +21,7 @@ class ProposalWizard : public QDialog
     ~ProposalWizard();
 
 private Q_SLOTS:
-    void onNextFromDetails();
-    void onBackToDetails();
-    void onPrepare();
-    void onMaybeAdvanceAfterConfirmations();
-    void onSubmit();
-    void onGoToSubmit();
+    void onCreate();
     void onViewJson();
     void onViewPayload();
 
@@ -48,22 +34,14 @@ private Q_SLOTS:
     Ui::ProposalWizard* m_ui;
 
     // State
+    int m_relay_confs{0};
+    int64_t m_superblock_cycle{0};
+    int64_t m_target_spacing{0};
     QString m_fee_formatted;
     QString m_hex;
     QString m_json;
-    QString m_txid;
-    qint64 m_prepareTime{0};
-    int64_t m_superblock_cycle{0};
-    int64_t m_target_spacing{0};
-    int m_relayRequiredConfs{1};
-    int m_requiredConfs{6};
-    int m_lastConfs{-1};
-    bool m_submitted{false};
-    QTimer* m_confirmTimer{nullptr};
 
     void buildJsonAndHex();
-    int queryConfirmations(const QString& txid);
-    void closeEvent(QCloseEvent* event) override;
 };
 
 #endif // BITCOIN_QT_PROPOSALWIZARD_H

From 080c8fbf6c49b88c1292dbcc713e652e48536117 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 21:54:03 +0530
Subject: [PATCH 22/30] qt: add "Resume Proposal" for post-confirmation
 broadcast

This replaces the remaining pages of the proposal wizard that we removed
in the last commit.

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/Makefile.qt.include           |   4 +
 src/governance/governance.cpp     |  15 +-
 src/governance/governance.h       |   3 +-
 src/interfaces/node.h             |   2 +-
 src/node/interfaces.cpp           |   5 +-
 src/qt/clientmodel.cpp            |   2 +-
 src/qt/forms/governancelist.ui    |   7 +
 src/qt/forms/proposalresume.ui    | 116 +++++++++++
 src/qt/governancelist.cpp         |  33 +++-
 src/qt/governancelist.h           |   1 +
 src/qt/proposalresume.cpp         | 311 ++++++++++++++++++++++++++++++
 src/qt/proposalresume.h           |  86 +++++++++
 src/qt/proposalwizard.cpp         |  15 +-
 src/qt/res/css/dark.css           |  14 ++
 src/qt/res/css/general.css        |  25 +++
 src/qt/res/css/light.css          |  14 ++
 test/util/data/non-backported.txt |   1 +
 17 files changed, 639 insertions(+), 15 deletions(-)
 create mode 100644 src/qt/forms/proposalresume.ui
 create mode 100644 src/qt/proposalresume.cpp
 create mode 100644 src/qt/proposalresume.h

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 18e92b926e04..09b6b7e4cd1a 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -32,6 +32,7 @@ QT_FORMS_UI = \
   qt/forms/openuridialog.ui \
   qt/forms/optionsdialog.ui \
   qt/forms/overviewpage.ui \
+  qt/forms/proposalresume.ui \
   qt/forms/proposalwizard.ui \
   qt/forms/psbtoperationsdialog.ui \
   qt/forms/qrdialog.ui \
@@ -78,6 +79,7 @@ QT_MOC_CPP = \
   qt/moc_peertablemodel.cpp \
   qt/moc_peertablesortproxy.cpp \
   qt/moc_proposalmodel.cpp \
+  qt/moc_proposalresume.cpp \
   qt/moc_proposalwizard.cpp \
   qt/moc_psbtoperationsdialog.cpp \
   qt/moc_qrdialog.cpp \
@@ -161,6 +163,7 @@ BITCOIN_QT_H = \
   qt/peertablemodel.h \
   qt/peertablesortproxy.h \
   qt/proposalmodel.h \
+  qt/proposalresume.h \
   qt/proposalwizard.h \
   qt/psbtoperationsdialog.h \
   qt/qrdialog.h \
@@ -282,6 +285,7 @@ BITCOIN_QT_WALLET_CPP = \
   qt/overviewpage.cpp \
   qt/paymentserver.cpp \
   qt/proposalmodel.cpp \
+  qt/proposalresume.cpp \
   qt/proposalwizard.cpp \
   qt/psbtoperationsdialog.cpp \
   qt/qrdialog.cpp \
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 31d1a864c23d..6eaa1ed71c89 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -532,19 +532,26 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
     return vecResult;
 }
 
-void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const
+void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime,
+                                          bool include_postponed) const
 {
     LOCK(cs_store);
 
     for (const auto& [_, govobj] : mapObjects) {
-        // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
         if (Assert(govobj)->GetCreationTime() < nMoreThanTime) {
             continue;
         }
-
-        // ADD GOVERNANCE OBJECT TO LIST
         objs.push_back(*govobj);
     }
+
+    if (include_postponed) {
+        for (const auto& [_, govobj] : mapPostponedObjects) {
+            if (Assert(govobj)->GetCreationTime() < nMoreThanTime) {
+                continue;
+            }
+            objs.push_back(*govobj);
+        }
+    }
 }
 
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 96485c317d03..fa048b40d9d2 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -291,7 +291,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const
+    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime,
+                         bool include_postponed = false) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 22e2c45c0743..13cab2f924ca 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -135,7 +135,7 @@ class GOV
 {
 public:
     virtual ~GOV() {}
-    virtual void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime) = 0;
+    virtual void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime, bool include_postponed = false) = 0;
     struct Votes {
         int32_t m_abs{0};
         int32_t m_no{0};
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 8c9b50051931..d551adde89b1 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -223,10 +223,11 @@ class GOVImpl : public GOV
     NodeContext& context() { return *Assert(m_context); }
 
 public:
-    void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime) override
+    void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime,
+                         bool include_postponed) override
     {
         if (context().govman != nullptr) {
-            context().govman->GetAllNewerThan(objs, nMoreThanTime);
+            context().govman->GetAllNewerThan(objs, nMoreThanTime, include_postponed);
         }
     }
     Votes getObjVotes(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index be899166bebc..9afcc54c89a2 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -153,7 +153,7 @@ int64_t ClientModel::getHeaderTipTime() const
 
 void ClientModel::getAllGovernanceObjects(std::vector<CGovernanceObject> &obj)
 {
-    m_node.gov().getAllNewerThan(obj, 0);
+    m_node.gov().getAllNewerThan(obj, 0, /*include_postponed=*/true);
 }
 
 std::map<CNetAddr, LocalServiceInfo> ClientModel::getNetLocalAddresses() const
diff --git a/src/qt/forms/governancelist.ui b/src/qt/forms/governancelist.ui
index 54045fe1d642..73e4803509e0 100644
--- a/src/qt/forms/governancelist.ui
+++ b/src/qt/forms/governancelist.ui
@@ -133,6 +133,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="btnResumeProposal">
+         <property name="text">
+          <string>Resume Proposal</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="horizontalSpacer_bottom">
          <property name="orientation">
diff --git a/src/qt/forms/proposalresume.ui b/src/qt/forms/proposalresume.ui
new file mode 100644
index 000000000000..dd7551274316
--- /dev/null
+++ b/src/qt/forms/proposalresume.ui
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProposalResume</class>
+ <widget class="QDialog" name="ProposalResume">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>720</width>
+    <height>400</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>720</width>
+    <height>400</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Resume Proposals</string>
+  </property>
+  <layout class="QVBoxLayout" name="mainLayout">
+   <property name="leftMargin">
+    <number>16</number>
+   </property>
+   <property name="topMargin">
+    <number>16</number>
+   </property>
+   <property name="rightMargin">
+    <number>16</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <widget class="QFrame" name="scrollContents">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <layout class="QVBoxLayout" name="proposalsLayout">
+       <property name="leftMargin">
+        <number>16</number>
+       </property>
+       <property name="topMargin">
+        <number>16</number>
+       </property>
+       <property name="rightMargin">
+        <number>16</number>
+       </property>
+       <property name="bottomMargin">
+        <number>16</number>
+       </property>
+       <property name="spacing">
+        <number>16</number>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>8</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>16</number>
+     </property>
+     <item>
+      <spacer name="buttonSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnClose">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index a18f47a5481d..5273ee514e18 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -5,6 +5,7 @@
 #include <qt/forms/ui_governancelist.h>
 
 #include <evo/deterministicmns.h>
+#include <governance/common.h>
 #include <governance/governance.h>
 #include <governance/vote.h>
 #include <util/underlying.h>
@@ -13,6 +14,7 @@
 #include <qt/governancelist.h>
 #include <qt/guiutil_font.h>
 #include <qt/proposalmodel.h>
+#include <qt/proposalresume.h>
 #include <qt/proposalwizard.h>
 
 #include <chainparams.h>
@@ -20,6 +22,7 @@
 #include <interfaces/wallet.h>
 #include <script/standard.h>
 #include <util/strencodings.h>
+#include <util/time.h>
 
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
@@ -37,6 +40,8 @@
 #include <QShowEvent>
 #include <QUrl>
 
+#include <univalue.h>
+
 namespace {
 constexpr int TITLE_MIN_WIDTH{220};
 } // anonymous namespace
@@ -87,8 +92,9 @@ GovernanceList::GovernanceList(QWidget* parent) :
     connect(proposalModelProxy, &QSortFilterProxyModel::rowsRemoved, this, &GovernanceList::updateProposalCount);
     connect(proposalModelProxy, &QSortFilterProxyModel::layoutChanged, this, &GovernanceList::updateProposalCount);
 
-    // Create Proposal button
+    // Connect buttons
     connect(ui->btnCreateProposal, &QPushButton::clicked, this, &GovernanceList::showCreateProposalDialog);
+    connect(ui->btnResumeProposal, &QPushButton::clicked, this, &GovernanceList::showResumeProposalDialog);
 
     // Initialize masternode count to 0
     ui->mnCountLabel->setText("0");
@@ -277,6 +283,11 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
             }
             ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, gov_info.requiredConfs));
         }
+        // Include unrelayed wallet proposals (0 confs, not yet broadcast)
+        for (const auto& obj : getWalletProposals(/*pending=*/true)) {
+            CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, queryCollateralDepth(obj.collateralHash)));
+        }
     } else if (m_proposal_source == ProposalSource::Local) {
         for (const auto& obj : getWalletProposals(/*pending=*/std::nullopt)) {
             CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
@@ -347,9 +358,29 @@ void GovernanceList::showCreateProposalDialog()
     proposalWizard->setWindowModality(Qt::NonModal);
     proposalWizard->setModal(false);
     proposalWizard->setWindowFlag(Qt::Window, true);
+    // Auto-open Resume dialog after successful creation and refresh the governance list
+    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::handleProposalListChanged);
+    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
     proposalWizard->show();
 }
 
+void GovernanceList::showResumeProposalDialog()
+{
+    if (!clientModel || !walletModel) {
+        QMessageBox::warning(this, tr("Resume proposal"), tr("A synced node and an unlocked wallet are required."));
+        return;
+    }
+
+    const auto proposals = getWalletProposals(/*pending=*/true);
+    ProposalResume* dialog = new ProposalResume(clientModel->node(), clientModel, walletModel, proposals, this);
+    connect(dialog, &ProposalResume::proposalBroadcasted, this, &GovernanceList::handleProposalListChanged);
+    dialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    dialog->setWindowModality(Qt::NonModal);
+    dialog->setModal(false);
+    dialog->setWindowFlag(Qt::Window, true);
+    dialog->show();
+}
+
 void GovernanceList::showProposalContextMenu(const QPoint& pos)
 {
     const auto index = ui->govTableView->indexAt(pos);
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 30aae729f2dd..a22dff16a03e 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -101,6 +101,7 @@ private Q_SLOTS:
     void showProposalContextMenu(const QPoint& pos);
     void showAdditionalInfo(const QModelIndex& index);
     void showCreateProposalDialog();
+    void showResumeProposalDialog();
     void openProposalUrl();
     void copyProposalJson();
 
diff --git a/src/qt/proposalresume.cpp b/src/qt/proposalresume.cpp
new file mode 100644
index 000000000000..3de08332f20c
--- /dev/null
+++ b/src/qt/proposalresume.cpp
@@ -0,0 +1,311 @@
+// Copyright (c) 2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <qt/proposalresume.h>
+#include <qt/forms/ui_proposalresume.h>
+
+#include <governance/governance.h>
+
+#include <qt/guiutil_font.h>
+#include <qt/proposalmodel.h>
+
+#include <interfaces/node.h>
+#include <interfaces/wallet.h>
+
+#include <qt/bitcoinunits.h>
+#include <qt/clientmodel.h>
+#include <qt/optionsmodel.h>
+#include <qt/walletmodel.h>
+
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QShowEvent>
+#include <QSpacerItem>
+#include <QStyle>
+#include <QTextEdit>
+#include <QTimer>
+#include <QVBoxLayout>
+
+#include <algorithm>
+
+ProposalResume::ProposalResume(interfaces::Node& node, ClientModel* client_model, WalletModel* wallet_model,
+                               const std::vector<Governance::Object>& proposals, QWidget* parent) :
+    QDialog{parent},
+    m_ui{new Ui::ProposalResume},
+    m_node{node},
+    m_client_model{client_model},
+    m_wallet_model{wallet_model}
+{
+    m_ui->setupUi(this);
+
+    m_ui->scrollArea->viewport()->setAutoFillBackground(false);
+    m_ui->scrollContents->setAttribute(Qt::WA_StyledBackground, true);
+
+    m_emptyLabel = new QLabel(tr("No pending proposals to broadcast."), m_ui->scrollContents);
+    m_emptyLabel->setAlignment(Qt::AlignCenter);
+    connect(m_ui->btnClose, &QPushButton::clicked, this, &QDialog::reject);
+
+    // Load parameters and add proposals
+    const auto info = m_node.gov().getGovernanceInfo();
+    m_relay_confs = info.relayRequiredConfs;
+    for (const auto& proposal : proposals) {
+        addProposal(proposal);
+    }
+    m_ui->proposalsLayout->addStretch();
+
+    startRefreshTimer();
+    updateEmptyState();
+    GUIUtil::updateFonts();
+    QTimer::singleShot(0, this, &ProposalResume::recalculateDescHeights);
+}
+
+ProposalResume::~ProposalResume()
+{
+    if (m_refresh_timer) {
+        m_refresh_timer->stop();
+    }
+    delete m_ui;
+}
+
+void ProposalResume::changeEvent(QEvent* e)
+{
+    QDialog::changeEvent(e);
+    if (e->type() == QEvent::StyleChange) {
+        QTimer::singleShot(0, this, &ProposalResume::refreshStyle);
+    }
+}
+
+void ProposalResume::showEvent(QShowEvent* e)
+{
+    QDialog::showEvent(e);
+    if (!e->spontaneous()) {
+        refreshStyle();
+    }
+}
+
+void ProposalResume::refreshStyle()
+{
+    style()->unpolish(m_ui->scrollContents);
+    style()->polish(m_ui->scrollContents);
+    m_ui->scrollContents->update();
+    for (auto& entry : m_entries) {
+        if (entry.container) {
+            style()->unpolish(entry.container);
+            style()->polish(entry.container);
+            entry.container->update();
+        }
+    }
+}
+
+int ProposalResume::queryConfirmations(const uint256& tx_hash)
+{
+    if (!m_wallet_model) return -1;
+    interfaces::WalletTxStatus tx_status; int num_blocks{}; int64_t block_time{};
+    if (!m_wallet_model->wallet().tryGetTxStatus(tx_hash, tx_status, num_blocks, block_time)) {
+        return -1;
+    }
+    return tx_status.depth_in_main_chain;
+}
+
+QString ProposalResume::formatProposalHtml(const Governance::Object& obj, int confirmations)
+{
+    const CGovernanceObject gov_obj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
+    const Proposal proposal(m_client_model, gov_obj, m_node.gov().getGovernanceInfo(), confirmations);
+    const BitcoinUnit unit = [this]() {
+        if (m_client_model && m_client_model->getOptionsModel()) {
+            return m_client_model->getOptionsModel()->getDisplayUnit();
+        }
+        return BitcoinUnit::DASH;
+    }();
+    const QString fund_summary{tr("For %1 payment(s) of %2 to %3")
+        .arg(proposal.paymentsRequested())
+        .arg(BitcoinUnits::formatWithUnit(unit, proposal.paymentAmount(), false, BitcoinUnits::SeparatorStyle::ALWAYS))
+        .arg(proposal.paymentAddress())};
+
+    QString conf_summary;
+    if (confirmations < 0) {
+        conf_summary = tr("Unknown");
+    } else if (confirmations < m_relay_confs) {
+        conf_summary = tr("Pending");
+    } else {
+        conf_summary = tr("Ready");
+    }
+
+    QString html;
+    html += "<table border='0' cellspacing='0' cellpadding='2' width='100%'>";
+    html += "<tr><td colspan='2'><h3>" + proposal.title().toHtmlEscaped() + "</h3></td></tr>";
+    html += "<tr><td colspan='2'>" + proposal.url().toHtmlEscaped() + "</td></tr>";
+    html += "<tr><td colspan='2'>" + fund_summary.toHtmlEscaped() + "</td></tr>";
+    html += "<tr><td colspan='2'><b>" + tr("Collateral Hash") + ":</b> " + proposal.collateralHash() + "</td></tr>";
+    html += "<tr><td colspan='2'><b>" + tr("Collateral Status") + ":</b> " + conf_summary + "</td></tr>";
+    html += "</table>";
+    return html;
+}
+
+void ProposalResume::addProposal(const Governance::Object& proposal)
+{
+    ProposalEntry entry;
+    entry.proposal = proposal;
+    entry.container = new QFrame(this);
+    entry.container->setFrameShape(QFrame::NoFrame);
+    entry.container->setObjectName("proposalEntry");
+
+    // Create entity with proposal details
+    entry.description = new QTextEdit(entry.container);
+    entry.description->setReadOnly(true);
+    entry.description->setFrameStyle(QFrame::NoFrame);
+    entry.description->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    entry.description->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    entry.description->setTextInteractionFlags(Qt::NoTextInteraction);
+    entry.description->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+    GUIUtil::registerWidget(entry.description, formatProposalHtml(proposal, -1));
+
+    // Create "Broadcast" action
+    entry.broadcast_btn = new QPushButton(tr("Broadcast"), entry.container);
+    entry.broadcast_btn->setEnabled(false);
+    entry.broadcast_btn->setMinimumWidth(100);
+    const uint256 obj_hash = proposal.GetHash();
+    connect(entry.broadcast_btn, &QPushButton::clicked, this, [this, obj_hash]() {
+        onBroadcast(obj_hash);
+    });
+
+    // Create entity with actions
+    QHBoxLayout* buttonLayout = new QHBoxLayout();
+    buttonLayout->setContentsMargins(0, 5, 0, 0);
+    buttonLayout->setSpacing(0);
+    buttonLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
+
+    // Register actions
+    buttonLayout->addWidget(entry.broadcast_btn);
+
+    // Create parent entity
+    QVBoxLayout* layout = new QVBoxLayout(entry.container);
+    layout->setContentsMargins(12, 12, 12, 12);
+    layout->setSpacing(0);
+
+    // Register description and actions
+    layout->addWidget(entry.description);
+    layout->addLayout(buttonLayout);
+
+    m_ui->proposalsLayout->addWidget(entry.container);
+    m_entries.push_back(entry);
+}
+
+void ProposalResume::onBroadcast(const uint256& obj_hash)
+{
+    auto it = std::find_if(m_entries.begin(), m_entries.end(),
+        [&obj_hash](const ProposalEntry& e) {
+            return e.proposal.GetHash() == obj_hash;
+        });
+    if (it == m_entries.end() || !m_wallet_model) {
+        return;
+    }
+    auto& entry = *it;
+
+    std::string error, result_hash;
+    if (m_node.gov().submitProposal(entry.proposal.hashParent, entry.proposal.revision,
+                                    entry.proposal.time, entry.proposal.GetDataAsHexString(),
+                                    entry.proposal.collateralHash, result_hash, error)) {
+        QMessageBox::information(this, tr("Broadcast proposal"),
+            tr("Proposal has been broadcasted to the network with hash %1").arg(QString::fromStdString(result_hash)));
+    } else {
+        QMessageBox::critical(this, tr("Broadcast proposal"),
+            tr("Unable to broadcast proposal, %1").arg(QString::fromStdString(error)));
+        return;
+    }
+
+    Q_EMIT proposalBroadcasted();
+
+    // Remove the entry's container widget and mark as removed
+    if (entry.container) {
+        m_ui->proposalsLayout->removeWidget(entry.container);
+        entry.container->deleteLater();
+        entry.container = nullptr;
+    }
+    m_entries.erase(it);
+
+    // Update empty state
+    updateEmptyState();
+}
+
+void ProposalResume::recalculateDescHeights()
+{
+    for (auto& entry : m_entries) {
+        if (!entry.description) continue;
+
+        // Set document width to viewport width for proper text wrapping
+        const int viewportWidth = entry.description->viewport()->width();
+        if (viewportWidth > 0) {
+            entry.description->document()->setTextWidth(viewportWidth);
+        }
+
+        // Calculate height from document and set as fixed height
+        const int docHeight = static_cast<int>(entry.description->document()->size().height());
+        const int margins = entry.description->contentsMargins().top() + entry.description->contentsMargins().bottom();
+        entry.description->setFixedHeight(docHeight + margins);
+    }
+}
+
+void ProposalResume::refreshConfirmations()
+{
+    bool all_confirmed{true};
+
+    for (auto& entry : m_entries) {
+        const int confs = queryConfirmations(entry.proposal.collateralHash);
+        if (confs != entry.collateral_confs) {
+            entry.collateral_confs = confs;
+            GUIUtil::registerWidget(entry.description, formatProposalHtml(entry.proposal, confs));
+            entry.broadcast_btn->setEnabled(confs >= m_relay_confs);
+        }
+        if (confs < m_relay_confs) {
+            all_confirmed = false;
+        }
+    }
+
+    // Stop polling when all entries are confirmed
+    if (all_confirmed && m_refresh_timer) {
+        m_refresh_timer->stop();
+    }
+}
+
+void ProposalResume::startRefreshTimer()
+{
+    if (m_refresh_timer) {
+        return;
+    }
+    m_refresh_timer = new QTimer(this);
+    connect(m_refresh_timer, &QTimer::timeout, this, &ProposalResume::refreshConfirmations);
+    m_refresh_timer->start(5000);
+    refreshConfirmations();
+}
+
+void ProposalResume::updateEmptyState()
+{
+    if (m_entries.empty()) {
+        // Clear any existing layout items
+        while (QLayoutItem* item = m_ui->proposalsLayout->takeAt(0)) {
+            if (QWidget* w = item->widget(); w && w != m_emptyLabel) {
+                w->deleteLater();
+            }
+            delete item;
+        }
+
+        // Add centered empty label
+        m_ui->proposalsLayout->addStretch(1);
+        m_ui->proposalsLayout->addWidget(m_emptyLabel);
+        m_ui->proposalsLayout->addStretch(1);
+        m_emptyLabel->setVisible(true);
+
+        // Stop timer
+        if (m_refresh_timer) {
+            m_refresh_timer->stop();
+        }
+    } else {
+        m_emptyLabel->setVisible(false);
+    }
+}
diff --git a/src/qt/proposalresume.h b/src/qt/proposalresume.h
new file mode 100644
index 000000000000..789e2666e147
--- /dev/null
+++ b/src/qt/proposalresume.h
@@ -0,0 +1,86 @@
+// Copyright (c) 2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_PROPOSALRESUME_H
+#define BITCOIN_QT_PROPOSALRESUME_H
+
+#include <governance/common.h>
+
+#include <QDialog>
+#include <QEvent>
+#include <QString>
+
+#include <vector>
+
+class ClientModel;
+class WalletModel;
+namespace interfaces {
+class Node;
+} // namespace interfaces
+
+class QFrame;
+class QLabel;
+class QShowEvent;
+class QPushButton;
+class QTextEdit;
+class QTimer;
+class QVBoxLayout;
+class QWidget;
+namespace Ui {
+class ProposalResume;
+} // namespace Ui
+
+struct ProposalEntry {
+    Governance::Object proposal;
+    QFrame* container{nullptr};
+    QTextEdit* description{nullptr};
+    QPushButton* broadcast_btn{nullptr};
+    int collateral_confs{-1};
+};
+
+class ProposalResume : public QDialog
+{
+    Q_OBJECT
+
+    Ui::ProposalResume* m_ui;
+
+public:
+    explicit ProposalResume(interfaces::Node& node, ClientModel* client_model, WalletModel* wallet_model,
+                            const std::vector<Governance::Object>& proposals, QWidget* parent = nullptr);
+    ~ProposalResume();
+
+    void addProposal(const Governance::Object& proposal);
+
+protected:
+    void changeEvent(QEvent* e) override;
+    void showEvent(QShowEvent* e) override;
+
+Q_SIGNALS:
+    void proposalBroadcasted();
+
+private Q_SLOTS:
+    void refreshConfirmations();
+
+private:
+    interfaces::Node& m_node;
+    ClientModel* m_client_model;
+    WalletModel* m_wallet_model;
+
+private:
+    int m_relay_confs{0};
+    QLabel* m_emptyLabel{nullptr};
+    QTimer* m_refresh_timer{nullptr};
+    std::vector<ProposalEntry> m_entries{};
+
+private:
+    int queryConfirmations(const uint256& tx_hash);
+    QString formatProposalHtml(const Governance::Object& proposal, int confirmations);
+    void onBroadcast(const uint256& obj_hash);
+    void recalculateDescHeights();
+    void refreshStyle();
+    void startRefreshTimer();
+    void updateEmptyState();
+};
+
+#endif // BITCOIN_QT_PROPOSALRESUME_H
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index a3fddfde263e..241db510a35d 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -164,6 +164,12 @@ void ProposalWizard::onViewPayload()
 void ProposalWizard::onCreate()
 {
     // Validate fields first
+    if (m_ui->editName->text().trimmed().isEmpty() || m_ui->editUrl->text().trimmed().isEmpty() ||
+        m_ui->editPayAddr->text().trimmed().isEmpty() || m_ui->paymentAmount->value() <= 0)
+    {
+        m_ui->labelError->setText(tr("All fields are mandatory"));
+        return;
+    }
     validateFields();
     if (!m_ui->labelError->text().isEmpty()) {
         return; // Don't proceed if there are errors
@@ -201,12 +207,11 @@ void ProposalWizard::onCreate()
     }
 
     QMessageBox::information(this, tr("Proposal Created"),
-        tr("%1 successfully sent for your proposal \"%2\".\n\nIt takes %3 confirmation(s) before "
-           "you can broadcast your proposal to the network.\n\nThis may take some time, you can monitor "
-           "progress and continue with publishing your proposal by clicking \"Resume Proposal\".")
+        tr("%1 successfully sent for your proposal \"%2\".\n\n"
+           "You will now be redirected to monitor and broadcast your new proposal, "
+           "you can resume this later by clicking \"Resume Proposal\".")
             .arg(m_fee_formatted)
-            .arg(m_ui->editName->text())
-            .arg(m_relay_confs));
+            .arg(m_ui->editName->text()));
 
     accept(); // Close the wizard
 }
diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css
index d7bd456895d3..1aa522d4df9d 100644
--- a/src/qt/res/css/dark.css
+++ b/src/qt/res/css/dark.css
@@ -837,6 +837,20 @@ GovernanceList QTableView {
     color: #c7c7c7;
 }
 
+/******************************************************
+ProposalResume
+******************************************************/
+
+QDialog#ProposalResume #scrollContents {
+    background-color: rgba(0, 0, 0, 0.15);
+    border-color: rgba(128, 128, 128, 0.4);
+}
+
+QDialog#ProposalResume #proposalEntry {
+    background-color: rgba(0, 0, 0, 0.1);
+    border-color: rgba(128, 128, 128, 0.4);
+}
+
 /******************************************************
 HelpMessageDialog
 ******************************************************/
diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css
index 47726e49ee63..cf49b570302f 100644
--- a/src/qt/res/css/general.css
+++ b/src/qt/res/css/general.css
@@ -1621,6 +1621,31 @@ QWidget .QFrame#frame_2 QListView { /* Transaction List */
     margin-right: 10px;
 }
 
+/******************************************************
+ProposalResume
+******************************************************/
+
+QDialog#ProposalResume #scrollArea {
+    background: transparent;
+}
+
+QDialog#ProposalResume #scrollContents {
+    background-color: red;
+    border: 1px solid red;
+    border-radius: 4px;
+}
+
+QDialog#ProposalResume #proposalEntry {
+    background-color: red;
+    border: 1px solid red;
+    border-radius: 4px;
+}
+
+QDialog#ProposalResume #proposalEntry QTextEdit {
+    background: transparent;
+    border: none;
+}
+
 /******************************************************
 ReceiveCoinsDialog
 ******************************************************/
diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css
index 1e896944c0eb..3e276d990a2f 100644
--- a/src/qt/res/css/light.css
+++ b/src/qt/res/css/light.css
@@ -823,6 +823,20 @@ GovernanceList QTableView {
     color: #555;
 }
 
+/******************************************************
+ProposalResume
+******************************************************/
+
+QDialog#ProposalResume #scrollContents {
+    background-color: rgba(0, 0, 0, 0.05);
+    border-color: #dcdcdc;
+}
+
+QDialog#ProposalResume #proposalEntry {
+    background-color: rgba(0, 0, 0, 0.03);
+    border-color: #dcdcdc;
+}
+
 /******************************************************
 HelpMessageDialog
 ******************************************************/
diff --git a/test/util/data/non-backported.txt b/test/util/data/non-backported.txt
index 97566cf80518..4270d5997c43 100644
--- a/test/util/data/non-backported.txt
+++ b/test/util/data/non-backported.txt
@@ -35,6 +35,7 @@ src/qt/masternodelist.*
 src/qt/masternodemodel.*
 src/qt/mnemonicverificationdialog.*
 src/qt/proposalmodel.*
+src/qt/proposalresume.*
 src/qt/proposalwizard.*
 src/rpc/coinjoin.cpp
 src/rpc/evo.cpp

From a0da7de2b78157a1c3176f8dcfcd095fc9d24e10 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 22:39:49 +0530
Subject: [PATCH 23/30] qt: disable proposal buttons until synced, creation
 button w/o funds

You cannot create a proposal without an adequate balance, it's a bad
idea to allow any kind of proposal manipulation without being synced.
---
 src/qt/governancelist.cpp | 48 ++++++++++++++++++++++++++++++++++-----
 src/qt/governancelist.h   |  4 ++++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 5273ee514e18..cf515c6786c1 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -24,6 +24,7 @@
 #include <util/strencodings.h>
 #include <util/time.h>
 
+#include <qt/bitcoinunits.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
@@ -95,6 +96,7 @@ GovernanceList::GovernanceList(QWidget* parent) :
     // Connect buttons
     connect(ui->btnCreateProposal, &QPushButton::clicked, this, &GovernanceList::showCreateProposalDialog);
     connect(ui->btnResumeProposal, &QPushButton::clicked, this, &GovernanceList::showResumeProposalDialog);
+    updateProposalButtons();
 
     // Initialize masternode count to 0
     ui->mnCountLabel->setText("0");
@@ -143,6 +145,7 @@ void GovernanceList::setClientModel(ClientModel* model)
         m_timer->stop();
         return;
     }
+    connect(clientModel, &ClientModel::additionalDataSyncProgressChanged, this, &GovernanceList::updateProposalButtons);
     connect(clientModel, &ClientModel::governanceChanged, this, &GovernanceList::handleProposalListChanged);
     connect(clientModel, &ClientModel::numBlocksChanged, this, &GovernanceList::handleProposalListChanged);
     connect(clientModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
@@ -194,6 +197,7 @@ void GovernanceList::setWalletModel(WalletModel* model)
         m_timer->stop();
         return;
     }
+    connect(walletModel, &WalletModel::balanceChanged, this, &GovernanceList::updateProposalButtons);
     if (clientModel && ui->proposalSourceCombo->findData(ToUnderlying(ProposalSource::Local)) == -1) {
         ui->proposalSourceCombo->addItem(tr("My Proposals"), ToUnderlying(ProposalSource::Local));
     }
@@ -272,8 +276,7 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
     // Need to query number of masternodes here with access to clientModel.
     const int nWeightedMnCount = dmn->getValidWeightedMNsCount();
     ret.m_abs_vote_req = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
-
-    const auto gov_info{clientModel->node().gov().getGovernanceInfo()};
+    ret.m_gov_info = clientModel->node().gov().getGovernanceInfo();
     if (m_proposal_source == ProposalSource::Active) {
         std::vector<CGovernanceObject> govObjList;
         clientModel->getAllGovernanceObjects(govObjList);
@@ -281,17 +284,17 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
             if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
                 continue; // Skip triggers.
             }
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, gov_info.requiredConfs));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, ret.m_gov_info.requiredConfs));
         }
         // Include unrelayed wallet proposals (0 confs, not yet broadcast)
         for (const auto& obj : getWalletProposals(/*pending=*/true)) {
             CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, queryCollateralDepth(obj.collateralHash)));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash)));
         }
     } else if (m_proposal_source == ProposalSource::Local) {
         for (const auto& obj : getWalletProposals(/*pending=*/std::nullopt)) {
             CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, gov_info, queryCollateralDepth(obj.collateralHash)));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash)));
         }
     }
 
@@ -316,8 +319,10 @@ void GovernanceList::setProposalList(CalcProposalList&& data)
 {
     proposalModel->setVotingParams(data.m_abs_vote_req);
     proposalModel->reconcile(std::move(data.m_proposals), std::move(data.m_fundable_hashes));
+    m_gov_info = std::move(data.m_gov_info);
     votableMasternodes = std::move(data.m_votable_masternodes);
     updateMasternodeCount();
+    updateProposalButtons();
 }
 
 void GovernanceList::updateProposalCount()
@@ -359,7 +364,8 @@ void GovernanceList::showCreateProposalDialog()
     proposalWizard->setModal(false);
     proposalWizard->setWindowFlag(Qt::Window, true);
     // Auto-open Resume dialog after successful creation and refresh the governance list
-    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::handleProposalListChanged);
+    connect(proposalWizard, &QDialog::accepted, this, [this] { handleProposalListChanged(/*force=*/true); });
+    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::updateProposalButtons);
     connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
     proposalWizard->show();
 }
@@ -438,6 +444,36 @@ void GovernanceList::updateMasternodeCount() const
     }
 }
 
+void GovernanceList::updateProposalButtons()
+{
+    if (!clientModel || !clientModel->masternodeSync().isGovernanceSynced()) {
+        const QString tooltip = tr("Cannot interact with governance before sync completes");
+        ui->btnCreateProposal->setEnabled(false);
+        ui->btnCreateProposal->setToolTip(tooltip);
+        ui->btnResumeProposal->setEnabled(false);
+        ui->btnResumeProposal->setToolTip(tooltip);
+        return;
+    }
+
+    // Using filler tooltips as tooltips once set cannot be disabled
+    ui->btnCreateProposal->setEnabled(true);
+    ui->btnCreateProposal->setToolTip(tr("Creates a new proposal"));
+    ui->btnResumeProposal->setEnabled(true);
+    ui->btnResumeProposal->setToolTip(tr("Resumes an existing proposal"));
+
+    // Wallets with insufficient balance cannot create proposals
+    if (walletModel && walletModel->getOptionsModel()) {
+        const auto proposal_fee = m_gov_info.proposalfee;
+        if (walletModel->wallet().getBalance() < proposal_fee) {
+            ui->btnCreateProposal->setEnabled(false);
+            ui->btnCreateProposal->setToolTip(
+                tr("Creating proposals costs %1, insufficient balance")
+                    .arg(BitcoinUnits::formatWithUnit(walletModel->getOptionsModel()->getDisplayUnit(), proposal_fee, false,
+                                                      BitcoinUnits::SeparatorStyle::ALWAYS)));
+        }
+    }
+}
+
 void GovernanceList::setProposalSource(int index)
 {
     m_proposal_source = static_cast<ProposalSource>(ui->proposalSourceCombo->itemData(index).toInt());
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index a22dff16a03e..cdec40048e82 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_QT_GOVERNANCELIST_H
 #define BITCOIN_QT_GOVERNANCELIST_H
 
+#include <interfaces/node.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <saltedhasher.h>
@@ -58,12 +59,14 @@ class GovernanceList : public QWidget
 private:
     struct CalcProposalList {
         int m_abs_vote_req{0};
+        interfaces::GOV::GovernanceInfo m_gov_info;
         ProposalList m_proposals;
         Uint256HashMap<CKeyID> m_votable_masternodes;
         Uint256HashSet m_fundable_hashes;
     };
 
     ClientModel* clientModel{nullptr};
+    interfaces::GOV::GovernanceInfo m_gov_info;
     ProposalModel* proposalModel{nullptr};
     ProposalSource m_proposal_source{ProposalSource::Active};
     QMenu* proposalContextMenu{nullptr};
@@ -85,6 +88,7 @@ class GovernanceList : public QWidget
     void setProposalList(CalcProposalList&& data);
     void updateEmptyPagePalette();
     void updateEmptyState();
+    void updateProposalButtons();
     void voteForProposal(vote_outcome_enum_t outcome);
 
 protected:

From 9fb0c35e62f6d4c70bc71a8e0abf64560abe9c86 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:26:44 +0530
Subject: [PATCH 24/30] qt: make governance clock opt-in

---
 src/qt/bitcoingui.cpp         |  4 +++-
 src/qt/forms/optionsdialog.ui | 33 +++++++++++++++++++++++++++++++++
 src/qt/optionsdialog.cpp      | 12 +++++++++++-
 src/qt/optionsmodel.cpp       | 13 +++++++++++++
 src/qt/optionsmodel.h         |  4 ++++
 5 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 6dced4fd4b41..4ae4a71fea4b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -910,6 +910,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
             connect(optionsModel, &OptionsModel::displayUnitChanged, this, &BitcoinGUI::updateGovernanceCycleIcon);
             connect(optionsModel, &OptionsModel::showCoinJoinChanged, this, &BitcoinGUI::updateCoinJoinVisibility);
             connect(optionsModel, &OptionsModel::showGovernanceChanged, this, &BitcoinGUI::updateGovernanceVisibility);
+            connect(optionsModel, &OptionsModel::showGovernanceClockChanged, this, &BitcoinGUI::updateGovernanceCycleIcon);
             connect(optionsModel, &OptionsModel::showMasternodesChanged, this, &BitcoinGUI::updateMasternodesVisibility);
 
             if (trayIcon) {
@@ -1773,7 +1774,8 @@ void BitcoinGUI::updateGovernanceCycleIcon()
     }
 
     const auto& options_model{*clientModel->getOptionsModel()};
-    if (!m_node.gov().isEnabled() || !options_model.getShowGovernanceTab() || clientModel->getNumConnections() == 0) {
+    const bool hide_gov{!options_model.getShowGovernanceTab() || !options_model.getShowGovernanceClock()};
+    if (!m_node.gov().isEnabled() || clientModel->getNumConnections() == 0 || hide_gov) {
         stopGovernanceSyncAnimation();
         labelGovernanceCycleIcon->hide();
         m_last_gov_cycle_height.reset();
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 8acb59b5c391..fd17092144b7 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -387,6 +387,39 @@
            </property>
           </widget>
          </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_govCycleIcon">
+           <item>
+            <spacer name="govCycleIconIndent">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>18</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="showGovernanceCycleIcon">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="toolTip">
+              <string>Show the governance clock in the status bar.</string>
+             </property>
+             <property name="text">
+              <string>Show governance clock</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
          <item>
           <widget class="QCheckBox" name="spendZeroConfChange">
            <property name="toolTip">
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index a1fd3d6b0388..c0dfffa2701d 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -263,6 +263,9 @@ void OptionsDialog::setModel(OptionsModel *_model)
         setMapper();
         mapper->toFirst();
 
+        // Initialize governance clock icon checkbox state based on governance tab checkbox
+        ui->showGovernanceCycleIcon->setEnabled(ui->showGovernanceTab->isChecked());
+
         appearance->setModel(_model);
 
         updateDefaultProxyNets();
@@ -288,12 +291,18 @@ void OptionsDialog::setModel(OptionsModel *_model)
     connect(ui->digits, qOverload<>(&QValueComboBox::valueChanged), [this]{ showRestartWarning(); });
     connect(ui->lang, qOverload<>(&QValueComboBox::valueChanged), [this]{ showRestartWarning(); });
     connect(ui->thirdPartyTxUrls, &QLineEdit::textChanged, [this]{ showRestartWarning(); });
-
+    /* Display, Dash-specific */
     connect(ui->coinJoinEnabled, &QCheckBox::clicked, [this](bool fChecked) {
         model->setOption(OptionsModel::CoinJoinEnabled, fChecked);
         updateCoinJoinVisibility();
         updateWidth();
     });
+    connect(ui->showGovernanceTab, &QCheckBox::clicked, [this](bool fChecked) {
+        ui->showGovernanceCycleIcon->setEnabled(fChecked);
+        if (!fChecked) {
+            ui->showGovernanceCycleIcon->setChecked(false);
+        }
+    });
 
     updateCoinJoinVisibility();
 
@@ -342,6 +351,7 @@ void OptionsDialog::setMapper()
     mapper->addMapping(ui->dustProtection, OptionsModel::DustProtection);
     mapper->addMapping(ui->dustProtectionThreshold, OptionsModel::DustProtectionThreshold);
     mapper->addMapping(ui->showMasternodesTab, OptionsModel::ShowMasternodesTab);
+    mapper->addMapping(ui->showGovernanceCycleIcon, OptionsModel::ShowGovernanceClock);
     mapper->addMapping(ui->showGovernanceTab, OptionsModel::ShowGovernanceTab);
     mapper->addMapping(ui->showAdvancedCJUI, OptionsModel::ShowAdvancedCJUI);
     mapper->addMapping(ui->showCoinJoinPopups, OptionsModel::ShowCoinJoinPopups);
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 38b1b1b5db7f..5a066a94bd36 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -348,6 +348,10 @@ bool OptionsModel::Init(bilingual_str& error)
         settings.setValue("fShowMasternodesTab", false);
     m_enable_masternodes = settings.value("fShowMasternodesTab", false).toBool();
 
+    if (!settings.contains("show_governance_clock"))
+        settings.setValue("show_governance_clock", false);
+    m_show_governance_clock = settings.value("show_governance_clock", false).toBool();
+
     if (!settings.contains("fShowGovernanceTab"))
         settings.setValue("fShowGovernanceTab", false);
     m_enable_governance = settings.value("fShowGovernanceTab", false).toBool();
@@ -670,6 +674,8 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
         return m_sub_fee_from_amount;
     case ShowMasternodesTab:
         return m_enable_masternodes;
+    case ShowGovernanceClock:
+        return m_show_governance_clock;
     case ShowGovernanceTab:
         return m_enable_governance;
     case CoinJoinEnabled:
@@ -869,6 +875,13 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value, const std::
         m_sub_fee_from_amount = value.toBool();
         settings.setValue("SubFeeFromAmount", m_sub_fee_from_amount);
         break;
+    case ShowGovernanceClock:
+        if (changed()) {
+            m_show_governance_clock = value.toBool();
+            settings.setValue("show_governance_clock", m_show_governance_clock);
+            Q_EMIT showGovernanceClockChanged();
+        }
+        break;
     case ShowGovernanceTab:
         if (changed()) {
             m_enable_governance = value.toBool();
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 1d4d740c1ddd..1e41c0b279ca 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -83,6 +83,7 @@ class OptionsModel : public QAbstractListModel
         ExternalSignerPath,     // QString
         SpendZeroConfChange,    // bool
         ShowMasternodesTab,     // bool
+        ShowGovernanceClock,    // bool
         ShowGovernanceTab,      // bool
         CoinJoinEnabled,        // bool
         ShowAdvancedCJUI,       // bool
@@ -135,6 +136,7 @@ class OptionsModel : public QAbstractListModel
     bool getEnablePSBTControls() const { return m_enable_psbt_controls; }
     bool getKeepChangeAddress() const { return fKeepChangeAddress; }
     bool getShowMasternodesTab() const { return m_enable_masternodes; }
+    bool getShowGovernanceClock() const { return m_show_governance_clock; }
     bool getShowGovernanceTab() const { return m_enable_governance; }
     bool getShowAdvancedCJUI() { return fShowAdvancedCJUI; }
     bool getDustProtection() const { return fDustProtection; }
@@ -169,6 +171,7 @@ class OptionsModel : public QAbstractListModel
     bool fKeepChangeAddress;
     bool m_enable_masternodes;
     bool m_enable_governance;
+    bool m_show_governance_clock;
     bool fShowAdvancedCJUI;
     bool fDustProtection{false};
     qint64 nDustProtectionThreshold{DEFAULT_DUST_PROTECTION_THRESHOLD};
@@ -193,6 +196,7 @@ class OptionsModel : public QAbstractListModel
     void coinControlFeaturesChanged(bool);
     void keepChangeAddressChanged(bool);
     void showCoinJoinChanged();
+    void showGovernanceClockChanged();
     void showGovernanceChanged();
     void showMasternodesChanged();
     void showTrayIconChanged(bool);

From d1e67ff48a6f31ef119837a5c3668d2c66047ce7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 19:06:51 +0530
Subject: [PATCH 25/30] fix: disable governance UI when node runs with
 `--disablegovernance`

---
 src/qt/bitcoingui.cpp    |  2 +-
 src/qt/optionsdialog.cpp | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 4ae4a71fea4b..01c616a6337f 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1502,7 +1502,7 @@ void BitcoinGUI::updateCoinJoinVisibility()
 void BitcoinGUI::updateGovernanceVisibility()
 {
     if (!clientModel || !clientModel->getOptionsModel()) return;
-    const bool fShow = clientModel->getOptionsModel()->getShowGovernanceTab();
+    const bool fShow = m_node.gov().isEnabled() && clientModel->getOptionsModel()->getShowGovernanceTab();
 
     // Show/hide the underlying QAction, hiding the QToolButton itself doesn't
     // work for the GUI part but is still needed for shortcuts to work properly.
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index c0dfffa2701d..6484ea9f0771 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -263,8 +263,16 @@ void OptionsDialog::setModel(OptionsModel *_model)
         setMapper();
         mapper->toFirst();
 
-        // Initialize governance clock icon checkbox state based on governance tab checkbox
-        ui->showGovernanceCycleIcon->setEnabled(ui->showGovernanceTab->isChecked());
+        // If governance is disabled at the node level, force-disable governance checkboxes.
+        if (m_client_model && !m_client_model->node().gov().isEnabled()) {
+            ui->showGovernanceTab->setChecked(false);
+            ui->showGovernanceTab->setEnabled(false);
+            ui->showGovernanceCycleIcon->setChecked(false);
+            ui->showGovernanceCycleIcon->setEnabled(false);
+        } else {
+            // Initialize governance clock checkbox state based on governance tab checkbox
+            ui->showGovernanceCycleIcon->setEnabled(ui->showGovernanceTab->isChecked());
+        }
 
         appearance->setModel(_model);
 

From 6cb7a4020168b9fd3101020d221ebdc950cec7de Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:39:50 +0530
Subject: [PATCH 26/30] qt: add pending status to signal unbroadcast proposals

---
 src/qt/governancelist.cpp |  9 ++++++---
 src/qt/proposalmodel.cpp  | 15 +++++++++++++--
 src/qt/proposalmodel.h    |  9 +++++++--
 src/qt/proposalresume.cpp |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index cf515c6786c1..34322d0a6ab9 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -284,17 +284,20 @@ GovernanceList::CalcProposalList GovernanceList::calcProposalList() const
             if (govObj.GetObjectType() != GovernanceObject::PROPOSAL) {
                 continue; // Skip triggers.
             }
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, ret.m_gov_info.requiredConfs));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, ret.m_gov_info.requiredConfs,
+                                                                    /*is_broadcast=*/true));
         }
         // Include unrelayed wallet proposals (0 confs, not yet broadcast)
         for (const auto& obj : getWalletProposals(/*pending=*/true)) {
             CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash)));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash),
+                                                                    /*is_broadcast=*/false));
         }
     } else if (m_proposal_source == ProposalSource::Local) {
         for (const auto& obj : getWalletProposals(/*pending=*/std::nullopt)) {
             CGovernanceObject govObj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
-            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash)));
+            ret.m_proposals.emplace_back(std::make_unique<Proposal>(this->clientModel, govObj, ret.m_gov_info, queryCollateralDepth(obj.collateralHash),
+                                                                    /*is_broadcast=*/clientModel->node().gov().existsObj(obj.GetHash())));
         }
     }
 
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index bee4d2896174..f6d46aa263d4 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -21,12 +21,14 @@
 #include <cmath>
 
 Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj,
-                   const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs) :
+                   const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs,
+                   bool is_broadcast) :
     clientModel{_clientModel},
-    govObj{_govObj},
+    m_is_broadcast{is_broadcast},
     m_block_height{_clientModel ? _clientModel->getNumBlocks() : 0},
     m_collateral_confs{collateral_confs},
     m_gov_info{govInfo},
+    govObj{_govObj},
     m_date_collateral{QDateTime::fromSecsSinceEpoch(govObj.GetCreationTime())},
     m_hash_collateral{QString::fromStdString(govObj.GetCollateralHash().ToString())},
     m_hash_object{QString::fromStdString(govObj.GetHash().ToString())},
@@ -134,6 +136,9 @@ ProposalStatus Proposal::status(bool is_fundable) const
     if (m_collateral_confs < m_gov_info.requiredConfs) {
         return ProposalStatus::Confirming;
     }
+    if (!m_is_broadcast) {
+        return ProposalStatus::Pending;
+    }
     if (m_gov_info.superblockcycle <= 0) {
         return ProposalStatus::Voting;
     }
@@ -178,6 +183,7 @@ void ProposalModel::refreshIcons()
     m_icon_failing = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::RED);
     m_icon_lapsed = GUIUtil::getIcon("transaction_6", GUIUtil::ThemedColor::RED);
     m_icon_passing = GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN);
+    m_icon_pending = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::BLUE);
     m_icon_unfunded = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::RED);
     m_icon_voting = GUIUtil::getIcon("voting", GUIUtil::ThemedColor::ORANGE);
 }
@@ -292,6 +298,9 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
             case ProposalStatus::Lapsed: {
                 return tr("Lapsed, past proposal end date");
             }
+            case ProposalStatus::Pending: {
+                return tr("Ready to broadcast, check \"Resume Proposal\" dialog");
+            }
             } // no default case, so the compiler can warn about missing cases
         }
         if (index.column() == Column::VOTING_STATUS) {
@@ -317,6 +326,8 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
             case ProposalStatus::Passing:
             case ProposalStatus::Funded:
                 return m_icon_passing;
+            case ProposalStatus::Pending:
+                return m_icon_pending;
             case ProposalStatus::Lapsed:
                 return m_icon_lapsed;
             } // no default case, so the compiler can warn about missing cases
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index a5dd412b6cf3..d91d419f90c5 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -31,6 +31,7 @@ enum class ProposalStatus : uint8_t {
     Funded,
     Lapsed,
     Passing,
+    Pending,
     Unfunded,
     Voting,
 };
@@ -39,10 +40,11 @@ class Proposal
 {
 private:
     ClientModel* clientModel;
-    const CGovernanceObject govObj;
+    bool m_is_broadcast{true};
     int m_block_height{0};
     int m_collateral_confs{0};
     interfaces::GOV::GovernanceInfo m_gov_info;
+    const CGovernanceObject govObj;
 
     CAmount m_paymentAmount{0};
     interfaces::GOV::Votes m_votes;
@@ -60,9 +62,11 @@ class Proposal
 
 public:
     explicit Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj,
-                      const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs);
+                      const interfaces::GOV::GovernanceInfo& govInfo, int collateral_confs,
+                      bool is_broadcast);
 
     bool isActive() const;
+    bool isBroadcast() const { return m_is_broadcast; }
     CAmount paymentAmount() const { return m_paymentAmount; }
     const uint256& objHash() const { return m_objHash; }
     int blocksUntilSuperblock() const;
@@ -101,6 +105,7 @@ class ProposalModel : public QAbstractTableModel
     QIcon m_icon_failing;
     QIcon m_icon_lapsed;
     QIcon m_icon_passing;
+    QIcon m_icon_pending;
     QIcon m_icon_unfunded;
     QIcon m_icon_voting;
     std::array<QIcon, 6> m_icon_confirming;
diff --git a/src/qt/proposalresume.cpp b/src/qt/proposalresume.cpp
index 3de08332f20c..e68870d16674 100644
--- a/src/qt/proposalresume.cpp
+++ b/src/qt/proposalresume.cpp
@@ -115,7 +115,7 @@ int ProposalResume::queryConfirmations(const uint256& tx_hash)
 QString ProposalResume::formatProposalHtml(const Governance::Object& obj, int confirmations)
 {
     const CGovernanceObject gov_obj(obj.hashParent, obj.revision, obj.time, obj.collateralHash, obj.GetDataAsHexString());
-    const Proposal proposal(m_client_model, gov_obj, m_node.gov().getGovernanceInfo(), confirmations);
+    const Proposal proposal(m_client_model, gov_obj, m_node.gov().getGovernanceInfo(), confirmations, /*is_broadcast=*/false);
     const BitcoinUnit unit = [this]() {
         if (m_client_model && m_client_model->getOptionsModel()) {
             return m_client_model->getOptionsModel()->getDisplayUnit();

From a5ae10c346cccb3cdc0617b29ce852cc8863b75c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 19:05:07 +0530
Subject: [PATCH 27/30] fix: correct tooltip display unit bug, IBD status
 flickering

- Fix display unit change not updating governance cycle tooltip by
  resetting height cache before calling updateGovernanceCycleIcon
- Snapshot block height in Proposal to prevent status flickering
  during IBD when chain tip advances between UI repaints

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/qt/bitcoingui.cpp    |  4 ++--
 src/qt/proposalmodel.cpp | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 01c616a6337f..166e19155bd8 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -907,7 +907,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
             unitDisplayControl->setOptionsModel(optionsModel);
             m_mask_values_action->setChecked(optionsModel->getOption(OptionsModel::OptionID::MaskValues).toBool());
 
-            connect(optionsModel, &OptionsModel::displayUnitChanged, this, &BitcoinGUI::updateGovernanceCycleIcon);
+            connect(optionsModel, &OptionsModel::displayUnitChanged, this, [this]() { m_last_gov_cycle_height.reset(); updateGovernanceCycleIcon(); });
             connect(optionsModel, &OptionsModel::showCoinJoinChanged, this, &BitcoinGUI::updateCoinJoinVisibility);
             connect(optionsModel, &OptionsModel::showGovernanceChanged, this, &BitcoinGUI::updateGovernanceVisibility);
             connect(optionsModel, &OptionsModel::showGovernanceClockChanged, this, &BitcoinGUI::updateGovernanceCycleIcon);
@@ -1797,7 +1797,7 @@ void BitcoinGUI::updateGovernanceCycleIcon()
     const int current_height{m_node.getNumBlocks()};
     if (current_height == m_last_gov_cycle_height) {
         // Governance clock only changes with new blocks; skip redundant updates
-        // triggered by connection changes, sync progress, or display unit signals.
+        // triggered by connection changes or sync progress signals.
         return;
     } else {
         m_last_gov_cycle_height = current_height;
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index f6d46aa263d4..0257bf2846f7 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -398,12 +398,10 @@ void ProposalModel::reconcile(ProposalList&& proposals, std::unordered_set<uint2
         if (it != m_data.end()) {
             const auto idx{static_cast<int>(std::distance(m_data.begin(), it))};
             keep_index[static_cast<size_t>(idx)] = true;
-            if ((*it)->getAbsoluteYesCount() != proposal->getAbsoluteYesCount() || (*it)->collateralConfs() != proposal->collateralConfs()) {
-                // Replace proposal to update vote count or confirmation depth
-                *it = std::move(proposal);
-                Q_EMIT dataChanged(createIndex(idx, Column::STATUS), createIndex(idx, Column::VOTING_STATUS));
-            }
-            // else: no changes, proposal unique_ptr goes out of scope and gets deleted
+            // Always replace: block height, vote breakdown, and broadcast status
+            // can all change between cycles without a single cheap sentinel.
+            *it = std::move(proposal);
+            Q_EMIT dataChanged(createIndex(idx, Column::STATUS), createIndex(idx, Column::VOTING_STATUS));
         } else {
             append(std::move(proposal));
         }
@@ -416,10 +414,6 @@ void ProposalModel::reconcile(ProposalList&& proposals, std::unordered_set<uint2
         }
     }
 
-    // Fundable set may have changed; refresh all status icons
-    if (!m_data.empty()) {
-        Q_EMIT dataChanged(createIndex(0, Column::STATUS), createIndex(rowCount() - 1, Column::STATUS));
-    }
 }
 
 void ProposalModel::setDisplayUnit(const BitcoinUnit& display_unit)

From 3d53afa456d7ec8fe51d0819a52831aa4a5e6e09 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 22:21:42 +0530
Subject: [PATCH 28/30] fix: hold `cs_main` to for consistent state when
 fetching GovernanceInfo

---
 src/node/interfaces.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index d551adde89b1..d805bf8494ae 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -285,11 +285,14 @@ class GOVImpl : public GOV
     GovernanceInfo getGovernanceInfo() override
     {
         GovernanceInfo info;
-        const NodeContext& ctx = context();
         const Consensus::Params& consensusParams = Params().GetConsensus();
-
-        if (ctx.chainman) {
-            CSuperblock::GetNearestSuperblocksHeights(ctx.chainman->ActiveHeight(), info.lastsuperblock, info.nextsuperblock);
+        if (context().chainman) {
+            LOCK(::cs_main);
+            CSuperblock::GetNearestSuperblocksHeights(context().chainman->ActiveHeight(), info.lastsuperblock, info.nextsuperblock);
+            info.governancebudget = CSuperblock::GetPaymentsLimit(context().chainman->ActiveChain(), info.nextsuperblock);
+            if (context().dmnman) {
+                info.fundingthreshold = context().dmnman->GetListAtChainTip().GetValidWeightedMNsCount() / 10;
+            }
         }
         info.proposalfee = GOVERNANCE_PROPOSAL_FEE_TX;
         info.superblockcycle = consensusParams.nSuperblockCycle;
@@ -297,12 +300,6 @@ class GOVImpl : public GOV
         info.targetSpacing = consensusParams.nPowTargetSpacing;
         info.relayRequiredConfs = GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS;
         info.requiredConfs = GOVERNANCE_FEE_CONFIRMATIONS;
-        if (ctx.dmnman) {
-            info.fundingthreshold = ctx.dmnman->GetListAtChainTip().GetValidWeightedMNsCount() / 10;
-        }
-        if (ctx.chainman) {
-            info.governancebudget = CSuperblock::GetPaymentsLimit(ctx.chainman->ActiveChain(), info.nextsuperblock);
-        }
         return info;
     }
     std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) override

From ce94c3ea32add3586b96ba91b84b6c2672d2cef8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 13 Feb 2026 22:22:36 +0530
Subject: [PATCH 29/30] fix: improve responsiveness in update after user
 interaction

---
 src/qt/governancelist.cpp | 31 +++++++++++++++++--------------
 src/qt/governancelist.h   |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 34322d0a6ab9..6f14efaa1c7b 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -146,8 +146,8 @@ void GovernanceList::setClientModel(ClientModel* model)
         return;
     }
     connect(clientModel, &ClientModel::additionalDataSyncProgressChanged, this, &GovernanceList::updateProposalButtons);
-    connect(clientModel, &ClientModel::governanceChanged, this, &GovernanceList::handleProposalListChanged);
-    connect(clientModel, &ClientModel::numBlocksChanged, this, &GovernanceList::handleProposalListChanged);
+    connect(clientModel, &ClientModel::governanceChanged, this, [this] { handleProposalListChanged(/*force=*/false); });
+    connect(clientModel, &ClientModel::numBlocksChanged, this, [this] { handleProposalListChanged(/*force=*/false); });
     connect(clientModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &GovernanceList::updateDisplayUnit);
     if (walletModel && ui->proposalSourceCombo->findData(ToUnderlying(ProposalSource::Local)) == -1) {
         ui->proposalSourceCombo->addItem(tr("My Proposals"), ToUnderlying(ProposalSource::Local));
@@ -212,18 +212,21 @@ void GovernanceList::updateDisplayUnit()
     }
 }
 
-void GovernanceList::handleProposalListChanged()
+void GovernanceList::handleProposalListChanged(bool force)
 {
-    if (!clientModel || m_timer->isActive()) {
-        // Too early or already processing, nothing to do
+    if (!clientModel) {
         return;
     }
-    int delay{GOVERNANCELIST_UPDATE_SECONDS * 1000};
-    if (!clientModel->masternodeSync().isBlockchainSynced()) {
-        // Currently syncing, reduce refreshes
-        delay *= 6;
+    if (force) {
+        updateProposalList();
+    } else if (!m_timer->isActive()) {
+        int delay{GOVERNANCELIST_UPDATE_SECONDS * 1000};
+        if (!clientModel->masternodeSync().isBlockchainSynced()) {
+            // Currently syncing, reduce refreshes
+            delay *= 6;
+        }
+        m_timer->start(delay);
     }
-    m_timer->start(delay);
 }
 
 int GovernanceList::queryCollateralDepth(const uint256& collateralHash) const
@@ -246,7 +249,7 @@ void GovernanceList::updateProposalList()
 
     if (m_in_progress.exchange(true)) {
         // Already applying, re-arm for next attempt
-        handleProposalListChanged();
+        handleProposalListChanged(/*force=*/false);
         return;
     }
 
@@ -382,7 +385,7 @@ void GovernanceList::showResumeProposalDialog()
 
     const auto proposals = getWalletProposals(/*pending=*/true);
     ProposalResume* dialog = new ProposalResume(clientModel->node(), clientModel, walletModel, proposals, this);
-    connect(dialog, &ProposalResume::proposalBroadcasted, this, &GovernanceList::handleProposalListChanged);
+    connect(dialog, &ProposalResume::proposalBroadcasted, this, [this] { handleProposalListChanged(/*force=*/true); });
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
     dialog->setWindowModality(Qt::NonModal);
     dialog->setModal(false);
@@ -481,7 +484,7 @@ void GovernanceList::setProposalSource(int index)
 {
     m_proposal_source = static_cast<ProposalSource>(ui->proposalSourceCombo->itemData(index).toInt());
     ui->govTableView->setColumnHidden(ProposalModel::Column::VOTING_STATUS, m_proposal_source == ProposalSource::Local);
-    m_timer->start(0);
+    handleProposalListChanged(/*force=*/true);
 }
 
 void GovernanceList::voteYes() { voteForProposal(VOTE_OUTCOME_YES); }
@@ -632,7 +635,7 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
     QMessageBox::information(this, tr("Voting Results"), message);
 
     // Update proposal list to show new vote counts
-    handleProposalListChanged();
+    handleProposalListChanged(/*force=*/true);
 }
 
 void GovernanceList::showEvent(QShowEvent* event)
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index cdec40048e82..09a39047ab9b 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -83,7 +83,7 @@ class GovernanceList : public QWidget
     CalcProposalList calcProposalList() const;
     int queryCollateralDepth(const uint256& collateralHash) const;
     std::vector<Governance::Object> getWalletProposals(std::optional<bool> pending) const;
-    void handleProposalListChanged();
+    void handleProposalListChanged(bool force);
     void refreshColumnWidths();
     void setProposalList(CalcProposalList&& data);
     void updateEmptyPagePalette();

From 707ce77ddafac4adee42da8cc10edfb85b779c27 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 22 Jan 2026 08:33:10 +0530
Subject: [PATCH 30/30] refactor: `qt/proposalwizard.{cpp,h}` ->
 `qt/proposalcreate.{cpp,h}`

We are no longer using the wizard format so the name is a misnomer, the
logic is also relatively simplified (as now half of it is in
`qt/proposalresume.{cpp,h}`)
---
 src/Makefile.qt.include                       |  8 ++--
 .../{proposalwizard.ui => proposalcreate.ui}  |  6 +--
 src/qt/governancelist.cpp                     | 20 ++++-----
 src/qt/governancelist.h                       |  2 +-
 ...{proposalwizard.cpp => proposalcreate.cpp} | 44 +++++++++----------
 src/qt/{proposalwizard.h => proposalcreate.h} | 20 +++++----
 src/qt/res/css/dark.css                       | 16 +++----
 src/qt/res/css/light.css                      | 16 +++----
 test/util/data/non-backported.txt             |  2 +-
 9 files changed, 67 insertions(+), 67 deletions(-)
 rename src/qt/forms/{proposalwizard.ui => proposalcreate.ui} (99%)
 rename src/qt/{proposalwizard.cpp => proposalcreate.cpp} (92%)
 rename src/qt/{proposalwizard.h => proposalcreate.h} (69%)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 09b6b7e4cd1a..095cf7ce2353 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -32,8 +32,8 @@ QT_FORMS_UI = \
   qt/forms/openuridialog.ui \
   qt/forms/optionsdialog.ui \
   qt/forms/overviewpage.ui \
+  qt/forms/proposalcreate.ui \
   qt/forms/proposalresume.ui \
-  qt/forms/proposalwizard.ui \
   qt/forms/psbtoperationsdialog.ui \
   qt/forms/qrdialog.ui \
   qt/forms/receivecoinsdialog.ui \
@@ -79,8 +79,8 @@ QT_MOC_CPP = \
   qt/moc_peertablemodel.cpp \
   qt/moc_peertablesortproxy.cpp \
   qt/moc_proposalmodel.cpp \
+  qt/moc_proposalcreate.cpp \
   qt/moc_proposalresume.cpp \
-  qt/moc_proposalwizard.cpp \
   qt/moc_psbtoperationsdialog.cpp \
   qt/moc_qrdialog.cpp \
   qt/moc_qrimagewidget.cpp \
@@ -162,9 +162,9 @@ BITCOIN_QT_H = \
   qt/paymentserver.h \
   qt/peertablemodel.h \
   qt/peertablesortproxy.h \
+  qt/proposalcreate.h \
   qt/proposalmodel.h \
   qt/proposalresume.h \
-  qt/proposalwizard.h \
   qt/psbtoperationsdialog.h \
   qt/qrdialog.h \
   qt/qrimagewidget.h \
@@ -284,9 +284,9 @@ BITCOIN_QT_WALLET_CPP = \
   qt/openuridialog.cpp \
   qt/overviewpage.cpp \
   qt/paymentserver.cpp \
+  qt/proposalcreate.cpp \
   qt/proposalmodel.cpp \
   qt/proposalresume.cpp \
-  qt/proposalwizard.cpp \
   qt/psbtoperationsdialog.cpp \
   qt/qrdialog.cpp \
   qt/qrimagewidget.cpp \
diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalcreate.ui
similarity index 99%
rename from src/qt/forms/proposalwizard.ui
rename to src/qt/forms/proposalcreate.ui
index 3f8ce3ad0823..bc673aab86b6 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalcreate.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ProposalWizard</class>
- <widget class="QDialog" name="ProposalWizard">
+ <class>ProposalCreate</class>
+ <widget class="QDialog" name="ProposalCreate">
   <property name="geometry">
      <rect>
       <x>0</x>
@@ -447,5 +447,3 @@
  <resources/>
  <connections/>
 </ui>
-
-
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 6f14efaa1c7b..4fb7f2047105 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -13,9 +13,9 @@
 #include <qt/descriptiondialog.h>
 #include <qt/governancelist.h>
 #include <qt/guiutil_font.h>
+#include <qt/proposalcreate.h>
 #include <qt/proposalmodel.h>
 #include <qt/proposalresume.h>
-#include <qt/proposalwizard.h>
 
 #include <chainparams.h>
 #include <interfaces/node.h>
@@ -362,18 +362,18 @@ void GovernanceList::showCreateProposalDialog()
         QMessageBox::warning(this, tr("Unavailable"), tr("A synced node and an unlocked wallet are required."));
         return;
     }
-    ProposalWizard* proposalWizard = new ProposalWizard(this->walletModel, this);
+    ProposalCreate* proposalCreate = new ProposalCreate(this->walletModel, this);
     // Ensure closing the dialog actually destroys it so a fresh flow starts next time
-    proposalWizard->setAttribute(Qt::WA_DeleteOnClose, true);
+    proposalCreate->setAttribute(Qt::WA_DeleteOnClose, true);
     // Modeless window that does not block the parent
-    proposalWizard->setWindowModality(Qt::NonModal);
-    proposalWizard->setModal(false);
-    proposalWizard->setWindowFlag(Qt::Window, true);
+    proposalCreate->setWindowModality(Qt::NonModal);
+    proposalCreate->setModal(false);
+    proposalCreate->setWindowFlag(Qt::Window, true);
     // Auto-open Resume dialog after successful creation and refresh the governance list
-    connect(proposalWizard, &QDialog::accepted, this, [this] { handleProposalListChanged(/*force=*/true); });
-    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::updateProposalButtons);
-    connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
-    proposalWizard->show();
+    connect(proposalCreate, &QDialog::accepted, this, [this] { handleProposalListChanged(/*force=*/true); });
+    connect(proposalCreate, &QDialog::accepted, this, &GovernanceList::updateProposalButtons);
+    connect(proposalCreate, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
+    proposalCreate->show();
 }
 
 void GovernanceList::showResumeProposalDialog()
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 09a39047ab9b..ae1eb0d6d878 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -28,7 +28,7 @@ inline constexpr int GOVERNANCELIST_UPDATE_SECONDS = 10;
 class ClientModel;
 class ProposalModel;
 class WalletModel;
-class ProposalWizard;
+class ProposalCreate;
 class CDeterministicMNList;
 enum vote_outcome_enum_t : int;
 namespace Governance {
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalcreate.cpp
similarity index 92%
rename from src/qt/proposalwizard.cpp
rename to src/qt/proposalcreate.cpp
index 241db510a35d..322e9ef475e0 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalcreate.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <qt/proposalwizard.h>
-#include <qt/forms/ui_proposalwizard.h>
+#include <qt/proposalcreate.h>
+#include <qt/forms/ui_proposalcreate.h>
 
 #include <governance/object.h>
 #include <governance/validators.h>
@@ -31,10 +31,10 @@
 
 #include <algorithm>
 
-ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
+ProposalCreate::ProposalCreate(WalletModel* walletModel, QWidget* parent) :
     QDialog(parent),
     m_walletModel(walletModel),
-    m_ui(new Ui::ProposalWizard)
+    m_ui(new Ui::ProposalCreate)
 {
     m_ui->setupUi(this);
     m_ui->labelError->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
@@ -70,20 +70,20 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     // Initialize total amount display (formatted with current unit)
     updateDisplayUnit();
 
-    connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalWizard::onViewJson);
-    connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalWizard::onViewPayload);
-    connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
-    connect(m_ui->editUrl, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
-    connect(m_ui->editPayAddr, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
-    connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalWizard::updateLabels);
-    connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
-    connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::validateFields);
-    connect(m_ui->btnCreate, &QPushButton::clicked, this, &ProposalWizard::onCreate);
+    connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalCreate::onViewJson);
+    connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalCreate::onViewPayload);
+    connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
+    connect(m_ui->editUrl, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
+    connect(m_ui->editPayAddr, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
+    connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalCreate::updateLabels);
+    connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalCreate::updateLabels);
+    connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalCreate::validateFields);
+    connect(m_ui->btnCreate, &QPushButton::clicked, this, &ProposalCreate::onCreate);
 
     // Update fee labels on display unit change
     if (m_walletModel && m_walletModel->getOptionsModel()) {
         connect(m_walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this,
-                &ProposalWizard::updateDisplayUnit);
+                &ProposalCreate::updateDisplayUnit);
     }
 
     GUIUtil::disableMacFocusRect(this);
@@ -91,12 +91,12 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     setFixedSize(size());
 }
 
-ProposalWizard::~ProposalWizard()
+ProposalCreate::~ProposalCreate()
 {
     delete m_ui;
 }
 
-void ProposalWizard::buildJsonAndHex()
+void ProposalCreate::buildJsonAndHex()
 {
     const int64_t multiplier = std::numeric_limits<int64_t>::max() / std::max<int64_t>(1, m_target_spacing);
 
@@ -139,7 +139,7 @@ void ProposalWizard::buildJsonAndHex()
     m_hex = QString::fromStdString(HexStr(json));
 }
 
-void ProposalWizard::onViewJson()
+void ProposalCreate::onViewJson()
 {
     buildJsonAndHex();
     const QString html = QString("<code style=\"white-space: pre-wrap;\">%1</code>").arg(m_json.toHtmlEscaped());
@@ -150,7 +150,7 @@ void ProposalWizard::onViewJson()
     dlg->show();
 }
 
-void ProposalWizard::onViewPayload()
+void ProposalCreate::onViewPayload()
 {
     buildJsonAndHex();
     const QString html = QString("<code style=\"word-wrap: break-word;\">%1</code>").arg(m_hex.toHtmlEscaped());
@@ -161,7 +161,7 @@ void ProposalWizard::onViewPayload()
     dlg->show();
 }
 
-void ProposalWizard::onCreate()
+void ProposalCreate::onCreate()
 {
     // Validate fields first
     if (m_ui->editName->text().trimmed().isEmpty() || m_ui->editUrl->text().trimmed().isEmpty() ||
@@ -216,7 +216,7 @@ void ProposalWizard::onCreate()
     accept(); // Close the wizard
 }
 
-void ProposalWizard::updateLabels()
+void ProposalCreate::updateLabels()
 {
     if (m_walletModel && m_walletModel->getOptionsModel()) {
         const auto unit = m_walletModel->getOptionsModel()->getDisplayUnit();
@@ -235,7 +235,7 @@ void ProposalWizard::updateLabels()
     }
 }
 
-void ProposalWizard::updateDisplayUnit()
+void ProposalCreate::updateDisplayUnit()
 {
     if (m_walletModel && m_walletModel->getOptionsModel()) {
         m_ui->paymentAmount->setDisplayUnit(m_walletModel->getOptionsModel()->getDisplayUnit());
@@ -243,7 +243,7 @@ void ProposalWizard::updateDisplayUnit()
     updateLabels();
 }
 
-void ProposalWizard::validateFields()
+void ProposalCreate::validateFields()
 {
     if (m_ui->editName->text().trimmed().isEmpty() && m_ui->editUrl->text().trimmed().isEmpty() &&
         m_ui->editPayAddr->text().trimmed().isEmpty() && m_ui->paymentAmount->value() == 0)
diff --git a/src/qt/proposalwizard.h b/src/qt/proposalcreate.h
similarity index 69%
rename from src/qt/proposalwizard.h
rename to src/qt/proposalcreate.h
index d4b48f994caa..a01eb2dfb964 100644
--- a/src/qt/proposalwizard.h
+++ b/src/qt/proposalcreate.h
@@ -2,10 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_QT_PROPOSALWIZARD_H
-#define BITCOIN_QT_PROPOSALWIZARD_H
-
-#include <qt/forms/ui_proposalwizard.h>
+#ifndef BITCOIN_QT_PROPOSALCREATE_H
+#define BITCOIN_QT_PROPOSALCREATE_H
 
 #include <QByteArray>
 #include <QDialog>
@@ -13,12 +11,16 @@
 
 class WalletModel;
 
-class ProposalWizard : public QDialog
+namespace Ui {
+class ProposalCreate;
+} // namespace Ui
+
+class ProposalCreate : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ProposalWizard(WalletModel* walletModel, QWidget* parent = nullptr);
-    ~ProposalWizard();
+    explicit ProposalCreate(WalletModel* walletModel, QWidget* parent = nullptr);
+    ~ProposalCreate();
 
 private Q_SLOTS:
     void onCreate();
@@ -31,7 +33,7 @@ private Q_SLOTS:
 
 private:
     WalletModel* m_walletModel;
-    Ui::ProposalWizard* m_ui;
+    Ui::ProposalCreate* m_ui;
 
     // State
     int m_relay_confs{0};
@@ -44,4 +46,4 @@ private Q_SLOTS:
     void buildJsonAndHex();
 };
 
-#endif // BITCOIN_QT_PROPOSALWIZARD_H
+#endif // BITCOIN_QT_PROPOSALCREATE_H
diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css
index 1aa522d4df9d..6e23b1f2c727 100644
--- a/src/qt/res/css/dark.css
+++ b/src/qt/res/css/dark.css
@@ -406,8 +406,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
-QDialog#ProposalWizard QPushButton#btnViewJson,
-QDialog#ProposalWizard QPushButton#btnViewPayload {
+QDialog#ProposalCreate QPushButton#btnViewJson,
+QDialog#ProposalCreate QPushButton#btnViewPayload {
     background-color: #c7c7c7;
     color: #333;
 }
@@ -426,8 +426,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
-QDialog#ProposalWizard QPushButton#btnViewJson:hover,
-QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
+QDialog#ProposalCreate QPushButton#btnViewJson:hover,
+QDialog#ProposalCreate QPushButton#btnViewPayload:hover {
     background-color: #818181;
     color: #2d2d2e;
 }
@@ -446,8 +446,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
-QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
-QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
+QDialog#ProposalCreate QPushButton#btnViewJson:pressed,
+QDialog#ProposalCreate QPushButton#btnViewPayload:pressed {
     background-color: #f6f6f6;
     color: #585858;
 }
@@ -466,8 +466,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
-QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
-QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
+QDialog#ProposalCreate QPushButton#btnViewJson:disabled,
+QDialog#ProposalCreate QPushButton#btnViewPayload:disabled {
     background-color: #39393b;
     border-color: #585858;
     color: #585858;
diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css
index 3e276d990a2f..dfdac7687a16 100644
--- a/src/qt/res/css/light.css
+++ b/src/qt/res/css/light.css
@@ -389,8 +389,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
-QDialog#ProposalWizard QPushButton#btnViewJson,
-QDialog#ProposalWizard QPushButton#btnViewPayload {
+QDialog#ProposalCreate QPushButton#btnViewJson,
+QDialog#ProposalCreate QPushButton#btnViewPayload {
     background-color: #c7c7c7;
     color: #555;
 }
@@ -409,8 +409,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
-QDialog#ProposalWizard QPushButton#btnViewJson:hover,
-QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
+QDialog#ProposalCreate QPushButton#btnViewJson:hover,
+QDialog#ProposalCreate QPushButton#btnViewPayload:hover {
     background-color: #a7a7a7;
     color: #555;
 }
@@ -429,8 +429,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
-QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
-QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
+QDialog#ProposalCreate QPushButton#btnViewJson:pressed,
+QDialog#ProposalCreate QPushButton#btnViewPayload:pressed {
     background-color: #c7c7c7;
     color: #555;
 }
@@ -449,8 +449,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
 QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
 QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
-QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
-QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
+QDialog#ProposalCreate QPushButton#btnViewJson:disabled,
+QDialog#ProposalCreate QPushButton#btnViewPayload:disabled {
     background-color: #eaeaec;
     border-color: #d2d2d2;
     color: #d2d2d2;
diff --git a/test/util/data/non-backported.txt b/test/util/data/non-backported.txt
index 4270d5997c43..31c094ae421e 100644
--- a/test/util/data/non-backported.txt
+++ b/test/util/data/non-backported.txt
@@ -34,9 +34,9 @@ src/qt/guiutil_font.*
 src/qt/masternodelist.*
 src/qt/masternodemodel.*
 src/qt/mnemonicverificationdialog.*
+src/qt/proposalcreate.*
 src/qt/proposalmodel.*
 src/qt/proposalresume.*
-src/qt/proposalwizard.*
 src/rpc/coinjoin.cpp
 src/rpc/evo.cpp
 src/rpc/evo_util.*