arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-25 17:09:44 +00:00
Code Issues Releases Wiki Activity

fix(tests): UI diff mercury timeout status screen

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2024-10-03 16:15:12 +02:00
parent 4d4ab93197
commit 32efef07e0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/embed/rust/src/ui/model_mercury/component/status_screen.rs
View File

@ -149,7 +149,7 @@ impl StatusScreen {
icon: Icon, icon: Icon,
icon_color: Color, icon_color: Color,
circle_color: Color, circle_color: Color,
dismiss_style: DismissType, dismiss_type: DismissType,
msg: TString<'static>, msg: TString<'static>,
) -> Self { ) -> Self {
Self { Self {
@ -157,7 +157,7 @@ impl StatusScreen {
icon, icon,
icon_color, icon_color,
circle_color, circle_color,
dismiss_type: dismiss_style, dismiss_type,
anim: StatusAnimation::default(), anim: StatusAnimation::default(),
msg: Label::new(msg, Alignment::Start, theme::TEXT_NORMAL).vertically_centered(), msg: Label::new(msg, Alignment::Start, theme::TEXT_NORMAL).vertically_centered(),
} }
@ -174,11 +174,12 @@ impl StatusScreen {
} }
pub fn new_success_timeout(msg: TString<'static>) -> Self { pub fn new_success_timeout(msg: TString<'static>) -> Self {
let timeout_ms = if !animation_disabled() { TIMEOUT_MS } else { 0 };
Self::new( Self::new(
theme::ICON_SIMPLE_CHECKMARK30, theme::ICON_SIMPLE_CHECKMARK30,
theme::GREEN_LIME, theme::GREEN_LIME,
theme::GREEN_LIGHT, theme::GREEN_LIGHT,
DismissType::Timeout(Timeout::new(TIMEOUT_MS)), DismissType::Timeout(Timeout::new(timeout_ms)),
msg, msg,
) )
} }
@ -194,11 +195,12 @@ impl StatusScreen {
} }
pub fn new_neutral_timeout(msg: TString<'static>) -> Self { pub fn new_neutral_timeout(msg: TString<'static>) -> Self {
let timeout_ms = if !animation_disabled() { TIMEOUT_MS } else { 0 };
Self::new( Self::new(
theme::ICON_SIMPLE_CHECKMARK30, theme::ICON_SIMPLE_CHECKMARK30,
theme::GREY_EXTRA_LIGHT, theme::GREY_EXTRA_LIGHT,
theme::GREY_DARK, theme::GREY_DARK,
DismissType::Timeout(Timeout::new(TIMEOUT_MS)), DismissType::Timeout(Timeout::new(timeout_ms)),
msg, msg,
) )
} }

2
tests/input_flows.py
View File

@ -663,7 +663,7 @@ class InputFlowShowXpubQRCode(InputFlowBase):
layout = self.debug.swipe_up() layout = self.debug.swipe_up()
self.debug.synchronize_at("PromptScreen") self.debug.synchronize_at("PromptScreen")
# tap to confirm # tap to confirm
self.debug.press_yes() self.debug.click(buttons.TAP_TO_CONFIRM)
class InputFlowPaymentRequestDetails(InputFlowBase): class InputFlowPaymentRequestDetails(InputFlowBase):