Skip to content

expiration changes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReverseControl merged 3 commits into from
Feb 26, 2024
Merged

expiration changes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14e45b0
Update invoices.py
silkyjohnson1 Feb 26, 2024
715615f
Update receive_tab.py
silkyjohnson1 Feb 26, 2024
ba27fe1
Update receive_tab.py
silkyjohnson1 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions electrum/gui/qt/receive_tab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,10 @@ 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.'),
_('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',
_('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.'),
'\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)
Expand Down
6 changes: 1 addition & 5 deletions electrum/invoices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down