From 99e13fec026841d9d6f46b4ac6d8b7e1beb3e134 Mon Sep 17 00:00:00 2001 From: obrusvit Date: Fri, 17 May 2024 13:31:30 +0200 Subject: [PATCH] fix(core): rebase on main [no changelog] --- core/embed/extmod/modtrezorui/modtrezorui-display.h | 4 ++++ .../rust/src/translations/generated/translated_string.rs | 9 +++------ core/embed/rust/src/ui/shape/corner_highlight.rs | 4 ++-- core/src/trezor/ui/layouts/mercury/reset.py | 2 +- core/translations/order.json | 7 +++---- core/translations/signatures.json | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/embed/extmod/modtrezorui/modtrezorui-display.h b/core/embed/extmod/modtrezorui/modtrezorui-display.h index 69e37d0152b..54b0669a703 100644 --- a/core/embed/extmod/modtrezorui/modtrezorui-display.h +++ b/core/embed/extmod/modtrezorui/modtrezorui-display.h @@ -171,7 +171,11 @@ STATIC const mp_rom_map_elem_t mod_trezorui_Display_locals_dict_table[] = { {MP_ROM_QSTR(MP_QSTR_FONT_NORMAL), MP_ROM_INT(FONT_NORMAL)}, {MP_ROM_QSTR(MP_QSTR_FONT_DEMIBOLD), MP_ROM_INT(FONT_DEMIBOLD)}, {MP_ROM_QSTR(MP_QSTR_FONT_MONO), MP_ROM_INT(FONT_MONO)}, +#ifdef FONT_BOLD_UPPER {MP_ROM_QSTR(MP_QSTR_FONT_BOLD_UPPER), MP_ROM_INT(FONT_BOLD_UPPER)}, +#else + {MP_ROM_QSTR(MP_QSTR_FONT_BOLD_UPPER), MP_ROM_INT(FONT_BOLD)}, +#endif }; STATIC MP_DEFINE_CONST_DICT(mod_trezorui_Display_locals_dict, mod_trezorui_Display_locals_dict_table); diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index 31f2c7ef303..8a1da684ef4 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -1256,10 +1256,9 @@ pub enum TranslatedString { instructions__continue_in_app = 861, // "Continue in the app" words__cancel_and_exit = 862, // "Cancel and exit" address__confirmed = 863, // "Receive address confirmed" - reset__title_shamir_backup = 864, // "Multi-share backup" - pin__cancel_description = 865, // "Continue without PIN" - pin__cancel_info = 866, // "Without a PIN, anyone can access this device." - pin__cancel_setup = 867, // "Cancel PIN setup" + pin__cancel_description = 864, // "Continue without PIN" + pin__cancel_info = 865, // "Without a PIN, anyone can access this device." + pin__cancel_setup = 866, // "Cancel PIN setup" } impl TranslatedString { @@ -2511,7 +2510,6 @@ impl TranslatedString { Self::instructions__continue_in_app => "Continue in the app", Self::words__cancel_and_exit => "Cancel and exit", Self::address__confirmed => "Receive address confirmed", - Self::reset__title_shamir_backup => "Multi-share backup", Self::pin__cancel_description => "Continue without PIN", Self::pin__cancel_info => "Without a PIN, anyone can access this device.", Self::pin__cancel_setup => "Cancel PIN setup", @@ -3767,7 +3765,6 @@ impl TranslatedString { Qstr::MP_QSTR_instructions__continue_in_app => Some(Self::instructions__continue_in_app), Qstr::MP_QSTR_words__cancel_and_exit => Some(Self::words__cancel_and_exit), Qstr::MP_QSTR_address__confirmed => Some(Self::address__confirmed), - Qstr::MP_QSTR_reset__title_shamir_backup => Some(Self::reset__title_shamir_backup), Qstr::MP_QSTR_pin__cancel_description => Some(Self::pin__cancel_description), Qstr::MP_QSTR_pin__cancel_info => Some(Self::pin__cancel_info), Qstr::MP_QSTR_pin__cancel_setup => Some(Self::pin__cancel_setup), diff --git a/core/embed/rust/src/ui/shape/corner_highlight.rs b/core/embed/rust/src/ui/shape/corner_highlight.rs index 2474eeb0da6..f018f3ea9e7 100644 --- a/core/embed/rust/src/ui/shape/corner_highlight.rs +++ b/core/embed/rust/src/ui/shape/corner_highlight.rs @@ -103,7 +103,7 @@ impl Shape<'_> for CornerHighlight { let circle_center = self.pos + Offset::uniform(self.r_outer).rotate(self.corner); let circle_visible_part = Rect::snap(self.pos_rect, Offset::uniform(self.r_outer), align); in_clip(canvas, circle_visible_part, &|can| { - can.fill_circle(circle_center, self.r_outer, self.color); + can.fill_circle(circle_center, self.r_outer, self.color, self.alpha); }); // rectangles (rounded) tailing from a corner @@ -146,7 +146,7 @@ impl Shape<'_> for CornerHighlight { self.pos + Offset::uniform(self.thickness + self.r_inner).rotate(self.corner); in_clip(canvas, rect_outer_fill, &|can| { can.fill_rect(rect_outer_fill, self.color, self.alpha); - can.fill_circle(circle_cover_center, self.r_inner, self.bg_color); + can.fill_circle(circle_cover_center, self.r_inner, self.bg_color, self.alpha); }); } diff --git a/core/src/trezor/ui/layouts/mercury/reset.py b/core/src/trezor/ui/layouts/mercury/reset.py index a614ddc8b47..eb7cc062e27 100644 --- a/core/src/trezor/ui/layouts/mercury/reset.py +++ b/core/src/trezor/ui/layouts/mercury/reset.py @@ -300,7 +300,7 @@ async def slip39_advanced_prompt_group_threshold(num_of_groups: int) -> int: ) -async def show_warning_backup(slip39: bool) -> None: +async def show_warning_backup() -> None: result = await interact( RustLayout( trezorui2.show_warning( diff --git a/core/translations/order.json b/core/translations/order.json index 87460963e62..adb73ccb9ac 100644 --- a/core/translations/order.json +++ b/core/translations/order.json @@ -863,8 +863,7 @@ "861": "instructions__continue_in_app", "862": "words__cancel_and_exit", "863": "address__confirmed", - "864": "reset__title_shamir_backup", - "865": "pin__cancel_description", - "866": "pin__cancel_info", - "867": "pin__cancel_setup" + "864": "pin__cancel_description", + "865": "pin__cancel_info", + "866": "pin__cancel_setup" } diff --git a/core/translations/signatures.json b/core/translations/signatures.json index eb1a5e8182a..2e93c3afb8a 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,8 +1,8 @@ { "current": { - "merkle_root": "9c620dab3212f47d952020e2badc61a9443778fbca180208db622f3d0ebcbe5c", - "datetime": "2024-05-17T10:46:08.576451", - "commit": "cce30d1364fb62e3ed51509fefe7d48c86b45a5c" + "merkle_root": "928438526b993d433d52359d86099848d570c13fbe6aac72a2f5a29a4e8e94c5", + "datetime": "2024-05-17T10:55:04.124405", + "commit": "1409ed27df07827a2a3e3756420db1b41fe108e5" }, "history": [ {