tfix #3948 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b7b592fd6eb59049896ec644bdfb86cc7bf1685b
DIR parent 36a444ba6c5d32fb2c89a4549449cfaab75bebcc
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 21 Feb 2018 19:04:33 +0100
fix #3948
Diffstat:
M lib/exchange_rate.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/lib/exchange_rate.py b/lib/exchange_rate.py
t@@ -508,9 +508,11 @@ class FxThread(ThreadJob):
return _(" (No FX rate available)") if rate.is_nan() else " 1 %s~%s %s" % (base_unit,
self.value_str(COIN / (10**(8 - decimal_point)), rate), self.ccy)
+ def fiat_value(self, satoshis, rate):
+ return Decimal('NaN') if satoshis is None else Decimal(satoshis) / COIN * Decimal(rate)
+
def value_str(self, satoshis, rate):
- value = Decimal('NaN') if satoshis is None else Decimal(satoshis) / COIN * Decimal(rate)
- return self.format_fiat(value)
+ return self.format_fiat(self.fiat_value(satoshis, rate))
def format_fiat(self, value):
if value.is_nan():
t@@ -527,12 +529,10 @@ class FxThread(ThreadJob):
return Decimal(rate)
def historical_value_str(self, satoshis, d_t):
- rate = self.history_rate(d_t)
- return self.value_str(satoshis, rate)
+ return self.format_fiat(self.historical_value(satoshis, d_t))
def historical_value(self, satoshis, d_t):
- rate = self.history_rate(d_t)
- return Decimal(satoshis) / COIN * Decimal(rate)
+ return self.fiat_value(satoshis, self.history_rate(d_t))
def timestamp_rate(self, timestamp):
from electrum.util import timestamp_to_datetime