From 14e45b069f7ab2207a032bab314824fcc950542d Mon Sep 17 00:00:00 2001 From: silkyjohnson1 <61355155+silkyjohnson1@users.noreply.github.com> Date: Sun, 25 Feb 2024 21:32:17 -0500 Subject: [PATCH 1/3] Update invoices.py --- electrum/invoices.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/electrum/invoices.py b/electrum/invoices.py index 096bf9bba..a7c89f240 100644 --- a/electrum/invoices.py +++ b/electrum/invoices.py @@ -59,13 +59,9 @@ PR_UNCONFIRMED: _('Unconfirmed'), } -PR_DEFAULT_EXPIRATION_WHEN_CREATING = 24*60*60 # 1 day +PR_DEFAULT_EXPIRATION_WHEN_CREATING = 0 # 1 day pr_expiration_values = { 0: _('Never'), - 10*60: _('10 minutes'), - 60*60: _('1 hour'), - 24*60*60: _('1 day'), - 7*24*60*60: _('1 week'), } assert PR_DEFAULT_EXPIRATION_WHEN_CREATING in pr_expiration_values From 715615f51d623f8ec9b97566be9afff908785671 Mon Sep 17 00:00:00 2001 From: silkyjohnson1 <61355155+silkyjohnson1@users.noreply.github.com> Date: Sun, 25 Feb 2024 21:34:01 -0500 Subject: [PATCH 2/3] Update receive_tab.py --- electrum/gui/qt/receive_tab.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/electrum/gui/qt/receive_tab.py b/electrum/gui/qt/receive_tab.py index 01c048952..8776840c8 100644 --- a/electrum/gui/qt/receive_tab.py +++ b/electrum/gui/qt/receive_tab.py @@ -182,12 +182,8 @@ def update_expiry_text(self): def expiry_dialog(self): msg = ''.join([ - _('Expiration period of your request.'), ' ', - _('This information is seen by the recipient if you send them a signed payment request.'), - '\n\n', - _('For on-chain requests, the address gets reserved until expiration. After that, it might get reused.'), ' ', - _('The bitcoin address never expires and will always be part of this electrum wallet.'), ' ', - _('You can reuse a bitcoin address any number of times but it is not good for your privacy.'), + _('The fact0rn address never expires and will always be part of this electrum wallet.'), ' ', + _('You can reuse a Fact0rn address any number of times but it is not good for your privacy.'), '\n\n', _('Lightning not supported.'), ]) From ba27fe1d137731ab1c9adbe3348d2c484a2a3337 Mon Sep 17 00:00:00 2001 From: silkyjohnson1 <61355155+silkyjohnson1@users.noreply.github.com> Date: Sun, 25 Feb 2024 21:34:44 -0500 Subject: [PATCH 3/3] Update receive_tab.py --- electrum/gui/qt/receive_tab.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qt/receive_tab.py b/electrum/gui/qt/receive_tab.py index 8776840c8..92cf41fa5 100644 --- a/electrum/gui/qt/receive_tab.py +++ b/electrum/gui/qt/receive_tab.py @@ -182,10 +182,10 @@ def update_expiry_text(self): def expiry_dialog(self): msg = ''.join([ - _('The fact0rn address never expires and will always be part of this electrum wallet.'), ' ', + _('The generated Fact0rn address never expires and will always be part of this wallet.'), ' ', _('You can reuse a Fact0rn address any number of times but it is not good for your privacy.'), '\n\n', - _('Lightning not supported.'), + _('Lightning requests not supported.'), ]) expiry = self.config.WALLET_PAYREQ_EXPIRY_SECONDS v = self.window.query_choice(msg, pr_expiration_values, title=_('Expiry'), default_choice=expiry)