Skip to content

Commit c9e0a61

Browse files
committed
Reset states after navigating to the settings page
1 parent b56111a commit c9e0a61

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

app/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ extern "C" fn sample_main() {
5757

5858
loop {
5959
let event = if tx_reviewer.display_settings() {
60+
tx_reviewer.reset_display_settings();
6061
nbgl_display::<Ins>(&mut comm, settings_strings, 0)
6162
} else if !tx_reviewer.review_started() {
6263
nbgl_display::<Ins>(&mut comm, settings_strings, INIT_HOME_PAGE as u8)

app/src/ui/nbgl/tx_reviewer_inner.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl TxReviewerInner {
103103

104104
pub fn finish_review<'a>(&mut self, fee_fields: &'a [Field<'a>]) -> Result<(), ErrorCode> {
105105
assert!(!fee_fields.is_empty());
106-
self.display_settings = false;
106+
self.reset_display_settings();
107107
self.review_fields(fee_fields, "Fees")?;
108108
let message = if self.is_tx_execute_script {
109109
"Accept risk and sign transaction"
@@ -149,4 +149,9 @@ impl TxReviewerInner {
149149
}
150150
Err(ErrorCode::BlindSigningDisabled)
151151
}
152+
153+
#[inline]
154+
pub fn reset_display_settings(&mut self) {
155+
self.display_settings = false;
156+
}
152157
}

app/src/ui/tx_reviewer.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,12 @@ impl TxReviewer {
579579
pub fn review_started(&self) -> bool {
580580
self.inner.review_started
581581
}
582+
583+
#[cfg(any(target_os = "stax", target_os = "flex"))]
584+
#[inline]
585+
pub fn reset_display_settings(&mut self) {
586+
self.inner.reset_display_settings()
587+
}
582588
}
583589

584590
// Output indexes for review

0 commit comments

Comments
 (0)