Merge pull request #18 from silkyjohnson1/master

expiration changes

Author: ReverseControl

electrum/gui/qt/receive_tab.py

@@ -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)

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