fix: m_updateNetworkInfoAction was active when sync Disabled

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00189f58b47c2fc23115eb3546f9aaf745a94331..5254bb08e108ee0d4a96f660abd74f3214aecd52 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: ci/gh-actions/build
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   build-ubuntu-without-scanner:

diff --git a/.github/workflows/guix.yml b/.github/workflows/guix.yml
index e36b0c8f2cd7dccfb1a59796a486d7c0ab70d728..abd058f0820fffc65599dabe3e813f227262124f 100644 (file)
--- a/.github/workflows/guix.yml
+++ b/.github/workflows/guix.yml
@@ -1,6 +1,9 @@
 name: ci/gh-actions/guix
 
-# on: [push, pull_request]
+on:
+  push:
+    tags:
+      - "guix-2.8.1-*"
 
 jobs:
   cache-sources:

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 4059879f3b4965b42803c911e0857ae9d712eaf2..ad90ce6194cfb914a32acafb29d09e5e7ecaf65b 100644 (file)
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -9,7 +9,6 @@ jobs:
   build:
     name: macOS (brew)
     runs-on: macos-latest
-    steps:
     env:
       CCACHE_DIR: /Users/runner/Library/Caches/ccache
       HOMEBREW_NO_AUTO_UPDATE: 1

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 020f5ed7dcda429dad38d5a6efd2fdc9f4f8ae4d..ae9a91912efef81c0753408f0749cbf8e234a6c9 100644 (file)
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -9,7 +9,6 @@ jobs:
   build:
     name: Windows (MSYS2)
     runs-on: windows-latest
-    steps:
     env:
       CCACHE_DIR: ~/.ccache
 

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index aae0d535faa6d1dccb06ad077c4d8e35bce8f1a9..bb2583429c1df8b0114169e71d6ed37495df940b 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -920,7 +920,7 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) {
         QString fiatCurrency = conf()->get(Config::preferredFiatCurrency).toString();
         double balanceFiatAmount = appData()->prices.convert("XMR", fiatCurrency, balance / constants::cdiv);
         bool isCacheValid = appData()->prices.lastUpdateTime.isValid();
-        bool isCacheFresh = isCacheValid && appData()->prices.lastUpdateTime.secsTo(QDateTime::currentDateTime()) < 3; // TODO: 3600
+        bool isCacheFresh = isCacheValid && appData()->prices.lastUpdateTime.secsTo(QDateTime::currentDateTime()) < 3600;
 
         if (balance > 0 && (balanceFiatAmount == 0.0 || !isCacheValid)) {
             if (conf()->get(Config::offlineMode).toBool() || m_wallet->connectionStatus() == Wallet::ConnectionStatus_Disconnected) {
@@ -936,7 +936,7 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) {
         }
     }
 
-    QString toolTip = "Click for details";
+    QString toolTip = "Right-click for details";
     if (appData()->prices.lastUpdateTime.isValid()) {
         toolTip += QString("\nLast updated: %1").arg(Utils::timeAgo(appData()->prices.lastUpdateTime));
     }
@@ -1107,7 +1107,7 @@ void MainWindow::onConnectionStatusChanged(int status)
     qDebug() << "Wallet connection status changed " << Utils::QtEnumToString(static_cast<Wallet::ConnectionStatus>(status));
 
     if (m_updateNetworkInfoAction) {  // Maybe not initialized on first function call
-        m_updateNetworkInfoAction->setEnabled(status != Wallet::ConnectionStatus_Disconnected);
+        m_updateNetworkInfoAction->setEnabled(status != Wallet::ConnectionStatus_Disconnected && !conf()->get(Config::syncPaused).toBool());
     }
 
     // Update connection info in status bar.