Merge pull request #1 from Infernoman/patch-1

Fix Transaction Comments (Thanks to Infernoman)
greencoin-dev · Dec 31, 2015 · 7e91032 · 7e91032
2 parents 9e73a9a + 9c92ebe
commit 7e91032
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -117,6 +117,8 @@ void SendCoinsDialog::on_sendButton_clicked()
     if(!model || !model->getOptionsModel())
         return;
 
+    QString txcomment = ui->editTxComment->text();
+
     QList<SendCoinsRecipient> recipients;
     bool valid = true;
 
@@ -172,9 +174,9 @@ void SendCoinsDialog::on_sendButton_clicked()
     WalletModel::SendCoinsReturn sendstatus;
 
     if (!model->getOptionsModel() || !model->getOptionsModel()->getCoinControlFeatures())
-        sendstatus = model->sendCoins(recipients);
+        sendstatus = model->sendCoins(txcomment, recipients);
     else
-        sendstatus = model->sendCoins(recipients, CoinControlDialog::coinControl);
+        sendstatus = model->sendCoins(txcomment, recipients, CoinControlDialog::coinControl);
 
     switch(sendstatus.status)
     {

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -213,7 +213,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
     if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
         strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
     if (!wtx.strTxComment.empty())
-        strHTML += "<b>" + tr("Transaction comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.strTxComment.c_str(), true) + "<br>";
+        strHTML += "<b>" + tr("Transaction comment") + ":</b><br>" + wtx.strTxComment.c_str() + "<br>";
     strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "<br>";
 
     if (wtx.IsCoinBase() || wtx.IsCoinStake())

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -140,7 +140,7 @@ bool WalletModel::validateAddress(const QString &address)
     return addressParsed.IsValid();
 }
 
-WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipient> &recipients, const CCoinControl *coinControl)
+WalletModel::SendCoinsReturn WalletModel::sendCoins(const QString &txcomment, const QList<SendCoinsRecipient> &recipients, const CCoinControl *coinControl)
 {
     qint64 total = 0;
     QSet<QString> setAddress;

diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -85,7 +85,7 @@ class WalletModel : public QObject
     };
 
     // Send coins to a list of recipients
-    SendCoinsReturn sendCoins(const QList<SendCoinsRecipient> &recipients, const CCoinControl *coinControl=NULL);
+    SendCoinsReturn sendCoins(const QString &txcomment, const QList<SendCoinsRecipient> &recipients, const CCoinControl *coinControl=NULL);
 
     // Wallet encryption
     bool setWalletEncrypted(bool encrypted, const SecureString &passphrase);
@@ -146,6 +146,8 @@ class WalletModel : public QObject
 
     QTimer *pollTimer;
 
+    QString txComment;
+
     void subscribeToCoreSignals();
     void unsubscribeFromCoreSignals();
     void checkBalanceChanged();