qml: Add total calculation to SendRecipientsListModel

Author: johnny9

src/qml/bitcoinamount.cpp

@@ -88,7 +88,7 @@ void BitcoinAmount::flipUnit()
     Q_EMIT amountChanged();
 }
 
-QString BitcoinAmount::satsToBtc(qint64 sat)
+QString BitcoinAmount::satsToBtcString(qint64 sat)
 {
     const bool negative = sat < 0;
     qint64 absSat = negative ? -sat : sat;
@@ -112,7 +112,7 @@ QString BitcoinAmount::toDisplay() const
     if (m_unit == Unit::SAT) {
         return QString::number(m_satoshi);
     } else {
-        return satsToBtc(m_satoshi);
+        return satsToBtcString(m_satoshi);
     }
 }
 

src/qml/bitcoinamount.h

@@ -36,6 +36,8 @@ class BitcoinAmount : public QObject
     qint64 satoshi() const;
     void setSatoshi(qint64 new_amount);
 
+    static QString satsToBtcString(qint64 sat);
+
 public Q_SLOTS:
     void flipUnit();
     void clear();
@@ -46,7 +48,6 @@ public Q_SLOTS:
 
 private:
     QString sanitize(const QString& text);
-    static QString satsToBtc(qint64 sat);
     static qint64 btcToSats(const QString& btc);
 
     qint64 m_satoshi{0};

src/qml/models/coinslistmodel.cpp

@@ -122,14 +122,14 @@ QString CoinsListModel::totalSelected() const
 
 QString CoinsListModel::changeAmount() const
 {
-    CAmount change = m_total_amount - m_wallet_model->sendRecipient()->cAmount();
+    CAmount change = m_total_amount - m_wallet_model->sendRecipientList()->totalAmountSatoshi();
     change = std::abs(change);
     return BitcoinUnits::format(BitcoinUnits::Unit::BTC, change);
 }
 
 bool CoinsListModel::overRequiredAmount() const
 {
-    return m_total_amount > m_wallet_model->sendRecipient()->cAmount();
+    return m_total_amount > m_wallet_model->sendRecipientList()->totalAmountSatoshi();
 }
 
 int CoinsListModel::coinCount() const

src/qml/models/sendrecipientslistmodel.cpp

@@ -3,14 +3,16 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qml/models/sendrecipientslistmodel.h>
-#include <qobjectdefs.h>
 
 #include <qml/models/sendrecipient.h>
 
 SendRecipientsListModel::SendRecipientsListModel(QObject* parent)
     : QAbstractListModel(parent)
 {
-    m_recipients.append(new SendRecipient(this));
+    auto* recipient = new SendRecipient(this);
+    connect(recipient->amount(), &BitcoinAmount::amountChanged,
+            this, &SendRecipientsListModel::updateTotalAmount);
+    m_recipients.append(recipient);
 }
 
 int SendRecipientsListModel::rowCount(const QModelIndex&) const
@@ -48,7 +50,10 @@ void SendRecipientsListModel::add()
 {
     const int row = m_recipients.size();
     beginInsertRows(QModelIndex(), row, row);
-    m_recipients.append(new SendRecipient(this));
+    auto* recipient = new SendRecipient(this);
+    connect(recipient->amount(), &BitcoinAmount::amountChanged,
+            this, &SendRecipientsListModel::updateTotalAmount);
+    m_recipients.append(recipient);
     endInsertRows();
     Q_EMIT countChanged();
     setCurrentIndex(row);
@@ -98,3 +103,18 @@ SendRecipient* SendRecipientsListModel::currentRecipient() const
 
     return m_recipients[m_current];
 }
+
+void SendRecipientsListModel::updateTotalAmount()
+{
+    qint64 total = 0;
+    for (const auto& recipient : m_recipients) {
+        total += recipient->amount()->satoshi();
+    }
+    m_totalAmount = total;
+    Q_EMIT totalAmountChanged();
+}
+
+QString SendRecipientsListModel::totalAmount() const
+{
+    return BitcoinAmount::satsToBtcString(m_totalAmount);
+}

src/qml/models/sendrecipientslistmodel.h

@@ -17,6 +17,7 @@ class SendRecipientsListModel : public QAbstractListModel
     Q_PROPERTY(int currentIndex READ currentIndex NOTIFY currentIndexChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(SendRecipient* current READ currentRecipient NOTIFY currentRecipientChanged)
+    Q_PROPERTY(QString totalAmount READ totalAmount NOTIFY totalAmountChanged)
 
 public:
     enum Roles {
@@ -42,15 +43,21 @@ class SendRecipientsListModel : public QAbstractListModel
     SendRecipient* currentRecipient() const;
     int count() const { return m_recipients.size(); }
     QList<SendRecipient*> recipients() const { return m_recipients; }
+    QString totalAmount() const;
+    qint64 totalAmountSatoshi() const { return m_totalAmount; }
 
 Q_SIGNALS:
     void currentIndexChanged();
     void currentRecipientChanged();
     void countChanged();
+    void totalAmountChanged();
 
 private:
+    void updateTotalAmount();
+
     QList<SendRecipient*> m_recipients;
     int m_current{0};
+    qint64 m_totalAmount{0};
 };
 
 #endif // BITCOIN_QML_MODELS_SENDRECIPIENTSLISTMODEL_H

src/qml/models/walletqmlmodel.cpp

@@ -130,7 +130,7 @@ bool WalletQmlModel::prepareTransaction()
             delete m_current_transaction;
         }
         CTransactionRef newTx = *res;
-        m_current_transaction = new WalletQmlModelTransaction(m_current_recipient, this);
+        m_current_transaction = new WalletQmlModelTransaction(m_send_recipients, this);
         m_current_transaction->setWtx(newTx);
         m_current_transaction->setTransactionFee(nFeeRequired);
         Q_EMIT currentTransactionChanged();

src/qml/models/walletqmlmodeltransaction.cpp

@@ -5,10 +5,9 @@
 #include <qml/models/walletqmlmodeltransaction.h>
 
 #include <policy/policy.h>
-#include <qobject.h>
 
-WalletQmlModelTransaction::WalletQmlModelTransaction(const SendRecipient* recipient, QObject* parent)
-    : QObject(parent), m_address(recipient->address()), m_amount(recipient->cAmount()), m_fee(0), m_label(recipient->label()), m_wtx(nullptr)
+WalletQmlModelTransaction::WalletQmlModelTransaction(const SendRecipientsListModel* recipient, QObject* parent)
+    : QObject(parent), m_address(recipient->recipients().at(0)->address()), m_amount(recipient->totalAmountSatoshi()), m_fee(0), m_label(recipient->recipients().at(0)->label()), m_wtx(nullptr)
 {
 }
 

src/qml/models/walletqmlmodeltransaction.h

@@ -5,12 +5,10 @@
 #ifndef BITCOIN_QML_MODELS_WALLETQMLMODELTRANSACTION_H
 #define BITCOIN_QML_MODELS_WALLETQMLMODELTRANSACTION_H
 
-#include <primitives/transaction.h>
-#include <qml/models/sendrecipient.h>
+#include <qml/models/sendrecipientslistmodel.h>
 
 #include <consensus/amount.h>
-
-#include <QObject>
+#include <primitives/transaction.h>
 
 
 class WalletQmlModelTransaction : public QObject
@@ -22,16 +20,14 @@ class WalletQmlModelTransaction : public QObject
     Q_PROPERTY(QString fee READ fee NOTIFY feeChanged)
     Q_PROPERTY(QString total READ total NOTIFY totalChanged)
 public:
-    explicit WalletQmlModelTransaction(const SendRecipient* recipient, QObject* parent = nullptr);
+    explicit WalletQmlModelTransaction(const SendRecipientsListModel* recipient, QObject* parent = nullptr);
 
     QString address() const;
     QString amount() const;
     QString fee() const;
     QString label() const;
     QString total() const;
 
-    QList<SendRecipient> getRecipients() const;
-
     CTransactionRef& getWtx();
     void setWtx(const CTransactionRef&);