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

Usages of SubmodelProxyModel migrated to ObjectProxyModel

This commit is contained in:
Michał Cieślak 2024-09-02 13:29:55 +02:00 committed by Michał
parent 1e06a9c15a
commit 7c24d19241
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/app/AppLayouts/Communities/panels/SharedAddressesAccountSelector.qml
View File

@ -179,13 +179,15 @@ StatusListView {
onClicked: shareAddressCheckbox.toggle() onClicked: shareAddressCheckbox.toggle()
SubmodelProxyModel { ObjectProxyModel {
id: filteredBalances id: filteredBalances
sourceModel: root.walletAssetsModel
submodelRoleName: "balances"
delegateModel: SortFilterProxyModel {
sourceModel: submodel
sourceModel: root.walletAssetsModel
delegate: SortFilterProxyModel {
readonly property SortFilterProxyModel balances: this
sourceModel: model.balances
filters: RegExpFilter { filters: RegExpFilter {
roleName: "account" roleName: "account"
pattern: listItem.address pattern: listItem.address
@ -193,6 +195,9 @@ StatusListView {
caseSensitivity: Qt.CaseInsensitive caseSensitivity: Qt.CaseInsensitive
} }
} }
expectedRoles: "balances"
exposedRoles: "balances"
} }
SortFilterProxyModel { SortFilterProxyModel {

25
ui/app/AppLayouts/Wallet/popups/swap/SwapModalAdaptor.qml
View File

@ -105,24 +105,29 @@ QObject {
// storing txHash to verify against tx completed event // storing txHash to verify against tx completed event
property string txHash property string txHash
readonly property SubmodelProxyModel filteredBalancesModel: SubmodelProxyModel { readonly property ObjectProxyModel filteredBalancesModel: ObjectProxyModel {
sourceModel: root.walletAssetsStore.baseGroupedAccountAssetModel sourceModel: root.walletAssetsStore.baseGroupedAccountAssetModel
submodelRoleName: "balances"
delegateModel: SortFilterProxyModel { delegate: SortFilterProxyModel {
sourceModel: joinModel readonly property var balances: this
filters: ValueFilter {
roleName: "chainId" sourceModel: LeftJoinModel {
value: root.swapFormData.selectedNetworkChainId leftModel: model.balances
}
readonly property LeftJoinModel joinModel: LeftJoinModel {
leftModel: submodel
rightModel: root.swapStore.flatNetworks rightModel: root.swapStore.flatNetworks
joinRole: "chainId" joinRole: "chainId"
} }
filters: ValueFilter {
roleName: "chainId"
value: root.swapFormData.selectedNetworkChainId
} }
} }
expectedRoles: "balances"
exposedRoles: "balances"
}
function processAccountBalance(address) { function processAccountBalance(address) {
if (!root.swapFormData.fromTokensKey || !root.fromToken) { if (!root.swapFormData.fromTokensKey || !root.fromToken) {
return null return null