diff --git a/ui/StatusQ/src/StatusQ/Components/StatusCard.qml b/ui/StatusQ/src/StatusQ/Components/StatusCard.qml index 0b4d748743..1b7ebcfb98 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusCard.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusCard.qml @@ -287,6 +287,13 @@ Rectangle { bottomPadding: 0 leftPadding: 8 rightPadding: 5 + input.edit.color: { // crash workaround, https://bugreports.qt.io/browse/QTBUG-107795 + if (root.state === "error") + return Theme.palette.dangerColor1 + if (root.locked) + return Theme.palette.directColor5 + return Theme.palette.directColor1 + } input.edit.font.pixelSize: 13 input.edit.readOnly: disabled input.background.radius: 4 @@ -319,7 +326,7 @@ Rectangle { } ] text: root.preCalculatedAdvancedText - onTextChanged: waitTimer.restart() + onTextChanged: waitTimer.restart() Timer { id: waitTimer interval: lockTimeout @@ -393,7 +400,7 @@ Rectangle { PropertyChanges { target: secondaryLabel text: disabled ? sensor.containsMouse ? root.enableText : disabledText : secondaryText - } + } PropertyChanges { target: secondaryLabel font.weight: disabled && sensor.containsMouse ? Font.Medium : Font.Normal @@ -422,11 +429,6 @@ Rectangle { target: advancedInput visible: advancedMode } - PropertyChanges { - target: advancedInput - input.edit.color: input.edit.activeFocus || !root.locked ? - Theme.palette.directColor1 : Theme.palette.directColor5 - } PropertyChanges { target: basicInput visible: !advancedMode && !(root.loading && !disabled) @@ -496,10 +498,6 @@ Rectangle { target: advancedInput visible: advancedMode } - PropertyChanges { - target: advancedInput - input.edit.color: Theme.palette.dangerColor1 - } PropertyChanges { target: basicInput visible: !advancedMode && !(root.loading && !disabled) @@ -569,10 +567,6 @@ Rectangle { target: advancedInput visible: advancedMode } - PropertyChanges { - target: advancedInput - input.edit.color: root.locked ? Theme.palette.directColor5 : Theme.palette.directColor1 - } PropertyChanges { target: basicInput visible: !advancedMode && !(root.loading && !disabled) @@ -640,10 +634,6 @@ Rectangle { target: advancedInput visible: false } - PropertyChanges { - target: advancedInput - input.edit.color: Theme.palette.directColor1 - } PropertyChanges { target: basicInput visible: true @@ -653,4 +643,5 @@ Rectangle { active: false } } - ]} + ] +} diff --git a/ui/imports/shared/popups/send/views/NetworkSelector.qml b/ui/imports/shared/popups/send/views/NetworkSelector.qml index de7a5e670f..aac57986ea 100644 --- a/ui/imports/shared/popups/send/views/NetworkSelector.qml +++ b/ui/imports/shared/popups/send/views/NetworkSelector.qml @@ -22,7 +22,7 @@ Item { property var selectedAccount property string ensAddressOrEmpty: "" property var selectedAsset - property var amountToSend + property double amountToSend property int minSendCryptoDecimals: 0 property int minReceiveCryptoDecimals: 0 property bool isLoading: false @@ -39,7 +39,7 @@ Item { QtObject { id: d readonly property int backgroundRectRadius: 13 - readonly property string backgroundRectColor: Theme.palette.indirectColor1 + readonly property color backgroundRectColor: Theme.palette.indirectColor1 } StatusSwitchTabBar {