payment-request UI: use SendCoinsRecipient.message for memo

Philip Kaufmann · Philip Kaufmann · commit 983cef48027f · 2013-10-31T17:51:13.000+01:00
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
@@ -450,7 +450,7 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, QList<Sen
     recipients.append(SendCoinsRecipient());
 
     recipients[0].paymentRequest = request;
-    recipients[0].label = GUIUtil::HtmlEscape(request.getDetails().memo()); // Todo: Change to .message once available
+    recipients[0].message = GUIUtil::HtmlEscape(request.getDetails().memo());
 
     request.getMerchant(PaymentServer::certStore, recipients[0].authenticatedMerchant);
 
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
@@ -171,15 +171,15 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
         if (recipient.authenticatedMerchant.isEmpty()) // insecure
         {
             ui->payTo_is->setText(recipient.address);
-            ui->memoTextLabel_is->setText(recipient.label);
+            ui->memoTextLabel_is->setText(recipient.message);
             ui->payAmount_is->setValue(recipient.amount);
             ui->payAmount_is->setReadOnly(true);
             setCurrentWidget(ui->SendCoins_InsecurePaymentRequest);
         }
         else // secure
         {
             ui->payTo_s->setText(recipient.authenticatedMerchant);
-            ui->memoTextLabel_s->setText(recipient.label);
+            ui->memoTextLabel_s->setText(recipient.message);
             ui->payAmount_s->setValue(recipient.amount);
             ui->payAmount_s->setReadOnly(true);
             setCurrentWidget(ui->SendCoins_SecurePaymentRequest);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -31,10 +31,9 @@ class SendCoinsRecipient
     // payment requests, we can abuse it for displaying an address list.
     // Todo: This is a hack, should be replaced with a cleaner solution!
     QString address;
-    // If from a payment request, this is used for storing the memo
-    // Todo: This is a hack, should be replaced with a cleaner solution!
     QString label;
     qint64 amount;
+    // If from a payment request, this is used for storing the memo
     QString message;
 
     // If from a payment request, paymentRequest.IsInitialized() will be true

Original file line number	Diff line number	Diff line change
`@@ -171,15 +171,15 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)`
`171`	`171`	`if (recipient.authenticatedMerchant.isEmpty()) // insecure`
`172`	`172`	`{`
`173`	`173`	`ui->payTo_is->setText(recipient.address);`
`174`		`- ui->memoTextLabel_is->setText(recipient.label);`
	`174`	`+ ui->memoTextLabel_is->setText(recipient.message);`
`175`	`175`	`ui->payAmount_is->setValue(recipient.amount);`
`176`	`176`	`ui->payAmount_is->setReadOnly(true);`
`177`	`177`	`setCurrentWidget(ui->SendCoins_InsecurePaymentRequest);`
`178`	`178`	`}`
`179`	`179`	`else // secure`
`180`	`180`	`{`
`181`	`181`	`ui->payTo_s->setText(recipient.authenticatedMerchant);`
`182`		`- ui->memoTextLabel_s->setText(recipient.label);`
	`182`	`+ ui->memoTextLabel_s->setText(recipient.message);`
`183`	`183`	`ui->payAmount_s->setValue(recipient.amount);`
`184`	`184`	`ui->payAmount_s->setReadOnly(true);`
`185`	`185`	`setCurrentWidget(ui->SendCoins_SecurePaymentRequest);`