fixup! fix(core): avoid failing ButtonRequest handling at ContinueOnErrors

Author: romanz

core/src/trezor/ui/__init__.py

@@ -331,8 +331,7 @@ def put_button_request(self, msg: ButtonRequestMsg | None) -> bool:
             return False
 
         br = ButtonRequest(code=msg[0], name=msg[1], pages=self.layout.page_count())
-        self.button_request_handler.put(br)
-        return True
+        return self.button_request_handler.put(br)
 
     def _paint(self) -> None:
         """Paint the layout and ensure that homescreen cache is properly invalidated."""

core/src/trezor/wire/protocol_common.py

@@ -188,7 +188,7 @@ def __init__(self, ctx: Context) -> None:
             # Used for detecting missing ButtonAck in debug builds.
             self.pending = False
 
-    def put(self, br: ButtonRequest) -> None:
+    def put(self, br: ButtonRequest) -> bool:
         if __debug__:
             if self.pending:
                 from . import FirmwareError
@@ -201,6 +201,7 @@ def put(self, br: ButtonRequest) -> None:
 
         # in production, we don't want this to fail, hence replace=True
         self.box.put(br, replace=True)
+        return True
 
     async def br_task(self, ack_callback: AckCallback) -> None:
         assert self.is_done.is_empty()
@@ -254,14 +255,14 @@ def __init__(self, ctx: Context, msg: str) -> None:
         self.msg = msg
         self.ignore = False
 
-    def put(self, br: ButtonRequest) -> None:
+    def put(self, br: ButtonRequest) -> bool:
         if self.ignore:
             # Stop handling ButtonRequests in case of unexpected error.
             if __debug__:
                 log.debug(__name__, "ButtonRequest: skipped %s (%s)", br.code, br.name)
-            return
+            return False
 
-        super().put(br)
+        return super().put(br)
 
     async def join(self) -> None:
         if self.ignore: