fixup! fixup! feat(core): implement show_more dialogue for TR

trezor · Aug 7, 2023 · 144da07 · 144da07
1 parent 8b4f92f
commit 144da07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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<T: Component + Paginate + MaybeTrace + 'static>(
     // 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
@@ -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)],
                 )
             )