ln: request_list: post rebase fixup (remove new_request_button deactivation)

This commit is contained in:
Janus 2019-01-23 18:25:58 +01:00 committed by ThomasV
parent 02798aeb39
commit 1f1207ecbe
2 changed files with 3 additions and 9 deletions

View file

@ -1162,7 +1162,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
def update_receive_address_styling(self): def update_receive_address_styling(self):
addr = str(self.receive_address_e.text()) addr = str(self.receive_address_e.text())
if self.wallet.is_used(addr): # note: 'addr' could be ln invoice here
if is_address(addr) and self.wallet.is_used(addr):
self.receive_address_e.setStyleSheet(ColorScheme.RED.as_stylesheet(True)) self.receive_address_e.setStyleSheet(ColorScheme.RED.as_stylesheet(True))
self.receive_address_e.setToolTip(_("This address has already been used. " self.receive_address_e.setToolTip(_("This address has already been used. "
"For better privacy, do not reuse it for new payments.")) "For better privacy, do not reuse it for new payments."))

View file

@ -113,14 +113,7 @@ class RequestList(MyTreeView):
self.parent.expires_combo.show() self.parent.expires_combo.show()
domain = self.wallet.get_receiving_addresses() domain = self.wallet.get_receiving_addresses()
try:
addr = self.wallet.get_unused_address()
except InternalAddressCorruption as e:
self.parent.show_error(str(e))
addr = ''
if current_address not in domain and addr:
self.parent.set_receive_address(addr)
self.parent.new_request_button.setEnabled(addr != current_address)
self.parent.update_receive_address_styling() self.parent.update_receive_address_styling()
self.model().clear() self.model().clear()