arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00
Code Issues Releases Wiki Activity

fix(core/ui): T3T1: wrong XPUB title

Browse Source 
[no changelog]
This commit is contained in:
Martin Milata 2024-06-06 14:48:56 +02:00
parent b868ccbbdd
commit 3760dd307c
6 changed files with 1156 additions and 1153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/rust/src/ui/model_mercury/flow/get_address.rs
View File

@ -142,7 +142,7 @@ pub extern "C" fn new_get_address(n_args: usize, args: *const Obj, kwargs: *mut
impl GetAddress { impl GetAddress {
fn new_obj(_args: &[Obj], kwargs: &Map) -> Result<Obj, error::Error> { fn new_obj(_args: &[Obj], kwargs: &Map) -> Result<Obj, error::Error> {
let title: TString = "Receive address".into(); // TODO: address__title_receive_address w/o uppercase let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
let description: Option<TString> = let description: Option<TString> =
kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?; kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
let extra: Option<TString> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?; let extra: Option<TString> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;

1
core/embed/rust/src/ui/model_mercury/layout.rs
View File

@ -1826,6 +1826,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
/// def flow_get_address( /// def flow_get_address(
/// *, /// *,
/// address: str | bytes, /// address: str | bytes,
/// title: str,
/// description: str | None, /// description: str | None,
/// extra: str | None, /// extra: str | None,
/// chunkify: bool, /// chunkify: bool,

1
core/mocks/generated/trezorui2.pyi
View File

@ -547,6 +547,7 @@ def show_wait_text(message: str, /) -> LayoutObj[None]:
def flow_get_address( def flow_get_address(
*, *,
address: str | bytes, address: str | bytes,
title: str,
description: str | None, description: str | None,
extra: str | None, extra: str | None,
chunkify: bool, chunkify: bool,

1
core/src/trezor/ui/layouts/mercury/__init__.py
View File

@ -469,6 +469,7 @@ async def show_address(
RustLayout( RustLayout(
trezorui2.flow_get_address( trezorui2.flow_get_address(
address=address, address=address,
title=title or TR.address__title_receive_address,
description=network or "", description=network or "",
extra=None, extra=None,
chunkify=chunkify, chunkify=chunkify,

2
tests/input_flows.py
View File

@ -644,7 +644,7 @@ class InputFlowShowXpubQRCode(InputFlowBase):
br = yield br = yield
layout = self.debug.wait_layout() layout = self.debug.wait_layout()
TR.assert_in(layout.title(), "address__title_receive_address") assert layout.title() in TR.translate("address__public_key") + ["XPUB"]
self.debug.click(buttons.CORNER_BUTTON, wait=True) self.debug.click(buttons.CORNER_BUTTON, wait=True)
assert "VerticalMenu" in self.all_components() assert "VerticalMenu" in self.all_components()

2302
tests/ui_tests/fixtures.json
View File

File diff suppressed because it is too large Load Diff