From 253f2587dca5604d3f719ab5c92badf1e222e1ce Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 7 Dec 2022 21:19:24 +0100 Subject: [PATCH] fix(core/ui): polish XPUB screen [no changelog] --- core/src/apps/bitcoin/get_public_key.py | 2 +- core/src/trezor/ui/layouts/tt_v2/__init__.py | 6 ++-- tests/ui_tests/fixtures.json | 32 ++++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/src/apps/bitcoin/get_public_key.py b/core/src/apps/bitcoin/get_public_key.py index 000e7fc78..46b47b665 100644 --- a/core/src/apps/bitcoin/get_public_key.py +++ b/core/src/apps/bitcoin/get_public_key.py @@ -82,7 +82,7 @@ async def get_public_key( if msg.show_display: from trezor.ui.layouts import show_xpub - await show_xpub(ctx, node_xpub, "XPUB", "Cancel") + await show_xpub(ctx, node_xpub, "XPUB") return PublicKey( node=node_type, diff --git a/core/src/trezor/ui/layouts/tt_v2/__init__.py b/core/src/trezor/ui/layouts/tt_v2/__init__.py index f2c974b84..6d0db6305 100644 --- a/core/src/trezor/ui/layouts/tt_v2/__init__.py +++ b/core/src/trezor/ui/layouts/tt_v2/__init__.py @@ -336,7 +336,7 @@ async def confirm_path_warning( ) -def _show_xpub(xpub: str, title: str, cancel: str) -> ui.Layout: +def _show_xpub(xpub: str, title: str, cancel: str | None) -> ui.Layout: content = RustLayout( trezorui2.confirm_blob( title=title, @@ -349,11 +349,11 @@ def _show_xpub(xpub: str, title: str, cancel: str) -> ui.Layout: return content -async def show_xpub(ctx: GenericContext, xpub: str, title: str, cancel: str) -> None: +async def show_xpub(ctx: GenericContext, xpub: str, title: str) -> None: await raise_if_not_confirmed( interact( ctx, - _show_xpub(xpub, title, cancel), + _show_xpub(xpub, title, None), "show_xpub", ButtonRequestType.PublicKey, ) diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 275955bb6..18e61b862 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -656,22 +656,22 @@ "TT_bitcoin-test_decred.py::test_send_decred": "69f9da1d576f445c24abfc82a9251a38d08a3bb93a10a2b9bf662342b864e05e", "TT_bitcoin-test_decred.py::test_send_decred_change": "a754ed4bfc8cdea51e9fd136e041bb05ab814bcd9ea5aa4927abe2cc95276bca", "TT_bitcoin-test_decred.py::test_spend_from_stake_generation_and_revocation_decred": "ca091e189a453f13ba8f30f13940c6f7be1de2ed076bb7bbc0414564590fe1da", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5-7a80e3db": "173e67419f44ea10b0f66aad3054d91dd78607f68936d6d91d79979fd226c48c", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh-03d56ac2": "24ee36501705f36e13689bb771e4ec1d5810bb9996769109a7f1049c7e24ce23", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c-22751b2f": "b6d49b427da6a2f952b37b197079e58ba1c33e896b5da4103b60cc616c11f160", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([-edfbc435": "4fae569b9f11ef403d5c136c38c9fc2937506822c4ceaacc370c6c7ad6e88fc6", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5-5ab06094": "76d72a0daca234c10c86b55d42987916cfcceb8285daf01e939325cd112a66fc", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh-5dd6ae4b": "5ddaa110591d41abdbd8863a320e6d1d8dda979730919c0e1068065964fda364", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c-f4f20781": "03517dfa40318e280b4047d2120361ebc76ae82c42e4fa4ece1a923262dde8df", -"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([-98a75f0a": "c0025190a185940af3dd157244d54eef4921b9b7254d99b6fbf869383d5f0dbc", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5-f63bf93f": "7b01ecc0104876ce6003036d60e9aaa6b7fb3ceb0ea6504161383d07b0ba0d7d", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh-fd42e1d9": "a87c4cd7ea470539226dd93d81265b34c75ec67314ce9ac2bd01255cb46bed53", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c-a794e72a": "f9b2a868805e17e39812d53c0e0c41920d949c6eff13ef8123841064d854033c", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([-e70d0168": "25cb1ac274e901bdeab20277a41caccb07d9dd717543ccd77ba9c61b6261db36", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5-2d5b32fe": "f8d055fb5d2e0fe12275ed8b9112b5560ac32cb063ecb13fc62a04a7c9e21211", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh-e8c5303c": "8b62d2f4f9b04b65b88ebc6dbe2ec52a4c6dab78d0bfecf3734e7ef8fc678be2", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c-ddc924d3": "82305a00a9a44321bce919a8559cf85b05f3601311633d124c1a0ce93f100083", -"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([-996ae319": "0c9355ccde6a8d78917af23716d40314a1add8f018de427ca19a11b34fca742d", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5-7a80e3db": "d6975d004f70ee48138b41141ef2c80c6c74f11192d5c566022a46ef7629fd2f", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh-03d56ac2": "3f29fcdbf49bfa95526c2393fcb6420eb3ce7d8b5d9c2d55024e462e3ffedb63", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c-22751b2f": "1383481e4c60157d6845b1d0a29e6987f3d80882511c86d233862b82fcd9b355", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([-edfbc435": "acaaaf1d60f908cbe104813d7961ea6e357357058bd0e206b210fb7badde142e", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5-5ab06094": "27a31d2fb540494c57dc604bb7a9564f7ba1424dfb91eb03bcf7e038ef4755fc", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh-5dd6ae4b": "566587cce91598b081ed32ccdebbd251a556c0d2fe2eac683f5678f021df4653", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c-f4f20781": "9456264f57432b39995e432303215718b76addbc033c55b9cc664819b4499fb6", +"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([-98a75f0a": "5415e8cdc6755e866468f57219c5870c799a1f2f54c40d8e639361e81e045619", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5-f63bf93f": "b7bebb1414d4799f5e72eca9f6a588d3f088aa762753542056b9f09e4e81379f", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh-fd42e1d9": "bc1b5b10b76dd62f7c7b738c5c731d31bd53f204b2a179d45843bb98132629fb", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c-a794e72a": "5dea985ab7d6185baef6bf9d2923b90eca017ff27ab894ead13283f8c62aa497", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([-e70d0168": "d579c81cb86b12d8fb7875962b25980b01d14ea7222c1aef6cb44f91b8ec667e", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5-2d5b32fe": "c033c0031be8ac678fd4f8701e2b82eb94b2b23ba5b7aefb439e5cca325e7f0c", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh-e8c5303c": "81571f466358a641aea786fb010780baffed5f990b347ff63b5c9d80226282f7", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c-ddc924d3": "6b6964451c7a7951ace4398a32ea21ede40cb8bf95362d2a09708725e36a10df", +"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([-996ae319": "d36efa9f5ae747d1d7ed70458f724549868d8ac3d6ec7a99dc1fe860f1037543", "TT_bitcoin-test_firo.py::test_spend_lelantus": "1176f2b2c97da24179ed9bf64c5a6a9ded8a120f907cc2907aba24559cb2fd75", "TT_bitcoin-test_fujicoin.py::test_send_p2tr": "1ca5f79eb988a6bc920e54d274839107e0be0eb57dc1f2a142b3638491ce4a89", "TT_bitcoin-test_getaddress.py::test_address_mac": "e0db5107ba371eb8d7039e6ad3138f6bbb731c779f405b75c2e14128dfad756f",