arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-24 15:28:10 +00:00
Code Issues Releases Wiki Activity

fix(core): TS3 device freeze

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2024-06-06 11:58:24 +02:00 committed by matejcik
parent 5a8989f00d
commit b560ce53c0
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/trezor/ui/layouts/tr/__init__.py
View File

@ -224,11 +224,17 @@ class RustLayout(LayoutParentType[T]):
else: else:
def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: def create_tasks(self) -> tuple[loop.AwaitableTask, ...]:
if context.CURRENT_CONTEXT:
return ( return (
self.handle_timers(), self.handle_timers(),
self.handle_input_and_rendering(), self.handle_input_and_rendering(),
self.handle_usb(context.get_context()), self.handle_usb(context.get_context()),
) )
else:
return (
self.handle_timers(),
self.handle_input_and_rendering(),
)
def _first_paint(self) -> None: def _first_paint(self) -> None:
self._paint() self._paint()

4
core/src/trezor/ui/layouts/tr/recovery.py
View File

@ -21,8 +21,6 @@ async def request_word_count(recovery_type: RecoveryType) -> int:
async def request_word( async def request_word(
word_index: int, word_count: int, is_slip39: bool, prefill_word: str = "" word_index: int, word_count: int, is_slip39: bool, prefill_word: str = ""
) -> str: ) -> str:
from trezor.wire.context import wait
prompt = TR.recovery__word_x_of_y_template.format(word_index + 1, word_count) prompt = TR.recovery__word_x_of_y_template.format(word_index + 1, word_count)
can_go_back = word_index > 0 can_go_back = word_index > 0
@ -40,7 +38,7 @@ async def request_word(
) )
) )
word: str = await wait(word_choice) word: str = await word_choice
return word return word

5
core/src/trezor/ui/layouts/tr/reset.py
View File

@ -74,7 +74,6 @@ async def select_word(
group_index: int | None = None, group_index: int | None = None,
) -> str: ) -> str:
from trezor.strings import format_ordinal from trezor.strings import format_ordinal
from trezor.wire.context import wait
# It may happen (with a very low probability) # It may happen (with a very low probability)
# that there will be less than three unique words to choose from. # that there will be less than three unique words to choose from.
@ -84,15 +83,13 @@ async def select_word(
words.append(words[-1]) words.append(words[-1])
word_ordinal = format_ordinal(checked_index + 1) word_ordinal = format_ordinal(checked_index + 1)
result = await wait( result = await RustLayout(
RustLayout(
trezorui2.select_word( trezorui2.select_word(
title="", title="",
description=TR.reset__select_word_template.format(word_ordinal), description=TR.reset__select_word_template.format(word_ordinal),
words=(words[0].lower(), words[1].lower(), words[2].lower()), words=(words[0].lower(), words[1].lower(), words[2].lower()),
) )
) )
)
if __debug__ and isinstance(result, str): if __debug__ and isinstance(result, str):
return result return result
assert isinstance(result, int) and 0 <= result <= 2 assert isinstance(result, int) and 0 <= result <= 2