coins: don't refresh for each freeze/thaw

feather-wallet · Oct 10, 2024 · fdc7a09 · fdc7a09
1 parent 796d4dd
commit fdc7a09
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 43 deletions.
diff --git a/src/CoinsWidget.cpp b/src/CoinsWidget.cpp
@@ -324,18 +324,12 @@ QVector<CoinsInfo*> CoinsWidget::currentEntries() {
 }
 
 void CoinsWidget::freezeCoins(QStringList &pubkeys) {
-    for (auto &pubkey : pubkeys) {
-        m_wallet->coins()->freeze(pubkey);
-    }
-    m_wallet->coins()->refresh();
+    m_wallet->coins()->freeze(pubkeys);
     m_wallet->updateBalance();
 }
 
 void CoinsWidget::thawCoins(QStringList &pubkeys) {
-    for (auto &pubkey : pubkeys) {
-        m_wallet->coins()->thaw(pubkey);
-    }
-    m_wallet->coins()->refresh();
+    m_wallet->coins()->thaw(pubkeys);
     m_wallet->updateBalance();
 }
 

diff --git a/src/SendWidget.h b/src/SendWidget.h
@@ -49,7 +49,7 @@ public slots:
     void disallowSending();
 
 private slots:
-    void onDataPasted(const QString &data);
+    void onDataFromQR(const QString &data);
 
 private:
     void setupComboBox();

diff --git a/src/libwalletqt/Coins.cpp b/src/libwalletqt/Coins.cpp
@@ -105,48 +105,52 @@ quint64 Coins::count() const
     return m_rows.length();
 }
 
-void Coins::freeze(QString &publicKey)
+void Coins::freeze(QStringList &publicKeys)
 {
     crypto::public_key pk;
-    if (!epee::string_tools::hex_to_pod(publicKey.toStdString(), pk))
-    {
-        qWarning() << "Invalid public key: " << publicKey;
-        return;
-    }
 
-    try
-    {
-        m_wallet2->freeze(pk);
-        refresh();
-    }
-    catch (const std::exception& e)
-    {
-        qWarning() << "freeze: " << e.what();
+    for (const auto& publicKey : publicKeys) {
+        if (!epee::string_tools::hex_to_pod(publicKey.toStdString(), pk))
+        {
+            qWarning() << "Invalid public key: " << publicKey;
+            continue;
+        }
+
+        try
+        {
+            m_wallet2->freeze(pk);
+        }
+        catch (const std::exception& e)
+        {
+            qWarning() << "freeze: " << e.what();
+        }
     }
 
-    emit coinFrozen();
+    refresh();
 }
 
-void Coins::thaw(QString &publicKey)
+void Coins::thaw(QStringList &publicKeys)
 {
     crypto::public_key pk;
-    if (!epee::string_tools::hex_to_pod(publicKey.toStdString(), pk))
-    {
-        qWarning() << "Invalid public key: " << publicKey;
-        return;
-    }
 
-    try
-    {
-        m_wallet2->thaw(pk);
-        refresh();
-    }
-    catch (const std::exception& e)
-    {
-        qWarning() << "thaw: " << e.what();
+    for (const auto& publicKey : publicKeys) {
+        if (!epee::string_tools::hex_to_pod(publicKey.toStdString(), pk))
+        {
+            qWarning() << "Invalid public key: " << publicKey;
+            continue;
+        }
+
+        try
+        {
+            m_wallet2->thaw(pk);
+        }
+        catch (const std::exception& e)
+        {
+            qWarning() << "thaw: " << e.what();
+        }
     }
 
-    emit coinThawed();
+    refresh();
 }
 
 QVector<CoinsInfo*> Coins::coins_from_txid(const QString &txid)

diff --git a/src/libwalletqt/Coins.h b/src/libwalletqt/Coins.h
@@ -31,8 +31,10 @@ Q_OBJECT
     CoinsInfo * coin(int index);
     void refresh();
     void refreshUnlocked();
-    void freeze(QString &publicKey);
-    void thaw(QString &publicKey);
+
+    void freeze(QStringList &publicKeys);
+    void thaw(QStringList &publicKeys);
+
     QVector<CoinsInfo*> coins_from_txid(const QString &txid);
     QVector<CoinsInfo*> coinsFromKeyImage(const QStringList &keyimages);
     void setDescription(const QString &publicKey, quint32 accountIndex, const QString &description);
@@ -43,8 +45,6 @@ Q_OBJECT
 signals:
     void refreshStarted() const;
     void refreshFinished() const;
-    void coinFrozen() const;
-    void coinThawed() const;
     void descriptionChanged() const;
 
 private: