From 770cd19899e603847c118a58513a82cf854fe0d5 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] --- common/tests/fixtures/ethereum/sign_tx_eip1559.json | 10 +++++----- legacy/firmware/layout2.c | 2 +- tests/ui_tests/fixtures.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/tests/fixtures/ethereum/sign_tx_eip1559.json b/common/tests/fixtures/ethereum/sign_tx_eip1559.json index d562539153..6f59186155 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 9d2c5f9736..0b7b00a5d3 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 9d2d5b5e37..01126f498a 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", @@ -1462,7 +1462,7 @@ "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]": "51c38dc04c2378b52c798ae37cf6bfb71d86f551d4afa3daecddfdf073350485", +"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",