fix(core/ui): T3T1: improve passphrase prompt

[no changelog]

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

@@ -1020,39 +1020,17 @@ extern "C" fn new_show_simple(n_args: usize, args: *const Obj, kwargs: *mut Map)
     let block = move |_args: &[Obj], kwargs: &Map| {
         let title: Option<TString> = kwargs.get(Qstr::MP_QSTR_title)?.try_into_option()?;
         let description: TString = kwargs.get_or(Qstr::MP_QSTR_description, "".into())?;
-        let button: TString = kwargs.get_or(Qstr::MP_QSTR_button, "".into())?;
 
         let obj = if let Some(t) = title {
             LayoutObj::new(Frame::left_aligned(
                 t,
-                Dialog::new(
+                Paragraphs::new(Paragraph::new(&theme::TEXT_NORMAL, description)),
-                    Paragraphs::new([Paragraph::new(&theme::TEXT_NORMAL, description)]),
-                    theme::button_bar(Button::with_text(button).map(|msg| {
-                        (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
-                    })),
-                ),
-            ))?
-            .into()
-        } else if !button.is_empty() {
-            LayoutObj::new(Border::new(
-                theme::borders(),
-                Dialog::new(
-                    Paragraphs::new([Paragraph::new(&theme::TEXT_NORMAL, description)]),
-                    theme::button_bar(Button::with_text(button).map(|msg| {
-                        (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
-                    })),
-                ),
             ))?
             .into()
         } else {
             LayoutObj::new(Border::new(
                 theme::borders(),
-                Dialog::new(
+                Paragraphs::new(Paragraph::new(&theme::TEXT_DEMIBOLD, description)),
-                    Paragraphs::new(
-                        [Paragraph::new(&theme::TEXT_DEMIBOLD, description).centered()],
-                    ),
-                    Empty,
-                ),
             ))?
             .into()
         };

core/src/apps/common/passphrase.py

@@ -62,7 +62,7 @@ async def _request_on_host() -> str:
             await confirm_action(
                 "passphrase_host1_hidden",
                 TR.passphrase__hidden_wallet,
-                description=f"{TR.passphrase__access_hidden_wallet}\n{TR.passphrase__from_host_not_shown}",
+                description=TR.passphrase__from_host_not_shown,
             )
         else:
             await confirm_action(

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

@@ -728,7 +728,6 @@ async def confirm_blob(
     ask_pagination: bool = False,
     chunkify: bool = False,
 ) -> None:
-    verb = verb or TR.buttons__confirm  # def_arg
     layout = RustLayout(
         trezorui2.confirm_blob(
             title=title,

tests/device_tests/test_session_id_and_passphrase.py

@@ -398,9 +398,10 @@ def test_hide_passphrase_from_host(client: Client):
 
         def input_flow():
             yield
-            TR.assert_in(
+            content = client.debug.wait_layout().text_content().lower()
-                client.debug.wait_layout().text_content(),
+            assert any(
-                "passphrase__access_hidden_wallet",
+                (s[:50].lower() in content)
+                for s in TR.translate("passphrase__from_host_not_shown")
             )
             if client.model in (models.T2T1, models.T3T1):
                 client.debug.press_yes()