qml: Clear Send form after sending transaciton

Author: johnny9

src/qml/models/sendrecipient.cpp

@@ -75,4 +75,5 @@ void SendRecipient::clear()
     Q_EMIT addressChanged();
     Q_EMIT labelChanged();
     Q_EMIT messageChanged();
+    Q_EMIT amount()->amountChanged();
 }

src/qml/models/sendrecipientslistmodel.cpp

@@ -118,3 +118,25 @@ QString SendRecipientsListModel::totalAmount() const
 {
     return BitcoinAmount::satsToBtcString(m_totalAmount);
 }
+
+void SendRecipientsListModel::clear()
+{
+    beginResetModel();
+    for (auto* recipient : m_recipients) {
+        delete recipient;
+    }
+    m_recipients.clear();
+    m_current = 0;
+    m_totalAmount = 0;
+
+    auto* recipient = new SendRecipient(this);
+    connect(recipient->amount(), &BitcoinAmount::amountChanged,
+            this, &SendRecipientsListModel::updateTotalAmount);
+    m_recipients.append(recipient);
+    endResetModel();
+
+    Q_EMIT countChanged();
+    Q_EMIT totalAmountChanged();
+    Q_EMIT currentRecipientChanged();
+    Q_EMIT currentIndexChanged();
+}

src/qml/models/sendrecipientslistmodel.h

@@ -37,6 +37,7 @@ class SendRecipientsListModel : public QAbstractListModel
     Q_INVOKABLE void next();
     Q_INVOKABLE void prev();
     Q_INVOKABLE void remove();
+    Q_INVOKABLE void clear();
 
     int currentIndex() const { return m_current + 1; }
     void setCurrentIndex(int row);

src/qml/models/walletqmlmodel.cpp

@@ -26,7 +26,6 @@ WalletQmlModel::WalletQmlModel(std::unique_ptr<interfaces::Wallet> wallet, QObje
     m_wallet = std::move(wallet);
     m_activity_list_model = new ActivityListModel(this);
     m_coins_list_model = new CoinsListModel(this);
-    m_current_recipient = new SendRecipient(this);
     m_send_recipients = new SendRecipientsListModel(this);
 }
 
@@ -35,15 +34,13 @@ WalletQmlModel::WalletQmlModel(QObject* parent)
 {
     m_activity_list_model = new ActivityListModel(this);
     m_coins_list_model = new CoinsListModel(this);
-    m_current_recipient = new SendRecipient(this);
     m_send_recipients = new SendRecipientsListModel(this);
 }
 
 WalletQmlModel::~WalletQmlModel()
 {
     delete m_activity_list_model;
     delete m_coins_list_model;
-    delete m_current_recipient;
     delete m_send_recipients;
     if (m_current_transaction) {
         delete m_current_transaction;
@@ -103,7 +100,7 @@ std::unique_ptr<interfaces::Handler> WalletQmlModel::handleTransactionChanged(Tr
 
 bool WalletQmlModel::prepareTransaction()
 {
-    if (!m_wallet || !m_current_recipient) {
+    if (!m_wallet || !m_send_recipients || m_send_recipients->recipients().empty()) {
         return false;
     }
 

src/qml/models/walletqmlmodel.h

@@ -27,7 +27,6 @@ class WalletQmlModel : public QObject
     Q_PROPERTY(QString balance READ balance NOTIFY balanceChanged)
     Q_PROPERTY(ActivityListModel* activityListModel READ activityListModel CONSTANT)
     Q_PROPERTY(CoinsListModel* coinsListModel READ coinsListModel CONSTANT)
-    Q_PROPERTY(SendRecipient* sendRecipient READ sendRecipient CONSTANT)
     Q_PROPERTY(SendRecipientsListModel* recipients READ sendRecipientList CONSTANT)
     Q_PROPERTY(WalletQmlModelTransaction* currentTransaction READ currentTransaction NOTIFY currentTransactionChanged)
 
@@ -40,7 +39,6 @@ class WalletQmlModel : public QObject
     QString balance() const;
     ActivityListModel* activityListModel() const { return m_activity_list_model; }
     CoinsListModel* coinsListModel() const { return m_coins_list_model; }
-    SendRecipient* sendRecipient() const { return m_send_recipients->currentRecipient(); }
     SendRecipientsListModel* sendRecipientList() const { return m_send_recipients; }
     WalletQmlModelTransaction* currentTransaction() const { return m_current_transaction; }
     Q_INVOKABLE bool prepareTransaction();
@@ -76,7 +74,6 @@ class WalletQmlModel : public QObject
     ActivityListModel* m_activity_list_model{nullptr};
     CoinsListModel* m_coins_list_model{nullptr};
     SendRecipientsListModel* m_send_recipients{nullptr};
-    SendRecipient* m_current_recipient{nullptr};
     WalletQmlModelTransaction* m_current_transaction{nullptr};
     wallet::CCoinControl m_coin_control;
 };

src/qml/pages/main.qml

@@ -110,7 +110,7 @@ ApplicationWindow {
                 main.pop()
             }
             onTransactionSent: {
-                walletController.selectedWallet.sendRecipient.clear()
+                walletController.selectedWallet.recipients.clear()
                 main.pop()
                 sendResult.open()
             }
@@ -124,7 +124,7 @@ ApplicationWindow {
                 main.pop()
             }
             onTransactionSent: {
-                walletController.selectedWallet.sendRecipient.clear()
+                walletController.selectedWallet.recipients.clear()
                 main.pop()
                 sendResult.open()
             }