status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Stefan 2024-04-14 11:07:34 +02:00 committed by Stefan Dunca
parent 228622359d
commit 8be1453fd0
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/StatusQ/src/wallet/managetokenscontroller.cpp
View File

@ -276,9 +276,7 @@ QString ManageTokensController::settingsGroupName() const
bool ManageTokensController::hasSettings() const bool ManageTokensController::hasSettings() const
{ {
Q_ASSERT(!m_settingsKey.isEmpty()); return !m_settingsData.isEmpty();
const auto groups = m_settings.childGroups();
return groups.contains(settingsGroupName());
} }
int ManageTokensController::compareTokens(const QString& lhsSymbol, const QString& rhsSymbol) const int ManageTokensController::compareTokens(const QString& lhsSymbol, const QString& rhsSymbol) const

2
ui/StatusQ/src/wallet/managetokenscontroller.h
View File

@ -160,7 +160,7 @@ private:
void setSerializeAsCollectibles(const bool newSerializeAsCollectibles); void setSerializeAsCollectibles(const bool newSerializeAsCollectibles);
QSettings m_settings; QSettings m_settings;
SerializedTokenData m_settingsData; // symbol -> {sortOrder, visible, groupId, isCommunityGroup, isCollectionGroup} SerializedTokenData m_settingsData;
bool hasSettings() const; bool hasSettings() const;
void loadSettingsData(bool withGroup = false); void loadSettingsData(bool withGroup = false);