close button

Author: bieleluk

core/embed/rust/src/ui/layout_eckhart/flow/confirm_reset.rs

@@ -18,7 +18,7 @@ use crate::{
 use super::super::{
     component::Button,
     firmware::{
-        ActionBar, Header, HeaderMsg, Hint, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
+        ActionBar, Header, Hint, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
         VerticalMenuScreen, VerticalMenuScreenMsg,
     },
     theme::{self, gradient::Gradient},
@@ -90,10 +90,7 @@ pub fn new_confirm_reset(recovery: bool) -> Result<SwipeFlow, error::Error> {
     let content_menu = VerticalMenuScreen::new(VerticalMenu::<ShortMenuVec>::empty().with_item(
         Button::new_menu_item(TR::buttons__cancel.into(), theme::menu_item_title_orange()),
     ))
-    .with_header(
-        Header::new(title)
-            .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-    )
+    .with_header(Header::new(title).with_close_button())
     .map(|msg| match msg {
         VerticalMenuScreenMsg::Selected(i) => Some(FlowMsg::Choice(i)),
         VerticalMenuScreenMsg::Close => Some(FlowMsg::Cancelled),

core/embed/rust/src/ui/layout_eckhart/flow/prompt_backup.rs

@@ -18,7 +18,7 @@ use crate::{
 use super::super::{
     component::Button,
     firmware::{
-        ActionBar, Header, HeaderMsg, Hint, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
+        ActionBar, Header, Hint, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
         VerticalMenuScreen, VerticalMenuScreenMsg,
     },
     theme::{self, gradient::Gradient},
@@ -79,10 +79,7 @@ pub fn new_prompt_backup() -> Result<SwipeFlow, error::Error> {
             theme::menu_item_title_orange(),
         ),
     ))
-    .with_header(
-        Header::new(title)
-            .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-    )
+    .with_header(Header::new(title).with_close_button())
     .map(|msg| match msg {
         VerticalMenuScreenMsg::Selected(i) => Some(FlowMsg::Choice(i)),
         VerticalMenuScreenMsg::Close => Some(FlowMsg::Cancelled),

core/embed/rust/src/ui/layout_eckhart/flow/receive.rs

@@ -24,7 +24,7 @@ use heapless::Vec;
 use super::super::{
     component::Button,
     firmware::{
-        ActionBar, Header, HeaderMsg, Hint, QrScreen, ShortMenuVec, TextScreen, TextScreenMsg,
+        ActionBar, Header, Hint, QrScreen, ShortMenuVec, TextScreen, TextScreenMsg,
         VerticalMenu, VerticalMenuScreen, VerticalMenuScreenMsg,
     },
     theme::{self, gradient::Gradient},
@@ -159,10 +159,7 @@ pub fn new_receive(
                 theme::menu_item_title_orange(),
             )),
     )
-    .with_header(
-        Header::new(title)
-            .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-    )
+    .with_header(Header::new(title).with_close_button())
     .map(|msg| match msg {
         VerticalMenuScreenMsg::Selected(i) => Some(FlowMsg::Choice(i)),
         VerticalMenuScreenMsg::Close => Some(FlowMsg::Cancelled),
@@ -171,10 +168,7 @@ pub fn new_receive(
 
     // QrCode
     let content_qr = QrScreen::new(qr.map(|s| Qr::new(s, case_sensitive))?)
-        .with_header(
-            Header::new(title_qr.into())
-                .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-        )
+        .with_header(Header::new(title_qr.into()).with_close_button())
         .map(|_| Some(FlowMsg::Cancelled));
 
     // AccountInfo
@@ -218,10 +212,7 @@ pub fn new_receive(
         para.into_paragraphs()
             .with_placement(LinearPlacement::vertical()),
     )
-    .with_header(
-        Header::new(TR::address_details__account_info.into())
-            .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-    )
+    .with_header(Header::new(TR::address_details__account_info.into()).with_close_button())
     .map(|_| Some(FlowMsg::Cancelled));
 
     // Cancel

core/embed/rust/src/ui/layout_eckhart/flow/show_danger.rs

@@ -19,7 +19,7 @@ use crate::{
 use super::super::{
     component::Button,
     firmware::{
-        ActionBar, Header, HeaderMsg, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
+        ActionBar, Header, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
         VerticalMenuScreen, VerticalMenuScreenMsg,
     },
     theme,
@@ -98,10 +98,7 @@ pub fn new_show_danger(
                 theme::menu_item_title_orange(),
             )),
     )
-    .with_header(
-        Header::new(menu_title.unwrap_or("".into()))
-            .with_right_button(Button::with_icon(theme::ICON_CROSS), HeaderMsg::Cancelled),
-    )
+    .with_header(Header::new(menu_title.unwrap_or(TString::empty())).with_close_button())
     .map(|msg| match msg {
         VerticalMenuScreenMsg::Selected(i) => Some(FlowMsg::Choice(i)),
         VerticalMenuScreenMsg::Close => Some(FlowMsg::Cancelled),