From 056de017f055e236998cd091f3f001e844f82f60 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Tue, 12 Jul 2022 15:38:54 +0200
Subject: [PATCH] wallet: use `get_request(addr)` instead of
 `receive_requests[addr]`

since "invoice unification", requests are often keyed by rhash
---
 electrum/gui/kivy/main_window.py | 2 +-
 electrum/gui/qt/main_window.py   | 2 +-
 electrum/wallet.py               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
index 682f30dc3..8ec8becd5 100644
--- a/electrum/gui/kivy/main_window.py
+++ b/electrum/gui/kivy/main_window.py
@@ -269,7 +269,7 @@ class ElectrumWindow(App, Logger, EventListener):
     def on_event_request_status(self, wallet, key, status):
         if wallet != self.wallet:
             return
-        req = self.wallet.receive_requests.get(key)
+        req = self.wallet.get_request(key)
         if req is None:
             return
         if self.receive_screen:
diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
index ac2dfb8f0..2afde7917 100644
--- a/electrum/gui/qt/main_window.py
+++ b/electrum/gui/qt/main_window.py
@@ -1134,7 +1134,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
     def on_event_request_status(self, wallet, key, status):
         if wallet != self.wallet:
             return
-        req = self.wallet.receive_requests.get(key)
+        req = self.wallet.get_request(key)
         if req is None:
             return
         if status == PR_PAID:
diff --git a/electrum/wallet.py b/electrum/wallet.py
index 0e391c8e9..17b76be39 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -2263,7 +2263,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
         choice = domain[0]
         for addr in domain:
             if not self.adb.is_used(addr):
-                if addr not in self.receive_requests.keys():
+                if self.get_request(addr) is None:
                     return addr
                 else:
                     choice = addr
@@ -2432,7 +2432,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
             return
         for txo in tx.outputs():
             addr = txo.address
-            if addr in self.receive_requests:
+            if self.get_request(addr):
                 status = self.get_request_status(addr)
                 util.trigger_callback('request_status', self, addr, status)