[gui] send dialog: split on_sendButton_clicked

This commit does not change behavior. Github-Pull: bitcoin#17509 Rebased-From: cb47d69 (Minified)
bitcoinknots · Feb 6, 2020 · f09f664 · f09f664
1 parent 2d5d820
commit f09f664
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -219,7 +219,7 @@ SendCoinsDialog::~SendCoinsDialog()
     delete ui;
 }
 
-void SendCoinsDialog::on_sendButton_clicked()
+void SendCoinsDialog::PrepareSendText(bool& ok, std::unique_ptr<WalletModelTransaction>& current_transaction, QString& questionString, QString& informative_text, QString& detailed_text)
 {
     if(!model || !model->getOptionsModel())
         return;
@@ -261,7 +261,8 @@ void SendCoinsDialog::on_sendButton_clicked()
     }
 
     // prepare transaction for getting txFee earlier
-    WalletModelTransaction currentTransaction(recipients);
+    current_transaction = MakeUnique<WalletModelTransaction>(recipients);
+    WalletModelTransaction& currentTransaction = *current_transaction;
     WalletModel::SendCoinsReturn prepareStatus;
 
     // Always use a CCoinControl instance, use the CoinControlDialog instance if CoinControl has been enabled
@@ -391,7 +392,6 @@ void SendCoinsDialog::on_sendButton_clicked()
         formatted.append(recipientElement);
     }
 
-    QString questionString;
     if (model->privateKeysDisabled()) {
         questionString.append(tr("Do you want to draft this transaction?"));
     } else {
@@ -445,15 +445,27 @@ void SendCoinsDialog::on_sendButton_clicked()
     questionString.append(QString("<br /><span style='font-size:10pt; font-weight:normal;'>(=%1)</span>")
         .arg(alternativeUnits.join(" " + tr("or") + " ")));
 
-    QString informative_text;
-    QString detailed_text;
     if (formatted.size() > 1) {
         questionString = questionString.arg("");
         informative_text = tr("To review recipient list click \"Show Details...\"");
         detailed_text = formatted.join("\n\n");
     } else {
         questionString = questionString.arg("<br /><br />" + formatted.at(0));
     }
+
+    ok = true;
+}
+
+void SendCoinsDialog::on_sendButton_clicked()
+{
+    bool ok = false;
+    std::unique_ptr<WalletModelTransaction> current_transaction;
+    QString questionString, informative_text, detailed_text;
+    PrepareSendText(ok, current_transaction, questionString, informative_text, detailed_text);
+    if (!ok) return;
+    assert(current_transaction);
+    WalletModelTransaction& currentTransaction = *current_transaction;
+
     const QString confirmation = model->privateKeysDisabled() ? tr("Confirm transaction proposal") : tr("Confirm send coins");
     const QString confirmButtonText = model->privateKeysDisabled() ? tr("Copy PSBT to clipboard") : tr("Send");
     SendConfirmationDialog confirmationDialog(QMessageBox::Question, confirmation, questionString, QMessageBox::Yes, confirmButtonText, QMessageBox::Cancel, informative_text, detailed_text, SEND_CONFIRM_DELAY, this);

diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
@@ -69,6 +69,8 @@ public Q_SLOTS:
     // Additional parameter msgArg can be used via .arg(msgArg).
     void processSendCoinsReturn(const WalletModel::SendCoinsReturn &sendCoinsReturn, const QString &msgArg = QString());
     void minimizeFeeSection(bool fMinimize);
+    // Format confirmation message
+    void PrepareSendText(bool& ok, std::unique_ptr<WalletModelTransaction>& current_transaction, QString& question_string, QString& informative_text, QString& detailed_text);
     void updateFeeMinimizedLabel();
     // Update the passed in CCoinControl with state from the GUI
     void updateCoinControlState(CCoinControl& ctrl);