diff --git a/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml b/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml index bf68282143..7e08a8afa0 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml @@ -210,7 +210,7 @@ Rectangle { asset.height: root.asset.height asset.width: root.asset.width - asset.name: root.useLetterIdenticons ? model.text : model.imageSource + asset.name: root.useLetterIdenticons ? model.text : (model.imageSource ?? "") asset.isImage: root.asset.isImage asset.bgColor: root.asset.bgColor asset.emoji: model.emoji ? model.emoji : "" diff --git a/ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml b/ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml index e53571e374..aa1990cd21 100644 --- a/ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml +++ b/ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml @@ -81,16 +81,13 @@ StatusListView { width: ListView.view.width key: model.key name: model.name - shortName: !!model.shortName ? model.shortName : "" - iconSource: model.iconSource + shortName: model.shortName ?? "" + iconSource: model.iconSource ?? "" subItems: model.subItems selected: root.checkedKeys.includes(model.key) - onItemClicked: root.itemClicked(model.key, - model.name, - model.shortName, - model.iconSource, - model.subItems) + onItemClicked: root.itemClicked( + key, name, shortName, iconSource, subItems) } section.property: root.searchMode ? "" : "categoryLabel" diff --git a/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml b/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml index 955a046de4..52cb05ac07 100644 --- a/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml +++ b/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml @@ -41,14 +41,14 @@ QtObject { function getTokenShortNameByKey(model, key) { const item = getTokenByKey(model, key) if (item) - return item.shortName + return item.shortName ?? "" return "" } function getTokenIconByKey(model, key) { const item = getTokenByKey(model, key) if (item) - return item.iconSource + return item.iconSource ?? "" return "" } diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml b/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml index 2083c1c7a7..106242b5ec 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml +++ b/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml @@ -69,7 +69,6 @@ StatusScrollView { sourceModel: model.channelsListModel - proxyRoles: [ ExpressionRole { name: "imageSource"