From 1f8ebc3562de067398f81a1927be9334993567f3 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 2 May 2025 12:53:35 +0300 Subject: [PATCH] fix(core): use `bool` for `_ignore_loader_messages` Since `trezor.pin` is persisted across sessions, it should use constant-size globals. [no changelog] --- core/src/trezor/pin.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/trezor/pin.py b/core/src/trezor/pin.py index 9622a98d6e..4880b5fd52 100644 --- a/core/src/trezor/pin.py +++ b/core/src/trezor/pin.py @@ -3,7 +3,7 @@ from typing import TYPE_CHECKING from . import config if TYPE_CHECKING: - from typing import Any, Container + from typing import Any from trezor.ui import ProgressLayout @@ -13,20 +13,17 @@ _progress_layout: ProgressLayout | None = None _started_with_empty_loader = False keepalive_callback: Any = None -_ignore_loader_messages: Container[config.StorageMessage] = () +_ignore_loader_messages: bool = False def ignore_nonpin_loader_messages() -> None: global _ignore_loader_messages - _ignore_loader_messages = ( - config.StorageMessage.PROCESSING_MSG, - config.StorageMessage.STARTING_MSG, - ) + _ignore_loader_messages = True def allow_all_loader_messages() -> None: global _ignore_loader_messages - _ignore_loader_messages = () + _ignore_loader_messages = False def render_empty_loader(message: config.StorageMessage, description: str = "") -> None: @@ -49,7 +46,10 @@ def show_pin_timeout( from trezor.ui.layouts.progress import pin_progress # Possibility to ignore certain messages - not showing loader for them - if message in _ignore_loader_messages: + if _ignore_loader_messages and message in ( + config.StorageMessage.PROCESSING_MSG, + config.StorageMessage.STARTING_MSG, + ): return False global _previous_seconds