chore(core): return to autolock menu after setting a new value
What changed, and why it matters
This commit is a minor user-interface polish change. After a user changes the auto-lock timeout setting on a Trezor device, the device now returns to the dedicated Auto-Lock menu instead of the broader Security menu. It does not change any security policy, cryptographic behavior, or data handling. The accompanying test updates simply expect the new screen.
No security action needed; this is a routine UX/navigation fix.
Security signals we found
No strong security signals were identified.
Evidence from the diff
In core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs, the menu-state mapping for DeviceMenuMsg::SetAutoLockBattery and DeviceMenuMsg::SetAutoLockUSB is changed from DeviceMenuId::Security to DeviceMenuId::AutoLock. The click tests and UI fixture hashes are updated to reflect the new expected screen. No logic for setting, validating, or enforcing auto-lock values is modified.
Changed components
core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rstests/click_tests/device_menu/test_auto_lock.pytests/ui_tests/fixtures.jsonInspect captured patch +30 / −30
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
index 9828b4d6..ece333a1 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
@@ -88,8 +88,8 @@ impl DeviceMenuScreen {
DeviceMenuMsg::ToggleBluetooth => DeviceMenuId::Settings,
DeviceMenuMsg::SetOrChangePin => DeviceMenuId::Security,
DeviceMenuMsg::RemovePin => DeviceMenuId::Security,
- DeviceMenuMsg::SetAutoLockBattery => DeviceMenuId::Security,
- DeviceMenuMsg::SetAutoLockUSB => DeviceMenuId::Security,
+ DeviceMenuMsg::SetAutoLockBattery => DeviceMenuId::AutoLock,
+ DeviceMenuMsg::SetAutoLockUSB => DeviceMenuId::AutoLock,
DeviceMenuMsg::SetOrChangeWipeCode => DeviceMenuId::Security,
DeviceMenuMsg::RemoveWipeCode => DeviceMenuId::Security,
DeviceMenuMsg::CheckBackup => DeviceMenuId::Security,
diff --git a/tests/click_tests/device_menu/test_auto_lock.py b/tests/click_tests/device_menu/test_auto_lock.py
index db6ceb67..ef432a72 100644
--- a/tests/click_tests/device_menu/test_auto_lock.py
+++ b/tests/click_tests/device_menu/test_auto_lock.py
@@ -100,7 +100,7 @@ def test_auto_lock_battery_change(device_handler: "BackgroundDeviceHandler"):
# Confirm changes
debug.click(debug.screen_buttons.ok())
# Make sure we are back at the security menu and go to homescreen
- assert_device_screen(debug, Menu.SECURITY)
+ assert_device_screen(debug, Menu.AUTO_LOCK)
close_device_menu(debug)
# Refresh features
@@ -138,7 +138,7 @@ def test_auto_lock_usb_change(device_handler: "BackgroundDeviceHandler"):
# Confirm changes
debug.click(debug.screen_buttons.ok())
# Make sure we are back at the security menu and go to homescreen
- assert_device_screen(debug, Menu.SECURITY)
+ assert_device_screen(debug, Menu.AUTO_LOCK)
close_device_menu(debug)
# Refresh features
@@ -175,7 +175,7 @@ def test_auto_lock_battery_cancel(device_handler: "BackgroundDeviceHandler"):
# Cancel auto-lock change
debug.click(debug.screen_buttons.cancel())
# Make sure we are back at the security menu and go to homescreen
- assert_device_screen(debug, Menu.SECURITY)
+ assert_device_screen(debug, Menu.AUTO_LOCK)
close_device_menu(debug)
# Refresh features
@@ -210,7 +210,7 @@ def test_auto_lock_usb_cancel(device_handler: "BackgroundDeviceHandler"):
# Cancel auto-lock change
debug.click(debug.screen_buttons.cancel())
# Make sure we are back at the security menu and go to homescreen
- assert_device_screen(debug, Menu.SECURITY)
+ assert_device_screen(debug, Menu.AUTO_LOCK)
close_device_menu(debug)
# Refresh features
diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json
index 30b470bb..0a7698fc 100644
--- a/tests/ui_tests/fixtures.json
+++ b/tests/ui_tests/fixtures.json
@@ -34188,12 +34188,12 @@
},
"T3W1": {
"click_tests": {
-"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "d573df3f95c5fee5e3cdc520264757135f685c8b3b9b530d756c8a8c7daa10c4",
-"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "17a46b3ff050c5421b1026bce1ba7fb716b4de9a934a1177f3c4fdfd081e0fe8",
+"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "6bb31912e17e00a2243f1d734ab319da7abdeec7e09ec50950453b433f5ded18",
+"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "fb5618b33e953264fe58f8802838a3a31e95e2b5fa414ad969cda82babdbf801",
"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "1902f8d31a992ad1a90c5af42c7d4a7e8d4e24d4eebb77ed0a3607d7a44f8fe1",
"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "808c5265a223115df4ce11a9f25f19f4197074c6163aee435c4afdf6200cef99",
-"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "8dad95dc21677147572dd2e32b30285ca692134d195b7fc56a0eae6ea7c4082f",
-"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "705d528f3f551637709061ac8413f3f312f181c284b58cde817aca7a8ff20ad4",
+"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "994c835c515265586678a25c49d1071493d0f728499f1d04ee7e14f209f242e3",
+"T3W1_cs_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "d885c9224ade07ac49f6b4247f4e9a7ca9c5a51b3f2a815e69ff87c2541c6bdc",
"T3W1_cs_device_menu-test_check_backup.py::test_backup_check_cancel": "9a0fb6bbb9d2ec153a80d3fa5203c81d34e55b052fe582674a913ce06cf678c0",
"T3W1_cs_device_menu-test_check_backup.py::test_backup_needed_fails": "70189256d6fdc7d2f72acfd8282e06e600a6dc20f61db99583ab1ee13771546c",
"T3W1_cs_device_menu-test_check_backup.py::test_no_backup_fails": "d3b1c8ee4fc3b1132ea0256b3c7c6fa0c3c7955deaaaa4311201ea377e71afa9",
@@ -34294,12 +34294,12 @@
"T3W1_cs_test_tutorial_eckhart.py::test_tutorial_menu_close": "62e16ae8a365062a8501c5f20323d55f31ce381b1d534810782a8cec9a356724",
"T3W1_cs_test_tutorial_eckhart.py::test_tutorial_menu_tropic": "0f37a9782ed9a0177058a0b25d0cda110a90db455329f3b4876f2fe685b2cefb",
"T3W1_cs_test_tutorial_eckhart.py::test_tutorial_restart": "4c8192c1faf331dfa4ce0b04884cb2f83f804443bdf8bec1affd324f5dc674d2",
-"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "031325fe189b4124c8a46d30fc57529fdcfcff38de09e7af925fcf12e93c4a28",
-"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "37f561abbe48ee3cf1fa95ec9a0ed65124bd546a21f9d7b00d70e8c06cf6a668",
+"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "e66cc26280eb416c65d27e163bdeb6490eb12b8ec0fad2dd99c154c73db6af4c",
+"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "4515bd221f115840bcb79c7feb95b4a6f918dbbe8610e4e3aa6fc31429703819",
"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "6217998ed7f21be981f183e5a56d4dd25bcd47c2a8542d991b826881bdb43027",
"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "247a2439a184467116322f5705a6bcc8e100ab9864509998536c5975dc459f9a",
-"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "a155f818dcca1eb91ee55bfdb6c2c5dc82d4ffe3dbb9f21212fbb2496ad63cbf",
-"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "e201cd6d09d516d4dcb53e165ed4801c3acc39401081b1a27c1f8169a2355b27",
+"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "33337ca797f0f675506aa97489dc4b8b84efe7dd8768508a98dc6efeb39bab18",
+"T3W1_de_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "68bc2048a9b5381a45d2a627e9138d24fef597525d1983b80a7377b9d3709bbd",
"T3W1_de_device_menu-test_check_backup.py::test_backup_check_cancel": "38b707e810c585c179d36bf6289bfe4edc9b265ff6b83dfea4070623e5e9b16d",
"T3W1_de_device_menu-test_check_backup.py::test_backup_needed_fails": "025d6e72cb36423563dd84ea9724fc180d01d4d9177578768390512e40677770",
"T3W1_de_device_menu-test_check_backup.py::test_no_backup_fails": "c112b56ed07896f2ac69cf8a5ed783235c8ec511e20c07fa87a97511c14142e5",
@@ -34400,12 +34400,12 @@
"T3W1_de_test_tutorial_eckhart.py::test_tutorial_menu_close": "993327ed3dd9d1cb2c8def8544d10216e1a04204e0f2b1ef4745029407ce6308",
"T3W1_de_test_tutorial_eckhart.py::test_tutorial_menu_tropic": "6e0ace51256a8114da7213acbe37ccce8655c3241543b27f162881cdf8c0b8ad",
"T3W1_de_test_tutorial_eckhart.py::test_tutorial_restart": "98ebef09326d9a5b902caf2d0f9a44559cfb5be78c7c4b091dfb7644d8c5fc03",
-"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "fd6be2b2b8ac284ff36a2d3300d90000a20e0e5e7a836de23452bd9b4748f33c",
-"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "52a012a5a086cbb89a227d34a8237a5e3bab519feede5cc7b20111067d01e3df",
+"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "b92a1202eff236c99e00bbdbe6dd6c93cbd4e01ae4eeee7d40541d59ebf458a2",
+"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "9f2e0f23d2acf420023c09a2e1d3d3f933c11185af7a8c89e239f35ab73382eb",
"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "5535ff3d62d739d0195dadb2da989f1b5ba20bde77cc66ecabc925ab88413238",
"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "bb1a56eba2e9b87d042baa5190f46391fa5246c614702935290371ae4b8524fb",
-"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "debe5956a898b92f4bb17d64576a93e5d8246b39744d5dfc468476e6c7344932",
-"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "a903b8f4eb820b4c56cca2759decb48d88cd137f645e6f361acdbd2eba3f937e",
+"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "4d768393d38232f9b0d48530f6ce7b7a77b49fa0112ec4df3fb1111460fd5410",
+"T3W1_en_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "fbe9d6dd264bfc1eb5de088460c3e71d08b374ee55edd651f58d783cc618b1ed",
"T3W1_en_device_menu-test_check_backup.py::test_backup_check_cancel": "bfcefa8dd7ef3b1d6ebd02b3833268c5a5acba47b7a6e6ba8a8207982a032eec",
"T3W1_en_device_menu-test_check_backup.py::test_backup_needed_fails": "30ff50235b953519b241da3611b1c23f53900fd3fbd19c4501040330af5bf186",
"T3W1_en_device_menu-test_check_backup.py::test_no_backup_fails": "b120b6a914412ad038de0ebae75e1d3b58fc348f26d6254f6cfcb60a229c95a4",
@@ -34506,12 +34506,12 @@
"T3W1_en_test_tutorial_eckhart.py::test_tutorial_menu_close": "392968f5e71e2e248cb8934ca7f00097d70e2de5550c615f129c2fafb5b9d7b9",
"T3W1_en_test_tutorial_eckhart.py::test_tutorial_menu_tropic": "e5ca76a9436cf2bc9f35c79274ae3c5bfbd1861c98e36e87ab83d2c1f3dae04c",
"T3W1_en_test_tutorial_eckhart.py::test_tutorial_restart": "8c645ea1a0bdae178d8564a4a2f0906d4dfe6b7570df720b523218c7b1bba918",
-"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "e8fe1eb6f22a17b20172d31536c444f8b50f2838f7d297a98ba7cce5c3b15b8d",
-"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "1a899f0f34e97bb2e0c5021b7388f159169e79e403a5b7d511ae5a6b746beb61",
+"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "beda93a047d7b0990e7a8dfa312eeab1325b097b4b34086383926aa9ddb7bef1",
+"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "e9360b2d8a01d83141c56c59680f88209e21443708a9cd9fd45da6acdd6b1928",
"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "9825be6ff3f1b493228490507680f8ac034ee8610543776feffea8e2d17903c0",
"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "a13a2a4d41f34b1d1582eef8ed5b7d99561f7936864ef18e9dabd9de6527b21d",
-"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "1b03d551630a4239e60332f0d2c584714c614f568775814241a2313c0f8a6072",
-"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "22b030c370a9ca18661fa28bac1710efd666c6d2324622e58b7e27d956176033",
+"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "53d2f99d57934b17070d7b1ca9f38a3da07b019740670496445d9747bd6172c0",
+"T3W1_es_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "d2892c89852ab84a738aca78c35a77c16d8374ae869a7eb63da05ec65f6b3f09",
"T3W1_es_device_menu-test_check_backup.py::test_backup_check_cancel": "d1aa971dd2be0aff8719eca79a4fe7b01aa0439be13552813eb12938d5f0823f",
"T3W1_es_device_menu-test_check_backup.py::test_backup_needed_fails": "d8541dfb02b95771b895e11798dcaa4dd4d2180b49fa6122e395e54de56f2d6c",
"T3W1_es_device_menu-test_check_backup.py::test_no_backup_fails": "ee342d1baa6c0d4392473cba41e44accf3a72593f6b6d4d36e2307cd44e028a5",
@@ -34612,12 +34612,12 @@
"T3W1_es_test_tutorial_eckhart.py::test_tutorial_menu_close": "ac2772bb1843148defef6c33ae04160ff089ae71b3e6c4417d5c66fac206ce44",
"T3W1_es_test_tutorial_eckhart.py::test_tutorial_menu_tropic": "8c51c790037002f16521b239368cdc78031625ec71d456739da3e1f738806787",
"T3W1_es_test_tutorial_eckhart.py::test_tutorial_restart": "57ba9b6b981b1364ee4919633d03cdeb5733852e2cd98797a6898585d177ae2f",
-"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "89159ed7fc20e023e9ac4e7302784496b2d38b16e044c4e9682a7858c9f1902b",
-"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "e231f9131ade74ba31ba6e3f7b3cf4f8cb310add098e06b0e1ed68428ac82daa",
+"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "7da886d9a16a32f3a84676e53d64c950cb346be8510393b8dfbc4a328a0419cf",
+"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "fb30c2f09c527bc6d4190d5ae565d70e8057c9560258e1b6d3e1041e7e4aed00",
"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "8e1fb25e3c49fcb71e7032fd9384f25725dd003c60b4a32fd6316d1864dac364",
"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "7cd3785d71a8c9b2c1338f858d9779ed17457093bfe8b3ed3befd7c70e982360",
-"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "ca9e74250d1148598755f130465653ac740ab3a434afee4f0d872800b9a6d7dc",
-"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "4a5d974fb9777db1eb7add0f9f62602fc61e12210d4e335b18c7f244fc9f4748",
+"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "feac1455ef33ea621112950d4298b2c9f445239e71dad15e1933c457d1f6c1fd",
+"T3W1_fr_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "11b14625a981488bf38c83e1589f547fca30b8339279fdb54f175de8ebdc3130",
"T3W1_fr_device_menu-test_check_backup.py::test_backup_check_cancel": "760dbe748f1d9717e0d7475b81c6c8a4bf1b572fbf8a5515cff5756c43f1f92b",
"T3W1_fr_device_menu-test_check_backup.py::test_backup_needed_fails": "3281fd0aceec1f4401b0fc4710c20ed261a99ae51557943ffc8c3ab6f3d80b9c",
"T3W1_fr_device_menu-test_check_backup.py::test_no_backup_fails": "39d760337d1d96d0cc0d2ec3b62b52c551aa64feb9256e709fa552736ac99806",
@@ -34718,12 +34718,12 @@
"T3W1_fr_test_tutorial_eckhart.py::test_tutorial_menu_close": "b81c5efd23c3510499ceb599f09343ba7bffcd6b42aa9d6c5b49a8df76b8eddc",
"T3W1_fr_test_tutorial_eckhart.py::test_tutorial_menu_tropic": "8629bc1d3c531bd4ba084c8885620b79487b1eaa5b101f1079b04a9a22d275ab",
"T3W1_fr_test_tutorial_eckhart.py::test_tutorial_restart": "4b3b00982854a3b7b9eadba2c170d33b5d179172814321404952dd078905691a",
-"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "55738c29110eb1a42d13bb0cd4ca8a72cf15ada5ce479635a492ef21693c6864",
-"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "be390d60e734ead45d35340885d23bd9f83a0362b77f52d51ca5bfd407f894fd",
+"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_battery_cancel": "46fe399ea8a55cc412ef56408033400b4c3d13ae1d3771deeb3bfe6182d6950c",
+"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_battery_change": "9eaef6e8ef580f0ad20b4d5b8673f8e9bd694ad0eeb2f2c099bb7482d446e396",
"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_pin_not_set": "34838d31bca7db84072ef2299e26cf1d4e30fc5b7c8ff000c2df51dd979a3698",
"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_uninitialized": "979f89ea5ff6302d4a8cc47f03f684e3eea0bd5fa2408c950aa037d14550c288",
-"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "15aca5a70702c282b420852173cdb23bea9735d0c9efe23aef2254c813d9319a",
-"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "ad0c6156eded53bc67189326ba66ea0d4e327a8530cab11a345ff438c9d8c9e7",
+"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_usb_cancel": "63c098cd06357e3ca671bfdebc828582e77aace6af7c7526278fb7248676852a",
+"T3W1_pt_device_menu-test_auto_lock.py::test_auto_lock_usb_change": "25e75d3ced997035613fdbde871e5a4c840442982f061a01dc44dc6a95cfddb0",
"T3W1_pt_device_menu-test_check_backup.py::test_backup_check_cancel": "be757bba7ad411114dbc62407fb9d019600ae89d7432d44cb0e16b0b1ff04861",
"T3W1_pt_device_menu-test_check_backup.py::test_backup_needed_fails": "858396b90bbcfdb762abdc5bee7214ac7da7045f8bbc7f3a44fac55042fd7a0c",
"T3W1_pt_device_menu-test_check_backup.py::test_no_backup_fails": "0c8c98f3c30dd77e5fbdf075a8404ec412ea60ecad5f9881486a579b10457089",
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.