1 files changed, 37 insertions, 19 deletions

diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 876b7f808b..75610f199e 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -12,12 +12,14 @@
 #include <QClipboard>
 
 SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
-    QFrame(parent),
+    QStackedWidget(parent),
     ui(new Ui::SendCoinsEntry),
     model(0)
 {
     ui->setupUi(this);
 
+    setCurrentWidget(ui->SendCoinsInsecure);
+
 #ifdef Q_OS_MAC
     ui->payToLayout->setSpacing(4);
 #endif
@@ -101,24 +103,24 @@ bool SendCoinsEntry::validate()
     // Check input validity
     bool retval = true;
 
-    if(!ui->payAmount->validate())
+    if (!recipient.authenticatedMerchant.isEmpty())
+        return retval;
+
+    if(!ui->payTo->hasAcceptableInput() ||
+       (model && !model->validateAddress(ui->payTo->text())))
     {
+        ui->payTo->setValid(false);
         retval = false;
     }
-    else
+
+    if(!ui->payAmount->validate())
     {
-        if(ui->payAmount->value() <= 0)
-        {
-            // Cannot send 0 coins or less
-            ui->payAmount->setValid(false);
-            retval = false;
-        }
+        retval = false;
     }
 
-    if(!ui->payTo->hasAcceptableInput() ||
-       (model && !model->validateAddress(ui->payTo->text())))
-    {
-        ui->payTo->setValid(false);
+    // Reject dust outputs:
+    if (retval && GUIUtil::isDust(ui->payTo->text(), ui->payAmount->value())) {
+        ui->payAmount->setValid(false);
         retval = false;
     }
 
@@ -127,13 +129,15 @@ bool SendCoinsEntry::validate()
 
 SendCoinsRecipient SendCoinsEntry::getValue()
 {
-    SendCoinsRecipient rv;
+    if (!recipient.authenticatedMerchant.isEmpty())
+        return recipient;
 
-    rv.address = ui->payTo->text();
-    rv.label = ui->addAsLabel->text();
-    rv.amount = ui->payAmount->value();
+    // User-entered or non-authenticated:
+    recipient.address = ui->payTo->text();
+    recipient.label = ui->addAsLabel->text();
+    recipient.amount = ui->payAmount->value();
 
-    return rv;
+    return recipient;
 }
 
 QWidget *SendCoinsEntry::setupTabChain(QWidget *prev)
@@ -148,9 +152,22 @@ QWidget *SendCoinsEntry::setupTabChain(QWidget *prev)
 
 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())
+    {
+        const payments::PaymentDetails& details = value.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);
+        setCurrentWidget(ui->SendCoinsSecure);
+    }
 }
 
 void SendCoinsEntry::setAddress(const QString &address)
@@ -161,7 +178,7 @@ void SendCoinsEntry::setAddress(const QString &address)
 
 bool SendCoinsEntry::isClear()
 {
-    return ui->payTo->text().isEmpty();
+    return ui->payTo->text().isEmpty() && ui->payTo_s->text().isEmpty();
 }
 
 void SendCoinsEntry::setFocus()
@@ -175,5 +192,6 @@ void SendCoinsEntry::updateDisplayUnit()
     {
         // Update payAmount with the current unit
         ui->payAmount->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
+        ui->payAmount_s->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
     }
 }