better balance (based on wallet status and sync pause status)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 314c2a7bd47c1f22c66c1a61b2e4bfd8aea00f81..1b5a0d89e8f371f86b446c55a49f8ad61c643fcc 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -910,8 +910,17 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) {
     if (conf()->get(Config::balanceShowFiat).toBool() && !hide) {
         QString fiatCurrency = conf()->get(Config::preferredFiatCurrency).toString();
         double balanceFiatAmount = appData()->prices.convert("XMR", fiatCurrency, balance / constants::cdiv);
-        if (balance > 0 && balanceFiatAmount == 0.0) {
-            suffixStr += " (unknown)";
+        bool isCacheFresh = appData()->prices.lastUpdateTime.isValid() &&
+                            appData()->prices.lastUpdateTime.secsTo(QDateTime::currentDateTime()) < 3600;
+
+        if (balance > 0 && (balanceFiatAmount == 0.0 || !isCacheFresh)) {
+            if (conf()->get(Config::offlineMode).toBool() || m_wallet->connectionStatus() == Wallet::ConnectionStatus_Disconnected) {
+                suffixStr += " (offline)";
+            } else if (!appData()->prices.markets.contains("XMR")) {
+                suffixStr += " (connecting)";
+            } else {
+                suffixStr += " (unknown)";
+            }
         } else {
             suffixStr += QString(" (%1)").arg(Utils::amountToCurrencyString(balanceFiatAmount, fiatCurrency));
         }

diff --git a/src/utils/prices.cpp b/src/utils/prices.cpp
index 10ac77f1e2a985cf13ddbaf965a210f390bba516..ccd283c80ba957dd48097f4b682f5dc51291db8d 100644 (file)
--- a/src/utils/prices.cpp
+++ b/src/utils/prices.cpp
@@ -31,6 +31,7 @@ void Prices::cryptoPricesReceived(const QJsonArray &data) {
         this->markets.insert(ms.symbol.toUpper(), ms);
     }
 
+    this->lastUpdateTime = QDateTime::currentDateTime();
     emit cryptoPricesUpdated();
 }
 

diff --git a/src/utils/prices.h b/src/utils/prices.h
index 8972c0e97f72ac93f7b4f29ebccde3cf2f3680d2..afee8b61be9b5618a04b536b5f1923b2d7b3fdc0 100644 (file)
--- a/src/utils/prices.h
+++ b/src/utils/prices.h
@@ -5,6 +5,7 @@
 #define FEATHER_PRICES_H
 
 #include <QObject>
+#include <QDateTime>
 
 #include "utils/Utils.h"
 
@@ -24,6 +25,7 @@ public:
     explicit Prices(QObject *parent = nullptr);
     QMap<QString, double> rates;
     QMap<QString, marketStruct> markets;
+    QDateTime lastUpdateTime;
 
 public slots:
     void cryptoPricesReceived(const QJsonArray &data);