1 files changed, 21 insertions, 12 deletions

diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 75610f199e..aa671e0540 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -85,10 +85,17 @@ void SendCoinsEntry::setRemoveEnabled(bool enabled)
 
 void SendCoinsEntry::clear()
 {
+    // clear UI elements for insecure payments
     ui->payTo->clear();
     ui->addAsLabel->clear();
     ui->payAmount->clear();
+    // and the ones for secure payments just to be sure
+    ui->payTo_s->clear();
+    ui->memoTextLabel_s->clear();
+    ui->payAmount_s->clear();
+
     ui->payTo->setFocus();
+
     // update the display unit, to not use the default ("BTC")
     updateDisplayUnit();
 }
@@ -106,8 +113,8 @@ bool SendCoinsEntry::validate()
     if (!recipient.authenticatedMerchant.isEmpty())
         return retval;
 
-    if(!ui->payTo->hasAcceptableInput() ||
-       (model && !model->validateAddress(ui->payTo->text())))
+    if (!ui->payTo->hasAcceptableInput() ||
+        (model && !model->validateAddress(ui->payTo->text())))
     {
         ui->payTo->setValid(false);
         retval = false;
@@ -154,18 +161,20 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
 {
     recipient = value;
 
-    ui->payTo->setText(value.address);
-    ui->addAsLabel->setText(value.label);
-    ui->payAmount->setValue(value.amount);
-
-    if (!recipient.authenticatedMerchant.isEmpty())
+    if (recipient.authenticatedMerchant.isEmpty())
+    {
+        ui->payTo->setText(recipient.address);
+        ui->addAsLabel->setText(recipient.label);
+        ui->payAmount->setValue(recipient.amount);
+    }
+    else
     {
-        const payments::PaymentDetails& details = value.paymentRequest.getDetails();
+        const payments::PaymentDetails& details = recipient.paymentRequest.getDetails();
 
-        ui->payTo_s->setText(value.authenticatedMerchant);
-        ui->memo_s->setTextFormat(Qt::PlainText);
-        ui->memo_s->setText(QString::fromStdString(details.memo()));
-        ui->payAmount_s->setValue(value.amount);
+        ui->payTo_s->setText(recipient.authenticatedMerchant);
+        ui->memoTextLabel_s->setText(QString::fromStdString(details.memo()));
+        ui->payAmount_s->setValue(recipient.amount);
+        ui->payAmount_s->setReadOnly(true);
         setCurrentWidget(ui->SendCoinsSecure);
     }
 }