From d7e7c1f48ce0b91996cfb3652956002b3a39a201 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 2 Jul 2022 10:33:00 +0100
Subject: [PATCH] Fixed bugs from merge conflict, causing incorrect systray
 statuses in some cases.

---
 src/main/java/org/qortal/controller/Controller.java            | 2 +-
 src/main/java/org/qortal/controller/OnlineAccountsManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index cde965c1..2bf01de3 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -819,7 +819,7 @@ public class Controller extends Thread {
 				actionText = String.format("%s", Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_BLOCKCHAIN"));
 				SysTray.getInstance().setTrayIcon(3);
 			}
-			else if (OnlineAccountsManager.getInstance().hasOnlineAccounts()) {
+			else if (OnlineAccountsManager.getInstance().hasActiveOnlineAccountSignatures()) {
 				actionText = Translator.INSTANCE.translate("SysTray", "MINTING_ENABLED");
 				SysTray.getInstance().setTrayIcon(2);
 			}
diff --git a/src/main/java/org/qortal/controller/OnlineAccountsManager.java b/src/main/java/org/qortal/controller/OnlineAccountsManager.java
index 1e476a4a..9a82df00 100644
--- a/src/main/java/org/qortal/controller/OnlineAccountsManager.java
+++ b/src/main/java/org/qortal/controller/OnlineAccountsManager.java
@@ -471,7 +471,7 @@ public class OnlineAccountsManager {
         final Long minLatestBlockTimestamp = NTP.getTime() - (2 * 60 * 60 * 1000L);
         boolean isUpToDate = Controller.getInstance().isUpToDate(minLatestBlockTimestamp);
 
-        return isUpToDate && hasOnlineAccounts();
+        return isUpToDate && hasOurOnlineAccounts();
     }
 
     public boolean hasOurOnlineAccounts() {