arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-27 15:51:02 +00:00
Code Issues Releases Wiki Activity

fix(core/ui): don't swipe left if there is no menu

Browse Source
This commit is contained in:
Ioan Bizău 2024-12-06 13:42:32 +01:00 committed by Ioan Bizău
parent a0bd4860ca
commit e6802bdd09
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/.changelog.d/4421.fixed Normal file
View File

@ -0,0 +1 @@
[T3T1] Fix swiping into empty page.

5
core/embed/rust/src/ui/model_mercury/flow/confirm_action.rs
View File

@ -248,7 +248,6 @@ fn new_confirm_action_uni<T: Component + Paginate + MaybeTrace + 'static>(
let mut content = Frame::left_aligned(strings.title, content) let mut content = Frame::left_aligned(strings.title, content)
.with_margin(frame_margin) .with_margin(frame_margin)
.with_swipe(Direction::Up, SwipeSettings::default()) .with_swipe(Direction::Up, SwipeSettings::default())
.with_swipe(Direction::Left, SwipeSettings::default())
.with_vertical_pages() .with_vertical_pages()
.with_footer( .with_footer(
TR::instructions__swipe_up.into(), TR::instructions__swipe_up.into(),
@ -257,7 +256,9 @@ fn new_confirm_action_uni<T: Component + Paginate + MaybeTrace + 'static>(
match extra { match extra {
ConfirmActionExtra::Menu { .. } => { ConfirmActionExtra::Menu { .. } => {
content = content.with_menu_button(); content = content
.with_menu_button()
.with_swipe(Direction::Left, SwipeSettings::default());
} }
ConfirmActionExtra::Cancel => { ConfirmActionExtra::Cancel => {
content = content.with_cancel_button(); content = content.with_cancel_button();