diff --git a/lib/gui.py b/lib/gui.py index 55aa41552..5cd364e32 100644 --- a/lib/gui.py +++ b/lib/gui.py @@ -843,6 +843,9 @@ class ElectrumWindow: self.show_message(str(e)) return + if label: + self.wallet.labels[tx.hash()] = label + status, msg = self.wallet.sendtx( tx ) if status: self.show_message( "payment sent.\n" + msg ) diff --git a/lib/gui_android.py b/lib/gui_android.py index 782fa6a84..0868cf430 100644 --- a/lib/gui_android.py +++ b/lib/gui_android.py @@ -457,6 +457,9 @@ def pay_to(recipient, amount, fee, label): droid.dialogDismiss() return + if label: + self.wallet.labels[tx.hash()] = label + droid.dialogDismiss() r, h = wallet.sendtx( tx ) diff --git a/lib/gui_qt.py b/lib/gui_qt.py index 8107f1691..b86da1c8d 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -914,6 +914,9 @@ class ElectrumWindow(QMainWindow): self.show_message(str(e)) return + if label: + self.wallet.labels[tx.hash()] = label + if self.wallet.seed: h = self.wallet.send_tx(tx) waiting_dialog(lambda: False if self.wallet.tx_event.isSet() else _("Please wait...")) diff --git a/lib/gui_text.py b/lib/gui_text.py index 3332c0ca6..92f1eadcd 100644 --- a/lib/gui_text.py +++ b/lib/gui_text.py @@ -265,6 +265,9 @@ class ElectrumGui: self.show_message(str(e)) return + if self.str_description: + self.wallet.labels[tx.hash()] = self.str_description + h = self.wallet.send_tx(tx) self.show_message(_("Please wait..."), getchar=False) self.wallet.tx_event.wait() diff --git a/lib/wallet.py b/lib/wallet.py index 76575fec5..f57afc109 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -689,9 +689,6 @@ class Wallet: if address not in self.addressbook and not self.is_mine(address): self.addressbook.append(address) - #if label: - # self.labels[tx.hash()] = label - return tx def sign_tx(self, tx, password):