From 421c34a0a2cd9c12ca21450c748efec9658147bc Mon Sep 17 00:00:00 2001
From: tychovrahe <brunam@seznam.cz>
Date: Thu, 18 Apr 2024 10:06:05 +0200
Subject: [PATCH] rebase

---
 core/Makefile                                          |  4 ++--
 core/embed/rust/librust_qstr.h                         |  2 +-
 .../src/ui/model_tt/component/number_input_slider.rs   | 10 +++++-----
 core/embed/rust/src/ui/model_tt/layout.rs              |  2 +-
 core/src/all_modules.py                                |  2 ++
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index dba27525e..64d726435 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -29,8 +29,8 @@ PRODUCTION ?= 0
 PYOPT      ?= 1
 BITCOIN_ONLY ?= 0
 BOOTLOADER_QA ?= 0
-BOOTLOADER_DEVEL ?= 0
-TREZOR_MODEL ?= T
+BOOTLOADER_DEVEL ?= 1
+TREZOR_MODEL ?= T3T1
 TREZOR_MEMPERF ?= 0
 ADDRESS_SANITIZER ?= 0
 CMAKELISTS ?= 0
diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h
index 991daece7..4d0f870e6 100644
--- a/core/embed/rust/librust_qstr.h
+++ b/core/embed/rust/librust_qstr.h
@@ -93,7 +93,6 @@ static void _librust_qstrs(void) {
   MP_QSTR_bounds;
   MP_QSTR_button;
   MP_QSTR_button_event;
-  MP_QSTR_callback;
   MP_QSTR_buttons__abort;
   MP_QSTR_buttons__access;
   MP_QSTR_buttons__again;
@@ -132,6 +131,7 @@ static void _librust_qstrs(void) {
   MP_QSTR_buttons__try_again;
   MP_QSTR_buttons__turn_off;
   MP_QSTR_buttons__turn_on;
+  MP_QSTR_callback;
   MP_QSTR_can_go_back;
   MP_QSTR_cancel_arrow;
   MP_QSTR_cancel_cross;
diff --git a/core/embed/rust/src/ui/model_tt/component/number_input_slider.rs b/core/embed/rust/src/ui/model_tt/component/number_input_slider.rs
index 8cc1db674..382429d6a 100644
--- a/core/embed/rust/src/ui/model_tt/component/number_input_slider.rs
+++ b/core/embed/rust/src/ui/model_tt/component/number_input_slider.rs
@@ -20,8 +20,8 @@ where
     area: Rect,
     callback: F,
     input: Child<NumberInputSlider>,
-    cancel_button: Child<Button<&'static str>>,
-    confirm_button: Child<Button<&'static str>>,
+    cancel_button: Child<Button>,
+    confirm_button: Child<Button>,
 }
 
 impl<F> NumberInputSliderDialog<F>
@@ -33,10 +33,10 @@ where
             area: Rect::zero(),
             callback,
             input: NumberInputSlider::new(min, max, init_value).into_child(),
-            cancel_button: Button::with_text("CANCEL")
+            cancel_button: Button::with_text("CANCEL".into())
                 .styled(theme::button_cancel())
                 .into_child(),
-            confirm_button: Button::with_text("CONFIRM")
+            confirm_button: Button::with_text("CONFIRM".into())
                 .styled(theme::button_confirm())
                 .into_child(),
         }
@@ -184,7 +184,7 @@ impl Component for NumberInputSlider {
         let val_pct = (100 * (self.value - self.min)) / (self.max - self.min);
         let fill_to = (val_pct as i16 * self.area.width()) / 100;
 
-        display::bar_with_text_and_fill::<&str>(
+        display::bar_with_text_and_fill(
             self.area,
             None,
             theme::FG,
diff --git a/core/embed/rust/src/ui/model_tt/layout.rs b/core/embed/rust/src/ui/model_tt/layout.rs
index dcca147e7..0d8a4032a 100644
--- a/core/embed/rust/src/ui/model_tt/layout.rs
+++ b/core/embed/rust/src/ui/model_tt/layout.rs
@@ -1356,7 +1356,7 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
 
 extern "C" fn new_request_number_slider(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let min_count: u32 = kwargs.get(Qstr::MP_QSTR_min_count)?.try_into()?;
         let max_count: u32 = kwargs.get(Qstr::MP_QSTR_max_count)?.try_into()?;
         let count: u32 = kwargs.get(Qstr::MP_QSTR_count)?.try_into()?;
diff --git a/core/src/all_modules.py b/core/src/all_modules.py
index 571e7cda5..bfae18415 100644
--- a/core/src/all_modules.py
+++ b/core/src/all_modules.py
@@ -179,6 +179,8 @@ trezor.ui.layouts.tt.fido
 import trezor.ui.layouts.tt.fido
 trezor.ui.layouts.tt.homescreen
 import trezor.ui.layouts.tt.homescreen
+trezor.ui.layouts.tt.progress
+import trezor.ui.layouts.tt.progress
 trezor.ui.layouts.tt.recovery
 import trezor.ui.layouts.tt.recovery
 trezor.ui.layouts.tt.reset