From 4c3e881a9d13be01219e9daaa24794d19955a6d7 Mon Sep 17 00:00:00 2001 From: grdddj Date: Wed, 23 Aug 2023 10:51:39 +0200 Subject: [PATCH 1/2] chore(core): replace `View full` button text with `Show all` [no changelog] --- core/embed/rust/src/ui/model_tr/component/address_details.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/embed/rust/src/ui/model_tr/component/address_details.rs b/core/embed/rust/src/ui/model_tr/component/address_details.rs index 65ef446f0ab..c4b47a246ea 100644 --- a/core/embed/rust/src/ui/model_tr/component/address_details.rs +++ b/core/embed/rust/src/ui/model_tr/component/address_details.rs @@ -108,7 +108,7 @@ where /// Button layout for the current page. /// Normally there are arrows everywhere, apart from the right side of the - /// last page. On xpub pages there is VIEW FULL middle button when it + /// last page. On xpub pages there is SHOW ALL middle button when it /// cannot fit one page. On xpub subpages there are wide arrows to /// scroll. fn get_button_layout(&mut self) -> ButtonLayout { @@ -123,7 +123,7 @@ where } else { let left = Some(ButtonDetails::left_arrow_icon()); let middle = if self.is_xpub_page() && self.subpages_in_current_page() > 1 { - Some(ButtonDetails::armed_text("VIEW FULL".into())) + Some(ButtonDetails::armed_text("SHOW ALL".into())) } else { None }; From cddc1f92baf565e2e1aacea1a9cf199f07747cf7 Mon Sep 17 00:00:00 2001 From: grdddj Date: Mon, 28 Aug 2023 09:59:13 +0200 Subject: [PATCH 2/2] chore(tests): regenerate fixtures [no changelog] --- tests/ui_tests/fixtures.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index e649aa34e02..9a546ef988c 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -861,12 +861,12 @@ "TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-86h-0h-12h-0-0-InputScriptType.SPENDTAP-4c5b2b38": "6dc182e19b40adf4ca57ef70ca51f125e617cb2679cb3011ae14abcfb40ddd84", "TR_bitcoin-test_getaddress_show.py::test_show_multisig_15": "8fce503b08fbaa4a5e5a9dd75c0dde2ab2cdbd5d56776f2094207662238fb690", "TR_bitcoin-test_getaddress_show.py::test_show_multisig_3": "87c29c513ce51ddacf1546243c38f3a172242cb96b022be9d6bbf1fd2643fed9", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "25f03d82d2ca98a03c923c987368d0308d1c51d6389774f9a9b6fc259bdf5a91", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "25f03d82d2ca98a03c923c987368d0308d1c51d6389774f9a9b6fc259bdf5a91", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "52315ea8b62cc0149e8fb54ab5552fdd3f6df35c789582fe60f9ba2ff47ae97e", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "b0956d088fc0a1bdb2ca75e0078a59f213aca93a209859e3f235b7bde77467e6", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "b1ce781c4f10a5207c1f41d3f38227abe10f2fda8752196d61ab63009e95a09a", -"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "5dd13f9615e4d1d051af609a41f971344fdaa766f5c7530ee11f1c247f504c7a", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "0e71d724b9fca31ae3edb818286439be6a2681a9b476734154c8225cd9e448fd", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "0e71d724b9fca31ae3edb818286439be6a2681a9b476734154c8225cd9e448fd", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "0e469b35904c69f883ef990d71374ce83c9e156c6eaf3e8fbc828756dc6dd34c", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "69673206ac52c3ea5fd902ce8e64cd566caaf75977103478c4a002ae3ddf9812", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "1b8567442723a175a3e3725ef8c84a59f333ccd021c3237bff26dcc69556d8a0", +"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "54cee9b8c6a116950c0511e1e3e0eb865237883bee33224decceec83125e66db", "TR_bitcoin-test_getaddress_show.py::test_show_tt[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-7e3bc134": "f2d14b4193c6e7cbbcc905f3c2820e4a64c10bd629fc8646eaa6ecd8a76d3c14", "TR_bitcoin-test_getaddress_show.py::test_show_tt[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWIT-fffcf75c": "01f1d349bb7ab583b269109d94aa9f425efe603dd20848ee40db3c77c9358557", "TR_bitcoin-test_getaddress_show.py::test_show_tt[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-2ad0a0fd": "08b93040d77975635e2ffaec9b0f5858450c8dc835b50b7e6fc9321710c8bf53",