arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

feat(core/ui): adjust device customization layouts

Browse Source
This commit is contained in:
Martin Milata 2023-02-06 21:15:25 +01:00
parent 7fb357dac6
commit 7a375b5642
5 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/.changelog.d/1922.changed Normal file
View File

@ -0,0 +1 @@
Switched to redesigned, Rust-based user interface.

6
core/src/apps/management/apply_settings.py
View File

@ -144,8 +144,8 @@ async def _require_confirm_change_label(ctx: GenericContext, label: str) -> None
await confirm_action(
ctx,
"set_label",
"Change label",
description="Do you really want to change the label to {}?",
"Device name",
description="Do you want to change device name to {}?",
description_param=label,
br_code=BRT_PROTECT_CALL,
)
@ -198,7 +198,7 @@ async def _require_confirm_change_display_rotation(
ctx,
"set_rotation",
"Change rotation",
description="Do you really want to change display rotation to {}?",
description="Do you want to change device rotation to {}?",
description_param=label,
br_code=BRT_PROTECT_CALL,
)

21
core/src/apps/management/change_pin.py
View File

@ -72,30 +72,27 @@ def _require_confirm_change_pin(ctx: Context, msg: ChangePin) -> Awaitable[None]
return confirm_action(
ctx,
"set_pin",
"Remove PIN",
"disable PIN protection?",
"Do you really want to",
reverse=True,
"PIN settings",
description="Do you want to disable PIN protection?",
verb="Disable",
)
if not msg.remove and has_pin: # changing pin
return confirm_action(
ctx,
"set_pin",
"Change PIN",
"change your PIN?",
"Do you really want to",
reverse=True,
"PIN settings",
description="Do you want to change your PIN?",
verb="Change",
)
if not msg.remove and not has_pin: # setting new pin
return confirm_action(
ctx,
"set_pin",
"Enable PIN",
"enable PIN protection?",
"Do you really want to",
reverse=True,
"PIN settings",
description="Do you want to enable PIN protection?",
verb="Enable",
)
# removing non-existing PIN

4
tests/device_tests/test_sdcard.py
View File

@ -75,7 +75,7 @@ def test_sd_protect_unlock(client: Client):
def input_flow_change_pin():
yield # do you really want to change PIN?
assert "CHANGE PIN" == layout().get_title()
assert "PIN SETTINGS" == layout().get_title()
client.debug.press_yes()
yield # enter current PIN
@ -103,7 +103,7 @@ def test_sd_protect_unlock(client: Client):
def input_flow_change_pin_format():
yield # do you really want to change PIN?
assert "CHANGE PIN" == layout().get_title()
assert "PIN SETTINGS" == layout().get_title()
client.debug.press_yes()
yield # enter current PIN

32
tests/ui_tests/fixtures.json
View File

@ -1616,7 +1616,7 @@
"TT_test_autolock.py::test_apply_auto_lock_delay_valid[60]": "971656fc0112c3d34f18a8b094b07900a2b91d35ab816dc9697b8d3ee08bf4f5",
"TT_test_autolock.py::test_apply_auto_lock_delay_valid[7227]": "17d08b88a90e9980214da7351856114e9bf77bdb92f7f545cfa9e8b6991cff5e",
"TT_test_autolock.py::test_autolock_cancels_ui": "7840363a8184cde21d3ce943a42835298a2737a4b57d14b62a68100f4713c69d",
"TT_test_autolock.py::test_autolock_default_value": "34668473c6c08ccb735625c0f69a6abd77c995e2dd7288a340b2f4e6922482d9",
"TT_test_autolock.py::test_autolock_default_value": "c12c4fa76069c70ee9bdbda306c2effc86d7e5d35acb95e06244185bf1ed98e6",
"TT_test_basic.py::test_device_id_different": "08515af24e5da8f81eedb0d878242f3c25751ff008822fdd61df4bd966104213",
"TT_test_basic.py::test_device_id_same": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
"TT_test_basic.py::test_features": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
@ -1635,11 +1635,11 @@
"TT_test_msg_applysettings.py::test_apply_homescreen_jpeg_progressive": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
"TT_test_msg_applysettings.py::test_apply_homescreen_jpeg_wrong_size": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
"TT_test_msg_applysettings.py::test_apply_homescreen_toif": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
"TT_test_msg_applysettings.py::test_apply_settings": "d48eb22c89c6faa9419ca4e77766a39f744f76ace4cb5f1df833646a783faf32",
"TT_test_msg_applysettings.py::test_apply_settings": "cfbbfa072bc825d1a97a199d4703cc1e4d5d9e3ba36e47645bbd23cdebfa7ec9",
"TT_test_msg_applysettings.py::test_apply_settings_passphrase": "9f1cdd0afa835c0284011ef4e7d9149132dd64f4e37a9655de82f5efcad7db3a",
"TT_test_msg_applysettings.py::test_apply_settings_passphrase_on_device": "44025f9b6ca5c41f63d2b5ced29ce332433952d4722b463159f1c7ba52b520cf",
"TT_test_msg_applysettings.py::test_apply_settings_rotation": "bd2c9d752815c0199748b98703039713aca1d3ad4c5eabd220fb919bc0c41afc",
"TT_test_msg_applysettings.py::test_experimental_features": "d5464f51966f98fff055aef7ac1148676b39f8fa4b25c17818139c628525ff02",
"TT_test_msg_applysettings.py::test_apply_settings_rotation": "0c1a22f5bfcb54781a3b44e3fb8fbb6894f8d3bf558bb51561130602f9f27dcd",
"TT_test_msg_applysettings.py::test_experimental_features": "5d92f2aab22113384cb601d221b434b9cf74fc5dfdde59858214db7236909ba1",
"TT_test_msg_applysettings.py::test_label_too_long": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
"TT_test_msg_applysettings.py::test_safety_checks": "3cda68830a0b8742253da415cf699ad58af4160ca2cd8004396235599e49a498",
"TT_test_msg_backup_device.py::test_backup_bip39": "c342bfb7d31ce2a014a4f46cbfffe7848be0b0f1da30e308fe1a6de885228b22",
@ -1650,16 +1650,16 @@
"TT_test_msg_backup_device.py::test_interrupt_backup_fails": "b1b812e4ea3974cf4b268a5b72b0d47c32427ccdd3c7615fdc4a6339c0180cda",
"TT_test_msg_backup_device.py::test_no_backup_fails": "06415ff75b08ef95be26f8d6ac3c29dd37797e48d3d5d604ae0b51d984f93ab8",
"TT_test_msg_backup_device.py::test_no_backup_show_entropy_fails": "1cbcf9bba947956dbccfb2fa59b4e734a6696f6608c6b772829bfa320789be02",
"TT_test_msg_change_wipe_code_t2.py::test_set_pin_to_wipe_code": "f9e108088c90eedb277e809ca49e6ed43dff9307fd4b672b4cb000f8af7a2b63",
"TT_test_msg_change_wipe_code_t2.py::test_set_remove_wipe_code": "eae5541680e0fc42b56bdb8c09438c4963d7982f6cd5c4be25b201f25622b813",
"TT_test_msg_change_wipe_code_t2.py::test_set_pin_to_wipe_code": "d3b33e8a9105c20e02234bf90974f82dacbf2fc5f0d4a0ec030a5fefef031608",
"TT_test_msg_change_wipe_code_t2.py::test_set_remove_wipe_code": "d37cb7b836584ef560373125ad3ee358be447b7541083ec366ca6362eb078fee",
"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_mismatch": "cc4cd5b71ad87d8081a7f558a12cd4afef257ece8bf9ca20a1a21173a5e2f4dc",
"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_to_pin": "3c76e1ebd70accb05e93aaa0494644e73ed13d8709e517fd78ca8d0edbb33f0b",
"TT_test_msg_changepin_t2.py::test_change_failed": "e4aa0ae7ecc275b8512377bb9607f4d6e0b4ed00623ae8e4f88cc6f7f879d838",
"TT_test_msg_changepin_t2.py::test_change_invalid_current": "cb867f57aeb506842799a6debc5236fd23446330f89687b7fa3db6805c9992b4",
"TT_test_msg_changepin_t2.py::test_change_pin": "52210988069d75f5b69ea1750d786d383c00a36f7164b539e63842165c0a4937",
"TT_test_msg_changepin_t2.py::test_remove_pin": "003f651d5ac75497dcbffc25635d37acd57cfb2c1e2b650a673e4047d85baee9",
"TT_test_msg_changepin_t2.py::test_set_failed": "871d5ef2e7d55123a1fae91f09903e6eb7f2f7c20f5fe7d224c3afcaac215d7c",
"TT_test_msg_changepin_t2.py::test_set_pin": "a84568ded91b91094016cb6f3f4c3f5395e17bed21ba77da6856d4a8cff7c3e4",
"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_to_pin": "484f56f2cc8dbf60d547e404b5557de804b34adef420d13fefa690b1f79a1ff3",
"TT_test_msg_changepin_t2.py::test_change_failed": "9b7dcdc1def72bf5b74d3a9febccefcedb6d3726a34a6c999d8a33c04fd427da",
"TT_test_msg_changepin_t2.py::test_change_invalid_current": "f38193f4a87042fdd54310815e5cedfc1eb4b5a01e770cf333b9099ec8d8d2cd",
"TT_test_msg_changepin_t2.py::test_change_pin": "e3fe3d7f20e99f5d76de99aefcb4fee3c0ffaa0e5e98b3f04cef5f0525395804",
"TT_test_msg_changepin_t2.py::test_remove_pin": "d556410729bd7f09049a733e5f945e299c9deec14755b9b1aaeffba7a68cde4e",
"TT_test_msg_changepin_t2.py::test_set_failed": "c827ffbf43cc2ca7da3b92892f985f02a51306c2645266c190b0d9b8169c3b95",
"TT_test_msg_changepin_t2.py::test_set_pin": "2a576edbaaba4e08c79875a86d980a628b5d1e8e059c6854e74b992689ec82b4",
"TT_test_msg_loaddevice.py::test_load_device_1": "fe0b267db1d64a397bd2aaaa0db68fa9636d8b4126e9910ef1d00aa5457a38be",
"TT_test_msg_loaddevice.py::test_load_device_2": "1bf5361f899f585f58abcc1d7459bacfe439c63fb8eb9163589e1877754aac12",
"TT_test_msg_loaddevice.py::test_load_device_slip39_advanced": "fe0b267db1d64a397bd2aaaa0db68fa9636d8b4126e9910ef1d00aa5457a38be",
@ -1679,8 +1679,8 @@
"TT_test_pin.py::test_exponential_backoff_t2": "aa9ebe473c70fa154bef1640d7d437cd1839595fa9a07864f24f17c34769030f",
"TT_test_pin.py::test_incorrect_pin_t2": "4bfc39a6ef7cc3c3dcfe2085bf1e16ef1ea82706e942062b7b4afa7694b12c18",
"TT_test_pin.py::test_no_protection": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
"TT_test_protection_levels.py::test_apply_settings": "935d4b5ce4805a8d3acf32c85a1eba492d5d7554229f2fa0558610311f5dd4a8",
"TT_test_protection_levels.py::test_change_pin_t2": "f0df1cf505a282d703727d2b0fbb8e15364954e401982f6d26cd08076d587ab3",
"TT_test_protection_levels.py::test_apply_settings": "e20d4ce99cc22dd4bce638e1110cecd54b28a861756aa342de14b9febfaef6cf",
"TT_test_protection_levels.py::test_change_pin_t2": "04d2949bc17ca79aecd1311432f5a19ef3ed11c7c748b4a05e72fa2e39ca03be",
"TT_test_protection_levels.py::test_get_address": "e5d600209fccef3827ec1154d5a892f4c0f9b5ec79e4f87f910e4d7a7bda282d",
"TT_test_protection_levels.py::test_get_entropy": "b8f51f201f310442d8a004571218176acb9a4c634965148bc6bbd1b95a59dd7b",
"TT_test_protection_levels.py::test_get_public_key": "e5d600209fccef3827ec1154d5a892f4c0f9b5ec79e4f87f910e4d7a7bda282d",
@ -1696,7 +1696,7 @@
"TT_test_protection_levels.py::test_wipe_device": "bc71ba00fd10530c5bee3ae4f4303d938aa80fc94ad2bf6b3d234779361f61d9",
"TT_test_sdcard.py::test_sd_format": "036c3f93a4a28d34bf91a8d24abc52ff26d9b14c8167f4dfc7b569fb39375c69",
"TT_test_sdcard.py::test_sd_no_format": "0710d8c40680fc8e96e368ae9978d1f7e0bd8b2f858547b8265c45930f43c959",
"TT_test_sdcard.py::test_sd_protect_unlock": "f49b02141ffd91ae77a8c461000702f22eb5e814c7d5faadc5e6fdfdd25591ae",
"TT_test_sdcard.py::test_sd_protect_unlock": "f4552a1756f3d788bf0226b5c4607683811fff99e20cdb7c7cc5f454d1412827",
"TT_test_session.py::test_cannot_resume_ended_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
"TT_test_session.py::test_clear_session": "f00466a5d9a6ffb68bdccbdd3c769a3c530ee483701062d919922c034aadebee",
"TT_test_session.py::test_derive_cardano_empty_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",