← Watch feed
refactor(core/ui): build bootloader screens without duplicating the parts
Public commit record
85/100 · Strong
What the developer wrote
Authored by tychovrahe
refactor(core/ui): build bootloader screens without duplicating the parts
Two size-driven cleanups in the delizia bootloader screens, both
behaviour-identical.
screen_install_confirm built TWO complete button pairs -- one with text, one with
icons -- and picked between them. Both branches used the same styles and the same
alignment, so `Button::with_text`/`with_icon` plus their whole styling chain were
instantiated twice. Select the ButtonContent first, then build each button once.
screen_intro and screen_install_confirm assembled their strings with one `unwrap!`
per `push_str` -- ten panic sites between them, each carrying its own location
string, for strings that are either built whole or not at all. A `bld_string`
helper gives one shared site and reads better than the chain it replaces.
160 B on T3T1
[no changelog]
✓ Specific, descriptive subject✓ Names a concrete action or component✓ Uses a recognizable type or scope✓ Provides detailed explanatory context
What changed, and why it matters
This is a code cleanup that makes two bootloader screens slightly smaller and easier to read. It does not change what the device does or how it behaves, and it does not fix any security bug.
Recommended action
No security action needed. Treat as a normal refactoring/size-optimization change.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit refactors delizia bootloader UI code to reduce firmware size. It replaces duplicated button construction with a single Button::new call using ButtonContent, and replaces repeated unwrap!(push_str(…)) calls with a helper that shares one panic site. The commit message explicitly states both changes are behavior-identical and the goal is a 160-byte size reduction on T3T1. No functional or security change is present in the diff.
Changed components
core/embed/rust/src/ui/layout_delizia/bootloader/mod.rsInspect captured patch +34 / −30
### core/embed/rust/src/ui/layout_delizia/bootloader/mod.rs
@@ -7,7 +7,7 @@ use ufmt::uwrite;
use super::bootloader::welcome::Welcome;
use super::component::bl_confirm::{Confirm, ConfirmTitle};
-use super::component::{Button, ResultScreen, WelcomeScreen};
+use super::component::{Button, ButtonContent, ResultScreen, WelcomeScreen};
use super::cshape::{render_loader, LoaderRange};
use super::theme::bootloader::{
button_bld, button_bld_menu, button_confirm, button_wipe_cancel, button_wipe_confirm, BLD_BG,
@@ -41,6 +41,19 @@ const RECONNECT_MESSAGE: &str = "PLEASE RECONNECT\nTHE DEVICE";
const SCREEN: Rect = UIDelizia::SCREEN;
const PROGRESS_TEXT_ORIGIN: Point = Point::new(2, 28);
+/// Concatenate parts into a bootloader string.
+///
+/// One shared panic site instead of one per `push_str`: each `unwrap!` carries
+/// its own location string, and these strings are either built whole or not at
+/// all.
+fn bld_string(parts: &[&str]) -> BootloaderString {
+ let mut s: BootloaderString = String::new();
+ for p in parts {
+ unwrap!(s.push_str(p));
+ }
+ s
+}
+
impl UIDelizia {
fn screen_progress(
text: &str,
@@ -186,11 +199,7 @@ impl BootloaderUI for UIDelizia {
is_newinstall: bool,
version_cmp: i32,
) -> u32 {
- let mut version_str: BootloaderString = String::new();
- unwrap!(version_str.push_str("Firmware version "));
- unwrap!(version_str.push_str(version));
- unwrap!(version_str.push_str("\nby "));
- unwrap!(version_str.push_str(vendor));
+ let version_str = bld_string(&["Firmware version ", version, "\nby ", vendor]);
let title_str = if is_newinstall {
"INSTALL FW"
@@ -210,23 +219,24 @@ impl BootloaderUI for UIDelizia {
TEXT_BOLD,
));
- let (left, right) = if should_keep_seed {
- let l = Button::with_text("CANCEL".into())
- .styled(button_bld())
- .with_text_align(Alignment::Center);
- let r = Button::with_text("INSTALL".into())
- .styled(button_confirm())
- .with_text_align(Alignment::Center);
- (l, r)
+ // Vary only the content: building the styling chain twice costs flash.
+ let (left_content, right_content) = if should_keep_seed {
+ (
+ ButtonContent::Text("CANCEL".into()),
+ ButtonContent::Text("INSTALL".into()),
+ )
} else {
- let l = Button::with_icon(Icon::new(X24))
- .styled(button_bld())
- .with_text_align(Alignment::Center);
- let r = Button::with_icon(Icon::new(CHECK24))
- .styled(button_confirm())
- .with_text_align(Alignment::Center);
- (l, r)
+ (
+ ButtonContent::Icon(Icon::new(X24)),
+ ButtonContent::Icon(Icon::new(CHECK24)),
+ )
};
+ let left = Button::new(left_content)
+ .styled(button_bld())
+ .with_text_align(Alignment::Center);
+ let right = Button::new(right_content)
+ .styled(button_confirm())
+ .with_text_align(Alignment::Center);
let mut frame = Confirm::new(BLD_BG, left, right, ConfirmTitle::Text(title), msg)
.with_info(
@@ -300,15 +310,9 @@ impl BootloaderUI for UIDelizia {
}
fn screen_intro(bld_version: &str, vendor: &str, version: &str, fw_ok: bool) -> u32 {
- let mut title_str: BootloaderString = String::new();
- unwrap!(title_str.push_str("BOOTLOADER "));
- unwrap!(title_str.push_str(bld_version));
-
- let mut version_str: BootloaderString = String::new();
- unwrap!(version_str.push_str("Firmware version "));
- unwrap!(version_str.push_str(version));
- unwrap!(version_str.push_str("\nby "));
- unwrap!(version_str.push_str(vendor));
+ let title_str = bld_string(&["BOOTLOADER ", bld_version]);
+
+ let version_str = bld_string(&["Firmware version ", version, "\nby ", vendor]);
let mut frame = Intro::new(
title_str.as_str().into(),Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.