arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

fix(core/ui): hold to confirm when finializing replacement transaction

Browse Source 
[no changelog]
This commit is contained in:
Martin Milata 2023-04-09 18:32:58 +02:00
parent 46940521d8
commit 2456219d52
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/embed/rust/src/ui/model_tt/layout.rs
View File

@ -876,16 +876,10 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m
Paragraph::new(&theme::TEXT_MONO, total_fee_new),
]);
let buttons = Button::cancel_confirm(
Button::with_icon(Icon::new(theme::ICON_CANCEL)),
Button::with_text("NEXT").styled(theme::button_confirm()),
true,
);
let obj = LayoutObj::new(Frame::left_aligned(
theme::label_title(),
"MODIFY FEE",
SwipePage::new(paragraphs, buttons, theme::BG).with_cancel_on_first_page(),
SwipeHoldPage::new(paragraphs, theme::BG),
))?;
Ok(obj.into())
};

20
tests/ui_tests/fixtures.json
View File

@ -1079,20 +1079,20 @@
"TT_bitcoin-test_signtx_replacement.py::test_attack_fake_int_input_amount": "f97a9ce841c7ceddbe8e1fd4c39a68c40b4606058eab4cc2c02c1d2143c60a38",
"TT_bitcoin-test_signtx_replacement.py::test_attack_false_internal": "f97a9ce841c7ceddbe8e1fd4c39a68c40b4606058eab4cc2c02c1d2143c60a38",
"TT_bitcoin-test_signtx_replacement.py::test_attack_steal_change": "11f992c1ee9aebb9c672be1ff0b6606368b84ecb340cfdde2a085c89db712657",
"TT_bitcoin-test_signtx_replacement.py::test_p2pkh_fee_bump": "ab1cc2908d43d5ef658677f946cc7f8ab05e0f37f94dce9fc4a083d4c3a1eabc",
"TT_bitcoin-test_signtx_replacement.py::test_p2tr_fee_bump": "04324465111bf0525755b9c8285ad6f4d061b0e2a7ceba3da4cba043c254bad8",
"TT_bitcoin-test_signtx_replacement.py::test_p2tr_invalid_signature": "04324465111bf0525755b9c8285ad6f4d061b0e2a7ceba3da4cba043c254bad8",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_finalize": "a5658a57adb56abe5d1c4d18362a461eac487d62b0a3fc1b6199058a281e4e88",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_fee_bump_from_external": "20c06bf9ae01bb4625e7665044326fa14eb37069113ca1d79786b9410549081b",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_remove_change": "0fa3fd26764313a18d935e1520be218412e8c743965b2393b73fb3e23f405d53",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_invalid_signature": "a5658a57adb56abe5d1c4d18362a461eac487d62b0a3fc1b6199058a281e4e88",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_op_return_fee_bump": "e0ddefb8913e050bea22ab3b1ccb424293adb63d79cf6d27b5cf584f9b64484d",
"TT_bitcoin-test_signtx_replacement.py::test_p2pkh_fee_bump": "fbf869ddec563f34f168eaa42a7e4c2c6764d21541d3199ce38660639d5ca094",
"TT_bitcoin-test_signtx_replacement.py::test_p2tr_fee_bump": "036353f716b4cc3dfe8159896e5fbbda99083428d20529a0e0bdadee3b065f9b",
"TT_bitcoin-test_signtx_replacement.py::test_p2tr_invalid_signature": "036353f716b4cc3dfe8159896e5fbbda99083428d20529a0e0bdadee3b065f9b",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_finalize": "b6cc31733a28894d9a9e4399f544ca87a3d36b80aa4eb405bba87c93f366f533",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_fee_bump_from_external": "331be8a8cac9da46160d3a999267d91328d75a4855d23797e85cb3b9a2ea6107",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_remove_change": "bd04e0c7d675c9fdb92cbd35e6fff88ecfc99900e6f2e1aaa71ee73e74da1ad6",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_invalid_signature": "b6cc31733a28894d9a9e4399f544ca87a3d36b80aa4eb405bba87c93f366f533",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_op_return_fee_bump": "5ba37ea0a488085f84a977ab26bc892c4ef592a7ef16e7b248781637e493d9bb",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909659-90000-02483045022100aa1b91-c9b963ae": "86967f42e1e91312cf364a9e9b0b99d9c3cf01ceb7d5c6eb94c0925fd7220fc8",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909718-90000-024730440220753f5304-ecb983d1": "86967f42e1e91312cf364a9e9b0b99d9c3cf01ceb7d5c6eb94c0925fd7220fc8",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909800-89859-0248304502210097a42b-7a89e474": "86967f42e1e91312cf364a9e9b0b99d9c3cf01ceb7d5c6eb94c0925fd7220fc8",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89800-02483045022100af3a87-80428fad": "733d1143eeb16f31c4a4dc66de78c1812a39975a2bea9b4d15a58fbcf133024b",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89800-02483045022100af3a87-80428fad": "30f6706f52ef795d528909cab43fd9e07dd9382b8bf2d77228c998ad4d0be62c",
"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89859-02483045022100eb74ab-881c7bef": "86967f42e1e91312cf364a9e9b0b99d9c3cf01ceb7d5c6eb94c0925fd7220fc8",
"TT_bitcoin-test_signtx_replacement.py::test_tx_meld": "983c0decdd9562b2f6e43cddde9f8af8a516aa1b5acfaa61ee07763b9818692c",
"TT_bitcoin-test_signtx_replacement.py::test_tx_meld": "1d4c6f043bfff920d09b8da2201ddffe84d970756a603ff54b9f9b59696c3ef6",
"TT_bitcoin-test_signtx_segwit.py::test_attack_change_input_address": "64771558b8dfb4f6317f95a1bc87c77e8461a7fd7ef6fee39770330984b55373",
"TT_bitcoin-test_signtx_segwit.py::test_attack_mixed_inputs": "e4b8ef3bb921e8f0e7759e91d6b634497bbb92cff213842e30bd9fb83f3353b9",
"TT_bitcoin-test_signtx_segwit.py::test_send_multisig_1": "4f66563032c2db963ad141655c8f362d54360902bc401d5d1101fa243b67dbc6",