From adf23f602dc71ec58123ad33739c300933766258 Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Fri, 24 Feb 2023 20:24:51 +0100
Subject: [PATCH] qml: don't show option Never for expiry combobox when in
 preferences

---
 electrum/gui/qml/components/Preferences.qml                  | 1 +
 .../gui/qml/components/controls/RequestExpiryComboBox.qml    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/electrum/gui/qml/components/Preferences.qml b/electrum/gui/qml/components/Preferences.qml
index 805e2be96..b30fc8692 100644
--- a/electrum/gui/qml/components/Preferences.qml
+++ b/electrum/gui/qml/components/Preferences.qml
@@ -247,6 +247,7 @@ Pane {
                     }
 
                     RequestExpiryComboBox {
+                        includeNever: false
                         onCurrentValueChanged: {
                             if (activeFocus)
                                 Config.requestExpiry = currentValue
diff --git a/electrum/gui/qml/components/controls/RequestExpiryComboBox.qml b/electrum/gui/qml/components/controls/RequestExpiryComboBox.qml
index 3a0e161b4..30d24feea 100644
--- a/electrum/gui/qml/components/controls/RequestExpiryComboBox.qml
+++ b/electrum/gui/qml/components/controls/RequestExpiryComboBox.qml
@@ -6,6 +6,8 @@ import org.electrum 1.0
 ElComboBox {
     id: expires
 
+    property bool includeNever: true
+
     textRole: 'text'
     valueRole: 'value'
 
@@ -18,7 +20,8 @@ ElComboBox {
             expiresmodel.append({'text': qsTr('1 day'), 'value': 24*60*60})
             expiresmodel.append({'text': qsTr('1 week'), 'value': 7*24*60*60})
             expiresmodel.append({'text': qsTr('1 month'), 'value': 31*24*60*60})
-            expiresmodel.append({'text': qsTr('Never'), 'value': 0})
+            if (includeNever)
+                expiresmodel.append({'text': qsTr('Never'), 'value': 0})
             expires.currentIndex = 0
             for (let i=0; i < expiresmodel.count; i++) {
                 if (expiresmodel.get(i).value == Config.requestExpiry) {