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

6
gui/qt/transaction_dialog.py
View File

@@ -177,12 +177,12 @@ class TxDialog(QDialog, MessageBoxMixin):
def update(self):
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(self.tx)
tx_hash = self.tx.hash()
desc = self.desc
time_str = None
self.broadcast_button.hide()
if self.tx.is_complete():
tx_hash = self.tx.hash()
if tx_hash in self.wallet.transactions.keys():
desc = self.wallet.get_label(tx_hash)
height, conf, timestamp = self.wallet.get_tx_height(tx_hash)
@@ -194,6 +194,8 @@ class TxDialog(QDialog, MessageBoxMixin):
status = _('Not verified')
else:
status = _('Unconfirmed')
if fee is None:
fee = self.wallet.tx_fees.get(tx_hash)
else:
status = _("Signed")
self.broadcast_button.show()
@@ -242,8 +244,6 @@ class TxDialog(QDialog, MessageBoxMixin):
else:
amount_str = _("Transaction unrelated to your wallet")
if fee is None:
fee = self.wallet.tx_fees.get(tx_hash)
fee_str = _("Transaction fee") + ': %s'% (format_amount(fee) + ' ' + base_unit if fee is not None else _('unknown'))
self.amount_label.setText(amount_str)