diff --git a/core/.changelog.d/4819.fixed b/core/.changelog.d/4819.fixed new file mode 100644 index 0000000000..7597f3b214 --- /dev/null +++ b/core/.changelog.d/4819.fixed @@ -0,0 +1 @@ +Updated EIP-1559 fee-related labels. diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index 0e73173e6f..99c6e280c1 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -450,7 +450,7 @@ pub enum TranslatedString { #[cfg(feature = "universal_fw")] ethereum__gas_price = 275, // "Gas price" #[cfg(feature = "universal_fw")] - ethereum__max_gas_price = 276, // "Max gas price" + ethereum__max_gas_price = 276, // "Max fee per gas" #[cfg(feature = "universal_fw")] ethereum__name_and_version = 277, // "Name and version" #[cfg(feature = "universal_fw")] @@ -458,7 +458,7 @@ pub enum TranslatedString { #[cfg(feature = "universal_fw")] ethereum__no_message_field = 279, // "No message field" #[cfg(feature = "universal_fw")] - ethereum__priority_fee = 280, // "Priority fee" + ethereum__priority_fee = 280, // "Max priority fee" #[cfg(feature = "universal_fw")] ethereum__show_full_array = 281, // "Show full array" #[cfg(feature = "universal_fw")] @@ -1853,7 +1853,7 @@ impl TranslatedString { #[cfg(feature = "universal_fw")] Self::ethereum__gas_price => "Gas price", #[cfg(feature = "universal_fw")] - Self::ethereum__max_gas_price => "Max gas price", + Self::ethereum__max_gas_price => "Max fee per gas", #[cfg(feature = "universal_fw")] Self::ethereum__name_and_version => "Name and version", #[cfg(feature = "universal_fw")] @@ -1861,7 +1861,7 @@ impl TranslatedString { #[cfg(feature = "universal_fw")] Self::ethereum__no_message_field => "No message field", #[cfg(feature = "universal_fw")] - Self::ethereum__priority_fee => "Priority fee", + Self::ethereum__priority_fee => "Max priority fee", #[cfg(feature = "universal_fw")] Self::ethereum__show_full_array => "Show full array", #[cfg(feature = "universal_fw")] diff --git a/core/mocks/trezortranslate_keys.pyi b/core/mocks/trezortranslate_keys.pyi index 24b3f60335..277b196857 100644 --- a/core/mocks/trezortranslate_keys.pyi +++ b/core/mocks/trezortranslate_keys.pyi @@ -303,11 +303,11 @@ class TR: ethereum__gas_limit: str = "Gas limit" ethereum__gas_price: str = "Gas price" ethereum__interaction_contract: str = "Interaction contract" - ethereum__max_gas_price: str = "Max gas price" + ethereum__max_gas_price: str = "Max fee per gas" ethereum__name_and_version: str = "Name and version" ethereum__new_contract: str = "New contract will be deployed" ethereum__no_message_field: str = "No message field" - ethereum__priority_fee: str = "Priority fee" + ethereum__priority_fee: str = "Max priority fee" ethereum__show_full_array: str = "Show full array" ethereum__show_full_domain: str = "Show full domain" ethereum__show_full_message: str = "Show full message" diff --git a/core/translations/en.json b/core/translations/en.json index 70a09846a3..4c63570fef 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -305,11 +305,11 @@ "ethereum__gas_limit": "Gas limit", "ethereum__gas_price": "Gas price", "ethereum__interaction_contract": "Interaction contract", - "ethereum__max_gas_price": "Max gas price", + "ethereum__max_gas_price": "Max fee per gas", "ethereum__name_and_version": "Name and version", "ethereum__new_contract": "New contract will be deployed", "ethereum__no_message_field": "No message field", - "ethereum__priority_fee": "Priority fee", + "ethereum__priority_fee": "Max priority fee", "ethereum__show_full_array": "Show full array", "ethereum__show_full_domain": "Show full domain", "ethereum__show_full_message": "Show full message", diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 61d58e5964..7bb17ba16a 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -13866,22 +13866,22 @@ "T3B1_en_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_data_go_back]": "8e9452f366c136c30fd45395d2c0cb8e4924c086b5b3d56c813e228c7a16d663", "T3B1_en_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_data_scroll_down]": "43a29fffe97957fcd32dc55777de277f2f27f21b77b5daf5029bbe9969e1c2d3", "T3B1_en_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_data_skip]": "58f34efc8c885f5574d511107d08b28c46b9a0897e5ecd283a3f36d24a49b77b", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-Ledger Live legacy path]": "8ba7fed5cd810356165b163e991cc680845dbb3323f80a2d936ef82059b74cd3", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-data_1]": "d5898a2f316d80045f57221c9dfca7eb16da9f734bbf82c6c960fbe5a8dbf597", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-data_2_bigdata]": "ad972ccd3793fd2a3c8eb176b2dcb6456308ed3134fbc7a203c83e2dbc6a1457", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-erc20]": "2937fc2d71489dbbf997cae4f8aa158c37b5724f630381db4b99b692ab9b1b1b", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-large_chainid]": "f3c9dd33acb8b84707f54b63c673d6a4e945d959a593d44ca0d19fdff86b3924", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-long_fees]": "cbde6ac7330c7899a3bcb7a7b815c1e40116922d1ce8df98a397b314827c0d52", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-nodata]": "8ba7fed5cd810356165b163e991cc680845dbb3323f80a2d936ef82059b74cd3", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-Ledger Live legacy path]": "355aa8f9dd6ff3970f9dcecaa0371952aa300e4fe810c56ca4716ab1227514d9", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-data_1]": "e2f3037a4ca38b9889742b404589bc21da36d12b66f3989fe8f546dafc0c93d9", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-data_2_bigdata]": "ed30c0408f251211c747cf8eceef2dd4d72def3652cec0955f686618eaa51f0c", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-erc20]": "ca21afa79e0ff6efb22068311df20bc7744fa4dbe461fa5ba98cc13a2c868e4f", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-large_chainid]": "c511db02f55e985dfb9c57cfc74ea619f213097965843107c8ecf781e61d47a0", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-long_fees]": "42be17316bcd0f55c8b7b49e32d9fae6a7f867d3948774862f0e6a30bb5e2b78", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-nodata]": "355aa8f9dd6ff3970f9dcecaa0371952aa300e4fe810c56ca4716ab1227514d9", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "007ad4b403183cd1386f859665e7cac022f2d93a77b4274868a49b69fc1e5a57", -"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559_access_list_larger": "007ad4b403183cd1386f859665e7cac022f2d93a77b4274868a49b69fc1e5a57", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-Ledger Live legacy path]": "302aff42c505a7a5cd260e064b382e7c38867d4b3b209070a12628da92db40b0", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-data_1]": "5c4a80533d62dc6a63b47e0310c7f4f4577440e18bc47bd11633c1eb6dbe7e7d", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-data_2_bigdata]": "e601f626dd492d8a1957b5bd4141b824a208aa269b72b63cd9fb7b3182f0f27e", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-erc20]": "64d9ea40eaf04e3b9dd11c5867a3913a686b8dc352c85c9e78f20476ac5d8b87", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-large_chainid]": "db079e6bcf9b3dd429d293d0a56d4d7af30302c26f42ad177ab2d292d29014f5", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-long_fees]": "f63b15ac7aef4239200122b9c6ac214ca677798ac06067addc66fe75945dc93a", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[False-nodata]": "302aff42c505a7a5cd260e064b382e7c38867d4b3b209070a12628da92db40b0", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-Ledger Live legacy path]": "ab5c1aed9a1f03c2f9388c426fe46691d5b14cafdc53d4ecb141f315be75e9ed", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-data_1]": "d3acf723463c6a5fcda54caca1355eb8cf455e42dc170b1ec84e7b3c80f6346a", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-data_2_bigdata]": "9293e9741cdf4cc06a9ed1d7f40fcc8b9eb0acd8ed8054274464c37246d27f0f", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-erc20]": "6de2905f726244221138fe7be13e8d76f9c27bf70b1129cb7d7d404a01f51774", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-large_chainid]": "56de43476315b3f8030d3edae5852aa89221e7dfb702ddf91729588ec05b31ae", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-long_fees]": "2e8aca6b4215fd54717a7b7928f339a19b65512647a45a6c43fa5c322ef9bd07", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559[True-nodata]": "ab5c1aed9a1f03c2f9388c426fe46691d5b14cafdc53d4ecb141f315be75e9ed", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "5c66a2bb6fab3a051eca0abfbeff85791b1324f7ed111c2275f7dc071b577fb3", +"T3B1_en_ethereum-test_signtx.py::test_signtx_eip1559_access_list_larger": "5c66a2bb6fab3a051eca0abfbeff85791b1324f7ed111c2275f7dc071b577fb3", "T3B1_en_ethereum-test_signtx.py::test_signtx_fee_info": "7bba106119e41b4b3fca10190cdd7d770c0d7f0235bc354a73a22bb26b81d159", "T3B1_en_ethereum-test_signtx.py::test_signtx_go_back_from_summary": "622492b78f56cf2e181af3561dfc01125920bf6d841aa4b7f5725e0104dea1bf", "T3B1_en_ethereum-test_signtx.py::test_signtx_staking[False-claim_holesky]": "b50ae1fc53a5175d452232131c43dad00164babc91a284832a9d6d8cd738eefe", @@ -13901,12 +13901,12 @@ "T3B1_en_ethereum-test_signtx.py::test_signtx_staking_bad_inputs[stake_bad_inputs_2]": "8fe8974766c33403b1b330cde685f65dcfb6e151981d94edae1dc6ba63d2dc0b", "T3B1_en_ethereum-test_signtx.py::test_signtx_staking_bad_inputs[unstake_bad_inputs_1]": "8fe8974766c33403b1b330cde685f65dcfb6e151981d94edae1dc6ba63d2dc0b", "T3B1_en_ethereum-test_signtx.py::test_signtx_staking_bad_inputs[unstake_bad_inputs_2]": "8fe8974766c33403b1b330cde685f65dcfb6e151981d94edae1dc6ba63d2dc0b", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[claim_holesky]": "94e172576466389a6836c2459d65696dca6ce0eb299a69dfec60718ef7d0f577", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[claim_mainnet]": "94e172576466389a6836c2459d65696dca6ce0eb299a69dfec60718ef7d0f577", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[stake_holesky]": "0c4e0544e882381b5c6ae7828a55fd11af8188b569d9f47d70dbe43b4a45b213", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[stake_main]": "0c4e0544e882381b5c6ae7828a55fd11af8188b569d9f47d70dbe43b4a45b213", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[unstake_holesky]": "42fd0c260dbdc90909b8686ad4920f653f0e2457b6b1135125decccac88ef76c", -"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[unstake_main]": "42fd0c260dbdc90909b8686ad4920f653f0e2457b6b1135125decccac88ef76c", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[claim_holesky]": "926c9523970458f39383473adab54961aeab31a57e441fef72f5fe08cc50a48c", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[claim_mainnet]": "926c9523970458f39383473adab54961aeab31a57e441fef72f5fe08cc50a48c", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[stake_holesky]": "31801bebd12d6b71cf658137f2413b889be3a22b7eee1fdf834e3015d1bc62f8", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[stake_main]": "31801bebd12d6b71cf658137f2413b889be3a22b7eee1fdf834e3015d1bc62f8", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[unstake_holesky]": "93f21cb7a4cbad6060de944c35403e4f5f0f6b43706db2e450908e98efa6e47c", +"T3B1_en_ethereum-test_signtx.py::test_signtx_staking_eip1559[unstake_main]": "93f21cb7a4cbad6060de944c35403e4f5f0f6b43706db2e450908e98efa6e47c", "T3B1_en_misc-test_msg_cipherkeyvalue.py::test_decrypt": "64fcfa249a4d36367f5da39e023d9bf3c193469a986d45c64d2cf3ac2f574774", "T3B1_en_misc-test_msg_cipherkeyvalue.py::test_decrypt_badlen": "1477d62e338f4d7c1bfac2fc5d2fc231218da5768666c11482dc1f83229506f3", "T3B1_en_misc-test_msg_cipherkeyvalue.py::test_encrypt": "e2a9a7e518de0ef49f5bcbaa87f8558483fc5ca5527141b629b3fbc6ab33faa7",