diff --git a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml index 2afbf3384b..3106c4c12e 100644 --- a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml +++ b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml @@ -25,6 +25,8 @@ StatusComboBox { property bool multiSelection: true property bool preferredNetworksMode: false property var preferredSharingNetworks: [] + property bool showAllSelectedText: true + property bool showCheckboxes: true /// \c network is a network.model.nim entry /// It is called for every toggled network if \c multiSelection is \c true @@ -101,13 +103,13 @@ StatusComboBox { lineHeight: 24 lineHeightMode: Text.FixedHeight verticalAlignment: Text.AlignVCenter - text: root.multiSelection ? (d.noneSelected ? qsTr("Select networks"): d.allSelected ? qsTr("All networks") : "") : d.selectedChainName + text: root.multiSelection ? (d.noneSelected ? qsTr("Select networks"): d.allSelected && root.showAllSelectedText ? qsTr("All networks") : "") : d.selectedChainName color: Theme.palette.baseColor1 visible: !!text } Row { spacing: -4 - visible: !d.allSelected && chainRepeater.count > 0 + visible: (!d.allSelected || !root.showAllSelectedText) && chainRepeater.count > 0 Repeater { id: chainRepeater model: root.preferredNetworksMode ? root.flatNetworks: root.multiSelection ? d.enabledFlatNetworks: [] @@ -126,6 +128,7 @@ StatusComboBox { flatNetworks: root.flatNetworks preferredSharingNetworks: root.preferredSharingNetworks preferredNetworksMode: root.preferredNetworksMode + showCheckboxes: root.showCheckboxes implicitWidth: contentWidth implicitHeight: contentHeight diff --git a/ui/app/AppLayouts/Wallet/controls/NetworkSelectItemDelegate.qml b/ui/app/AppLayouts/Wallet/controls/NetworkSelectItemDelegate.qml index 3786e34d47..956a38b0c5 100644 --- a/ui/app/AppLayouts/Wallet/controls/NetworkSelectItemDelegate.qml +++ b/ui/app/AppLayouts/Wallet/controls/NetworkSelectItemDelegate.qml @@ -15,6 +15,7 @@ StatusListItem { property var singleSelection property var radioButtonGroup property bool useEnabledRole: true + property bool showCheckboxes: true // Needed for preferred sharing networks property bool preferredNetworksMode: false @@ -49,7 +50,7 @@ StatusListItem { id: checkBox objectName: "networkSelectionCheckbox_" + model.chainName tristate: true - visible: !root.singleSelection.enabled + visible: !root.singleSelection.enabled && root.showCheckboxes checkState: { if(root.preferredNetworksMode) { diff --git a/ui/app/AppLayouts/Wallet/views/NetworkSelectionView.qml b/ui/app/AppLayouts/Wallet/views/NetworkSelectionView.qml index 5d63d633aa..4aad79f57d 100644 --- a/ui/app/AppLayouts/Wallet/views/NetworkSelectionView.qml +++ b/ui/app/AppLayouts/Wallet/views/NetworkSelectionView.qml @@ -19,6 +19,7 @@ StatusListView { property SingleSelectionInfo singleSelection: SingleSelectionInfo {} property var preferredSharingNetworks: [] property bool preferredNetworksMode: false + property bool showCheckboxes: true signal toggleNetwork(var network, int index) @@ -35,6 +36,7 @@ StatusListView { preferredNetworksMode: root.preferredNetworksMode preferredSharingNetworks: root.preferredSharingNetworks allChecked: root.preferredSharingNetworks.length === root.count + showCheckboxes: root.showCheckboxes } section {