From d9072ebdb13d71c27e3a3a6c19adb98bf861e4b5 Mon Sep 17 00:00:00 2001
From: Anastasiya <anastasija.ig@gmail.com>
Date: Thu, 16 Jul 2026 11:08:45 +0300
Subject: [PATCH] fix(@wallet): apply custom token order on Wallet after Save
 and apply

Refresh Assets/Collectibles sort when walletSettings custom-order
timestamp changes. Fixes #21517.
---
 .../AppLayouts/Wallet/views/RightTabView.qml  | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ui/app/AppLayouts/Wallet/views/RightTabView.qml b/ui/app/AppLayouts/Wallet/views/RightTabView.qml
index 973df18b84..0e9b0ae8ac 100644
--- a/ui/app/AppLayouts/Wallet/views/RightTabView.qml
+++ b/ui/app/AppLayouts/Wallet/views/RightTabView.qml
@@ -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