diff --git a/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml b/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml index 6a21cba417..c3f87f6cba 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml @@ -20,6 +20,9 @@ Rectangle { property string tertiaryTitle: "" property string label: "" property string titleTextIcon: "" + property string beneathTagsIcon: "" + property color beneathTagsIconColor: Theme.palette.primaryColor1 + property string beneathTagsTitle: "" property real leftPadding: 16 property real rightPadding: 16 property bool highlighted: false @@ -356,6 +359,7 @@ Rectangle { } Flickable { + id: tagsFlickable visible: tagsRepeater.count > 0 anchors.top: statusListItemTertiaryTitle.bottom anchors.topMargin: visible ? 8 : 0 @@ -375,6 +379,32 @@ Rectangle { } } } + + RowLayout { + anchors.top: tagsFlickable.bottom + anchors.topMargin: visible ? 8 : 0 + width: parent.width + visible: !!root.beneathTagsIcon || !!root.beneathTagsTitle + spacing: 4 + + StatusIcon { + id: statusListItemBeneathTagsIcon + Layout.preferredWidth: visible ? 16 : 0 + Layout.preferredHeight: visible ? 16 : 0 + visible: !!root.beneathTagsIcon + icon: root.beneathTagsIcon + color: root.beneathTagsIconColor + } + + StatusTextWithLoadingState { + id: statusListItemBeneathTagsTitle + visible: !!root.beneathTagsTitle + text: root.beneathTagsTitle + customColor: Theme.palette.baseColor1 + font.pixelSize: 13 + wrapMode: Text.WrapAtWordBoundaryOrAnywhere + } + } } Row { diff --git a/ui/imports/shared/popups/keycard/helpers/KeyPairItem.qml b/ui/imports/shared/popups/keycard/helpers/KeyPairItem.qml index 3f524110d4..9bf9c34ee0 100644 --- a/ui/imports/shared/popups/keycard/helpers/KeyPairItem.qml +++ b/ui/imports/shared/popups/keycard/helpers/KeyPairItem.qml @@ -47,10 +47,13 @@ StatusListItem { } return t } - tertiaryTitle: !root.canBeSelected? - qsTr("This Keypair contains an account which is created out of the Status wallet derivation tree") : - "" - statusListItemTertiaryTitle.color: Theme.palette.dangerColor1 + + beneathTagsTitle: root.keyPairType === Constants.keycard.keyPairType.profile? + qsTr("Moving this key pair will require you to use your Keycard to login") : + !root.canBeSelected? + qsTranslate("", "Contains account(s) with Keycard incompatible derivation paths", root.keyPairAccounts.count.toString()) : + "" + beneathTagsIcon: !!beneathTagsTitle? "info" : "" asset { width: root.keyPairIcon? 24 : 40