From 8be1453fd01e7897618c6ac814e2a4ecffce44e5 Mon Sep 17 00:00:00 2001
From: Stefan <stefand@status.im>
Date: Sun, 14 Apr 2024 11:07:34 +0200
Subject: [PATCH] fix(token-order): global has settings check that introduced
 side effects

The "settings exist" done via ManageTokensController::hasSettings() was
using the global store, hence not working user based. Therefore, after
an onboarding the previous user's settings presence was taken into account.
The fix now uses the order data that is loaded externally per user.

Closes #14383
---
 ui/StatusQ/src/wallet/managetokenscontroller.cpp | 4 +---
 ui/StatusQ/src/wallet/managetokenscontroller.h   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/StatusQ/src/wallet/managetokenscontroller.cpp b/ui/StatusQ/src/wallet/managetokenscontroller.cpp
index eff58dccc8..11359c83d7 100644
--- a/ui/StatusQ/src/wallet/managetokenscontroller.cpp
+++ b/ui/StatusQ/src/wallet/managetokenscontroller.cpp
@@ -276,9 +276,7 @@ QString ManageTokensController::settingsGroupName() const
 
 bool ManageTokensController::hasSettings() const
 {
-    Q_ASSERT(!m_settingsKey.isEmpty());
-    const auto groups = m_settings.childGroups();
-    return groups.contains(settingsGroupName());
+    return !m_settingsData.isEmpty();
 }
 
 int ManageTokensController::compareTokens(const QString& lhsSymbol, const QString& rhsSymbol) const
diff --git a/ui/StatusQ/src/wallet/managetokenscontroller.h b/ui/StatusQ/src/wallet/managetokenscontroller.h
index ba99c6d92f..863b604493 100644
--- a/ui/StatusQ/src/wallet/managetokenscontroller.h
+++ b/ui/StatusQ/src/wallet/managetokenscontroller.h
@@ -160,7 +160,7 @@ private:
     void setSerializeAsCollectibles(const bool newSerializeAsCollectibles);
 
     QSettings m_settings;
-    SerializedTokenData m_settingsData; // symbol -> {sortOrder, visible, groupId, isCommunityGroup, isCollectionGroup}
+    SerializedTokenData m_settingsData;
     bool hasSettings() const;
     void loadSettingsData(bool withGroup = false);