fixup! fixup! fixup! chore(core/eckhart): Update ETH approve flow

Author: bieleluk

core/embed/rust/librust_qstr.h

@@ -745,7 +745,6 @@ static void _librust_qstrs(void) {
   MP_QSTR_subprompt;
   MP_QSTR_subtext;
   MP_QSTR_subtitle;
-  MP_QSTR_suite_sign;
   MP_QSTR_summary_br_code;
   MP_QSTR_summary_br_name;
   MP_QSTR_summary_items;

core/embed/rust/src/ui/api/firmware_micropython.rs

@@ -387,7 +387,6 @@ extern "C" fn new_confirm_summary(n_args: usize, args: *const Obj, kwargs: *mut
             .get(Qstr::MP_QSTR_verb_cancel)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
-        let suite_sign: bool = kwargs.get_or(Qstr::MP_QSTR_suite_sign, false)?;
 
         let layout = ModelUI::confirm_summary(
             amount,
@@ -400,7 +399,6 @@ extern "C" fn new_confirm_summary(n_args: usize, args: *const Obj, kwargs: *mut
             extra_items,
             extra_title,
             verb_cancel,
-            suite_sign,
         )?;
         Ok(LayoutObj::new_root(layout)?.into())
     };
@@ -1439,7 +1437,6 @@ pub static mp_module_trezorui_api: Module = obj_module! {
     ///     extra_items: Iterable[tuple[str, str]] | None = None,
     ///     extra_title: str | None = None,
     ///     verb_cancel: str | None = None,
-    ///     suite_sign: bool = False,
     /// ) -> LayoutObj[UiResult]:
     ///     """Confirm summary of a transaction."""
     Qstr::MP_QSTR_confirm_summary => obj_fn_kw!(0, new_confirm_summary).as_obj(),

core/embed/rust/src/ui/layout_bolt/ui_firmware.rs

@@ -438,7 +438,6 @@ impl FirmwareUI for UIBolt {
         extra_items: Option<Obj>,
         _extra_title: Option<TString<'static>>,
         verb_cancel: Option<TString<'static>>,
-        _suite_sign: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {
         let info_button: bool = account_items.is_some() || extra_items.is_some();
         let mut paragraphs = ParagraphVecShort::new();

core/embed/rust/src/ui/layout_caesar/ui_firmware.rs

@@ -497,7 +497,6 @@ impl FirmwareUI for UICaesar {
         extra_items: Option<Obj>,
         extra_title: Option<TString<'static>>,
         verb_cancel: Option<TString<'static>>,
-        _suite_sign: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {
         // collect available info pages
         let mut info_pages: Vec<(TString, Obj), 2> = Vec::new();

core/embed/rust/src/ui/layout_delizia/ui_firmware.rs

@@ -368,7 +368,6 @@ impl FirmwareUI for UIDelizia {
         extra_items: Option<Obj>,
         extra_title: Option<TString<'static>>,
         verb_cancel: Option<TString<'static>>,
-        _suite_sign: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {
         let mut summary_params = ShowInfoParams::new(title.unwrap_or(TString::empty()))
             .with_menu_button()

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

@@ -99,7 +99,6 @@ pub fn new_confirm_summary(
     extra_title: Option<TString<'static>>,
     extra_paragraphs: Option<ParagraphVecShort<'static>>,
     verb_cancel: Option<TString<'static>>,
-    suite_sign: bool,
 ) -> Result<SwipeFlow, error::Error> {
     // Summary
     let mut summary_paragraphs = ParagraphVecShort::new();
@@ -113,7 +112,7 @@ pub fn new_confirm_summary(
         .add(Paragraph::new(&theme::TEXT_SMALL_LIGHT, fee_label))
         .add(Paragraph::new(&theme::TEXT_MONO_MEDIUM_LIGHT, fee));
 
-    let mut screen_summary = TextScreen::new(
+    let content_summary = TextScreen::new(
         summary_paragraphs
             .into_paragraphs()
             .with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)),
@@ -123,16 +122,12 @@ pub fn new_confirm_summary(
         Button::with_text(TR::instructions__hold_to_sign.into())
             .with_long_press(theme::CONFIRM_HOLD_DURATION)
             .styled(theme::button_confirm()),
-    ));
-
-    if suite_sign {
-        screen_summary = screen_summary.with_hint(Hint::new_instruction(
-            TR::send__send_in_the_app,
-            Some(theme::ICON_INFO),
-        ))
-    }
-
-    let content_summary = screen_summary.map(|msg| match msg {
+    ))
+    .with_hint(Hint::new_instruction(
+        TR::send__send_in_the_app,
+        Some(theme::ICON_INFO),
+    ))
+    .map(|msg| match msg {
         TextScreenMsg::Confirmed => Some(FlowMsg::Confirmed),
         TextScreenMsg::Cancelled => Some(FlowMsg::Cancelled),
         TextScreenMsg::Menu => Some(FlowMsg::Info),

core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs

@@ -312,7 +312,6 @@ impl FirmwareUI for UIEckhart {
         extra_items: Option<Obj>,
         extra_title: Option<TString<'static>>,
         verb_cancel: Option<TString<'static>>,
-        suite_sign: bool,
     ) -> Result<impl LayoutMaybeTrace, Error> {
         // collect available info
         let account_paragraphs = if let Some(items) = account_items {
@@ -351,7 +350,6 @@ impl FirmwareUI for UIEckhart {
             extra_title,
             extra_paragraphs,
             verb_cancel,
-            suite_sign,
         )?;
         Ok(flow)
     }

core/embed/rust/src/ui/ui_firmware.rs

@@ -143,7 +143,6 @@ pub trait FirmwareUI {
         extra_items: Option<Obj>, // TODO: replace Obj
         extra_title: Option<TString<'static>>,
         verb_cancel: Option<TString<'static>>,
-        suite_sign: bool,
     ) -> Result<impl LayoutMaybeTrace, Error>;
 
     fn confirm_with_info(

core/mocks/generated/trezorui_api.pyi

@@ -287,7 +287,6 @@ def confirm_summary(
     extra_items: Iterable[tuple[str, str]] | None = None,
     extra_title: str | None = None,
     verb_cancel: str | None = None,
-    suite_sign: bool = False,
 ) -> LayoutObj[UiResult]:
     """Confirm summary of a transaction."""
 

core/src/trezor/ui/layouts/eckhart/__init__.py

@@ -766,7 +766,6 @@ def confirm_total(
             account_items=account_items or None,
             extra_items=fee_items or None,
             extra_title=TR.confirm_total__title_fee,
-            suite_sign=True,
         ),
         br_name,
         br_code,