qml: Updates to SendReview page

Properly output formatted amounts in the SendReview page. In
addition, remove the WalletQmlModelTransaction QObject and move
the fee and totalAmount values into the SendRecipientsListModel

Author: johnny9

src/Makefile.qt.include

@@ -53,7 +53,6 @@ QT_MOC_CPP = \
   qml/models/moc_snapshotqml.cpp \
   qml/models/moc_walletlistmodel.cpp \
   qml/models/moc_walletqmlmodel.cpp \
-  qml/models/moc_walletqmlmodeltransaction.cpp \
   qml/moc_appmode.cpp \
   qml/moc_bitcoinamount.cpp \
   qml/moc_clipboard.cpp \
@@ -147,7 +146,6 @@ BITCOIN_QT_H = \
   qml/models/sendrecipientslistmodel.h \
   qml/models/walletlistmodel.h \
   qml/models/walletqmlmodel.h \
-  qml/models/walletqmlmodeltransaction.h \
   qml/appmode.h \
   qml/clipboard.h \
   qml/bitcoin.h \
@@ -353,7 +351,6 @@ BITCOIN_QML_BASE_CPP = \
   qml/models/sendrecipientslistmodel.cpp \
   qml/models/walletlistmodel.cpp \
   qml/models/walletqmlmodel.cpp \
-  qml/models/walletqmlmodeltransaction.cpp \
   qml/imageprovider.cpp \
   qml/qrimageprovider.cpp \
   qml/util.cpp \

src/qml/bitcoin.cpp

@@ -35,7 +35,6 @@
 #include <qml/models/sendrecipient.h>
 #include <qml/models/walletlistmodel.h>
 #include <qml/models/walletqmlmodel.h>
-#include <qml/models/walletqmlmodeltransaction.h>
 #include <qml/qrimageprovider.h>
 #include <qml/util.h>
 #include <qml/walletqmlcontroller.h>
@@ -348,8 +347,6 @@ int QmlGuiMain(int argc, char* argv[])
 #ifdef ENABLE_WALLET
     qmlRegisterUncreatableType<WalletQmlModel>("org.bitcoincore.qt", 1, 0, "WalletQmlModel",
                                                "WalletQmlModel cannot be instantiated from QML");
-    qmlRegisterUncreatableType<WalletQmlModelTransaction>("org.bitcoincore.qt", 1, 0, "WalletQmlModelTransaction",
-                                                          "WalletQmlModelTransaction cannot be instantiated from QML");
 #endif
 
     engine.load(QUrl(QStringLiteral("qrc:///qml/pages/main.qml")));

src/qml/models/sendrecipientslistmodel.cpp

@@ -148,6 +148,7 @@ void SendRecipientsListModel::clear()
     Q_EMIT countChanged();
     Q_EMIT totalAmountChanged();
     Q_EMIT currentRecipientChanged();
+    Q_EMIT firstRecipientChanged();
     Q_EMIT currentIndexChanged();
     Q_EMIT listCleared();
 }
@@ -176,3 +177,25 @@ void SendRecipientsListModel::clearToFront()
         Q_EMIT currentIndexChanged();
     }
 }
+
+void SendRecipientsListModel::setFee(qint64 fee)
+{
+    if (m_fee != fee) {
+        m_fee = fee;
+        Q_EMIT totalAmountChanged();
+        Q_EMIT feeChanged();
+    }
+}
+
+QString SendRecipientsListModel::fee() const
+{
+    return BitcoinAmount::satsToRichBtcString(m_fee);
+}
+
+SendRecipient* SendRecipientsListModel::firstRecipient() const
+{
+    if (m_recipients.size() == 0) {
+        return nullptr;
+    }
+    return m_recipients[0];
+}

src/qml/models/sendrecipientslistmodel.h

@@ -18,7 +18,9 @@ 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(SendRecipient* first READ firstRecipient NOTIFY firstRecipientChanged)
     Q_PROPERTY(QString totalAmount READ totalAmount NOTIFY totalAmountChanged)
+    Q_PROPERTY(QString fee READ fee NOTIFY feeChanged)
 
 public:
     enum Roles {
@@ -44,16 +46,21 @@ class SendRecipientsListModel : public QAbstractListModel
     int currentIndex() const { return m_current + 1; }
     void setCurrentIndex(int row);
     SendRecipient* currentRecipient() const;
+    SendRecipient* firstRecipient() const;
     int count() const { return m_recipients.size(); }
     QList<SendRecipient*> recipients() const { return m_recipients; }
     QString totalAmount() const;
     qint64 totalAmountSatoshi() const { return m_totalAmount; }
+    QString fee() const;
+    void setFee(qint64 fee);
 
 Q_SIGNALS:
     void currentIndexChanged();
     void currentRecipientChanged();
+    void firstRecipientChanged();
     void countChanged();
     void totalAmountChanged();
+    void feeChanged();
     void listCleared();
 
 private:
@@ -63,6 +70,7 @@ class SendRecipientsListModel : public QAbstractListModel
     QList<SendRecipient*> m_recipients;
     int m_current{0};
     qint64 m_totalAmount{0};
+    qint64 m_fee{0};
 };
 
 #endif // BITCOIN_QML_MODELS_SENDRECIPIENTSLISTMODEL_H

src/qml/models/walletqmlmodel.cpp

@@ -51,9 +51,6 @@ WalletQmlModel::~WalletQmlModel()
     delete m_coins_list_model;
     delete m_send_recipients;
     delete m_current_payment_request;
-    if (m_current_transaction) {
-        delete m_current_transaction;
-    }
 }
 
 QString WalletQmlModel::balance() const
@@ -162,14 +159,8 @@ bool WalletQmlModel::prepareTransaction()
     CAmount nFeeRequired = 0;
     const auto& res = m_wallet->createTransaction(vecSend, m_coin_control, true, nChangePosRet, nFeeRequired);
     if (res) {
-        if (m_current_transaction) {
-            delete m_current_transaction;
-        }
-        CTransactionRef newTx = *res;
-        m_current_transaction = new WalletQmlModelTransaction(m_send_recipients, this);
-        m_current_transaction->setWtx(newTx);
-        m_current_transaction->setTransactionFee(nFeeRequired);
-        Q_EMIT currentTransactionChanged();
+        m_current_transaction = *res;
+        m_send_recipients->setFee(nFeeRequired);
         return true;
     } else {
         return false;
@@ -182,7 +173,7 @@ void WalletQmlModel::sendTransaction()
         return;
     }
 
-    CTransactionRef newTx = m_current_transaction->getWtx();
+    CTransactionRef newTx = m_current_transaction;
     if (!newTx) {
         return;
     }

src/qml/models/walletqmlmodel.h

@@ -16,6 +16,7 @@
 #include <interfaces/handler.h>
 #include <interfaces/wallet.h>
 #include <wallet/coincontrol.h>
+#include <wallet/wallet.h>
 
 #include <memory>
 #include <vector>
@@ -30,7 +31,6 @@ class WalletQmlModel : public QObject
     Q_PROPERTY(ActivityListModel* activityListModel READ activityListModel CONSTANT)
     Q_PROPERTY(CoinsListModel* coinsListModel READ coinsListModel CONSTANT)
     Q_PROPERTY(SendRecipientsListModel* recipients READ sendRecipientList CONSTANT)
-    Q_PROPERTY(WalletQmlModelTransaction* currentTransaction READ currentTransaction NOTIFY currentTransactionChanged)
     Q_PROPERTY(unsigned int targetBlocks READ feeTargetBlocks WRITE setFeeTargetBlocks NOTIFY feeTargetBlocksChanged)
     Q_PROPERTY(PaymentRequest* currentPaymentRequest READ currentPaymentRequest CONSTANT)
     Q_PROPERTY(bool isWalletLoaded READ isWalletLoaded NOTIFY walletIsLoadedChanged)
@@ -49,7 +49,6 @@ class WalletQmlModel : public QObject
     ActivityListModel* activityListModel() const { return m_activity_list_model; }
     CoinsListModel* coinsListModel() const { return m_coins_list_model; }
     SendRecipientsListModel* sendRecipientList() const { return m_send_recipients; }
-    WalletQmlModelTransaction* currentTransaction() const { return m_current_transaction; }
     Q_INVOKABLE bool prepareTransaction();
     Q_INVOKABLE void sendTransaction();
 
@@ -81,7 +80,6 @@ class WalletQmlModel : public QObject
 Q_SIGNALS:
     void nameChanged();
     void balanceChanged();
-    void currentTransactionChanged();
     void feeTargetBlocksChanged();
     void walletIsLoadedChanged();
 
@@ -93,7 +91,7 @@ class WalletQmlModel : public QObject
     ActivityListModel* m_activity_list_model{nullptr};
     CoinsListModel* m_coins_list_model{nullptr};
     SendRecipientsListModel* m_send_recipients{nullptr};
-    WalletQmlModelTransaction* m_current_transaction{nullptr};
+    CTransactionRef m_current_transaction{nullptr};
     wallet::CCoinControl m_coin_control;
     bool m_is_wallet_loaded{false};
 };

src/qml/models/walletqmlmodeltransaction.cpp

@@ -108,7 +108,7 @@ Page {
                     Layout.fillWidth: true
                 }
                 CoreText {
-                    text: root.transaction.total
+                    text: root.wallet.recipients.totalAmount
                     font.pixelSize: 20
                     color: Theme.color.neutral9
                 }
@@ -130,7 +130,7 @@ Page {
                     Layout.fillWidth: true
                 }
                 CoreText {
-                    text: root.transaction.fee
+                    text: root.wallet.recipients.fee
                     font.pixelSize: 15
                 }
             }