chore(core/eckhart): Update passphrase-related flows

[no changelog]

Author: bieleluk

core/embed/rust/librust_qstr.h

@@ -394,14 +394,17 @@ static void _librust_qstrs(void) {
   MP_QSTR_pages;
   MP_QSTR_paint;
   MP_QSTR_paired_devices;
+  MP_QSTR_passphrase__access_hidden_wallet;
   MP_QSTR_passphrase__access_wallet;
   MP_QSTR_passphrase__always_on_device;
   MP_QSTR_passphrase__continue_with_empty_passphrase;
   MP_QSTR_passphrase__from_host_not_shown;
+  MP_QSTR_passphrase__hidden_wallet;
   MP_QSTR_passphrase__hide;
   MP_QSTR_passphrase__next_screen_will_show_passphrase;
   MP_QSTR_passphrase__please_enter;
   MP_QSTR_passphrase__revoke_on_device;
+  MP_QSTR_passphrase__show;
   MP_QSTR_passphrase__title_confirm;
   MP_QSTR_passphrase__title_enter;
   MP_QSTR_passphrase__title_hide;

core/embed/rust/src/translations/generated/translated_string.rs

@@ -131,7 +131,7 @@ impl PassphraseKeyboard {
             input: PassphraseInput::new(),
             input_prompt: Label::left_aligned(
                 TString::from_translation(TR::passphrase__title_enter),
-                theme::TEXT_SMALL,
+                theme::firmware::TEXT_SMALL,
             )
             .vertically_centered(),
             next_btn,

core/embed/rust/src/ui/layout_eckhart/firmware/keyboard/passphrase.rs

@@ -54,6 +54,7 @@ where
     const SUBTITLE_HEIGHT: i16 = 44;
     const SUBTITLE_DOUBLE_HEIGHT: i16 = 76;
     const SUBTITLE_STYLE: TextStyle = theme::TEXT_MEDIUM_EXTRA_LIGHT;
+    const CONTENT_INSETS_NO_HEADER: Insets = Insets::top(38);
 
     pub fn new(content: T) -> Self {
         Self {
@@ -169,10 +170,11 @@ where
         };
 
         // Introduce side insets + top padding if the header is not present
+        content_area = content_area.inset(SIDE_INSETS);
         content_area = if self.header.is_none() {
-            content_area.inset(Insets::top(38)).inset(SIDE_INSETS)
+            content_area.inset(Self::CONTENT_INSETS_NO_HEADER)
         } else {
-            content_area.inset(SIDE_INSETS)
+            content_area
         };
 
         self.content.place(content_area);

core/embed/rust/src/ui/layout_eckhart/firmware/text_screen.rs

@@ -3,12 +3,15 @@ use crate::{
     strutil::ShortString,
     translations::TR,
     ui::{
-        component::{text::op::OpTextLayout, ComponentExt, FormattedText},
+        component::{
+            text::paragraphs::{Paragraph, ParagraphSource},
+            ComponentExt,
+        },
         flow::{
             base::{Decision, DecisionBuilder as _},
             FlowController, FlowMsg, SwipeFlow,
         },
-        geometry::Direction,
+        geometry::{Direction, LinearPlacement},
     },
 };
 
@@ -17,7 +20,7 @@ use super::super::{
     firmware::{
         ActionBar, Header, PassphraseKeyboard, PassphraseKeyboardMsg, TextScreen, TextScreenMsg,
     },
-    fonts, theme,
+    theme,
 };
 
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -56,22 +59,24 @@ impl FlowController for RequestPassphrase {
 }
 
 pub fn new_request_passphrase() -> Result<SwipeFlow, error::Error> {
-    let op_confirm = OpTextLayout::new(theme::TEXT_NORMAL).text(
-        TR::passphrase__continue_with_empty_passphrase,
-        fonts::FONT_SATOSHI_REGULAR_38,
-    );
-
-    let content_confirm_empty = TextScreen::new(FormattedText::new(op_confirm))
-        .with_header(Header::new("".into()))
-        .with_action_bar(ActionBar::new_double(
-            Button::with_icon(theme::ICON_CROSS).styled(theme::button_cancel()),
-            Button::with_icon(theme::ICON_CHECKMARK).styled(theme::button_confirm()),
-        ))
-        .map(|msg| match msg {
-            TextScreenMsg::Cancelled => Some(FlowMsg::Cancelled),
-            TextScreenMsg::Confirmed => Some(FlowMsg::Confirmed),
-            _ => Some(FlowMsg::Cancelled),
-        });
+    let content_confirm_empty = TextScreen::new(
+        Paragraph::new(
+            &theme::TEXT_NORMAL,
+            TR::passphrase__continue_with_empty_passphrase,
+        )
+        .into_paragraphs()
+        .with_placement(LinearPlacement::vertical()),
+    )
+    .with_header(Header::new(TR::passphrase__title_enter.into()))
+    .with_action_bar(ActionBar::new_double(
+        Button::with_icon(theme::ICON_CHEVRON_LEFT),
+        Button::with_text(TR::buttons__confirm.into()).styled(theme::button_default()),
+    ))
+    .map(|msg| match msg {
+        TextScreenMsg::Cancelled => Some(FlowMsg::Cancelled),
+        TextScreenMsg::Confirmed => Some(FlowMsg::Confirmed),
+        _ => Some(FlowMsg::Cancelled),
+    });
 
     let content_keypad = PassphraseKeyboard::new().map(|msg| match msg {
         PassphraseKeyboardMsg::Confirmed(s) => Some(FlowMsg::Text(s)),

core/embed/rust/src/ui/layout_eckhart/flow/request_passphrase.rs

@@ -1222,7 +1222,9 @@ impl FirmwareUI for UIEckhart {
         title: Option<TString<'static>>,
         button: Option<TString<'static>>,
     ) -> Result<Gc<LayoutObj>, Error> {
-        let paragraphs = Paragraph::new(&theme::TEXT_REGULAR, text).into_paragraphs();
+        let paragraphs = Paragraph::new(&theme::TEXT_REGULAR, text)
+            .into_paragraphs()
+            .with_placement(LinearPlacement::vertical());
 
         let mut screen = TextScreen::new(paragraphs);
         if let Some(title) = title {

core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs

@@ -506,14 +506,17 @@ class TR:
     nem__unencrypted: str = "Unencrypted"
     nem__unknown_mosaic: str = "Unknown mosaic!"
     nostr__event_kind_template: str = "Event kind: {0}"
+    passphrase__access_hidden_wallet: str = "Access hidden wallet"
     passphrase__access_wallet: str = "Access passphrase wallet?"
     passphrase__always_on_device: str = "Always enter your passphrase on Trezor?"
     passphrase__continue_with_empty_passphrase: str = "Continue with empty passphrase?"
     passphrase__from_host_not_shown: str = "Passphrase provided by host will be used but will not be displayed due to the device settings."
+    passphrase__hidden_wallet: str = "Hidden wallet"
     passphrase__hide: str = "Hide passphrase coming from host?"
     passphrase__next_screen_will_show_passphrase: str = "The next screen shows your passphrase."
     passphrase__please_enter: str = "Please enter your passphrase."
     passphrase__revoke_on_device: str = "Do you want to revoke the passphrase on device setting?"
+    passphrase__show: str = "Show passphrase"
     passphrase__title_confirm: str = "Confirm passphrase"
     passphrase__title_enter: str = "Enter passphrase"
     passphrase__title_hide: str = "Hide passphrase"

core/mocks/trezortranslate_keys.pyi

@@ -30,9 +30,12 @@ async def get() -> str:
 
 
 async def _request_on_host() -> str:
-    from trezor import TR
     from trezor.messages import PassphraseAck, PassphraseRequest
-    from trezor.ui.layouts import request_passphrase_on_host
+    from trezor.ui.layouts import (
+        confirm_hidden_passphrase_from_host,
+        request_passphrase_on_host,
+        show_passphrase_from_host,
+    )
     from trezor.wire.context import call
 
     request_passphrase_on_host()
@@ -55,30 +58,10 @@ async def _request_on_host() -> str:
 
     # non-empty passphrase
     if passphrase:
-        from trezor.ui.layouts import confirm_action, confirm_blob
-
         # We want to hide the passphrase, or show it, according to settings.
         if storage_device.get_hide_passphrase_from_host():
-            await confirm_action(
-                "passphrase_host1_hidden",
-                TR.passphrase__wallet,
-                description=TR.passphrase__from_host_not_shown,
-                prompt_screen=True,
-                prompt_title=TR.passphrase__access_wallet,
-            )
+            await confirm_hidden_passphrase_from_host()
         else:
-            await confirm_action(
-                "passphrase_host1",
-                TR.passphrase__wallet,
-                description=TR.passphrase__next_screen_will_show_passphrase,
-                verb=TR.buttons__continue,
-            )
-
-            await confirm_blob(
-                "passphrase_host2",
-                TR.passphrase__title_confirm,
-                passphrase,
-                info=False,
-            )
+            await show_passphrase_from_host(passphrase)
 
     return passphrase

core/src/apps/common/passphrase.py

@@ -197,6 +197,32 @@ def confirm_hide_passphrase_from_host() -> Awaitable[None]:
     )
 
 
+async def confirm_hidden_passphrase_from_host() -> None:
+    await confirm_action(
+        "passphrase_host1_hidden",
+        TR.passphrase__wallet,
+        description=TR.passphrase__from_host_not_shown,
+        prompt_screen=True,
+        prompt_title=TR.passphrase__access_wallet,
+    )
+
+
+async def show_passphrase_from_host(passphrase: str | None) -> None:
+    await confirm_action(
+        "passphrase_host1",
+        TR.passphrase__wallet,
+        description=TR.passphrase__next_screen_will_show_passphrase,
+        verb=TR.buttons__continue,
+    )
+
+    await confirm_blob(
+        "passphrase_host2",
+        TR.passphrase__title_confirm,
+        passphrase or "",
+        info=False,
+    )
+
+
 def confirm_change_passphrase_source(
     passphrase_always_on_device: bool,
 ) -> Awaitable[None]:
@@ -709,6 +735,7 @@ def confirm_value(
     info_title: str | None = None,
     chunkify: bool = False,
     chunkify_info: bool = False,
+    cancel: bool = False,
 ) -> Awaitable[None]:
     """General confirmation dialog, used by many other confirm_* functions."""
 
@@ -734,6 +761,7 @@ def confirm_value(
             verb_cancel=verb_cancel,
             info=bool(info_items),
             hold=hold,
+            cancel=cancel,
         ),
         info_layout,
         br_name,

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

@@ -214,6 +214,32 @@ def confirm_hide_passphrase_from_host() -> Awaitable[None]:
     )
 
 
+async def confirm_hidden_passphrase_from_host() -> None:
+    await confirm_action(
+        "passphrase_host1_hidden",
+        TR.passphrase__wallet,
+        description=TR.passphrase__from_host_not_shown,
+        prompt_screen=True,
+        prompt_title=TR.passphrase__access_wallet,
+    )
+
+
+async def show_passphrase_from_host(passphrase: str | None) -> None:
+    await confirm_action(
+        "passphrase_host1",
+        TR.passphrase__wallet,
+        description=TR.passphrase__next_screen_will_show_passphrase,
+        verb=TR.buttons__continue,
+    )
+
+    await confirm_blob(
+        "passphrase_host2",
+        TR.passphrase__title_confirm,
+        passphrase or "",
+        info=False,
+    )
+
+
 def confirm_change_passphrase_source(
     passphrase_always_on_device: bool,
 ) -> Awaitable[None]:
@@ -776,6 +802,7 @@ async def confirm_value(
     info_items: Iterable[tuple[str, str]] | None = None,
     chunkify: bool = False,
     chunkify_info: bool = False,
+    cancel: bool = False,
 ) -> None:
     """General confirmation dialog, used by many other confirm_* functions."""
 
@@ -794,6 +821,7 @@ async def confirm_value(
                 hold=hold,
                 is_data=is_data,
                 chunkify=chunkify,
+                cancel=cancel,
             ),
             br_name,
             br_code,