Browse Source

Merge #692: Improve checks for send ("Single Join") in GUI

2076dbf Improve checks for send ("Single Join") in GUI (Kristaps Kaupe)
master
Adam Gibson 5 years ago
parent
commit
d3704e4d0d
No known key found for this signature in database
GPG Key ID: 141001A1AF77F20B
  1. 21
      scripts/joinmarket-qt.py

21
scripts/joinmarket-qt.py

@ -707,7 +707,7 @@ class SpendTab(QWidget):
def startSingle(self): def startSingle(self):
if not self.spendstate.runstate == 'ready': if not self.spendstate.runstate == 'ready':
log.info("Cannot start join, already running.") log.info("Cannot start join, already running.")
if not self.validateSettings(): if not self.validateSingleSend():
return return
destaddr = str(self.addressInput.text().strip()) destaddr = str(self.addressInput.text().strip())
@ -1069,13 +1069,25 @@ class SpendTab(QWidget):
self.tumbler_options = None self.tumbler_options = None
self.tumbler_destaddrs = None self.tumbler_destaddrs = None
def validateSettings(self): def validateSingleSend(self):
if not mainWindow.wallet_service:
JMQtMessageBox(self,
"There is no wallet loaded.",
mbtype='warn',
title="Error")
return False
if jm_single().bc_interface is None: if jm_single().bc_interface is None:
JMQtMessageBox( JMQtMessageBox(
self, self,
"Sending coins not possible without blockchain source.", "Sending coins not possible without blockchain source.",
mbtype='warn', title="Error") mbtype='warn', title="Error")
return False return False
if len(self.addressInput.text()) == 0:
JMQtMessageBox(
self,
"Recipient address or BIP21 bitcoin: payment URI must be provided.",
mbtype='warn', title="Error")
return False
valid, errmsg = validate_address( valid, errmsg = validate_address(
str(self.addressInput.text().strip())) str(self.addressInput.text().strip()))
if not valid: if not valid:
@ -1098,11 +1110,6 @@ class SpendTab(QWidget):
self, self,
"Amount, in bitcoins, must be provided.", "Amount, in bitcoins, must be provided.",
mbtype='warn', title="Error") mbtype='warn', title="Error")
if not mainWindow.wallet_service:
JMQtMessageBox(self,
"There is no wallet loaded.",
mbtype='warn',
title="Error")
return False return False
return True return True

Loading…
Cancel
Save