Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disallow canceling on uncancelable pages on T3B1 #4506

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Disallow canceling on uncancelable pages on T3B1 #4506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/.changelog.d/4500.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[T3B1] Fix backup failing if middle button is pressed during confirmation.
6 changes: 5 additions & 1 deletion core/embed/rust/src/ui/layout_samson/component/button_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,11 @@ impl Component for ButtonController {
} else {
(
ButtonState::OneReleased(b),
Some(ButtonControllerMsg::Triggered(b.into(), false)),
match b {
PhysicalButton::Left => self.left_btn.maybe_trigger(ctx),
PhysicalButton::Right => self.right_btn.maybe_trigger(ctx),
_ => None,
},
)
}
}
Expand Down
4 changes: 3 additions & 1 deletion core/embed/rust/src/ui/layout_samson/component/page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,11 @@ where
// Clicked BACK. Scroll up.
self.go_to_previous_page();
self.change_page(ctx);
} else {
} else if self.cancel_btn_details.is_some() {
// Clicked CANCEL. Send result.
return Some(PageMsg::Cancelled);
} else {
return None;
}
}
ButtonPos::Right => {
Expand Down
Loading