Skip to content
Snippets Groups Projects
Commit a33ed263 authored by inso's avatar inso
Browse files

Merge branch 'master' into dev

parents 328e4e74 271812b7
No related branches found
No related tags found
No related merge requests found
...@@ -101,7 +101,6 @@ class Wallet(object): ...@@ -101,7 +101,6 @@ class Wallet(object):
def send_money(self, salt, password, community, def send_money(self, salt, password, community,
recipient, amount, message): recipient, amount, message):
inputs = self.tx_inputs(int(amount), community) inputs = self.tx_inputs(int(amount), community)
logging.debug("Inputs : {0}".format(inputs)) logging.debug("Inputs : {0}".format(inputs))
outputs = self.tx_outputs(recipient, amount, inputs) outputs = self.tx_outputs(recipient, amount, inputs)
......
...@@ -38,6 +38,8 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): ...@@ -38,6 +38,8 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog):
for contact in sender.contacts: for contact in sender.contacts:
self.combo_contact.addItem(contact.name) self.combo_contact.addItem(contact.name)
self.edit_message.setEnabled(False)
def accept(self): def accept(self):
message = self.edit_message.text() message = self.edit_message.text()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment