From aee3f01b959359c472363b38ed4e775d256b9723 Mon Sep 17 00:00:00 2001 From: obrusvit Date: Thu, 14 Nov 2024 13:26:48 +0100 Subject: [PATCH] fix(core/mercury): info at bitcoin fee bump --- .../model_mercury/flow/confirm_with_info.rs | 4 ++-- .../embed/rust/src/ui/model_mercury/layout.rs | 23 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/core/embed/rust/src/ui/model_mercury/flow/confirm_with_info.rs b/core/embed/rust/src/ui/model_mercury/flow/confirm_with_info.rs index b34b5a30b5..890cbde0aa 100644 --- a/core/embed/rust/src/ui/model_mercury/flow/confirm_with_info.rs +++ b/core/embed/rust/src/ui/model_mercury/flow/confirm_with_info.rs @@ -52,13 +52,13 @@ impl FlowController for ConfirmWithInfo { pub fn new_confirm_with_info( title: TString<'static>, - button: TString<'static>, + footer_description: Option>, info_button: TString<'static>, paragraphs: ParagraphVecShort<'static>, ) -> Result { let content_main = Frame::left_aligned(title, SwipeContent::new(paragraphs.into_paragraphs())) .with_menu_button() - .with_footer(TR::instructions__swipe_up.into(), Some(button)) + .with_footer(TR::instructions__swipe_up.into(), footer_description) .with_swipe(Direction::Up, SwipeSettings::default()) .map(|msg| matches!(msg, FrameMsg::Button(FlowMsg::Info)).then_some(FlowMsg::Info)); diff --git a/core/embed/rust/src/ui/model_mercury/layout.rs b/core/embed/rust/src/ui/model_mercury/layout.rs index dc9ea273ed..edaad7b4b4 100644 --- a/core/embed/rust/src/ui/model_mercury/layout.rs +++ b/core/embed/rust/src/ui/model_mercury/layout.rs @@ -696,20 +696,19 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m }; let paragraphs = ParagraphVecShort::from_iter([ - Paragraph::new(&theme::TEXT_NORMAL, description), + Paragraph::new(&theme::TEXT_SUB_GREY, description), Paragraph::new(&theme::TEXT_MONO, change), - Paragraph::new(&theme::TEXT_NORMAL, total_label), + Paragraph::new(&theme::TEXT_SUB_GREY, total_label), Paragraph::new(&theme::TEXT_MONO, total_fee_new), - ]) - .into_paragraphs(); + ]); - let obj = LayoutObj::new(SwipeUpScreen::new( - Frame::left_aligned(title, paragraphs) - .with_menu_button() - .with_footer(TR::instructions__swipe_up.into(), None) - .with_swipe(Direction::Up, SwipeSettings::default()), - ))?; - Ok(obj.into()) + let flow = flow::new_confirm_with_info( + title, + None, + TR::words__title_information.into(), + paragraphs, + )?; + Ok(LayoutObj::new_root(flow)?.into()) }; unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) } } @@ -868,7 +867,7 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu } let flow = - confirm_with_info::new_confirm_with_info(title, button, info_button, paragraphs)?; + confirm_with_info::new_confirm_with_info(title, Some(button), info_button, paragraphs)?; Ok(LayoutObj::new_root(flow)?.into()) }; unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }