fix(core): correctly repaint ShowMore component when requested

trezor · Apr 7, 2024 · 6e311c3 · 6e311c3
1 parent fd914bd
commit 6e311c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/core/embed/rust/src/ui/model_tr/component/show_more.rs b/core/embed/rust/src/ui/model_tr/component/show_more.rs
@@ -1,7 +1,7 @@
 use crate::{
     strutil::TString,
     ui::{
-        component::{Child, Component, Event, EventCtx},
+        component::{Child, Component, Event, EventCtx, Never},
         geometry::{Insets, Rect},
     },
 };
@@ -42,7 +42,7 @@ where
 
 impl<T> Component for ShowMore<T>
 where
-    T: Component,
+    T: Component<Msg = Never>,
 {
     type Msg = CancelInfoConfirmMsg;
 
@@ -55,6 +55,7 @@ where
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        self.content.event(ctx, event);
         let button_event = self.buttons.event(ctx, event);
 
         if let Some(ButtonControllerMsg::Triggered(pos, _)) = button_event {

diff --git a/core/embed/rust/src/ui/model_tr/layout.rs b/core/embed/rust/src/ui/model_tr/layout.rs
@@ -21,18 +21,14 @@ use crate::{
     trezorhal::model,
     ui::{
         component::{
-            base::Component,
-            connect::Connect,
-            paginated::{PageMsg, Paginate},
-            text::{
+            base::Component, connect::Connect, paginated::{PageMsg, Paginate}, text::{
                 op::OpTextLayout,
                 paragraphs::{
                     Checklist, Paragraph, ParagraphSource, ParagraphVecLong, ParagraphVecShort,
                     Paragraphs, VecExt,
                 },
                 TextStyle,
-            },
-            ComponentExt, FormattedText, Label, LineBreaking, Timeout,
+            }, ComponentExt, FormattedText, Label, LineBreaking, Never, Timeout
         },
         display, geometry,
         layout::{
@@ -66,7 +62,7 @@ impl From<CancelConfirmMsg> for Obj {
 
 impl<T> ComponentMsgObj for ShowMore<T>
 where
-    T: Component,
+    T: Component<Msg = Never>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {