gui: add more detailed address error message

bitcoin-core · Jan 21, 2022 · d90ca37 · d90ca37
1 parent e3ce019
commit d90ca37
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 12 deletions.
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
@@ -10,6 +10,7 @@
 
 #include <QDataWidgetMapper>
 #include <QMessageBox>
+#include <key_io.h>
 
 
 EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
@@ -44,6 +45,8 @@ EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
     connect(delegate, &GUIUtil::ItemDelegate::keyEscapePressed, this, &EditAddressDialog::reject);
     mapper->setItemDelegate(delegate);
 
+    connect(ui->addressEdit, &QValidatedLineEdit::textEdited, this, &EditAddressDialog::addressEdited);
+
     GUIUtil::handleCloseWindowShortcut(this);
 }
 
@@ -164,3 +167,24 @@ void EditAddressDialog::setAddress(const QString &_address)
     this->address = _address;
     ui->addressEdit->setText(_address);
 }
+
+// Address changed
+void EditAddressDialog::addressEdited(const QString& text)
+{
+    if (text.isEmpty()) // Nothing entered
+    {
+        ui->errorMessage->setText("");
+        return;
+    }
+
+    std::string error_msg;
+
+    if (!IsValidDestination(DecodeDestination(text.toStdString(), error_msg))) // Invalid address
+    {
+        ui->errorMessage->setText(QString::fromStdString(error_msg));
+    }
+    else // Valid address
+    {
+        ui->errorMessage->setText("");
+    }
+}
diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h
@@ -42,6 +42,9 @@ class EditAddressDialog : public QDialog
 public Q_SLOTS:
     void accept() override;
 
+private Q_SLOTS:
+    void addressEdited(const QString &);
+
 private:
     bool saveCurrentRow();
 

diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>457</width>
-    <height>126</height>
+    <height>138</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,6 +53,16 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="errorMessage">
+       <property name="styleSheet">
+        <string notr="true">color:red;</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>729</width>
-    <height>150</height>
+    <height>172</height>
    </rect>
   </property>
   <property name="focusPolicy">
@@ -33,7 +33,17 @@
     <property name="verticalSpacing">
      <number>8</number>
     </property>
-    <item row="0" column="0">
+    <item row="0" column="1">
+     <widget class="QLabel" name="errorMessage">
+      <property name="styleSheet">
+       <string notr="true">color:red;</string>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
      <widget class="QLabel" name="payToLabel">
       <property name="text">
        <string>Pay &amp;To:</string>
@@ -46,7 +56,7 @@
       </property>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="1" column="1">
      <layout class="QHBoxLayout" name="payToLayout">
       <property name="spacing">
        <number>0</number>
@@ -126,7 +136,7 @@
       </item>
      </layout>
     </item>
-    <item row="1" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="labellLabel">
       <property name="text">
        <string>&amp;Label:</string>
@@ -139,7 +149,7 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
+    <item row="2" column="1">
      <widget class="QLineEdit" name="addAsLabel">
       <property name="toolTip">
        <string>Enter a label for this address to add it to the list of used addresses</string>
@@ -149,7 +159,7 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="3" column="0">
      <widget class="QLabel" name="amountLabel">
       <property name="text">
        <string>A&amp;mount:</string>
@@ -162,7 +172,7 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
+    <item row="3" column="1">
      <layout class="QHBoxLayout" name="horizontalLayoutAmount" stretch="0,1,0">
       <item>
        <widget class="BitcoinAmountField" name="payAmount">
@@ -174,7 +184,7 @@
       <item>
        <widget class="QCheckBox" name="checkboxSubtractFeeFromAmount">
         <property name="toolTip">
-         <string>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</string>
+         <string>The fee will be deducted from the amount being sent. The recipient will receive less bitcoin than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</string>
         </property>
         <property name="text">
          <string>S&amp;ubtract fee from amount</string>
@@ -190,7 +200,7 @@
       </item>
      </layout>
     </item>
-    <item row="3" column="0">
+    <item row="4" column="0">
      <widget class="QLabel" name="messageLabel">
       <property name="text">
        <string>Message:</string>
@@ -200,7 +210,7 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="4" column="1">
      <widget class="QLabel" name="messageTextLabel">
       <property name="toolTip">
        <string>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string>
@@ -210,7 +220,7 @@
       </property>
      </widget>
     </item>
-    <item row="4" column="0" colspan="2">
+    <item row="5" column="0" colspan="2">
      <widget class="Line" name="line">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>

diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
@@ -19,6 +19,8 @@
 #include <QApplication>
 #include <QClipboard>
 
+#include <key_io.h>
+
 SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *parent) :
     QStackedWidget(parent),
     ui(new Ui::SendCoinsEntry),
@@ -50,6 +52,7 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *par
     connect(ui->deleteButton_is, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked);
     connect(ui->deleteButton_s, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked);
     connect(ui->useAvailableBalanceButton, &QPushButton::clicked, this, &SendCoinsEntry::useAvailableBalanceClicked);
+    connect(ui->payTo, &QValidatedLineEdit::textEdited, this, &SendCoinsEntry::addressEdited);
 }
 
 SendCoinsEntry::~SendCoinsEntry()
@@ -266,3 +269,24 @@ bool SendCoinsEntry::updateLabel(const QString &address)
 
     return false;
 }
+
+// Address changed
+void SendCoinsEntry::addressEdited(const QString& text)
+{
+    if (text.isEmpty()) // Nothing entered
+    {
+        ui->errorMessage->setText("");
+        return;
+    }
+
+    std::string error_msg;
+
+    if (!IsValidDestination(DecodeDestination(text.toStdString(), error_msg))) // Invalid address
+    {
+        ui->errorMessage->setText(QString::fromStdString(error_msg));
+    }
+    else // Valid address
+    {
+        ui->errorMessage->setText("");
+    }
+}
diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h
@@ -68,6 +68,7 @@ private Q_SLOTS:
     void on_addressBookButton_clicked();
     void on_pasteButton_clicked();
     void updateDisplayUnit();
+    void addressEdited(const QString &);
 
 protected:
     void changeEvent(QEvent* e) override;