fix(core): revert bad renderer lifetime changes

[no changelog]

core/embed/rust/src/ui/component/bar.rs

@@ -41,7 +41,7 @@ impl Component for Bar {
         display::rect_fill_rounded(self.area, self.color, self.bg_color, self.radius as u8);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::Bar::new(self.area)
             .with_bg(self.color)
             .with_radius(self.radius)

core/embed/rust/src/ui/component/base.rs

@@ -63,7 +63,7 @@ pub trait Component {
     /// the `Child` wrapper.
     fn paint(&mut self);
 
-    fn render<'s>(&self, _target: &mut impl Renderer<'s>);
+    fn render<'s>(&'s self, _target: &mut impl Renderer<'s>);
 
     #[cfg(feature = "ui_bounds")]
     /// Report current paint bounds of this component. Used for debugging.
@@ -159,7 +159,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.component.render(target);
     }
 
@@ -279,7 +279,7 @@ where
         self.inner.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner().render(target);
     }
 
@@ -321,7 +321,7 @@ where
         self.1.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.0.render(target);
         self.1.render(target);
     }
@@ -375,7 +375,7 @@ where
         self.2.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.0.render(target);
         self.1.render(target);
         self.2.render(target);
@@ -408,7 +408,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if let Some(ref c) = self {
             c.render(target)
         }

core/embed/rust/src/ui/component/border.rs

@@ -42,7 +42,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 

core/embed/rust/src/ui/component/button_request.rs

@@ -41,7 +41,7 @@ impl<T: Component> Component for OneButtonRequest<T> {
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl crate::ui::shape::Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl crate::ui::shape::Renderer<'s>) {
         self.inner.render(target)
     }
 }

core/embed/rust/src/ui/component/connect.rs

@@ -57,7 +57,7 @@ impl Component for Connect {
         });
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let font = Font::NORMAL;
 
         self.bg.render(target);

core/embed/rust/src/ui/component/empty.rs

@@ -17,7 +17,7 @@ impl Component for Empty {
 
     fn paint(&mut self) {}
 
-    fn render<'s>(&self, _target: &mut impl Renderer<'s>) {}
+    fn render<'s>(&'s self, _target: &mut impl Renderer<'s>) {}
 }
 
 #[cfg(feature = "ui_debug")]

core/embed/rust/src/ui/component/image.rs

@@ -50,7 +50,7 @@ impl Component for Image {
         self.draw(self.area.center(), Alignment2D::CENTER);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::ToifImage::new(self.area.center(), self.toif)
             .with_align(Alignment2D::CENTER)
             .render(target);
@@ -138,7 +138,7 @@ impl Component for BlendedImage {
         self.paint_image();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::ToifImage::new(self.bg_top_left, self.bg.toif)
             .with_fg(self.bg_color)
             .render(target);

core/embed/rust/src/ui/component/jpeg.rs

@@ -48,7 +48,7 @@ impl Component for Jpeg {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::JpegImage::new_image(self.area.center(), self.image)
             .with_align(Alignment2D::CENTER)
             .with_scale(self.scale)

core/embed/rust/src/ui/component/label.rs

@@ -136,7 +136,7 @@ impl Component for Label<'_> {
         self.text.map(|c| self.layout.render_text(c));
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.text.map(|c| self.layout.render_text2(c, target));
     }
 

core/embed/rust/src/ui/component/map.rs

@@ -31,7 +31,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 
@@ -102,7 +102,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 

core/embed/rust/src/ui/component/marquee.rs

@@ -124,7 +124,7 @@ impl Marquee {
             .map(|t| display::marquee(self.area, t, offset, self.font, self.fg, self.bg));
     }
 
-    pub fn render_anim<'s>(&self, target: &mut impl Renderer<'s>, offset: i16) {
+    pub fn render_anim<'s>(&'s self, target: &mut impl Renderer<'s>, offset: i16) {
         target.in_window(self.area, &|target| {
             let text_height = self.font.text_height();
             let pos = self.area.top_left() + Offset::new(offset, text_height - 1);
@@ -228,7 +228,7 @@ impl Component for Marquee {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let now = Instant::now();
 
         match self.state {

core/embed/rust/src/ui/component/maybe.rs

@@ -95,7 +95,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         if self.visible {
             self.inner.render(target);

core/embed/rust/src/ui/component/pad.rs

@@ -55,7 +55,7 @@ impl Pad {
         }
     }
 
-    pub fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    pub fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::Bar::new(self.area)
             .with_bg(self.color)
             .render(target);

core/embed/rust/src/ui/component/placed.rs

@@ -65,7 +65,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 }
@@ -112,7 +112,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 }
@@ -188,7 +188,7 @@ where
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.inner.render(target);
     }
 }
@@ -283,7 +283,7 @@ where
         self.second.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.first.render(target);
         self.second.render(target);
     }

core/embed/rust/src/ui/component/qr_code.rs

@@ -143,7 +143,7 @@ impl Component for Qr {
         Self::draw(&qr, area, self.border, scale);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let mut outbuffer = [0u8; QR_MAX_VERSION.buffer_len()];
         let mut tempbuffer = [0u8; QR_MAX_VERSION.buffer_len()];
 

core/embed/rust/src/ui/component/swipe.rs

@@ -155,5 +155,5 @@ impl Component for Swipe {
 
     fn paint(&mut self) {}
 
-    fn render<'s>(&self, _target: &mut impl Renderer<'s>) {}
+    fn render<'s>(&'s self, _target: &mut impl Renderer<'s>) {}
 }

core/embed/rust/src/ui/component/text/formatted.rs

@@ -134,7 +134,7 @@ impl Component for FormattedText {
         self.layout_content(&mut TextRenderer);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.layout_content(&mut TextRenderer2::new(target));
     }
 

core/embed/rust/src/ui/component/text/paragraphs.rs

@@ -189,7 +189,7 @@ where
         )
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         Self::foreach_visible(
             &self.source,
             &self.visible,
@@ -713,7 +713,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.paragraphs.render(target);
         self.render_left_column(target);
     }

core/embed/rust/src/ui/component/timeout.rs

@@ -47,7 +47,7 @@ impl Component for Timeout {
 
     fn paint(&mut self) {}
 
-    fn render<'s>(&self, _target: &mut impl Renderer<'s>) {}
+    fn render<'s>(&'s self, _target: &mut impl Renderer<'s>) {}
 }
 
 #[cfg(feature = "ui_debug")]

core/embed/rust/src/ui/flow/page.rs

@@ -67,7 +67,11 @@ impl<T: Component + Paginate + Clone> SwipePage<T> {
         finished
     }
 
-    fn render_transition<'s>(&self, transition: &Transition<T>, target: &mut impl Renderer<'s>) {
+    fn render_transition<'s>(
+        &'s self,
+        transition: &'s Transition<T>,
+        target: &mut impl Renderer<'s>,
+    ) {
         target.in_clip(self.bounds, &|target| {
             util::render_slide(
                 |target| transition.cloned.render(target),
@@ -106,7 +110,7 @@ impl<T: Component + Paginate + Clone> Component for SwipePage<T> {
         self.inner.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if let Some(t) = &self.transition {
             return self.render_transition(t, target);
         }
@@ -197,7 +201,7 @@ impl<T: Component> Component for IgnoreSwipe<T> {
         self.0.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.0.render(target)
     }
 }

core/embed/rust/src/ui/flow/store.rs

@@ -22,7 +22,7 @@ pub trait FlowStore {
     fn event(&mut self, i: usize, ctx: &mut EventCtx, event: Event) -> Option<FlowMsg>;
 
     /// Call `Component::render` on i-th element.
-    fn render<'s>(&self, i: usize, target: &mut impl Renderer<'s>);
+    fn render<'s>(&'s self, i: usize, target: &mut impl Renderer<'s>);
 
     #[cfg(feature = "ui_debug")]
     /// Call `Trace::trace` on i-th element.
@@ -62,7 +62,7 @@ impl FlowStore for FlowEmpty {
         panic!()
     }
 
-    fn render<'s>(&self, _i: usize, _target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, _i: usize, _target: &mut impl Renderer<'s>) {
         panic!()
     }
 
@@ -132,7 +132,7 @@ where
         }
     }
 
-    fn render<'s>(&self, i: usize, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, i: usize, target: &mut impl Renderer<'s>) {
         if i == 0 {
             self.as_ref().render(target)
         } else {

core/embed/rust/src/ui/flow/swipe.rs

@@ -80,12 +80,12 @@ impl<Q: FlowState, S: FlowStore> SwipeFlow<Q, S> {
         ctx.request_paint();
     }
 
-    fn render_state<'s>(&self, state: Q, target: &mut impl Renderer<'s>) {
+    fn render_state<'s>(&'s self, state: Q, target: &mut impl Renderer<'s>) {
         self.store.render(state.index(), target)
     }
 
     fn render_transition<'s>(
-        &self,
+        &'s self,
         prev_state: &Q,
         animation: &Animation<f32>,
         direction: &SwipeDirection,
@@ -188,7 +188,7 @@ impl<Q: FlowState, S: FlowStore> Component for SwipeFlow<Q, S> {
 
     fn paint(&mut self) {}
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         match &self.transition {
             Transition::None | Transition::Internal => self.render_state(self.state, target),
             Transition::External {

core/embed/rust/src/ui/model_mercury/bootloader/intro.rs

@@ -107,7 +107,7 @@ impl<'a> Component for Intro<'a> {
         self.menu.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.title.render(target);
         self.text.render(target);

core/embed/rust/src/ui/model_mercury/bootloader/menu.rs

@@ -109,7 +109,7 @@ impl Component for Menu {
         self.reset.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.title.render(target);
         self.close.render(target);

core/embed/rust/src/ui/model_mercury/bootloader/welcome.rs

@@ -64,7 +64,7 @@ impl Component for Welcome {
         );
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         shape::Text::new(TEXT_ORIGIN, "Get started")

core/embed/rust/src/ui/model_mercury/component/address_details.rs

@@ -161,7 +161,7 @@ impl Component for AddressDetails {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         match self.current_page {
             0 => self.details.render(target),
             _ => self.xpub_view.render(target),

core/embed/rust/src/ui/model_mercury/component/bl_confirm.rs

@@ -241,7 +241,7 @@ impl Component for Confirm<'_> {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.content_pad.render(target);
 

core/embed/rust/src/ui/model_mercury/component/button.rs

@@ -408,7 +408,7 @@ impl Component for Button {
         self.paint_content(style);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let style = self.style();
         self.render_background(target, style, 0xFF);
         self.render_content(target, style, 0xFF);

core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs

@@ -124,7 +124,7 @@ where
         self.label.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
 
         let center = constant::screen().center() + Offset::y(LOADER_OFFSET);

core/embed/rust/src/ui/model_mercury/component/dialog.rs

@@ -72,7 +72,7 @@ where
         self.controls.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
         self.controls.render(target);
     }
@@ -202,7 +202,7 @@ where
         self.controls.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.image.render(target);
         self.paragraphs.render(target);
         self.controls.render(target);

core/embed/rust/src/ui/model_mercury/component/error.rs

@@ -92,7 +92,7 @@ impl<'a> Component for ErrorScreen<'a> {
         self.footer.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         let icon = ICON_WARNING40;

core/embed/rust/src/ui/model_mercury/component/fido.rs

@@ -211,7 +211,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.icon.render(target);
         self.controls.render(target);
         self.app_name.render(target);

core/embed/rust/src/ui/model_mercury/component/footer.rs

@@ -94,7 +94,7 @@ impl<'a> Component for Footer<'a> {
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // show description only if there is space for it
         if self.area.height() == Footer::HEIGHT_DEFAULT {
             if let Some(description) = self.text_description {

core/embed/rust/src/ui/model_mercury/component/frame.rs

@@ -218,7 +218,7 @@ where
         self.footer.paint();
         self.content.paint();
     }
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
         self.subtitle.render(target);
         self.button.render(target);

core/embed/rust/src/ui/model_mercury/component/hold_to_confirm.rs

@@ -245,7 +245,7 @@ impl Component for HoldToConfirm {
         unimplemented!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let elapsed = self.anim.eval();
 
         shape::Bar::new(screen())

core/embed/rust/src/ui/model_mercury/component/homescreen.rs

@@ -108,7 +108,7 @@ impl Homescreen {
         }
     }
 
-    fn render_loader<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_loader<'s>(&'s self, target: &mut impl Renderer<'s>) {
         TR::progress__locking_device.map_translated(|t| {
             shape::Text::new(TOP_CENTER + Offset::y(HOLD_Y), t)
                 .with_align(Alignment::Center)
@@ -188,7 +188,7 @@ impl Component for Homescreen {
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if self.loader.is_animating() || self.loader.is_completely_grown(Instant::now()) {
             self.render_loader(target);
         } else {
@@ -353,15 +353,14 @@ impl Component for Lockscreen {
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         const OVERLAY_SIZE: i16 = 170;
         const OVERLAY_BORDER: i16 = (AREA.height() - OVERLAY_SIZE) / 2;
         const OVERLAY_OFFSET: i16 = 9;
 
         let center = AREA.center();
 
-        // shape::RawImage::new(AREA, self.bg_image.view())
+        shape::RawImage::new(AREA, self.bg_image.view()).render(target);
-        //     .render(target);
 
         cshape::UnlockOverlay::new(center + Offset::y(OVERLAY_OFFSET), self.anim.eval())
             .render(target);

core/embed/rust/src/ui/model_mercury/component/keyboard/bip39.rs

@@ -107,7 +107,7 @@ impl Component for Bip39Input {
         todo!("remove when ui-t3t1 done");
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let area = self.button.area();
         let style = self.button.style();
 

core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs

@@ -208,7 +208,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if self.input.inner().inner().is_empty() {
             self.prompt.render(target);
             if self.can_go_back {

core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs

@@ -372,7 +372,7 @@ impl Component for PassphraseKeyboard {
         todo!("remove when ui-t3t1 done")
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.input.render(target);
         self.next_btn.render(target);
         self.erase_btn.render(target);
@@ -436,7 +436,7 @@ impl Component for Input {
         todo!("remove when ui-t3t1 done");
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let style = theme::label_keyboard();
 
         let text_baseline = self.area.top_left() + Offset::y(style.text_font.text_height())

core/embed/rust/src/ui/model_mercury/component/keyboard/pin.rs

@@ -237,7 +237,7 @@ impl Component for PinKeyboard<'_> {
         todo!("remove when ui-t3t1 done");
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.erase_btn.render(target);
         self.textbox_pad.render(target);
 
@@ -433,7 +433,7 @@ impl Component for PinDots {
         // TODO: remove when ui-t3t1 done
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let dot_area = self.area.inset(HEADER_PADDING);
         self.pad.render(target);
         if self.display_digits {

core/embed/rust/src/ui/model_mercury/component/keyboard/slip39.rs

@@ -127,7 +127,7 @@ impl Component for Slip39Input {
         todo!("remove when ui-t3t1 done")
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let area = self.button.area();
         let style = self.button.style();
 

core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs

@@ -67,7 +67,7 @@ impl Component for SelectWordCount {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         for btn in self.button.iter() {
             btn.render(target)
         }

core/embed/rust/src/ui/model_mercury/component/loader.rs

@@ -204,7 +204,7 @@ impl Component for Loader {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // TODO: Consider passing the current instant along with the event -- that way,
         // we could synchronize painting across the component tree. Also could be useful
         // in automated tests.

core/embed/rust/src/ui/model_mercury/component/number_input.rs

@@ -97,7 +97,7 @@ where
         todo!("remove when ui-t3t1 done");
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.input.render(target);
         self.paragraphs_pad.render(target);
         self.paragraphs.render(target);
@@ -212,7 +212,7 @@ impl Component for NumberInput {
         todo!("remove when ui-t3t1 done");
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let mut buf = [0u8; 10];
 
         if let Some(text) = strutil::format_i64(self.value as i64, &mut buf) {

core/embed/rust/src/ui/model_mercury/component/number_input_slider.rs

@@ -92,7 +92,7 @@ impl Component for NumberInputSliderDialog {
         self.confirm_button.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.input.render(target);
 
         let mut str = ShortString::new();
@@ -193,7 +193,7 @@ impl Component for NumberInputSlider {
         display::bar_with_text_and_fill(self.area, None, theme::FG, theme::BG, 0, fill_to as _);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let val_pct = (100 * (self.value - self.min)) / (self.max - self.min);
 
         shape::Bar::new(self.area)

core/embed/rust/src/ui/model_mercury/component/page.rs

@@ -420,7 +420,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         match &self.loader {
             Some(l) if l.is_animating() => self.loader.render(target),

core/embed/rust/src/ui/model_mercury/component/progress.rs

@@ -110,7 +110,7 @@ impl Component for Progress {
         self.description.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
 
         let center = constant::screen().center() + Offset::y(self.loader_y_offset);

core/embed/rust/src/ui/model_mercury/component/prompt_screen.rs

@@ -60,7 +60,7 @@ impl Component for PromptScreen {
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         match self {
             PromptScreen::Tap(t) => t.render(target),
             PromptScreen::Hold(h) => h.render(target),

core/embed/rust/src/ui/model_mercury/component/result.rs

@@ -97,7 +97,7 @@ impl Component for ResultFooter<'_> {
         self.text.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // divider line
         let bar = Rect::from_center_and_size(
             Point::new(self.area.center().x, self.area.y0),
@@ -182,7 +182,7 @@ impl<'a> Component for ResultScreen<'a> {
         self.footer.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.footer_pad.render(target);
 

core/embed/rust/src/ui/model_mercury/component/scroll.rs

@@ -124,7 +124,7 @@ impl Component for ScrollBar {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         fn dotsize(distance: usize, nhidden: usize) -> Icon {
             match (nhidden.saturating_sub(distance)).min(2 - distance) {
                 0 => theme::DOT_INACTIVE,

core/embed/rust/src/ui/model_mercury/component/set_brightness.rs

@@ -55,7 +55,7 @@ impl Component for SetBrightnessDialog {
         self.0.paint()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.0.render(target);
     }
 

core/embed/rust/src/ui/model_mercury/component/share_words.rs

@@ -110,7 +110,7 @@ impl<'a> Component for ShareWords<'a> {
         // TODO: remove when ui-t3t1 done
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // corner highlights
         let (_, top_right_shape, bot_left_shape, bot_right_shape) =
             shape::CornerHighlight::from_rect(self.area_word, theme::GREY_DARK, theme::BG);

core/embed/rust/src/ui/model_mercury/component/simple_page.rs

@@ -170,7 +170,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.content.render(target);
         if self.scrollbar.has_pages() {

core/embed/rust/src/ui/model_mercury/component/status_screen.rs

@@ -194,7 +194,7 @@ impl Component for StatusScreen {
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let t = self.anim.eval();
 
         shape::Circle::new(self.area.center(), self.anim.get_circle_radius(t))

core/embed/rust/src/ui/model_mercury/component/swipe_up_screen.rs

@@ -52,7 +52,7 @@ where
         todo!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
     }
 

core/embed/rust/src/ui/model_mercury/component/tap_to_confirm.rs

@@ -196,7 +196,7 @@ impl Component for TapToConfirm {
         unimplemented!()
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         const PAD_RADIUS: i16 = 70;
         const PAD_THICKNESS: i16 = 20;
         const CIRCLE_RADIUS: i16 = 50;

core/embed/rust/src/ui/model_mercury/component/vertical_menu.rs

@@ -119,7 +119,7 @@ impl Component for VerticalMenu {
         // TODO remove when ui-t3t1 done
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // render buttons separated by thin bars
         for button in &self.buttons {
             button.render(target);

core/embed/rust/src/ui/model_mercury/component/welcome_screen.rs

@@ -54,7 +54,7 @@ impl Component for WelcomeScreen {
         );
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::ToifImage::new(
             self.area.top_center() + Offset::y(ICON_TOP_MARGIN),
             theme::ICON_LOGO.toif,

core/embed/rust/src/ui/model_tr/bootloader/intro.rs

@@ -106,7 +106,7 @@ impl<'a> Component for Intro<'a> {
         self.buttons.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.title.render(target);
 

core/embed/rust/src/ui/model_tr/bootloader/menu.rs

@@ -184,7 +184,7 @@ impl Component for Menu {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.choice_page.render(target);
     }

core/embed/rust/src/ui/model_tr/bootloader/welcome.rs

@@ -60,7 +60,7 @@ impl Component for Welcome {
         );
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         let top_center = self.bg.area.top_center();

core/embed/rust/src/ui/model_tr/component/address_details.rs

@@ -260,7 +260,7 @@ impl Component for AddressDetails {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.buttons.render(target);
         match self.current_page {

core/embed/rust/src/ui/model_tr/component/bl_confirm.rs

@@ -218,7 +218,7 @@ impl Component for Confirm<'_> {
         self.buttons.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         let mut display_top_left = |text: TString| {

core/embed/rust/src/ui/model_tr/component/button.rs

@@ -263,7 +263,7 @@ impl Component for Button {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let style = self.style();
         let fg_color = style.text_color;
         let bg_color = fg_color.negate();

core/embed/rust/src/ui/model_tr/component/button_controller.rs

@@ -95,7 +95,7 @@ impl ButtonType {
         }
     }
 
-    pub fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    pub fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         match self {
             Self::Button(button) => {
                 button.render(target);
@@ -167,7 +167,7 @@ impl ButtonContainer {
         self.button_type.paint();
     }
 
-    pub fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    pub fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.button_type.render(target);
     }
 
@@ -592,7 +592,7 @@ impl Component for ButtonController {
         self.right_btn.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.left_btn.render(target);
         self.middle_btn.render(target);
@@ -778,7 +778,7 @@ impl Component for AutomaticMover {
 
     fn paint(&mut self) {}
 
-    fn render<'s>(&self, _target: &mut impl Renderer<'s>) {}
+    fn render<'s>(&'s self, _target: &mut impl Renderer<'s>) {}
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
         // Moving automatically only when we receive a TimerToken that we have

core/embed/rust/src/ui/model_tr/component/changing_text.rs

@@ -111,7 +111,7 @@ where
         common::display_left(baseline, &self.text, self.font);
     }
 
-    fn render_left<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_left<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let baseline = Point::new(self.pad.area.x0, self.y_baseline());
         shape::Text::new(baseline, self.text.as_ref())
             .with_font(self.font)
@@ -123,7 +123,7 @@ where
         common::display_center(baseline, &self.text, self.font);
     }
 
-    fn render_center<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_center<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let baseline = Point::new(self.pad.area.bottom_center().x, self.y_baseline());
         shape::Text::new(baseline, self.text.as_ref())
             .with_align(Alignment::Center)
@@ -136,7 +136,7 @@ where
         common::display_right(baseline, &self.text, self.font);
     }
 
-    fn render_right<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_right<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let baseline = Point::new(self.pad.area.x1, self.y_baseline());
         shape::Text::new(baseline, self.text.as_ref())
             .with_align(Alignment::End)
@@ -201,7 +201,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         if self.show_content {
             // In the case text cannot fit, show ellipsis and its right part

core/embed/rust/src/ui/model_tr/component/coinjoin_progress.rs

@@ -130,7 +130,7 @@ impl Component for CoinJoinProgress {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // TOP
         let center = self.area.center() + Offset::y(self.loader_y_offset);
 

core/embed/rust/src/ui/model_tr/component/error.rs

@@ -102,7 +102,7 @@ impl Component for ErrorScreen<'_> {
         self.footer.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         if self.show_icons {

core/embed/rust/src/ui/model_tr/component/flow.rs

@@ -315,7 +315,7 @@ where
         self.current_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         // Scrollbars are painted only with a title and when requested
         if self.title.is_some() {

core/embed/rust/src/ui/model_tr/component/flow_pages.rs

@@ -122,7 +122,7 @@ impl Page {
         self.formatted.paint();
     }
 
-    pub fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    pub fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.formatted.render(target);
     }
 

core/embed/rust/src/ui/model_tr/component/frame.rs

@@ -82,7 +82,7 @@ where
         self.content.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
         self.content.render(target);
     }
@@ -204,7 +204,7 @@ where
         self.content.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
         self.scrollbar.render(target);
         self.content.render(target);

core/embed/rust/src/ui/model_tr/component/hold_to_confirm.rs

@@ -124,7 +124,7 @@ impl Component for HoldToConfirm {
         self.loader.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.loader.render(target);
     }
 }

core/embed/rust/src/ui/model_tr/component/homescreen.rs

@@ -117,7 +117,7 @@ impl Homescreen {
         }
     }
 
-    fn render_homescreen_image<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_homescreen_image<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if let Some(image) = self.custom_image {
             shape::ToifImage::new_image(TOP_CENTER, image)
                 .with_align(Alignment2D::TOP_CENTER)
@@ -159,7 +159,7 @@ impl Homescreen {
         }
     }
 
-    fn render_notification<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_notification<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let baseline = TOP_CENTER + Offset::y(NOTIFICATION_FONT.line_height());
         if !usb_configured() {
             shape::Bar::new(AREA.split_top(NOTIFICATION_HEIGHT).0)
@@ -214,7 +214,7 @@ impl Homescreen {
         self.label.paint();
     }
 
-    fn render_label<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_label<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // paint black background to place the label
         let mut outset = Insets::uniform(LABEL_OUTSET);
         // the margin at top is bigger (caused by text-height vs line-height?)
@@ -315,7 +315,7 @@ impl Component for Homescreen {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // Redraw the whole screen when the screen changes (loader vs homescreen)
         if self.show_loader {
             self.loader.render(target);
@@ -329,8 +329,8 @@ impl Component for Homescreen {
     }
 }
 
-pub struct Lockscreen {
+pub struct Lockscreen<'a> {
-    label: Child<Label<'static>>,
+    label: Child<Label<'a>>,
     instruction: Child<Label<'static>>,
     /// Used for unlocking the device from lockscreen
     invisible_buttons: Child<ButtonController>,
@@ -340,8 +340,8 @@ pub struct Lockscreen {
     screensaver: bool,
 }
 
-impl Lockscreen {
+impl<'a> Lockscreen<'a> {
-    pub fn new(label: TString<'static>, bootscreen: bool, coinjoin_authorized: bool) -> Self {
+    pub fn new(label: TString<'a>, bootscreen: bool, coinjoin_authorized: bool) -> Self {
         // Buttons will not be visible, we only need all three of them to be present,
         // so that even middle-click triggers the event.
         let invisible_btn_layout = ButtonLayout::arrow_armed_arrow("".into());
@@ -360,7 +360,7 @@ impl Lockscreen {
     }
 }
 
-impl Component for Lockscreen {
+impl Component for Lockscreen<'_> {
     type Msg = ();
 
     fn place(&mut self, bounds: Rect) -> Rect {
@@ -400,7 +400,7 @@ impl Component for Lockscreen {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if self.screensaver {
             // keep screen blank
             return;
@@ -484,7 +484,7 @@ impl Component for ConfirmHomescreen {
         self.buttons.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if self.image.is_empty() {
             render_default_image(target);
         } else {
@@ -537,7 +537,7 @@ impl crate::trace::Trace for Homescreen {
 }
 
 #[cfg(feature = "ui_debug")]
-impl crate::trace::Trace for Lockscreen {
+impl crate::trace::Trace for Lockscreen<'_> {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("Lockscreen");
         t.child("label", &self.label);

core/embed/rust/src/ui/model_tr/component/input_methods/choice.rs

@@ -257,7 +257,7 @@ where
 
     /// Display current, previous and next choices according to
     /// the current ChoiceItem.
-    fn render_choices<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_choices<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // Getting the row area for the choices - so that displaying
         // items in the used font will show them in the middle vertically.
         let area_height_half = self.pad.area.height() / 2;
@@ -341,7 +341,7 @@ where
     }
 
     /// Display the current choice in the middle.
-    fn show_current_choice2<'s>(&self, target: &mut impl Renderer<'s>, area: Rect) {
+    fn show_current_choice2<'s>(&'s self, target: &mut impl Renderer<'s>, area: Rect) {
         self.get_current_item()
             .render_center(target, area, self.inverse_selected_item);
     }
@@ -390,7 +390,7 @@ where
 
     /// Display all the choices fitting on the left side.
     /// Going as far as possible.
-    fn show_left_choices2<'s>(&self, target: &mut impl Renderer<'s>, area: Rect) {
+    fn show_left_choices2<'s>(&'s self, target: &mut impl Renderer<'s>, area: Rect) {
         // NOTE: page index can get negative here, so having it as i16 instead of usize
         let mut page_index = self.page_counter as i16 - 1;
         let mut current_area = area.split_right(self.items_distance).0;
@@ -473,7 +473,7 @@ where
 
     /// Display all the choices fitting on the right side.
     /// Going as far as possible.
-    fn show_right_choices2<'s>(&self, target: &mut impl Renderer<'s>, area: Rect) {
+    fn show_right_choices2<'s>(&'s self, target: &mut impl Renderer<'s>, area: Rect) {
         let mut page_index = self.page_counter + 1;
         let mut current_area = area.split_left(self.items_distance).1;
         while current_area.width() > 0 {
@@ -720,7 +720,7 @@ where
         self.paint_choices();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.buttons.render(target);
         self.render_choices(target);

core/embed/rust/src/ui/model_tr/component/input_methods/number_input.rs

@@ -83,7 +83,7 @@ impl Component for NumberInput {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.choice_page.render(target);
     }
 }

core/embed/rust/src/ui/model_tr/component/input_methods/passphrase.rs

@@ -450,7 +450,7 @@ impl Component for PassphraseEntry {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.passphrase_dots.render(target);
         self.choice_page.render(target);
     }

core/embed/rust/src/ui/model_tr/component/input_methods/pin.rs

@@ -325,7 +325,7 @@ impl Component for PinEntry<'_> {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.header_line.render(target);
         self.pin_line.render(target);
         self.choice_page.render(target);

core/embed/rust/src/ui/model_tr/component/input_methods/simple_choice.rs

@@ -117,7 +117,7 @@ impl Component for SimpleChoice {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.choice_page.render(target);
     }
 }

core/embed/rust/src/ui/model_tr/component/input_methods/wordlist.rs

@@ -316,7 +316,7 @@ impl Component for WordlistEntry {
         self.choice_page.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.chosen_letters.render(target);
         self.choice_page.render(target);
     }

core/embed/rust/src/ui/model_tr/component/loader.rs

@@ -168,7 +168,7 @@ impl Loader {
     }
 
     pub fn render_loader<'s>(
-        &self,
+        &'s self,
         target: &mut impl Renderer<'s>,
         style: &LoaderStyle,
         done: i32,
@@ -271,7 +271,7 @@ impl Component for Loader {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // TODO: Consider passing the current instant along with the event -- that way,
         // we could synchronize painting across the component tree. Also could be useful
         // in automated tests.
@@ -393,7 +393,7 @@ impl Component for ProgressLoader {
         self.loader.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.loader.render(target);
     }
 }

core/embed/rust/src/ui/model_tr/component/page.rs

@@ -217,7 +217,7 @@ where
         self.buttons.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.pad.render(target);
         self.content.render(target);
         self.buttons.render(target);

core/embed/rust/src/ui/model_tr/component/progress.rs

@@ -154,7 +154,7 @@ impl Component for Progress {
         self.description.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
 
         let area = constant::screen();

core/embed/rust/src/ui/model_tr/component/result.rs

@@ -110,7 +110,7 @@ impl Component for ResultScreen<'_> {
         self.message_bottom.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.small_pad.render(target);
 

core/embed/rust/src/ui/model_tr/component/scrollbar.rs

@@ -234,7 +234,7 @@ impl ScrollBar {
         }
     }
 
-    fn render_horizontal<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_horizontal<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let mut top_right = self.pad.area.top_right();
         for dot in self.get_drawable_dots().iter().rev() {
             self.render_dot(target, dot, top_right);
@@ -274,7 +274,7 @@ impl Component for ScrollBar {
     }
 
     /// Displaying one dot for each page.
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // Not showing the scrollbar dot when there is only one page
         if self.page_count <= 1 {
             return;

core/embed/rust/src/ui/model_tr/component/share_words.rs

@@ -99,7 +99,7 @@ where
     }
 
     /// Display the final page with user confirmation.
-    fn render_final_page<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_final_page<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let final_text = self.get_final_text();
         text_multiline2(
             target,
@@ -131,7 +131,7 @@ where
     }
 
     /// Display current set of recovery words.
-    fn render_words<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render_words<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let mut y_offset = 0;
         // Showing the word index and the words itself
         for i in 0..WORDS_PER_PAGE {
@@ -191,7 +191,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         // Showing scrollbar in all cases
         // Individual pages are responsible for not colliding with it
         self.scrollbar.render(target);

core/embed/rust/src/ui/model_tr/component/show_more.rs

@@ -79,7 +79,7 @@ where
         self.buttons.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
         self.buttons.render(target);
     }

core/embed/rust/src/ui/model_tr/component/title.rs

@@ -135,7 +135,7 @@ impl Component for Title {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         if self.needs_marquee {
             self.marquee.render(target);
         } else if self.centered {

core/embed/rust/src/ui/model_tr/component/welcome_screen.rs

@@ -55,7 +55,7 @@ impl Component for WelcomeScreen {
         );
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         shape::ToifImage::new(
             self.area.bottom_center() - Offset::y(5),
             theme::ICON_DEVICE_NAME.toif,

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

@@ -204,7 +204,7 @@ impl ComponentMsgObj for Homescreen {
     }
 }
 
-impl ComponentMsgObj for Lockscreen {
+impl<'a> ComponentMsgObj for Lockscreen<'a> {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         Ok(CANCELLED.as_obj())
     }

core/embed/rust/src/ui/model_tt/bootloader/intro.rs

@@ -106,7 +106,7 @@ impl<'a> Component for Intro<'a> {
         self.menu.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.title.render(target);
         self.text.render(target);

core/embed/rust/src/ui/model_tt/bootloader/menu.rs

@@ -109,7 +109,7 @@ impl Component for Menu {
         self.reset.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.title.render(target);
         self.close.render(target);

core/embed/rust/src/ui/model_tt/bootloader/welcome.rs

@@ -59,7 +59,7 @@ impl Component for Welcome {
         );
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         shape::Text::new(screen().top_center() + Offset::y(102), "Get started with")

core/embed/rust/src/ui/model_tt/component/address_details.rs

@@ -177,7 +177,7 @@ impl Component for AddressDetails {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         match self.current_page {
             0 => self.qr_code.render(target),
             1 => self.details.render(target),

core/embed/rust/src/ui/model_tt/component/bl_confirm.rs

@@ -239,7 +239,7 @@ impl Component for Confirm<'_> {
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
         self.content_pad.render(target);
 

core/embed/rust/src/ui/model_tt/component/button.rs

@@ -377,7 +377,7 @@ impl Component for Button {
         self.paint_content(style);
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         let style = self.style();
         self.render_background(target, style);
         self.render_content(target, style);

core/embed/rust/src/ui/model_tt/component/coinjoin_progress.rs

@@ -125,7 +125,7 @@ where
         self.label.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
 
         let center = constant::screen().center() + Offset::y(LOADER_OFFSET);

core/embed/rust/src/ui/model_tt/component/dialog.rs

@@ -72,7 +72,7 @@ where
         self.controls.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.content.render(target);
         self.controls.render(target);
     }
@@ -202,7 +202,7 @@ where
         self.controls.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.image.render(target);
         self.paragraphs.render(target);
         self.controls.render(target);

core/embed/rust/src/ui/model_tt/component/error.rs

@@ -92,7 +92,7 @@ impl<'a> Component for ErrorScreen<'a> {
         self.footer.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.bg.render(target);
 
         let icon = ICON_WARNING40;

core/embed/rust/src/ui/model_tt/component/fido.rs

@@ -213,7 +213,7 @@ where
         }
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.icon.render(target);
         self.controls.render(target);
         self.app_name.render(target);

core/embed/rust/src/ui/model_tt/component/frame.rs

@@ -176,7 +176,7 @@ where
         self.content.paint();
     }
 
-    fn render<'s>(&self, target: &mut impl Renderer<'s>) {
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.title.render(target);
         self.subtitle.render(target);
         self.button.render(target);