From 73f89d516aff9579e4b3b7ad34c0fff2b707595d Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Mon, 17 Apr 2023 13:52:16 +0200 Subject: [PATCH] qml: don't determine channel state on gui string, use state enum instead --- electrum/gui/qml/components/ChannelDetails.qml | 2 +- electrum/gui/qml/components/controls/ChannelDelegate.qml | 2 +- electrum/gui/qml/qechanneldetails.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qml/components/ChannelDetails.qml b/electrum/gui/qml/components/ChannelDetails.qml index 3043cea1e..99965410f 100644 --- a/electrum/gui/qml/components/ChannelDetails.qml +++ b/electrum/gui/qml/components/ChannelDetails.qml @@ -72,7 +72,7 @@ Pane { Label { text: channeldetails.state - color: channeldetails.state == 'OPEN' + color: channeldetails.stateCode == ChannelDetails.Open ? constants.colorChannelOpen : Material.foreground } diff --git a/electrum/gui/qml/components/controls/ChannelDelegate.qml b/electrum/gui/qml/components/controls/ChannelDelegate.qml index bf54d0a76..af1fcce84 100644 --- a/electrum/gui/qml/components/controls/ChannelDelegate.qml +++ b/electrum/gui/qml/components/controls/ChannelDelegate.qml @@ -79,7 +79,7 @@ ItemDelegate { font.pixelSize: constants.fontSizeMedium color: _closed ? constants.mutedForeground - : model.state == 'OPEN' + : model.state_code == ChannelDetails.Open ? constants.colorChannelOpen : Material.foreground } diff --git a/electrum/gui/qml/qechanneldetails.py b/electrum/gui/qml/qechanneldetails.py index 572f076c8..d24c9ec34 100644 --- a/electrum/gui/qml/qechanneldetails.py +++ b/electrum/gui/qml/qechanneldetails.py @@ -17,6 +17,7 @@ class QEChannelDetails(QObject, QtEventListener): _logger = get_logger(__name__) class State: # subset, only ones we currently need in UI + Open = ChannelState.OPEN Closed = ChannelState.CLOSED Redeemed = ChannelState.REDEEMED