From 71ddb0f59bd3816a872967fba603a905609054b3 Mon Sep 17 00:00:00 2001 From: Lukas Bielesch Date: Sun, 13 Apr 2025 22:35:32 +0200 Subject: [PATCH] fixup! feat(eckhart): add FIDO2 support FidoCredential component, confirm_fido flow and icons --- core/embed/rust/src/ui/layout_eckhart/flow/mod.rs | 2 ++ core/src/trezor/ui/layouts/caesar/fido.py | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/embed/rust/src/ui/layout_eckhart/flow/mod.rs b/core/embed/rust/src/ui/layout_eckhart/flow/mod.rs index f05a1c6d73..57a12917dd 100644 --- a/core/embed/rust/src/ui/layout_eckhart/flow/mod.rs +++ b/core/embed/rust/src/ui/layout_eckhart/flow/mod.rs @@ -1,3 +1,4 @@ +#[cfg(feature = "universal_fw")] pub mod confirm_fido; pub mod confirm_output; pub mod confirm_reset; @@ -10,6 +11,7 @@ pub mod request_passphrase; pub mod show_danger; pub mod show_share_words; +#[cfg(feature = "universal_fw")] pub use confirm_fido::new_confirm_fido; pub use confirm_output::new_confirm_output; pub use confirm_reset::new_confirm_reset; diff --git a/core/src/trezor/ui/layouts/caesar/fido.py b/core/src/trezor/ui/layouts/caesar/fido.py index e6d174b419..4b7304b7c2 100644 --- a/core/src/trezor/ui/layouts/caesar/fido.py +++ b/core/src/trezor/ui/layouts/caesar/fido.py @@ -1,5 +1,3 @@ -from typing import TYPE_CHECKING - import trezorui_api from trezor import ui from trezor.enums import ButtonRequestType @@ -7,9 +5,6 @@ from trezor.ui.layouts import show_error_and_raise from ..common import interact -if TYPE_CHECKING: - from typing import NoReturn - async def confirm_fido( header: str, @@ -50,7 +45,7 @@ async def confirm_fido_reset() -> bool: return (await ui.Layout(confirm).get_result()) is trezorui_api.CONFIRMED -async def credential_warning(br_name: str, content: str) -> NoReturn: +async def credential_warning(br_name: str, content: str) -> None: await show_error_and_raise( br_name=br_name, content=content,