some more simplifications to status/label/fiat updates

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a1820b367f9f47977d2ef172955e601c1690af92..3cd283257c4241b094789bc29eadddcb306838be 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -824,10 +824,8 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) {
         if (balance > 0 && (balanceFiatAmount == 0.0 || !isCacheValid)) {
             if (conf()->get(Config::offlineMode).toBool() || conf()->get(Config::disableWebsocket).toBool() || m_wallet->connectionStatus() == Wallet::ConnectionStatus_Disconnected) {
                 suffixStr += " (offline)";
-            } else if (!appData()->prices.markets.contains("XMR")) {
-                suffixStr += " (connecting)";
             } else {
-                suffixStr += " (unknown)";
+                suffixStr += " (connecting)";
             }
         } else {
             QString approx = !conf()->get(Config::disableWebsocket).toBool() ? "" : "~ ";
@@ -1125,8 +1123,9 @@ void MainWindow::onConnectionStatusChanged(int status)
                     .arg(QLocale::system().toString(targetHeight));
         }
     }
-    m_statusBtnConnectionStatusIndicator->setToolTip(statusStr);
+    // m_statusBtnConnectionStatusIndicator->setToolTip(statusStr);
     m_statusBtnConnectionStatusIndicator->setIcon(icon);
+    this->updateBalance();
 }
 
 void MainWindow::onTransactionCreated(PendingTransaction *tx, const QVector<QString> &address) {

diff --git a/src/utils/prices.cpp b/src/utils/prices.cpp
index ccd283c80ba957dd48097f4b682f5dc51291db8d..d8ebf29f02f4694098e03bd0b9a3bd5ac0758a54 100644 (file)
--- a/src/utils/prices.cpp
+++ b/src/utils/prices.cpp
@@ -38,7 +38,7 @@ void Prices::cryptoPricesReceived(const QJsonArray &data) {
 void Prices::fiatPricesReceived(const QJsonObject &data) {
     QJsonObject ratesData = data.value("rates").toObject();
     for (const auto &currency : ratesData.keys()) {
-        this->rates.insert(currency, ratesData.value(currency).toDouble());
+        this->rates.insert(currency.toUpper(), ratesData.value(currency).toDouble());
     }
     emit fiatPricesUpdated();
 }