gat_wallet_delta: reverse sign of returned fee
This commit is contained in:
parent
79fbb5edce
commit
0843aaafb5
|
@ -127,8 +127,8 @@ class TxDialog(Factory.Popup):
|
||||||
if is_relevant:
|
if is_relevant:
|
||||||
if is_mine:
|
if is_mine:
|
||||||
if fee is not None:
|
if fee is not None:
|
||||||
self.amount_str = self.app.format_amount_and_units(-v+fee)
|
self.amount_str = self.app.format_amount_and_units(-v-fee)
|
||||||
self.fee_str = self.app.format_amount_and_units(-fee)
|
self.fee_str = self.app.format_amount_and_units(fee)
|
||||||
else:
|
else:
|
||||||
self.amount_str = self.app.format_amount_and_units(-v)
|
self.amount_str = self.app.format_amount_and_units(-v)
|
||||||
self.fee_str = _("unknown")
|
self.fee_str = _("unknown")
|
||||||
|
|
|
@ -2711,7 +2711,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
|
|
||||||
def bump_fee_dialog(self, tx):
|
def bump_fee_dialog(self, tx):
|
||||||
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(tx)
|
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(tx)
|
||||||
fee = -fee
|
|
||||||
d = WindowModalDialog(self, _('Bump Fee'))
|
d = WindowModalDialog(self, _('Bump Fee'))
|
||||||
vbox = QVBoxLayout(d)
|
vbox = QVBoxLayout(d)
|
||||||
vbox.addWidget(QLabel(_('Current fee') + ': %s'% self.format_amount(fee) + ' ' + self.base_unit()))
|
vbox.addWidget(QLabel(_('Current fee') + ': %s'% self.format_amount(fee) + ' ' + self.base_unit()))
|
||||||
|
|
|
@ -234,7 +234,7 @@ class TxDialog(QDialog, MessageBoxMixin):
|
||||||
if is_relevant:
|
if is_relevant:
|
||||||
if is_mine:
|
if is_mine:
|
||||||
if fee is not None:
|
if fee is not None:
|
||||||
amount_str = _("Amount sent:") + ' %s'% format_amount(-v+fee) + ' ' + base_unit
|
amount_str = _("Amount sent:") + ' %s'% format_amount(-v-fee) + ' ' + base_unit
|
||||||
else:
|
else:
|
||||||
amount_str = _("Amount sent:") + ' %s'% format_amount(-v) + ' ' + base_unit
|
amount_str = _("Amount sent:") + ' %s'% format_amount(-v) + ' ' + base_unit
|
||||||
else:
|
else:
|
||||||
|
@ -244,7 +244,7 @@ class TxDialog(QDialog, MessageBoxMixin):
|
||||||
|
|
||||||
if fee is None:
|
if fee is None:
|
||||||
fee = self.wallet.tx_fees.get(tx_hash)
|
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'))
|
fee_str = _("Transaction fee") + ': %s'% (format_amount(fee) + ' ' + base_unit if fee is not None else _('unknown'))
|
||||||
|
|
||||||
self.amount_label.setText(amount_str)
|
self.amount_label.setText(amount_str)
|
||||||
self.fee_label.setText(fee_str)
|
self.fee_label.setText(fee_str)
|
||||||
|
|
|
@ -596,7 +596,7 @@ class Abstract_Wallet(PrintError):
|
||||||
fee = None
|
fee = None
|
||||||
else:
|
else:
|
||||||
# all inputs are mine
|
# all inputs are mine
|
||||||
fee = v_out - v_in
|
fee = v_in - v_out
|
||||||
if not is_mine:
|
if not is_mine:
|
||||||
fee = None
|
fee = None
|
||||||
return is_relevant, is_mine, v, fee
|
return is_relevant, is_mine, v, fee
|
||||||
|
|
Loading…
Reference in New Issue