From 24221584e2f5e97888d38df3a425253b159bf841 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 24 Oct 2019 09:32:40 +0200 Subject: [PATCH] fix clear_requests button --- electrum/gui/kivy/uix/screens.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electrum/gui/kivy/uix/screens.py b/electrum/gui/kivy/uix/screens.py index 1a5a929b3..401a936cc 100644 --- a/electrum/gui/kivy/uix/screens.py +++ b/electrum/gui/kivy/uix/screens.py @@ -503,14 +503,14 @@ class ReceiveScreen(CScreen): d.open() def clear_requests_dialog(self): - expired = [req for req in self.app.wallet.get_sorted_requests() if req['status'] == PR_EXPIRED] + requests = self.app.wallet.get_sorted_requests() + expired = [req for req in requests if get_request_status(req)[0] == PR_EXPIRED] if len(expired) == 0: return def callback(c): if c: for req in expired: - is_lightning = req.get('lightning', False) - key = req['rhash'] if is_lightning else req['address'] + key = req.get('rhash') or req['address'] self.app.wallet.delete_request(key) self.update() d = Question(_('Delete expired requests?'), callback)