From 43b3e074790a133c01d09096b741ea70c59e164a Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 18 Apr 2023 14:51:19 +0200 Subject: [PATCH] Revert "qml: don't determine channel state on gui string, use state enum instead" This reverts commit 73f89d516aff9579e4b3b7ad34c0fff2b707595d. --- electrum/gui/qml/components/ChannelDetails.qml | 2 +- electrum/gui/qml/components/controls/ChannelDelegate.qml | 2 +- electrum/gui/qml/qechanneldetails.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qml/components/ChannelDetails.qml b/electrum/gui/qml/components/ChannelDetails.qml index d1f11c090..e614f0246 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.stateCode == ChannelDetails.Open + color: channeldetails.state == 'OPEN' ? constants.colorChannelOpen : Material.foreground } diff --git a/electrum/gui/qml/components/controls/ChannelDelegate.qml b/electrum/gui/qml/components/controls/ChannelDelegate.qml index af1fcce84..bf54d0a76 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_code == ChannelDetails.Open + : model.state == 'OPEN' ? constants.colorChannelOpen : Material.foreground } diff --git a/electrum/gui/qml/qechanneldetails.py b/electrum/gui/qml/qechanneldetails.py index af25a7784..4706f6a47 100644 --- a/electrum/gui/qml/qechanneldetails.py +++ b/electrum/gui/qml/qechanneldetails.py @@ -17,7 +17,6 @@ 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