diff --git a/core/embed/rust/src/ui/model_tr/component/flow.rs b/core/embed/rust/src/ui/model_tr/component/flow.rs index ef2a959ebf..a9ba26fc8e 100644 --- a/core/embed/rust/src/ui/model_tr/component/flow.rs +++ b/core/embed/rust/src/ui/model_tr/component/flow.rs @@ -143,7 +143,9 @@ where let (title_content_area, button_area) = bounds.split_bottom(theme::BUTTON_HEIGHT); // Accounting for possible title let content_area = if self.common_title.is_some() { - title_content_area.split_top(10).1 + title_content_area + .split_top(theme::FONT_HEADER.line_height()) + .1 } else { title_content_area }; diff --git a/core/embed/rust/src/ui/model_tr/component/flow_pages.rs b/core/embed/rust/src/ui/model_tr/component/flow_pages.rs index 814c8665e1..5993a9ec1a 100644 --- a/core/embed/rust/src/ui/model_tr/component/flow_pages.rs +++ b/core/embed/rust/src/ui/model_tr/component/flow_pages.rs @@ -191,7 +191,7 @@ impl Page { impl Page { pub fn icon_label_text(self, icon: IconAndName, label: StrBuffer, text: StrBuffer) -> Self { self.icon_with_offset(icon, 3) - .text_normal(label) + .text_mono(label) .newline() .text_bold(text) } diff --git a/core/embed/rust/src/ui/model_tr/layout.rs b/core/embed/rust/src/ui/model_tr/layout.rs index bc598f3cf7..2ce8dcae51 100644 --- a/core/embed/rust/src/ui/model_tr/layout.rs +++ b/core/embed/rust/src/ui/model_tr/layout.rs @@ -201,7 +201,7 @@ extern "C" fn confirm_output(n_args: usize, args: *const Obj, kwargs: *mut Map) let truncated_address: StrBuffer = kwargs.get(Qstr::MP_QSTR_truncated_address)?.try_into()?; let amount: StrBuffer = kwargs.get(Qstr::MP_QSTR_amount)?.try_into()?; - let title: StrBuffer = "Send".into(); + let title: StrBuffer = "SEND".into(); let get_page = move |page_index| { // Showing two screens - the recipient address and summary confirmation @@ -214,7 +214,7 @@ extern "C" fn confirm_output(n_args: usize, args: *const Obj, kwargs: *mut Map) Some(ButtonDetails::text("CONTINUE")), ); let btn_actions = ButtonActions::cancel_next(); - Page::<20>::new(btn_layout, btn_actions, Font::NORMAL).icon_label_text( + Page::<20>::new(btn_layout, btn_actions, Font::MONO).icon_label_text( theme::ICON_USER, "Recipient".into(), address.clone(), @@ -231,7 +231,7 @@ extern "C" fn confirm_output(n_args: usize, args: *const Obj, kwargs: *mut Map) ), ); let btn_actions = ButtonActions::cancel_confirm(); - Page::<20>::new(btn_layout, btn_actions, Font::NORMAL) + Page::<20>::new(btn_layout, btn_actions, Font::MONO) .icon_label_text( theme::ICON_USER, "Recipient".into(), @@ -273,7 +273,7 @@ extern "C" fn confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Map) - ); let btn_actions = ButtonActions::cancel_confirm(); - let mut flow_page = Page::<25>::new(btn_layout, btn_actions, Font::NORMAL) + let mut flow_page = Page::<25>::new(btn_layout, btn_actions, Font::MONO) .icon_label_text(theme::ICON_PARAM, total_label.clone(), total_amount.clone()) .newline() .icon_label_text(theme::ICON_PARAM, fee_label.clone(), fee_amount.clone());