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

trezor · Dec 11, 2024 · e6802bd · e6802bd
1 parent a0bd486
commit e6802bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/.changelog.d/4421.fixed b/core/.changelog.d/4421.fixed
@@ -0,0 +1 @@
+[T3T1] Fix swiping into empty page.
diff --git a/core/embed/rust/src/ui/model_mercury/flow/confirm_action.rs b/core/embed/rust/src/ui/model_mercury/flow/confirm_action.rs
@@ -248,7 +248,6 @@ fn new_confirm_action_uni<T: Component + Paginate + MaybeTrace + 'static>(
     let mut content = Frame::left_aligned(strings.title, content)
         .with_margin(frame_margin)
         .with_swipe(Direction::Up, SwipeSettings::default())
-        .with_swipe(Direction::Left, SwipeSettings::default())
         .with_vertical_pages()
         .with_footer(
             TR::instructions__swipe_up.into(),
@@ -257,7 +256,9 @@ fn new_confirm_action_uni<T: Component + Paginate + MaybeTrace + 'static>(
 
     match extra {
         ConfirmActionExtra::Menu { .. } => {
-            content = content.with_menu_button();
+            content = content
+                .with_menu_button()
+                .with_swipe(Direction::Left, SwipeSettings::default());
         }
         ConfirmActionExtra::Cancel => {
             content = content.with_cancel_button();