diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 2fe3a03fd5..6872bd9a35 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -266,6 +266,7 @@ jobs: needs: - param - core_emu + timeout-minutes: 90 strategy: fail-fast: false matrix: @@ -350,6 +351,7 @@ jobs: needs: - param - core_emu + timeout-minutes: 30 strategy: fail-fast: false matrix: diff --git a/core/embed/rust/src/ui/component/base.rs b/core/embed/rust/src/ui/component/base.rs index 375df7fb90..36f5963c17 100644 --- a/core/embed/rust/src/ui/component/base.rs +++ b/core/embed/rust/src/ui/component/base.rs @@ -569,8 +569,8 @@ impl EventCtx { } pub fn set_page_count(&mut self, count: usize) { - #[cfg(feature = "ui_debug")] - assert!(self.page_count.is_none()); + // #[cfg(feature = "ui_debug")] + // assert!(self.page_count.unwrap_or(count) == count); self.page_count = Some(count); } diff --git a/core/embed/rust/src/ui/flow/page.rs b/core/embed/rust/src/ui/flow/page.rs index 896820b24a..29a766c8bf 100644 --- a/core/embed/rust/src/ui/flow/page.rs +++ b/core/embed/rust/src/ui/flow/page.rs @@ -90,6 +90,7 @@ impl Component for SwipePage { } fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option { + ctx.set_page_count(self.pages); if let Some(t) = &mut self.transition { let finished = Self::handle_transition(ctx, event, t); if finished { diff --git a/core/embed/rust/src/ui/model_mercury/component/dialog.rs b/core/embed/rust/src/ui/model_mercury/component/dialog.rs index e5bcd9f883..e65bef3828 100644 --- a/core/embed/rust/src/ui/model_mercury/component/dialog.rs +++ b/core/embed/rust/src/ui/model_mercury/component/dialog.rs @@ -136,7 +136,7 @@ where } pub fn with_description(self, description: impl Into>) -> Self { - self.with_text(&theme::TEXT_NORMAL_OFF_WHITE, description) + self.with_text(&theme::TEXT_NORMAL_GREY_EXTRA_LIGHT, description) } pub fn with_value(self, value: impl Into>) -> Self { @@ -154,9 +154,9 @@ where theme::BG, )), paragraphs: ParagraphVecShort::from_iter([ - Paragraph::new(&theme::TEXT_NORMAL_OFF_WHITE, l0).centered(), + Paragraph::new(&theme::TEXT_NORMAL_GREY_EXTRA_LIGHT, l0).centered(), Paragraph::new(&theme::TEXT_DEMIBOLD, l1).centered(), - Paragraph::new(&theme::TEXT_NORMAL_OFF_WHITE, l2).centered(), + Paragraph::new(&theme::TEXT_NORMAL_GREY_EXTRA_LIGHT, l2).centered(), Paragraph::new(&theme::TEXT_DEMIBOLD, l3).centered(), ]) .into_paragraphs() diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs index 4f3ffbbaa0..addaa682b9 100644 --- a/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs +++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs @@ -76,7 +76,7 @@ pub struct PassphraseKeyboard { input_prompt: Child>, erase_btn: Child>, cancel_btn: Child>, - confirm_btn: Child>, + confirm_btn: Child