status-im/status-app
1
0
Fork 0
mirror of https://github.com/status-im/status-app.git synced 2026-08-27 07:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(@wallet): apply custom token order on Wallet after Save and apply

Browse Source 
Refresh Assets/Collectibles sort when walletSettings custom-order
timestamp changes. Fixes #21517.
This commit is contained in:
Anastasiya
2026-07-17 09:51:28 +03:00
committed by Anastasiya
parent d55b501bee
commit d9072ebdb1
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/AppLayouts/Wallet/views/RightTabView.qml
+18 -10
View File
@@ -303,6 +303,8 @@ RightTabBaseView {
id: assetsView
AssetsView {
id: walletAssetsView
AssetsViewAdaptor {
id: assetsViewAdaptor
@@ -340,14 +342,13 @@ RightTabBaseView {
settings.category = settingsCategoryName
walletSettings.sync()
settings.sync()
let value = SortOrderComboBox.TokenOrderBalance
if (walletSettings.assetsViewCustomOrderApplyTimestamp > settings.sortOrderUpdateTimestamp && customOrderAvailable) {
value = SortOrderComboBox.TokenOrderCustom
sortByValue(SortOrderComboBox.TokenOrderCustom)
setSortOrder(Qt.AscendingOrder) // same as SortOrderComboBox.onActivated for Custom order
} else {
value = settings.currentSortValue
sortByValue(settings.currentSortValue)
setSortOrder(settings.currentSortOrder)
}
sortByValue(value)
setSortOrder(settings.currentSortOrder)
}
function saveSortSettings() {
@@ -373,6 +374,7 @@ RightTabBaseView {
id: walletSettings
category: "walletSettings-" + root.contactsStore.myPublicKey
property var assetsViewCustomOrderApplyTimestamp
onAssetsViewCustomOrderApplyTimestampChanged: walletAssetsView.refreshSortSettings()
}
readonly property var settings: Settings { /* https://bugreports.qt.io/browse/QTBUG-135039 */
@@ -454,14 +456,13 @@ RightTabBaseView {
settings.category = settingsCategoryName
walletSettings.sync()
settings.sync()
let value = SortOrderComboBox.TokenOrderBalance
if (walletSettings.collectiblesViewCustomOrderApplyTimestamp > settings.sortOrderUpdateTimestamp && customOrderAvailable) {
value = SortOrderComboBox.TokenOrderCustom
sortByValue(SortOrderComboBox.TokenOrderCustom)
setSortOrder(Qt.AscendingOrder) // same as SortOrderComboBox.onActivated for Custom order
} else {
value = settings.currentSortValue
sortByValue(settings.currentSortValue)
setSortOrder(settings.currentSortOrder)
}
sortByValue(value)
setSortOrder(settings.currentSortOrder)
}
function saveSortSettings() {
@@ -480,6 +481,13 @@ RightTabBaseView {
Component.onCompleted: refreshSortSettings()
Component.onDestruction: saveSortSettings()
Connections {
target: walletSettings
function onCollectiblesViewCustomOrderApplyTimestampChanged() {
collView.refreshSortSettings()
}
}
readonly property var settings: Settings { /* https://bugreports.qt.io/browse/QTBUG-135039 */
id: settings
property int currentSortValue: SortOrderComboBox.TokenOrderDateAdded