arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-01 19:38:33 +00:00
Code Issues Releases Wiki Activity

feat(core): update menu layout in Delizia

Browse Source 
[no changelog]
This commit is contained in:
Roman Zeyde 2025-07-09 09:56:32 +03:00 committed by Roman Zeyde
parent c6d8fd6c77
commit 502f5e95a4
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/embed/rust/src/ui/layout_delizia/ui_firmware.rs
View File

@ -26,7 +26,10 @@ use crate::{
obj::{LayoutMaybeTrace, LayoutObj, RootComponent},
util::{ContentType, PropsList, RecoveryType},
},
layout_delizia::component::{FrameMsg, VerticalMenuChoiceMsg},
layout_delizia::component::{
FrameMsg, ScrolledVerticalMenu, VerticalMenuChoiceMsg, VerticalMenuItem,
VerticalMenuItems,
},
ui_firmware::{
FirmwareUI, ERROR_NOT_IMPLEMENTED, MAX_CHECKLIST_ITEMS, MAX_GROUP_SHARE_LINES,
MAX_MENU_ITEMS, MAX_WORD_QUIZ_ITEMS,
@ -791,13 +794,14 @@ impl FirmwareUI for UIDelizia {
_current: usize,
cancel: Option<TString<'static>>,
) -> Result<impl LayoutMaybeTrace, Error> {
let mut menu = VerticalMenu::empty();
let mut menu_items = VerticalMenuItems::new();
if let Some(text) = cancel {
menu = menu.danger(theme::ICON_CANCEL, text);
unwrap!(menu_items.push(VerticalMenuItem::Cancel(text)));
}
for text in items {
menu = menu.item(theme::ICON_CHEVRON_RIGHT, text);
unwrap!(menu_items.push(VerticalMenuItem::Item(text)));
}
let menu = ScrolledVerticalMenu::new(menu_items);
let frame = Frame::left_aligned(TString::empty(), menu).with_cancel_button();
let layout = MsgMap::new(frame, move |msg| {
let choice = match msg {

24
tests/ui_tests/fixtures.json
View File

@ -18927,7 +18927,7 @@
"T3T1_cs_test_recovery.py::test_recovery_cancel_number_of_words": "5f43b7ef903f251cc61a0fda3424be3acc7eb6113b9242dcea0056543abf0e0e",
"T3T1_cs_test_recovery.py::test_recovery_slip39_basic": "0711778f13861849188a284aca0f1315e29f68bd89d4a3ae87ab3a2519d3e4eb",
"T3T1_cs_test_recovery.py::test_recovery_slip39_issue5306": "05233ebce81b625be904f9477b196e9418d9814e3ec71d169a1087d775502be5",
"T3T1_cs_test_repeated_backup.py::test_repeated_backup_via_device": "d235cd338d4ae28598a00df255aab0266babbdd11fcc0982209e2938b7a3ecf1",
"T3T1_cs_test_repeated_backup.py::test_repeated_backup_via_device": "b4ecfa06e1be361f31651b97d3f6afad310a036709ea4801436eed0ccfdbb91a",
"T3T1_cs_test_reset_bip39.py::test_reset_bip39": "6bff7a7eed8fd54293e0c5c726c3c8841a49608d7d9fddb2acc863d515948809",
"T3T1_cs_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "b15cd79b82c3b874fad637a5ef4d142edfaf387d27f7ab4937ed578e48077b41",
"T3T1_cs_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "ff62a341d4ce6012764e77bdf9c81159516c786cbb1d432e42be4142deab8e8d",
@ -18985,7 +18985,7 @@
"T3T1_de_test_recovery.py::test_recovery_cancel_number_of_words": "247160c18c462b92b558263f49d4f79974ea95202ab3faa0ef33f50a2d21d2f7",
"T3T1_de_test_recovery.py::test_recovery_slip39_basic": "314caaeb33d6bfc7e9c4f7977b486516eb338ea2220ff13ee40f62beb0179303",
"T3T1_de_test_recovery.py::test_recovery_slip39_issue5306": "7bbd2a980215b1fd61d76c0e5930dd9917471952b81eab1153b99f874ba69ccb",
"T3T1_de_test_repeated_backup.py::test_repeated_backup_via_device": "203b2efbd1df12209a06f2124af5cfbdbaaaf02cb17a11d9bd4309a25b8b9894",
"T3T1_de_test_repeated_backup.py::test_repeated_backup_via_device": "118743451135d1d12d2967d50ea645f32acee138bf6e425bd94e4723408283ab",
"T3T1_de_test_reset_bip39.py::test_reset_bip39": "b9248b8bfd35de9b4e268db9638dbf1e1710e5ae25115c88c408d1e4260970ad",
"T3T1_de_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "4f925c8ff2782f56731f2faa831b66970b5af3d0faf2efe82d7f144ca49e56a1",
"T3T1_de_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "c2dd8ddf2a8f46d1238b1125e3c9f0ae253e797a9172a903b05cde44556e052d",
@ -19043,7 +19043,7 @@
"T3T1_en_test_recovery.py::test_recovery_cancel_number_of_words": "40c22731deba58bc21a75bd77f5fba9fee11d84cce1c57d1402a941a79650189",
"T3T1_en_test_recovery.py::test_recovery_slip39_basic": "6989ce3c9a9ef7484fe41a75d9a9023e110a535f4c8be2c72406c40f71f484cd",
"T3T1_en_test_recovery.py::test_recovery_slip39_issue5306": "dc3cf81707370b57510c6ad98eb3b9a80b2b55bbb0fa8e5ca0ebd58ebea53982",
"T3T1_en_test_repeated_backup.py::test_repeated_backup_via_device": "f2d30ed07d3d3013b690ec8d90eedd58a63d58eb497dec6aa97490331ba120bc",
"T3T1_en_test_repeated_backup.py::test_repeated_backup_via_device": "6adc5755d4ac1777a5d404d6ad6ccd2140e84f3723fb84c8856659d5e9d5b76e",
"T3T1_en_test_reset_bip39.py::test_reset_bip39": "bfd6ba797bd3277fb45ba705f2e8ca12a869087c1a4592a0b11587486545af14",
"T3T1_en_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "e6fff7f7a396a62a202550800b7387ba58757166f82f889a93deb12ee9ebf061",
"T3T1_en_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "a92940c6ba7e025d7342bd01d116490bb9821028154b8e8e667ffaa7946804e0",
@ -19101,7 +19101,7 @@
"T3T1_es_test_recovery.py::test_recovery_cancel_number_of_words": "819f4d4a518fd03805dcfaf583258e2788da00a2a54931981af2464f72971e65",
"T3T1_es_test_recovery.py::test_recovery_slip39_basic": "75267dc5782cd86264a65ad502e1ddf413f8e278fe2f073c10613bd40e784849",
"T3T1_es_test_recovery.py::test_recovery_slip39_issue5306": "dac0c21b41e7cd8c16aad001e76e17ba401c794caca46578133cf99a91618698",
"T3T1_es_test_repeated_backup.py::test_repeated_backup_via_device": "8eb2ce71cc875829b44ea3bc68d8e75a3de66b95fb6769414a14ce1e47322905",
"T3T1_es_test_repeated_backup.py::test_repeated_backup_via_device": "877d06d18b3a4b8dc453b67045c5c41e7580be248e704475f7a6ac765c310452",
"T3T1_es_test_reset_bip39.py::test_reset_bip39": "775b7800d0acde5083dc8e0e4084fa70dfb8c74174d985af78bdb33e975e9096",
"T3T1_es_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "142e89d0af9c3a185adf6b4a3a8c2b9b29ad4a5ab8d2588ffcdc90b772cf322b",
"T3T1_es_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "2ea525a911c728c8e58f0842b2be16bf6810860c753286017a7cbef161744a93",
@ -19159,7 +19159,7 @@
"T3T1_fr_test_recovery.py::test_recovery_cancel_number_of_words": "195b4d7ea094959d5b61dde6bb9d4e31165885f54099ae10ed99ab5e8d2fe14e",
"T3T1_fr_test_recovery.py::test_recovery_slip39_basic": "ec1991f833adfdf98cdcf09a3bd828f44ab39600765bec8459d2873d9da73b77",
"T3T1_fr_test_recovery.py::test_recovery_slip39_issue5306": "d2a19f6035187cde8e65727bf3d66bd12a9ce3b7eedb79ae53d899a0eba8fb43",
"T3T1_fr_test_repeated_backup.py::test_repeated_backup_via_device": "b5819a83a7ed426a77097cfa5cbece16e848f646946ac4b4607b55f62390bd7a",
"T3T1_fr_test_repeated_backup.py::test_repeated_backup_via_device": "6cf30d8d84fbc8f80ca17f9c29db45363cdc7639e1ccfd51077a399639a6837b",
"T3T1_fr_test_reset_bip39.py::test_reset_bip39": "229b2d3bab421f688806dca5fc095b9a15331c2adba4fbe5510e20af6b4852e4",
"T3T1_fr_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "ef181f48b10b5138411a9f9b9d7be82e5f7bf53d48a5bbeb607bf108ef942659",
"T3T1_fr_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "c0f27d8df0fd703e8667cce023987f19941172660d8589d490f3bcc86926a6d9",
@ -19217,7 +19217,7 @@
"T3T1_pt_test_recovery.py::test_recovery_cancel_number_of_words": "62e74061f5f7450330de79565a5e6e6eb0ba2bdeac812b9f5f02d22b295c3570",
"T3T1_pt_test_recovery.py::test_recovery_slip39_basic": "b9c123296ce9d6b167eef45d31a420a97cba8eacc8f891cbb3af163e595b27be",
"T3T1_pt_test_recovery.py::test_recovery_slip39_issue5306": "0d4bf36abb59639570a6a137ba2e8a8374923a3aad8a5659a96faa671bfbe19e",
"T3T1_pt_test_repeated_backup.py::test_repeated_backup_via_device": "67d99be3e9fb33b72f8b27f3ec16068c1f5f60c5b35722750e53e25ffb5accbb",
"T3T1_pt_test_repeated_backup.py::test_repeated_backup_via_device": "b2526d527c87df6141c37c214ec4a181ef6b824d65a8868ddea4f19b0f2842b8",
"T3T1_pt_test_reset_bip39.py::test_reset_bip39": "c5cdc6ba952e8c83208c8aa5e0ea849bb133f3b75c62b3f6caf7b424887b5933",
"T3T1_pt_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "3508b77247d53dea952557c9046b464875d070c8268402b361c662f5e2a160d0",
"T3T1_pt_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "291c2a9510a2ee1a6f7a58472830ab32604212fa1ad2ad3000e91cc924aa5b88",
@ -20554,7 +20554,7 @@
"T3T1_cs_test_msg_applysettings.py::test_experimental_features": "8ce0a4117096530ef20a269c386810b653b41bd9df5fb825f42c88a162eee78f",
"T3T1_cs_test_msg_applysettings.py::test_label_too_long": "592adf9c06f8f39132298b46037dd524fac99e58237a0c023197bf47df67d632",
"T3T1_cs_test_msg_applysettings.py::test_safety_checks": "cd150c7a633843533fba556d446d0b5fe691adbf2da639a9d10584a8118fef87",
"T3T1_cs_test_msg_applysettings.py::test_set_brightness": "fa3fb5d5dc38feab9b8bbb03b2d92810886be5fc7e5ece4ac6deb84754c50dd7",
"T3T1_cs_test_msg_applysettings.py::test_set_brightness": "038eeb78649595da2d07af0171fffaa04677725e8c4bfceda5ccfc1e2abb4c5e",
"T3T1_cs_test_msg_backup_device.py::test_backup_bip39": "8f3d3e673925da0665037606123a1db3ea06fc2468262e8219862f7a0bb6d220",
"T3T1_cs_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "c585537bffda6867427f2485845a2b6c92cca1f0a41da2eec07266d722eca4e3",
"T3T1_cs_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "d66ed6c5095dee75dd5d257024d24cbf01fa0f532f2018227a22d17678349aae",
@ -21993,7 +21993,7 @@
"T3T1_de_test_msg_applysettings.py::test_experimental_features": "178456e000fdcc986c4f13d54f983cbea1cb090684e51f448a0e211f4fbf958d",
"T3T1_de_test_msg_applysettings.py::test_label_too_long": "f2fcbbd7ad83aff9adc0ee97fe98e7272d8bcfcc4a023798e2ab1c9895fda70f",
"T3T1_de_test_msg_applysettings.py::test_safety_checks": "efe381b2aeaee488ce8684bf9af18d2f6b261101a757eb430c2794497d569a28",
"T3T1_de_test_msg_applysettings.py::test_set_brightness": "f8342a43683d761d655c5c2499bd2045dbfb43afb26d9ec33de0dac884007712",
"T3T1_de_test_msg_applysettings.py::test_set_brightness": "9c633724f551c94e18318d26a4f3bcbf65a9e38e48560ad7d8ec11fe94b47d51",
"T3T1_de_test_msg_backup_device.py::test_backup_bip39": "f817695806b178b66bc1a563ec0fcc464e26982b3b6f58ba99d04444fed39613",
"T3T1_de_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "f58947a0bd5a1e16e24fe6c7f150d3bf7e338fc595f3f0b4634ab6863072aa79",
"T3T1_de_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "9738d2eed42137232f38d3b18141ac3b16dd4b2fc194047aa4546bc72d08797b",
@ -23434,7 +23434,7 @@
"T3T1_en_test_msg_applysettings.py::test_experimental_features": "9d8bfbaeabca9b46c5382386fa9277cdae0168f3466248a91b69d27678e02de5",
"T3T1_en_test_msg_applysettings.py::test_label_too_long": "cb8641952bec9e793e7d19f281a85a0ca1be2c3397ca5c0cf4ee7ad905429984",
"T3T1_en_test_msg_applysettings.py::test_safety_checks": "8dc9b3dc4fde1441eedaac795d917ff4e6eb45c326d4fbb2e51b1c4ba6af5680",
"T3T1_en_test_msg_applysettings.py::test_set_brightness": "d0a38960e5bdbee28123648af4a79f0c2e9de4a3ac30cb82213a2f6a102c6e23",
"T3T1_en_test_msg_applysettings.py::test_set_brightness": "5e0830b1607b041f82dbcc813ff85c0492e8e0e13172d1f9606ad03be7e49f79",
"T3T1_en_test_msg_backup_device.py::test_backup_bip39": "74ee624757d2f85e728c384e3af2760a9edb3866cb5778b0e833836581f78430",
"T3T1_en_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "77e0226698b6c403c18bf13b0bd79b6226af7dabc60adc3eeaa9fb02ee27879a",
"T3T1_en_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "b2274378d42a3627eefe2b0a01de1a4e9dbadcd0749f48291fcaa7570c6c13f4",
@ -24873,7 +24873,7 @@
"T3T1_es_test_msg_applysettings.py::test_experimental_features": "b4585199c4630b82d945964adb654c0338c3a18392f3c259f3fad9af5e660d20",
"T3T1_es_test_msg_applysettings.py::test_label_too_long": "c568b82943d9f63ad6b29b7dee6f5ed9dca78fc9610d4fa7f12bb8a061a6882a",
"T3T1_es_test_msg_applysettings.py::test_safety_checks": "a8426a364cdc1b7e3483dcaae47fc6601601a316d9d40fba6f3a8d5a28874560",
"T3T1_es_test_msg_applysettings.py::test_set_brightness": "5decd55091da499ceb195890ab1a5047160a5115d4a95738b2338de149d484a8",
"T3T1_es_test_msg_applysettings.py::test_set_brightness": "8d49d35ebeba647730c76656647696dce1338b27169860d541a1256f5c1fb21a",
"T3T1_es_test_msg_backup_device.py::test_backup_bip39": "3ee1b35753e4f57e74378d780b93ea71382764b6c292f67e9b69802871df9187",
"T3T1_es_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "df54f287cdf879ba3ca2e80db20846074b8a30ed85181fe9d50a992c5b3e8475",
"T3T1_es_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "52e818e0c91efdaee0f6b82d169118b85af37361c01aef4ffa51422a43cd05df",
@ -26312,7 +26312,7 @@
"T3T1_fr_test_msg_applysettings.py::test_experimental_features": "637fb6b09ad63757230f4ca8f705e6659b7ce5b593d70574f21431beb0d551b7",
"T3T1_fr_test_msg_applysettings.py::test_label_too_long": "c4dffa9195d175f9bc4a23e9e0f80b92f7c6687128918a5a70c14b4a6e7e3694",
"T3T1_fr_test_msg_applysettings.py::test_safety_checks": "ce4dacd82f22bea641c7326189dd63d17ee90086c2f8155be5bc51e50d869013",
"T3T1_fr_test_msg_applysettings.py::test_set_brightness": "5da9d0abd7d2977c9d9625ce38c86fd32397a41677d0d93404ad3df9b5e3b7c6",
"T3T1_fr_test_msg_applysettings.py::test_set_brightness": "26e5392f5d41d5a9a949ccade61060af01a0997eac4aa8769562ad0faa1ea4b2",
"T3T1_fr_test_msg_backup_device.py::test_backup_bip39": "673cfe3b736e5c76a01853af202ec8e9b6d4ba499e60021e4a06f1932ac1c0a7",
"T3T1_fr_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "a0c04866ce70d5f9f69570d33d6011ebafd15e41fc45d3f8fcb03262e418eea4",
"T3T1_fr_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "7de768c9c17f68a33e6f30ef4079a42a529431bf9aa3e192a660db305ec57be9",
@ -27751,7 +27751,7 @@
"T3T1_pt_test_msg_applysettings.py::test_experimental_features": "5a2ea23020bcde2585fa002d0322acfef06472ec1937531a4f174edb524c3c10",
"T3T1_pt_test_msg_applysettings.py::test_label_too_long": "c15216b8aa033bd81f0a8fb6415c6728320b0c30fe3150eeb8a1749ae0a1a83c",
"T3T1_pt_test_msg_applysettings.py::test_safety_checks": "0130f103254b9a9cc742a6f8df628bb860ccda6b31d1fda84643f17dfc084225",
"T3T1_pt_test_msg_applysettings.py::test_set_brightness": "61b3acb2b413ecc15139509b1524d883acb01b36087bfb507b935e036c890310",
"T3T1_pt_test_msg_applysettings.py::test_set_brightness": "878d8319e0d6a09d8c3310276c0ffebc6c468ddb38cc06792351004b7bc00031",
"T3T1_pt_test_msg_backup_device.py::test_backup_bip39": "2d3758273b1723e8fa129398809bf0e3a181a083018993ce996913129b98e793",
"T3T1_pt_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "759e167564702620c3d7736b54b3402c9606063779287441374366bab4ef8e4a",
"T3T1_pt_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "c609f89722fb5ff8c0a591545e0bb6e9fb09681ab5eb23363ad6ab31fa50bacc",