fixup! feat(core/ui): add cancel button to paginated blobs

core/embed/rust/src/ui/model_mercury/flow/confirm_action.rs

@@ -32,11 +32,7 @@ const MENU_ITEM_INFO: usize = 1;
 #[derive(PartialEq)]
 pub enum ConfirmActionExtra {
     // Opens a menu which can (optionally) lead to an extra Info screen, or cancel the action
-    Menu {
+    Menu(ConfirmActionMenuStrings),
-        verb_cancel: Option<TString<'static>>,
-        has_info: bool,
-        verb_info: Option<TString<'static>>,
-    },
     // Shows a cancel button directly
     Cancel,
 }
@@ -64,6 +60,34 @@ impl ConfirmActionStrings {
     }
 }
 
+#[derive(PartialEq)]
+pub struct ConfirmActionMenuStrings {
+    verb_cancel: Option<TString<'static>>,
+    has_info: bool,
+    verb_info: Option<TString<'static>>,
+}
+
+impl ConfirmActionMenuStrings {
+    pub fn new() -> Self {
+        Self {
+            verb_cancel: None,
+            has_info: false,
+            verb_info: None,
+        }
+    }
+
+    pub const fn with_verb_cancel(mut self, verb_cancel: Option<TString<'static>>) -> Self {
+        self.verb_cancel = verb_cancel;
+        self
+    }
+
+    pub const fn with_info(mut self, has_info: bool, verb_info: Option<TString<'static>>) -> Self {
+        self.has_info = has_info;
+        self.verb_info = verb_info;
+        self
+    }
+}
+
 /// The simplest form of the ConfirmAction flow:
 /// no menu, nor a separate "Tap to confirm" or "Hold to confirm".
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -194,11 +218,7 @@ pub fn new_confirm_action(
 
     new_confirm_action_simple(
         paragraphs,
-        ConfirmActionExtra::Menu {
+        ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new().with_verb_cancel(verb_cancel)),
-            verb_cancel,
-            has_info: false,
-            verb_info: None,
-        },
         ConfirmActionStrings::new(title, subtitle, None, prompt_screen.then_some(prompt_title)),
         hold,
         None,
@@ -299,27 +319,26 @@ fn create_menu(
     extra: ConfirmActionExtra,
     prompt_screen: Option<TString<'static>>,
 ) -> Result<SwipeFlow, Error> {
-    if let ConfirmActionExtra::Menu {
+    if let ConfirmActionExtra::Menu(menu_strings) = extra {
-        verb_cancel,
-        has_info,
-        verb_info,
-    } = extra
-    {
         // NB: The Cancel menu item is always the first,
         // because of the MENU_ITEM_CANCEL = 0.
         // If we want the cancel item to be somewhere else,
         // we would need to account for that and we could not use a constant.
         let mut menu_choices = VerticalMenu::empty().danger(
             theme::ICON_CANCEL,
-            verb_cancel.unwrap_or(TR::buttons__cancel.into()),
+            menu_strings
+                .verb_cancel
+                .unwrap_or(TR::buttons__cancel.into()),
         );
 
-        if has_info {
+        if menu_strings.has_info {
             // The Info menu item (if present) has to be the 2nd,
             // because of MENU_ITEM_INFO = 1!
             menu_choices = menu_choices.item(
                 theme::ICON_CHEVRON_RIGHT,
-                verb_info.unwrap_or(TR::words__title_information.into()),
+                menu_strings
+                    .verb_info
+                    .unwrap_or(TR::words__title_information.into()),
             );
         }
 

core/embed/rust/src/ui/model_mercury/flow/mod.rs

@@ -19,7 +19,8 @@ pub mod util;
 pub mod warning_hi_prio;
 
 pub use confirm_action::{
-    new_confirm_action, new_confirm_action_simple, ConfirmActionExtra, ConfirmActionStrings,
+    new_confirm_action, new_confirm_action_simple, ConfirmActionExtra, ConfirmActionMenuStrings,
+    ConfirmActionStrings,
 };
 #[cfg(feature = "universal_fw")]
 pub use confirm_fido::new_confirm_fido;

core/embed/rust/src/ui/model_mercury/flow/util.rs

@@ -3,7 +3,7 @@ use super::{
         component::{Frame, FrameMsg},
         theme,
     },
-    ConfirmActionExtra, ConfirmActionStrings,
+    ConfirmActionExtra, ConfirmActionMenuStrings, ConfirmActionStrings,
 };
 use crate::{
     error::Error,
@@ -272,11 +272,11 @@ impl ConfirmBlobParams {
         let confirm_extra = if self.cancel {
             ConfirmActionExtra::Cancel
         } else {
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(
-                verb_cancel: self.verb_cancel,
+                ConfirmActionMenuStrings::new()
-                has_info: self.info_button,
+                    .with_verb_cancel(self.verb_cancel)
-                verb_info: self.verb_info,
+                    .with_info(self.info_button, self.verb_info),
-            }
+            )
         };
 
         flow::new_confirm_action_simple(

core/embed/rust/src/ui/model_mercury/layout.rs

@@ -55,7 +55,7 @@ use crate::{
             flow::{
                 new_confirm_action_simple,
                 util::{ConfirmBlobParams, ShowInfoParams},
-                ConfirmActionExtra, ConfirmActionStrings,
+                ConfirmActionExtra, ConfirmActionMenuStrings, ConfirmActionStrings,
             },
             theme::ICON_BULLET_CHECKMARK,
         },
@@ -246,11 +246,7 @@ extern "C" fn new_confirm_emphasized(n_args: usize, args: *const Obj, kwargs: *m
 
         new_confirm_action_simple(
             FormattedText::new(ops).vertically_centered(),
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                verb_cancel: None,
-                has_info: false,
-                verb_info: None,
-            },
             ConfirmActionStrings::new(title, None, None, Some(title)),
             false,
             None,
@@ -395,11 +391,7 @@ extern "C" fn new_confirm_address(n_args: usize, args: *const Obj, kwargs: *mut
 
         flow::new_confirm_action_simple(
             paragraphs,
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                verb_cancel: None,
-                has_info: false,
-                verb_info: None,
-            },
             ConfirmActionStrings::new(title, None, None, None),
             false,
             None,
@@ -442,11 +434,7 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
 
         new_confirm_action_simple(
             paragraphs.into_paragraphs(),
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                verb_cancel: None,
-                has_info: false,
-                verb_info: None,
-            },
             ConfirmActionStrings::new(title, None, None, hold.then_some(title)),
             hold,
             None,
@@ -476,11 +464,7 @@ extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *m
 
             new_confirm_action_simple(
                 paragraphs,
-                ConfirmActionExtra::Menu {
+                ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                    verb_cancel: None,
-                    has_info: false,
-                    verb_info: None,
-                },
                 ConfirmActionStrings::new(
                     TR::homescreen__settings_title.into(),
                     Some(TR::homescreen__settings_subtitle.into()),
@@ -792,11 +776,7 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
 
         new_confirm_action_simple(
             paragraphs.into_paragraphs(),
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                verb_cancel: None,
-                has_info: true,
-                verb_info: None,
-            },
             ConfirmActionStrings::new(title, None, None, Some(title)),
             true,
             None,
@@ -1113,11 +1093,7 @@ extern "C" fn new_confirm_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut
 
         new_confirm_action_simple(
             paragraphs,
-            ConfirmActionExtra::Menu {
+            ConfirmActionExtra::Menu(ConfirmActionMenuStrings::new()),
-                verb_cancel: None,
-                has_info: false,
-                verb_info: None,
-            },
             ConfirmActionStrings::new(
                 TR::coinjoin__title.into(),
                 None,