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: Apply custom asset / collectible order (#16227)

This commit is contained in:
Cuteivist 2024-09-11 14:00:25 +02:00 committed by GitHub
parent 77fd4e78eb
commit ff9f272295
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 226 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
storybook/pages/AssetsViewPage.qml
View File

@ -11,6 +11,7 @@ import Qt.labs.settings 1.1
import Models 1.0
import AppLayouts.Wallet.controls 1.0
import AppLayouts.stores 1.0 as AppLayoutStores
import AppLayouts.Wallet.views 1.0
import AppLayouts.Wallet.stores 1.0
@ -172,6 +173,7 @@ SplitView {
SplitView.fillHeight: true
AssetsView {
id: assetView
anchors.fill: parent
loading: loadingCheckBox.checked
@ -265,6 +267,44 @@ SplitView {
text: "market data error"
}
ColumnLayout {
spacing: 5
Button {
text: "Sort desc"
onClicked: assetView.setSortOrder(Qt.DescendingOrder)
}
Button {
text: "Sort asc"
onClicked: assetView.setSortOrder(Qt.AscendingOrder)
}
}
ColumnLayout {
spacing: 10
Layout.fillWidth: true
Label {
text: "Sort by:"
}
ComboBox {
id: sortValueComboBox
Layout.fillWidth: true
textRole: "text"
valueRole: "value"
displayText: currentText || ""
currentIndex: 4
model: [
{ value: SortOrderComboBox.TokenOrderCurrencyBalance, text: "TokenOrderCurrencyBalance" },
{ value: SortOrderComboBox.TokenOrderBalance, text: "TokenOrderBalance" },
{ value: SortOrderComboBox.TokenOrderCurrencyPrice, text: "TokenOrderCurrencyPrice" },
{ value: SortOrderComboBox.TokenOrder1DChange, text: "TokenOrder1DChange" },
{ value: SortOrderComboBox.TokenOrderAlpha, text: "TokenOrderAlpha" },
{ value: SortOrderComboBox.TokenOrderCustom, text: "TokenOrderCustom" }
]
onCurrentValueChanged: assetView.sortByValue(currentValue)
}
}
}
}

1
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -246,6 +246,7 @@ StatusSectionLayout {
sourceComponent: WalletView {
implicitWidth: parent.width
implicitHeight: parent.height
myPublicKey: root.store.contactsStore.myPublicKey
rootStore: root.store
tokensStore: root.tokensStore
networkConnectionStore: root.networkConnectionStore

24
ui/app/AppLayouts/Profile/views/WalletView.qml
View File

@ -31,6 +31,7 @@ SettingsContentBase {
id: root
property var emojiPopup
property string myPublicKey: ""
property ProfileSectionStore rootStore
property WalletStore walletStore: rootStore.walletStore
required property TokensStore tokensStore
@ -81,15 +82,14 @@ SettingsContentBase {
}
let sectionLink = "%1/%2/".arg(Constants.appSection.wallet).arg(WalletLayout.LeftPanelSelection.AllAddresses)
if (Global.settingsSubSubsection === Constants.walletSettingsSubsection.manageAssets) {
if (manageTokensView.assetsPanelVisible) {
sectionLink += WalletLayout.RightPanelSelection.Assets
priv.assetSettings.setValue("currentSortValue", SortOrderComboBox.TokenOrderCustom)
priv.assetSettings.sync()
} else if (Global.settingsSubSubsection === Constants.walletSettingsSubsection.manageCollectibles) {
priv.walletSettings.setValue("assetsViewCustomOrderApplyTimestamp", new Date().getTime())
priv.walletSettings.sync()
} else if (manageTokensView.collectiblesPanelVisible) {
sectionLink += WalletLayout.RightPanelSelection.Collectibles
priv.collectiblesSettings.setValue("currentSortValue", SortOrderComboBox.TokenOrderCustom)
priv.collectiblesSettings.sync()
priv.walletSettings.setValue("collectiblesViewCustomOrderApplyTimestamp", new Date().getTime())
priv.walletSettings.sync()
}
Global.displayToastMessage(
@ -113,14 +113,8 @@ SettingsContentBase {
Global.settingsSubSubsection === Constants.walletSettingsSubsection.manageHidden ||
Global.settingsSubSubsection === Constants.walletSettingsSubsection.manageAdvanced
readonly property var assetSettings: Settings {
category: "AssetsViewSortSettings"
//property int currentSortValue
}
readonly property var collectiblesSettings: Settings {
category: "CollectiblesViewSortSettings"
//property int currentSortValue
readonly property var walletSettings: Settings {
category: "walletSettings-" + root.myPublicKey
}
}

3
ui/app/AppLayouts/Profile/views/wallet/ManageTokensView.qml
View File

@ -50,6 +50,9 @@ Item {
loader.item.resetChanges()
}
readonly property bool assetsPanelVisible: tabBar.currentIndex === d.assetsTabIndex
readonly property bool collectiblesPanelVisible: tabBar.currentIndex === d.collectiblesTabIndex
QtObject {
id: d

66
ui/app/AppLayouts/Wallet/views/CollectiblesView.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import Qt.labs.settings 1.1
import QtQml 2.15
import StatusQ 0.1
@ -38,6 +37,11 @@ ColumnLayout {
property bool isUpdating: false // Indicates if the collectibles list is being updated
property bool isError: false // Indicates an error occurred while updating/fetching the collectibles list
// allows/disables choosing custom sort order from a sorter
property bool customOrderAvailable
property alias selectedFilterGroupIds: cmbFilter.selectedFilterGroupIds
signal collectibleClicked(int chainId, string contractAddress, string tokenId, string uid, int tokenType, string communityId)
signal sendRequested(string symbol, int tokenType, string fromAddress)
signal receiveRequested(string symbol)
@ -46,9 +50,28 @@ ColumnLayout {
spacing: 0
function setSortOrder(order) {
d.sortOrder = order
}
function getSortOrder() {
return d.sortOrder
}
function getSortValue() {
return d.sortValue
}
function sortByValue(value) {
d.sortValue = value
}
QtObject {
id: d
property int sortValue: SortOrderComboBox.TokenOrderAlpha
property int sortOrder: Qt.DescendingOrder
readonly property int cellHeight: 225
readonly property int communityCellHeight: 242
readonly property int cellWidth: 176
@ -70,15 +93,6 @@ ColumnLayout {
}
}
Component.onCompleted: {
settings.sync()
if (settings.currentSortValue === SortOrderComboBox.TokenOrderDateAdded && !d.hasAllTimestamps) {
cmbTokenOrder.currentIndex = cmbTokenOrder.indexOfValue(SortOrderComboBox.TokenOrderAlpha) // Change to a different default option
} else {
cmbTokenOrder.currentIndex = cmbTokenOrder.indexOfValue(settings.currentSortValue) // Change to a different default option
}
}
onIsLoadingChanged: {
d.loadingItemsModel.refresh()
}
@ -305,18 +319,6 @@ ColumnLayout {
]
}
Settings {
id: settings
category: "CollectiblesViewSortSettings-" + root.addressFilters
property int currentSortValue: SortOrderComboBox.TokenOrderDateAdded
property alias currentSortOrder: cmbTokenOrder.currentSortOrder
property alias selectedFilterGroupIds: cmbFilter.selectedFilterGroupIds
}
Component.onDestruction: {
settings.currentSortValue = cmbTokenOrder.currentValue
}
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: false
@ -386,7 +388,25 @@ ColumnLayout {
SortOrderComboBox {
id: cmbTokenOrder
hasCustomOrderDefined: root.controller.hasSettings
hasCustomOrderDefined: root.customOrderAvailable
Binding on currentIndex {
value: {
cmbTokenOrder.count
let sortValue = d.sortValue
if (root.sortValue === SortOrderComboBox.TokenOrderDateAdded && !d.hasAllTimestamps)
sortValue = SortOrderComboBox.TokenOrderAlpha
let id = cmbTokenOrder.indexOfValue(sortValue)
if (id === -1)
id = cmbTokenOrder.indexOfValue(SortOrderComboBox.TokenOrderAlpha)
return id
}
when: cmbTokenOrder.count > 0
}
onCurrentValueChanged: d.sortValue = cmbTokenOrder.currentValue
Binding on currentSortOrder {
value: d.sortOrder
}
onCurrentSortOrderChanged: d.sortOrder = cmbTokenOrder.currentSortOrder
model: [
{ value: SortOrderComboBox.TokenOrderDateAdded, text: qsTr("Date added"), icon: "", sortRoleName: "lastTxTimestamp", isDisabled: !d.hasAllTimestamps }, // Custom SFPM role
{ value: SortOrderComboBox.TokenOrderAlpha, text: qsTr("Collectible name"), icon: "", sortRoleName: "name" },

97
ui/app/AppLayouts/Wallet/views/RightTabView.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import Qt.labs.settings 1.1
import StatusQ.Components 0.1
import StatusQ.Controls 0.1
@ -7,6 +8,8 @@ import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Core.Utils 0.1
import AppLayouts.Wallet.controls 1.0
import utils 1.0
import shared.controls 1.0
import shared.views 1.0
@ -195,6 +198,52 @@ RightTabBaseView {
}
}
function refreshSortSettings() {
settings.category = settingsCategoryName
walletSettings.sync()
settings.sync()
let value = SortOrderComboBox.TokenOrderAlpha
if (walletSettings.assetsViewCustomOrderApplyTimestamp > settings.sortOrderUpdateTimestamp && customOrderAvailable) {
value = SortOrderComboBox.TokenOrderCustom
} else {
value = settings.currentSortValue
}
sortByValue(value)
setSortOrder(settings.currentSortOrder)
}
function saveSortSettings() {
settings.currentSortValue = getSortValue()
settings.currentSortOrder = getSortOrder()
settings.sortOrderUpdateTimestamp = new Date().getTime()
settings.sync()
}
readonly property string settingsCategoryName: {
const addressFilters = RootStore.addressFilters
return "AssetsViewSortSettings-" + (addressFilters.indexOf(':') > -1 ? "all" : addressFilters)
}
onSettingsCategoryNameChanged: {
saveSortSettings()
refreshSortSettings()
}
Component.onCompleted: refreshSortSettings()
Component.onDestruction: saveSortSettings()
readonly property Settings walletSettings: Settings {
id: walletSettings
category: "walletSettings-" + root.contactsStore.myPublicKey
property var assetsViewCustomOrderApplyTimestamp
}
readonly property Settings settings: Settings {
id: settings
property int currentSortValue: SortOrderComboBox.TokenOrderDateAdded
property var sortOrderUpdateTimestamp
property int currentSortOrder: Qt.DescendingOrder
}
loading: RootStore.overview.balanceLoading
sorterVisible: filterButton.checked
customOrderAvailable: RootStore.walletAssetsStore.assetsController.hasSettings
@ -269,13 +318,59 @@ RightTabBaseView {
Component {
id: collectiblesView
CollectiblesView {
CollectiblesView {
id: collView
function refreshSortSettings() {
settings.category = settingsCategoryName
walletSettings.sync()
settings.sync()
let value = SortOrderComboBox.TokenOrderAlpha
if (walletSettings.collectiblesViewCustomOrderApplyTimestamp > settings.sortOrderUpdateTimestamp && customOrderAvailable) {
value = SortOrderComboBox.TokenOrderCustom
} else {
value = settings.currentSortValue
}
sortByValue(value)
setSortOrder(settings.currentSortOrder)
}
function saveSortSettings() {
settings.currentSortValue = getSortValue()
settings.currentSortOrder = getSortOrder()
settings.sortOrderUpdateTimestamp = new Date().getTime()
settings.sync()
}
readonly property string settingsCategoryName: "CollectiblesViewSortSettings-" + (addressFilters.indexOf(':') > -1 ? "all" : addressFilters)
onSettingsCategoryNameChanged: {
saveSortSettings()
refreshSortSettings()
}
Component.onCompleted: refreshSortSettings()
Component.onDestruction: saveSortSettings()
readonly property Settings walletSettings: Settings {
id: walletSettings
category: "walletSettings-" + root.contactsStore.myPublicKey
property real collectiblesViewCustomOrderApplyTimestamp: 0
}
readonly property Settings settings: Settings {
id: settings
property int currentSortValue: SortOrderComboBox.TokenOrderDateAdded
property real sortOrderUpdateTimestamp: 0
property alias selectedFilterGroupIds: collView.selectedFilterGroupIds
property int currentSortOrder: Qt.DescendingOrder
}
ownedAccountsModel: RootStore.nonWatchAccounts
controller: RootStore.collectiblesStore.collectiblesController
networkFilters: RootStore.networkFilters
addressFilters: RootStore.addressFilters
sendEnabled: root.networkConnectionStore.sendBuyBridgeEnabled && !RootStore.overview.isWatchOnlyAccount && RootStore.overview.canSend
filterVisible: filterButton.checked
customOrderAvailable: controller.hasSettings
onCollectibleClicked: {
RootStore.collectiblesStore.getDetailedCollectible(chainId, contractAddress, tokenId)
RootStore.setCurrentViewedHolding(uid, uid, tokenType, communityId)

35
ui/imports/shared/views/AssetsView.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQml 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
@ -82,10 +83,28 @@ Control {
signal hideCommunityAssetsRequested(string communityKey)
signal manageTokensRequested
function setSortOrder(order) {
d.sortOrder = order
}
function getSortOrder() {
return d.sortOrder
}
function getSortValue() {
return d.sortValue
}
function sortByValue(value) {
d.sortValue = value
}
QtObject {
id: d
readonly property int loadingItemsCount: 25
property int sortOrder: Qt.DescendingOrder
property int sortValue: -1
}
SortFilterProxyModel {
@ -159,7 +178,21 @@ Control {
objectName: "cmbTokenOrder"
hasCustomOrderDefined: root.customOrderAvailable
Binding on currentIndex {
value: {
sortOrderComboBox.count
let id = sortOrderComboBox.indexOfValue(d.sortValue)
if (id === -1)
id = sortOrderComboBox.indexOfValue(SortOrderComboBox.TokenOrderAlpha)
return id
}
when: sortOrderComboBox.count > 0
}
onCurrentValueChanged: d.sortValue = sortOrderComboBox.currentValue
Binding on currentSortOrder {
value: d.sortOrder
}
onCurrentSortOrderChanged: d.sortOrder = sortOrderComboBox.currentSortOrder
model: [
{ value: SortOrderComboBox.TokenOrderCurrencyBalance,
text: qsTr("Asset balance value"), icon: "", sortRoleName: "marketBalance" },