From 3c65d2e69e4762292425ffca8daede31521e15e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Tue, 25 Jul 2023 16:03:18 +0200 Subject: [PATCH] chore(Communities): Fees box - use danger outline for account selector when error --- ui/StatusQ/src/StatusQ/Controls/StatusComboBox.qml | 11 +++++++++-- .../AppLayouts/Communities/controls/FeesBoxFooter.qml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusComboBox.qml b/ui/StatusQ/src/StatusQ/Controls/StatusComboBox.qml index ee6aa6d5f2..e176fbe7a6 100644 --- a/ui/StatusQ/src/StatusQ/Controls/StatusComboBox.qml +++ b/ui/StatusQ/src/StatusQ/Controls/StatusComboBox.qml @@ -12,6 +12,7 @@ Item { property alias control: comboBox property alias model: comboBox.model + property alias count: comboBox.count property alias delegate: comboBox.delegate property alias contentItem: comboBox.contentItem @@ -20,6 +21,7 @@ Item { property alias label: labelItem.text property alias validationError: validationErrorItem.text + property bool forceError: false property string popupContentItemObjectName: "" property string indicatorIcon: "chevron-down" @@ -74,9 +76,14 @@ Item { background: Rectangle { color: root.type === StatusComboBox.Type.Secondary ? "transparent" : Theme.palette.baseColor2 radius: 8 - border.width: (!!root.validationError || comboBox.hovered || comboBox.down || comboBox.visualFocus || root.type === StatusComboBox.Type.Secondary) ? 1 : 0 + border.width: (!!root.validationError || root.forceError + || comboBox.hovered || comboBox.down + || comboBox.visualFocus + || root.type === StatusComboBox.Type.Secondary) + ? 1 : 0 + border.color: { - if (!!root.validationError) + if (!!root.validationError || root.forceError) return Theme.palette.dangerColor1 if (comboBox.visualFocus || comboBox.popup.opened) diff --git a/ui/app/AppLayouts/Communities/controls/FeesBoxFooter.qml b/ui/app/AppLayouts/Communities/controls/FeesBoxFooter.qml index 1eb2ef486d..85b93a4f0d 100644 --- a/ui/app/AppLayouts/Communities/controls/FeesBoxFooter.qml +++ b/ui/app/AppLayouts/Communities/controls/FeesBoxFooter.qml @@ -87,6 +87,7 @@ Control { Layout.topMargin: Style.current.halfPadding visible: root.showAccountsSelector + forceError: accountErrorText.visible } ErrorText {