Merge eb74c1a8a5 into 13df961317

This is a unified interface for flow_warning_hi_prio,
which was available only on Mercury before.

[no changelog]

.github/workflows/core.yml

@@ -712,6 +712,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - run: sleep 1m  # try avoiding github api rate limit
       - uses: ./.github/actions/ui-comment
 
   core_upload_emu:

.github/workflows/legacy.yml

@@ -139,6 +139,8 @@ jobs:
           status: ${{ job.status }}
         continue-on-error: true
         if: ${{ always() && matrix.coins == 'universal' }}
+      - run: echo "${{ env.PULL_COMMENT }}" >> $GITHUB_STEP_SUMMARY
+        if: ${{ always() && matrix.coins == 'universal' }}
 
   legacy_upgrade_test:
     name: Upgrade test
@@ -217,14 +219,6 @@ jobs:
           aws s3 sync --only-show-errors master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}
         continue-on-error: true
 
-  legacy_ui_comment:
-    name: Post comment with UI diff URLs
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ui-comment
-
   legacy_upload_emu:
     name: Upload emulator binaries
     if: github.event_name == 'schedule'

common/protob/pb2py

@@ -93,7 +93,7 @@ if not PROTOC:
 PROTOC_PREFIX = Path(PROTOC).resolve().parent.parent
 
 
-ENUM_ENTRY = c.PrefixedArray(c.Byte, c.Int16ul)
+ENUM_ENTRY = c.PrefixedArray(c.Int16ul, c.Int16ul)
 
 FIELD_STRUCT = c.Struct(
     "tag" / c.Byte,

core/embed/rust/librust_qstr.h

@@ -262,7 +262,6 @@ static void _librust_qstrs(void) {
   MP_QSTR_flow_request_number;
   MP_QSTR_flow_request_passphrase;
   MP_QSTR_flow_show_share_words;
-  MP_QSTR_flow_warning_hi_prio;
   MP_QSTR_get_language;
   MP_QSTR_get_transition_out;
   MP_QSTR_haptic_feedback__disable;
@@ -652,6 +651,7 @@ static void _librust_qstrs(void) {
   MP_QSTR_share_words__wrote_down_all;
   MP_QSTR_show_address_details;
   MP_QSTR_show_checklist;
+  MP_QSTR_show_danger;
   MP_QSTR_show_error;
   MP_QSTR_show_group_share_success;
   MP_QSTR_show_homescreen;

core/embed/rust/src/protobuf/defs.rs

@@ -209,7 +209,7 @@ pub unsafe fn get_msg(msg_offset: u16) -> MsgDef {
 unsafe fn get_enum(enum_offset: u16) -> EnumDef {
     // #[repr(C, packed)]
     // struct EnumDef {
-    //     count: u8,
+    //     count: u16,
     //     vals: [u16],
     // }
 
@@ -217,8 +217,10 @@ unsafe fn get_enum(enum_offset: u16) -> EnumDef {
     // definition inside `ENUM_DEFS`.
     unsafe {
         let ptr = ENUM_DEFS.as_ptr().add(enum_offset as usize);
-        let count = ptr.offset(0).read() as usize;
-        let vals = ptr.offset(1);
+        let count_lo = ptr.offset(0).read();
+        let count_hi = ptr.offset(1).read();
+        let count = u16::from_le_bytes([count_lo, count_hi]) as usize;
+        let vals = ptr.offset(2);
 
         EnumDef {
             values: slice::from_raw_parts(vals.cast(), count),

core/embed/rust/src/ui/model_mercury/flow/mod.rs

@@ -12,10 +12,10 @@ pub mod prompt_backup;
 pub mod request_number;
 pub mod request_passphrase;
 pub mod set_brightness;
+pub mod show_danger;
 pub mod show_share_words;
 pub mod show_tutorial;
 pub mod util;
-pub mod warning_hi_prio;
 
 pub use confirm_action::{
     new_confirm_action, new_confirm_action_simple, ConfirmActionExtra, ConfirmActionMenuStrings,
@@ -34,7 +34,7 @@ pub use prompt_backup::PromptBackup;
 pub use request_number::RequestNumber;
 pub use request_passphrase::RequestPassphrase;
 pub use set_brightness::SetBrightness;
+pub use show_danger::ShowDanger;
 pub use show_share_words::ShowShareWords;
 pub use show_tutorial::ShowTutorial;
 pub use util::{ConfirmBlobParams, ShowInfoParams};
-pub use warning_hi_prio::WarningHiPrio;

core/embed/rust/src/ui/model_mercury/flow/show_danger.rs

@@ -22,13 +22,13 @@ use super::super::{
 };
 
 #[derive(Copy, Clone, PartialEq, Eq)]
-pub enum WarningHiPrio {
+pub enum ShowDanger {
     Message,
     Menu,
     Cancelled,
 }
 
-impl FlowController for WarningHiPrio {
+impl FlowController for ShowDanger {
     #[inline]
     fn index(&'static self) -> usize {
         *self as usize
@@ -57,7 +57,7 @@ impl FlowController for WarningHiPrio {
 
 const EXTRA_PADDING: i16 = 6;
 
-pub fn new_warning_hi_prio(
+pub fn new_show_danger(
     title: TString<'static>,
     description: TString<'static>,
     value: TString<'static>,
@@ -106,9 +106,9 @@ pub fn new_warning_hi_prio(
     .with_result_icon(theme::ICON_BULLET_CHECKMARK, theme::GREY_DARK)
     .map(|_| Some(FlowMsg::Cancelled));
 
-    let res = SwipeFlow::new(&WarningHiPrio::Message)?
-        .with_page(&WarningHiPrio::Message, content_message)?
-        .with_page(&WarningHiPrio::Menu, content_menu)?
-        .with_page(&WarningHiPrio::Cancelled, content_cancelled)?;
+    let res = SwipeFlow::new(&ShowDanger::Message)?
+        .with_page(&ShowDanger::Message, content_message)?
+        .with_page(&ShowDanger::Menu, content_menu)?
+        .with_page(&ShowDanger::Cancelled, content_cancelled)?;
     Ok(res)
 }

core/embed/rust/src/ui/model_mercury/layout.rs

@@ -1491,7 +1491,7 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
     panic!();
 }
 
-extern "C" fn new_warning_hi_prio(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+extern "C" fn new_show_danger(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
@@ -1501,8 +1501,7 @@ extern "C" fn new_warning_hi_prio(n_args: usize, args: *const Obj, kwargs: *mut
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
 
-        let flow =
-            flow::warning_hi_prio::new_warning_hi_prio(title, description, value, verb_cancel)?;
+        let flow = flow::show_danger::new_show_danger(title, description, value, verb_cancel)?;
         Ok(LayoutObj::new_root(flow)?.into())
     };
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@@ -1717,6 +1716,16 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     """Warning modal. No buttons shown when `button` is empty string."""
     Qstr::MP_QSTR_show_warning => obj_fn_kw!(0, new_show_warning).as_obj(),
 
+    /// def show_danger(
+    ///     *,
+    ///     title: str,
+    ///     description: str,
+    ///     value: str = "",
+    ///     verb_cancel: str | None = None,
+    /// ) -> LayoutObj[UiResult]:
+    ///     """Warning modal that makes it easier to cancel than to continue."""
+    Qstr::MP_QSTR_show_danger => obj_fn_kw!(0, new_show_danger).as_obj(),
+
     /// def show_success(
     ///     *,
     ///     title: str,
@@ -1971,16 +1980,6 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     """Get address / receive funds."""
     Qstr::MP_QSTR_flow_get_address => obj_fn_kw!(0, new_get_address).as_obj(),
 
-    /// def flow_warning_hi_prio(
-    ///     *,
-    ///     title: str,
-    ///     description: str,
-    ///     value: str = "",
-    ///     verb_cancel: str | None = None,
-    /// ) -> LayoutObj[UiResult]:
-    ///     """Warning modal with multiple steps to confirm."""
-    Qstr::MP_QSTR_flow_warning_hi_prio => obj_fn_kw!(0, new_warning_hi_prio).as_obj(),
-
     /// def flow_confirm_output(
     ///     *,
     ///     title: str | None,

core/mocks/generated/trezorui2.pyi

@@ -216,6 +216,17 @@ def show_warning(
     """Warning modal. No buttons shown when `button` is empty string."""
 
 
+# rust/src/ui/model_mercury/layout.rs
+def show_danger(
+    *,
+    title: str,
+    description: str,
+    value: str = "",
+    verb_cancel: str | None = None,
+) -> LayoutObj[UiResult]:
+    """Warning modal that makes it easier to cancel than to continue."""
+
+
 # rust/src/ui/model_mercury/layout.rs
 def show_success(
     *,
@@ -497,17 +508,6 @@ def flow_get_address(
     """Get address / receive funds."""
 
 
-# rust/src/ui/model_mercury/layout.rs
-def flow_warning_hi_prio(
-    *,
-    title: str,
-    description: str,
-    value: str = "",
-    verb_cancel: str | None = None,
-) -> LayoutObj[UiResult]:
-    """Warning modal with multiple steps to confirm."""
-
-
 # rust/src/ui/model_mercury/layout.rs
 def flow_confirm_output(
     *,

core/src/trezor/ui/layouts/mercury/__init__.py

@@ -119,29 +119,27 @@ def confirm_path_warning(
         if not path_type
         else f"{TR.words__unknown} {path_type.lower()}."
     )
-    return raise_if_not_confirmed(
-        trezorui2.flow_warning_hi_prio(
-            title=f"{TR.words__warning}!", description=description, value=path
-        ),
+    return show_danger(
         "path_warning",
+        description,
+        value=path,
+        verb_cancel=TR.words__cancel_and_exit,
         br_code=ButtonRequestType.UnknownDerivationPath,
     )
 
 
 def confirm_multisig_warning() -> Awaitable[None]:
-    return raise_if_not_confirmed(
-        trezorui2.flow_warning_hi_prio(
-            title=f"{TR.words__important}!",
-            description=TR.send__receiving_to_multisig,
-        ),
+    return show_danger(
         "warning_multisig",
-        br_code=ButtonRequestType.Warning,
+        TR.send__receiving_to_multisig,
+        title=TR.words__important,
+        verb_cancel=TR.words__cancel_and_exit,
     )
 
 
 def confirm_multisig_different_paths_warning() -> Awaitable[None]:
     return raise_if_not_confirmed(
-        trezorui2.flow_warning_hi_prio(
+        trezorui2.show_danger(
             title=f"{TR.words__important}!",
             description="Using different paths for different XPUBs.",
         ),
@@ -327,6 +325,28 @@ def show_warning(
     )
 
 
+def show_danger(
+    br_name: str,
+    content: str,
+    value: str | None = None,
+    title: str | None = None,
+    verb_cancel: str | None = None,
+    br_code: ButtonRequestType = ButtonRequestType.Warning,
+) -> Awaitable[None]:
+    title = title or TR.words__warning
+    verb_cancel = verb_cancel or TR.buttons__cancel
+    return raise_if_not_confirmed(
+        trezorui2.show_danger(
+            title=title,
+            description=content,
+            value=(value or ""),
+            verb_cancel=verb_cancel,
+        ),
+        br_name,
+        br_code,
+    )
+
+
 def show_success(
     br_name: str,
     content: str,
@@ -724,14 +744,10 @@ def _confirm_summary(
 if not utils.BITCOIN_ONLY:
 
     def confirm_ethereum_unknown_contract_warning() -> Awaitable[None]:
-        return raise_if_not_confirmed(
-            trezorui2.flow_warning_hi_prio(
-                title=TR.words__warning,
-                description=TR.ethereum__unknown_contract_address,
-                verb_cancel=TR.send__cancel_sign,
-            ),
+        return show_danger(
             "unknown_contract_warning",
-            ButtonRequestType.Warning,
+            TR.ethereum__unknown_contract_address,
+            verb_cancel=TR.send__cancel_sign,
         )
 
     async def confirm_ethereum_tx(

core/src/trezor/ui/layouts/tr/__init__.py

@@ -420,6 +420,24 @@ def show_warning(
     )
 
 
+def show_danger(
+    br_name: str,
+    content: str,
+    value: str | None = None,
+    title: str | None = None,
+    verb_cancel: str | None = None,
+    br_code: ButtonRequestType = ButtonRequestType.Warning,
+) -> Awaitable[ui.UiResult]:
+    title = title or TR.words__warning
+    return show_warning(
+        br_name,
+        title,
+        content,
+        TR.words__continue_anyway,
+        br_code=br_code,
+    )
+
+
 def show_success(
     br_name: str,
     content: str,
@@ -564,7 +582,6 @@ def confirm_blob(
     title: str,
     data: bytes | str,
     description: str | None = None,
-    text_mono: bool = True,
     subtitle: str | None = None,
     verb: str | None = None,
     verb_cancel: str | None = None,  # icon
@@ -815,11 +832,8 @@ def confirm_total(
 if not utils.BITCOIN_ONLY:
 
     def confirm_ethereum_unknown_contract_warning() -> Awaitable[ui.UiResult]:
-        return show_warning(
-            "unknown_contract_warning",
-            TR.words__warning,
-            TR.ethereum__unknown_contract_address_short,
-            TR.words__continue_anyway,
+        return show_danger(
+            "unknown_contract_warning", TR.ethereum__unknown_contract_address_short
         )
 
     async def confirm_ethereum_staking_tx(

core/src/trezor/ui/layouts/tt/__init__.py

@@ -372,6 +372,22 @@ def show_warning(
     )
 
 
+def show_danger(
+    br_name: str,
+    content: str,
+    value: str | None = None,
+    title: str | None = None,
+    verb_cancel: str | None = None,
+    br_code: ButtonRequestType = ButtonRequestType.Warning,
+) -> Awaitable[None]:
+    return show_warning(
+        br_name,
+        content,
+        TR.words__continue_anyway_question,
+        br_code=br_code,
+    )
+
+
 def show_success(
     br_name: str,
     content: str,
@@ -779,10 +795,8 @@ def _confirm_summary(
 if not utils.BITCOIN_ONLY:
 
     def confirm_ethereum_unknown_contract_warning() -> Awaitable[None]:
-        return show_warning(
-            "unknown_contract_warning",
-            TR.ethereum__unknown_contract_address_short,
-            TR.words__continue_anyway_question,
+        return show_danger(
+            "unknown_contract_warning", TR.ethereum__unknown_contract_address_short
         )
 
     async def confirm_ethereum_tx(