diff --git a/core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs b/core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs index aba96cf791..c7f4cdc879 100644 --- a/core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs +++ b/core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs @@ -76,11 +76,16 @@ impl FirmwareUI for UIEckhart { ) }; - let verb = verb.unwrap_or(TR::buttons__confirm.into()); - let mut right_button = Button::with_text(verb).styled(theme::firmware::button_confirm()); - if hold { - right_button = right_button.with_long_press(theme::CONFIRM_HOLD_DURATION); - } + let right_button = if hold { + let verb = verb.unwrap_or(TR::buttons__hold_to_confirm.into()); + Button::with_text(verb) + .with_long_press(theme::CONFIRM_HOLD_DURATION) + .styled(theme::firmware::button_confirm()) + } else if let Some(verb) = verb { + Button::with_text(verb) + } else { + Button::with_text(TR::buttons__confirm.into()).styled(theme::firmware::button_confirm()) + }; let mut screen = TextScreen::new(paragraphs) .with_header(Header::new(title)) diff --git a/core/src/trezor/ui/layouts/eckhart/__init__.py b/core/src/trezor/ui/layouts/eckhart/__init__.py index fcc688b09a..b74b0b7364 100644 --- a/core/src/trezor/ui/layouts/eckhart/__init__.py +++ b/core/src/trezor/ui/layouts/eckhart/__init__.py @@ -633,6 +633,7 @@ def confirm_value( info_title: str | None = None, chunkify_info: bool = False, warning_footer: str | None = None, + cancel: bool = False, ) -> Awaitable[None]: """General confirmation dialog, used by many other confirm_* functions.""" @@ -655,7 +656,7 @@ def confirm_value( hold=hold, chunkify=chunkify, warning_footer=warning_footer, - cancel=False, + cancel=cancel, ), info_layout, br_name,