From 02eb051e78577f712ea67c37a8940d43b165032e Mon Sep 17 00:00:00 2001 From: adityapk00 Date: Sat, 10 Nov 2018 08:01:43 -0800 Subject: [PATCH] #34 Properly validate address field when there is a label --- src/mainwindow.h | 2 ++ src/sendtab.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mainwindow.h b/src/mainwindow.h index 33d8f53..c789081 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -92,6 +92,8 @@ private: void restoreSavedStates(); + QString addressFromAddressField(const QString& lblAddr) { return lblAddr.split("/").last(); } + RPC* rpc = nullptr; QCompleter* labelCompleter = nullptr; diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 6f0007e..90b164e 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -243,8 +243,9 @@ void MainWindow::addAddressSection() { QTimer::singleShot(10, [=] () {ui->sendToScrollArea->ensureWidgetVisible(ui->addAddressButton);}); } -void MainWindow::addressChanged(int itemNumber, const QString& text) { - setMemoEnabled(itemNumber, text.startsWith("z")); +void MainWindow::addressChanged(int itemNumber, const QString& text) { + auto addr = addressFromAddressField(text); + setMemoEnabled(itemNumber, addr.startsWith("z")); } void MainWindow::amountChanged(int item, const QString& text) { @@ -376,7 +377,7 @@ Tx MainWindow::createTxFromSendPage() { for (int i=0; i < totalItems; i++) { QString addr = ui->sendToWidgets->findChild(QString("Address") % QString::number(i+1))->text().trimmed(); // Remove label if it exists - addr = addr.split("/").last(); + addr = addressFromAddressField(addr); double amt = ui->sendToWidgets->findChild(QString("Amount") % QString::number(i+1))->text().trimmed().toDouble(); QString memo = ui->sendToWidgets->findChild(QString("MemoTxt") % QString::number(i+1))->text().trimmed();