Merge branch 'develop' of https://github.com/dashpay/dash into develop

dashpay · Dec 7, 2024 · 1315f8e · 1315f8e
2 parents 3b24115 + 96c97bb
commit 1315f8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -106,10 +106,11 @@ class TransactionTablePriv
 
     /* Query entire wallet anew from core.
      */
-    void refreshWallet(interfaces::Wallet& wallet)
+    void refreshWallet(interfaces::Wallet& wallet, bool force = false)
     {
         parent->beginResetModel();
-        assert(!m_loaded);
+        assert(!m_loaded || force);
+        cachedWallet.clear();
         try {
             for (const auto& wtx : wallet.getWalletTxs()) {
                 if (TransactionRecord::showTransaction()) {
@@ -284,9 +285,9 @@ TransactionTableModel::~TransactionTableModel()
     delete priv;
 }
 
-void TransactionTableModel::refreshWallet()
+void TransactionTableModel::refreshWallet(bool force)
 {
-    priv->refreshWallet(walletModel->wallet());
+    priv->refreshWallet(walletModel->wallet(), force);
 }
 
 /** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */
@@ -846,12 +847,13 @@ void TransactionTablePriv::DispatchNotifications()
 
             vQueueNotifications[i].invoke(parent);
         }
+        vQueueNotifications.clear();
     } else {
-        // it's much faster to just refresh the whole thing instead
-        bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection);
+        // it's much faster to just drop all the queued notifications and refresh the whole thing instead
+        vQueueNotifications.clear();
+        bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection, Q_ARG(bool, true));
         assert(invoked);
     }
-    vQueueNotifications.clear();
 }
 
 void TransactionTableModel::subscribeToCoreSignals()

diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
@@ -114,7 +114,7 @@ class TransactionTableModel : public QAbstractTableModel
 
 public Q_SLOTS:
     /* Refresh the whole wallet, helpful for huge notification queues */
-    void refreshWallet();
+    void refreshWallet(bool foce = false);
     /* New transaction, or transaction changed status */
     void updateTransaction(const QString &hash, int status, bool showTransaction);
     void updateAddressBook(const QString &address, const QString &label,