diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -8,4 +8,4 @@ - The help message also reflects this. - Code standard updated to c++14. - Remove `depends` from transaction objects provided by `getblocktemplate`. - \ No newline at end of file + - The option to reuse exisiting receiving addresses has been removed from the wallet. diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -28,23 +28,6 @@ - - - - Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before. - - - R&euse an existing receiving address (not recommended) - - - - - - - - - - @@ -127,7 +110,7 @@ - + @@ -184,7 +167,7 @@ - + @@ -324,7 +307,6 @@ reqLabel reqAmount reqMessage - reuseAddress receiveButton clearButton recentRequestsView diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -112,7 +112,6 @@ ui->reqAmount->clear(); ui->reqLabel->setText(""); ui->reqMessage->setText(""); - ui->reuseAddress->setChecked(false); updateDisplayUnit(); } @@ -138,25 +137,9 @@ QString address; QString label = ui->reqLabel->text(); - if (ui->reuseAddress->isChecked()) { - /* Choose existing receiving address */ - AddressBookPage dlg(platformStyle, AddressBookPage::ForSelection, - AddressBookPage::ReceivingTab, this); - dlg.setModel(model->getAddressTableModel()); - if (dlg.exec()) { - address = dlg.getReturnValue(); - // If no label provided, use the previously used label - if (label.isEmpty()) { - label = model->getAddressTableModel()->labelForAddress(address); - } - } else { - return; - } - } else { - /* Generate new receiving address */ - address = model->getAddressTableModel()->addRow( - AddressTableModel::Receive, label, ""); - } + /* Generate new receiving address */ + address = model->getAddressTableModel()->addRow(AddressTableModel::Receive, + label, ""); SendCoinsRecipient info(address, label, ui->reqAmount->value(), ui->reqMessage->text()); ReceiveRequestDialog *dialog = new ReceiveRequestDialog(config, this);