From 11ae7a92abe9156e49b2938d09c6164ebef1501a Mon Sep 17 00:00:00 2001 From: matejcik Date: Sun, 7 Apr 2024 14:15:53 +0200 Subject: [PATCH] style: fix complaining lints & formatters --- core/embed/rust/src/ui/model_tr/layout.rs | 8 ++++++-- python/src/trezorlib/debuglink.py | 3 +-- tests/input_flows.py | 12 ++++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/core/embed/rust/src/ui/model_tr/layout.rs b/core/embed/rust/src/ui/model_tr/layout.rs index 8bba29210..8fa00eded 100644 --- a/core/embed/rust/src/ui/model_tr/layout.rs +++ b/core/embed/rust/src/ui/model_tr/layout.rs @@ -32,14 +32,18 @@ use crate::{ ui::{ backlight::BACKLIGHT_LEVELS_OBJ, component::{ - base::Component, connect::Connect, paginated::{PageMsg, Paginate}, text::{ + base::Component, + connect::Connect, + paginated::{PageMsg, Paginate}, + text::{ op::OpTextLayout, paragraphs::{ Checklist, Paragraph, ParagraphSource, ParagraphVecLong, ParagraphVecShort, Paragraphs, VecExt, }, TextStyle, - }, ComponentExt, FormattedText, Label, LineBreaking, Never, Timeout + }, + ComponentExt, FormattedText, Label, LineBreaking, Never, Timeout, }, geometry, layout::{ diff --git a/python/src/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py index 76c918321..99e54463f 100644 --- a/python/src/trezorlib/debuglink.py +++ b/python/src/trezorlib/debuglink.py @@ -67,8 +67,7 @@ if TYPE_CHECKING: self, hold_ms: Optional[int] = None, wait: Optional[bool] = None, - ) -> "LayoutContent": - ... + ) -> "LayoutContent": ... EXPECTED_RESPONSES_CONTEXT_LINES = 3 diff --git a/tests/input_flows.py b/tests/input_flows.py index 1166a096a..cd0956ea7 100644 --- a/tests/input_flows.py +++ b/tests/input_flows.py @@ -96,8 +96,10 @@ class InputFlowSetupDevicePINWIpeCode(InputFlowBase): self.debug.press_yes() if self.client.layout_type is LayoutType.TR: - yield from swipe_if_necessary(self.debug) # wipe code info - self.debug.press_yes() + layout = self.debug.read_layout() + if "PinKeyboard" not in layout.all_components(): + yield from swipe_if_necessary(self.debug) # wipe code info + self.debug.press_yes() yield # enter current pin self.debug.input(self.pin) @@ -127,8 +129,10 @@ class InputFlowNewCodeMismatch(InputFlowBase): self.debug.press_yes() if self.client.layout_type is LayoutType.TR: - yield from swipe_if_necessary(self.debug) # code info - self.debug.press_yes() + layout = self.debug.read_layout() + if "PinKeyboard" not in layout.all_components(): + yield from swipe_if_necessary(self.debug) # code info + self.debug.press_yes() def input_two_different_pins() -> BRGeneratorType: yield from self.PIN.setup_new_pin(