From 144da07d29ad219fb3123b6c632a68095a821e44 Mon Sep 17 00:00:00 2001 From: grdddj Date: Mon, 7 Aug 2023 10:43:34 +0200 Subject: [PATCH] fixup! fixup! feat(core): implement show_more dialogue for TR --- core/embed/rust/src/ui/model_tr/layout.rs | 10 +++++++--- core/src/trezor/ui/layouts/tr/__init__.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/embed/rust/src/ui/model_tr/layout.rs b/core/embed/rust/src/ui/model_tr/layout.rs index 982b948985c..08971d934ba 100644 --- a/core/embed/rust/src/ui/model_tr/layout.rs +++ b/core/embed/rust/src/ui/model_tr/layout.rs @@ -256,7 +256,11 @@ fn content_in_button_page( // Left button - icon, text or nothing. let cancel_btn = if let Some(verb_cancel) = verb_cancel { if !verb_cancel.is_empty() { - Some(ButtonDetails::text(verb_cancel)) + if verb_cancel.as_ref() == "left_arrow_icon" { + Some(ButtonDetails::left_arrow_icon()) + } else { + Some(ButtonDetails::text(verb_cancel)) + } } else { Some(ButtonDetails::cancel_icon()) } @@ -1169,8 +1173,8 @@ extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map content_in_button_page( title, paragraphs.into_paragraphs(), - button.clone(), - Some(button), + button, + Some("left_arrow_icon".into()), false, ) }; diff --git a/core/src/trezor/ui/layouts/tr/__init__.py b/core/src/trezor/ui/layouts/tr/__init__.py index 05760202c7f..9c4524099de 100644 --- a/core/src/trezor/ui/layouts/tr/__init__.py +++ b/core/src/trezor/ui/layouts/tr/__init__.py @@ -805,7 +805,7 @@ async def _confirm_ask_pagination( paginated = RustLayout( trezorui2.confirm_more( title=title, - button="CLOSE", + button="GO BACK", items=[(ui.MONO, data)], ) )