AaronFiore/electrum
1
0
Fork 0
Code Activity

for unconfirmed transactions, show fee sent by server

Browse Source
This commit is contained in:
ThomasV
2016-06-02 11:39:18 +02:00
parent 0843aaafb5
commit bdb4958a34
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/kivy/uix/dialogs/tx_dialog.py
View File

@@ -104,6 +104,7 @@ class TxDialog(Factory.Popup):
self.update()
def update(self):
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(self.tx)
self.can_broadcast = False
if self.tx.is_complete():
self.tx_hash = self.tx.hash()
@@ -115,6 +116,8 @@ class TxDialog(Factory.Popup):
self.date_str = datetime.fromtimestamp(timestamp).isoformat(' ')[:-3]
else:
self.status_str = _('Unconfirmed')
if fee is None:
fee = self.wallet.tx_fees.get(tx_hash)
else:
self.can_broadcast = self.app.network is not None
self.status_str = _('Signed')
@@ -122,7 +125,6 @@ class TxDialog(Factory.Popup):
s, r = self.tx.signature_count()
self.status_str = _("Unsigned") if s == 0 else _('Partially signed') + ' (%d/%d)'%(s,r)
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(self.tx)
self.is_mine = is_mine
if is_relevant:
if is_mine: