From 1eb0eb9d91b092e571aac63db4ebff2a07fd8a1f Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 2 Mar 2023 11:28:00 +0100 Subject: [PATCH] fix(legacy): lower maximum of chars per line so that we actually fit if all the biggest characters are used [no changelog] (cherry picked from commit 770cd19899e603847c118a58513a82cf854fe0d5) --- .../fixtures/ethereum/sign_tx_eip1559.json | 10 +++++----- legacy/firmware/layout2.c | 2 +- tests/ui_tests/fixtures.json | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/tests/fixtures/ethereum/sign_tx_eip1559.json b/common/tests/fixtures/ethereum/sign_tx_eip1559.json index d56253915..6f5918615 100644 --- a/common/tests/fixtures/ethereum/sign_tx_eip1559.json +++ b/common/tests/fixtures/ethereum/sign_tx_eip1559.json @@ -148,15 +148,15 @@ "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, "nonce": "0x0", - "gas_limit": "0x141414141414141414", - "max_gas_fee": "0x14141414141414141414", - "max_priority_fee": "0x11111111111111111", + "gas_limit": "0xff", + "max_gas_fee": "0x15681d9b48e13b1e2", + "max_priority_fee": "0x6b14e9f812f366fb9", "value": "0xa" }, "result": { "sig_v": 0, - "sig_r": "3f3bfa6762b33819f268a98744803e1876aa440a6fd2ebef90cfd606bb893429", - "sig_s": "241e1128a715a5386c3b6d0998f9f42c21ee080568fbf2c642a05916c30737e2" + "sig_r": "e592ffedd8b802c95b634520f2b700f27e394ed47fe2555f2f378e26cdc2c1ff", + "sig_s": "0ad471ea5e6fdc90dc25c4a012f12d48bb3d5679cd5a39ad7d5bbfc26b5d333f" } } ] diff --git a/legacy/firmware/layout2.c b/legacy/firmware/layout2.c index 9d2c5f973..0b7b00a5d 100644 --- a/legacy/firmware/layout2.c +++ b/legacy/firmware/layout2.c @@ -263,7 +263,7 @@ void *layoutLast = NULL; void layoutDialogSwipeWrapping(const BITMAP *icon, const char *btnNo, const char *btnYes, const char *heading, const char *description, const char *wrap_text) { - const uint32_t row_len = 20; + const uint32_t row_len = 18; const char **str = split_message((const uint8_t *)wrap_text, strlen(wrap_text), row_len); layoutDialogSwipe(icon, btnNo, btnYes, NULL, heading, description, str[0], diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 5998ae0a5..ccde9bb8d 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -427,7 +427,7 @@ "T1_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "28d2a0d397b4e9865ca8286cc1a3669c3a7d34bb31b430662354bf3ec69d1cc5", "T1_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "b8e205a40711e377f2185cec6e085fa2f6a4d5bbc6a03d9cf2758058b6c1e17b", "T1_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "5b008a081b4ef9e7b47c9d0c1fc4bb24d729d77841193694232bd2da4a386515", -"T1_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "ae698173acb069ced4d987735e53f8d46197dedb3d4b215c0dc02023ce8e986d", +"T1_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "ef84e6b4ae6ff0b4c9d22a4b6356c8c67affbf28882e83cef4aea6e93b4bdcf5", "T1_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "5b008a081b4ef9e7b47c9d0c1fc4bb24d729d77841193694232bd2da4a386515", "T1_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "548c1f22918351e9cbcc1e16d8ba67bc2e7460b9a92cfc6c8bfa0a2b063e68da", "T1_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "f6c5f398d4e80fc8f93cf70e9b10de24b9a968db04dc6ea21b28d1a273f04ca1", @@ -1457,14 +1457,14 @@ "TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_go_back]": "cb6d2a60c192b972e2cff02c4f7a6396184ba1a46df3c05b947e089f94427f0f", "TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_scroll_down]": "861ad7ab30bc8ea6edcc8138e86c654d04f9231dfd14ec1ca391820f145f7e57", "TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_skip]": "a8310b52786197219e3fb8399b19e624bbb74370a080c410daecc7f7422ea9cf", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[Ledger Live legacy path]": "66b381da23a9f31f962115de7a8ae95d575eda72f665d2d65f00bead78cdab48", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_1]": "5165979cd94b31b68ca478f2f230ee1470c74e2cf0cc80d53fc0278c41f34d1f", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "1da940fdb1d80374ebb1eb3922ab15bccf54eaec6ed40ce83834a93695fa1311", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "0e43071011c080f3a64130113914a03285f35c0e9c69379f6c94eda48dc9816f", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "c2fa2b3fe49f369b7cf1da456cdd08fc56d232155aa48232ef5ba965df9cafaa", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "dd272effd96a8ba69c2ef4ae3369963d03de957830e61de2a3f00e8ca7ba1f42", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "66b381da23a9f31f962115de7a8ae95d575eda72f665d2d65f00bead78cdab48", -"TT_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "541822da15b3d11952c9329092d38ba363ca021a0193967e441a2feb59b771fb", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[Ledger Live legacy path]": "11dde80cec962e0ed13d036455f72bdaba4480b5b80ef85255540727e497feed", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_1]": "9a1dfddc74a87f6ad67d45efeb9117918570d9f768019d8614f873389716af39", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "2bd2220cabf0625a12aa7c0ad8dd9d4f03db0fc9c9af0e15579271334c8558bb", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "9af8e6fa7cf9411dab4be1dd4566788b08fa7fc0347e0a47580f51875ddd9a0b", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "19e9d757f4a896db3f06538cd5a5bcf6a54a354101634c336c9d09554a7e10e7", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "709b2333c3811d957df9f068929a61c7e5ac95a87caeb1e2a6dcdb731045d840", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "11dde80cec962e0ed13d036455f72bdaba4480b5b80ef85255540727e497feed", +"TT_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "c021afc221550999f2842bce9be2f06cf46f69ab4155cbe0776e21f036ae21a9", "TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "e32e0029dedc39857f3d8eb31ce8cf7a06d32e6ca81df7d67586fce123df4f7d", "TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list_larger": "e32e0029dedc39857f3d8eb31ce8cf7a06d32e6ca81df7d67586fce123df4f7d", "TT_misc-test_cosi.py::test_cosi_different_key": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",