From 3195eca6ea7d3f5fb717553183fba59369597a64 Mon Sep 17 00:00:00 2001 From: chris-belcher Date: Sat, 27 May 2017 15:48:47 +0100 Subject: [PATCH] Made status bar exchange rate display in terms of base unit --- gui/qt/main_window.py | 3 ++- lib/exchange_rate.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index bb3d8803..1e6cc6cc 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -666,7 +666,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): # append fiat balance and price if self.fx.is_enabled(): - text += self.fx.get_fiat_status_text(c + u + x) or '' + text += self.fx.get_fiat_status_text(c + u + x, + self.base_unit(), self.get_decimal_point()) or '' if not self.network.proxy: icon = QIcon(":icons/status_connected.png") else: diff --git a/lib/exchange_rate.py b/lib/exchange_rate.py index d95edf3e..3aaf9ce0 100644 --- a/lib/exchange_rate.py +++ b/lib/exchange_rate.py @@ -406,10 +406,10 @@ class FxThread(ThreadJob): rate = self.exchange_rate() return '' if rate is None else "%s %s" % (self.value_str(btc_balance, rate), self.ccy) - def get_fiat_status_text(self, btc_balance): + def get_fiat_status_text(self, btc_balance, base_unit, decimal_point): rate = self.exchange_rate() - return _(" (No FX rate available)") if rate is None else " 1 BTC~%s %s" % (self.value_str(COIN, rate), self.ccy) - + return _(" (No FX rate available)") if rate is None else " 1 %s~%s %s" % (base_unit, + self.value_str(COIN / (10**(8 - decimal_point)), rate), self.ccy) def value_str(self, satoshis, rate): if satoshis is None: # Can happen with incomplete history