diff --git a/electrum/gui/qt/request_list.py b/electrum/gui/qt/request_list.py index b2e09339a..cb9212a9b 100644 --- a/electrum/gui/qt/request_list.py +++ b/electrum/gui/qt/request_list.py @@ -117,7 +117,6 @@ class RequestList(MyTreeView): continue request_type = req['type'] timestamp = req.get('time', 0) - expiration = req.get('exp', 0) amount = req.get('amount') message = req.get('message') or req.get('memo') date = format_time(timestamp) diff --git a/electrum/util.py b/electrum/util.py index 81e84c71c..f839d0fac 100644 --- a/electrum/util.py +++ b/electrum/util.py @@ -113,7 +113,7 @@ pr_expiration_values = { def get_request_status(req): status = req['status'] - exp = req.get('exp', 0) + exp = req.get('exp', 0) or 0 if req['status'] == PR_UNPAID and exp > 0 and req['time'] + req['exp'] < time.time(): status = PR_EXPIRED status_str = pr_tooltips[status] diff --git a/electrum/wallet.py b/electrum/wallet.py index 4d7e84ee4..2ac690837 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -1529,7 +1529,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC): timestamp = r.get('time', 0) if timestamp and type(timestamp) != int: timestamp = 0 - exp = r.get('exp', 0) + exp = r.get('exp', 0) or 0 paid, conf = self.get_payment_status(address, amount) if not paid: if exp > 0 and time.time() > timestamp + exp: