From 272fb4842a9680cb7e23b009b29fa6d96a5e68cd Mon Sep 17 00:00:00 2001
From: grdddj <jiri.musil06@seznam.cz>
Date: Mon, 28 Aug 2023 10:22:12 +0200
Subject: [PATCH] feat(core/rust): show last entered passphrase character for
 T2B1

[no changelog]
---
 .../component/input_methods/passphrase.rs     | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/core/embed/rust/src/ui/model_tr/component/input_methods/passphrase.rs b/core/embed/rust/src/ui/model_tr/component/input_methods/passphrase.rs
index 9741852ede..a408069b5c 100644
--- a/core/embed/rust/src/ui/model_tr/component/input_methods/passphrase.rs
+++ b/core/embed/rust/src/ui/model_tr/component/input_methods/passphrase.rs
@@ -236,6 +236,7 @@ pub struct PassphraseEntry<T: StringType + Clone> {
     choice_page: ChoicePage<ChoiceFactoryPassphrase, T, PassphraseAction>,
     passphrase_dots: Child<ChangingTextLine<String<MAX_PASSPHRASE_LENGTH>>>,
     show_plain_passphrase: bool,
+    show_last_digit: bool,
     textbox: TextBox<MAX_PASSPHRASE_LENGTH>,
     current_category: ChoiceCategory,
 }
@@ -251,6 +252,7 @@ where
                 .with_initial_page_counter(random_menu_position()),
             passphrase_dots: Child::new(ChangingTextLine::center_mono(String::new())),
             show_plain_passphrase: false,
+            show_last_digit: false,
             textbox: TextBox::empty(),
             current_category: ChoiceCategory::Menu,
         }
@@ -259,11 +261,20 @@ where
     fn update_passphrase_dots(&mut self, ctx: &mut EventCtx) {
         let text_to_show = if self.show_plain_passphrase {
             String::from(self.passphrase())
+        } else if self.is_empty() {
+            String::from("")
         } else {
+            // Showing asterisks and possibly the last digit.
             let mut dots: String<MAX_PASSPHRASE_LENGTH> = String::new();
-            for _ in 0..self.textbox.len() {
-                unwrap!(dots.push_str("*"));
+            for _ in 0..self.textbox.len() - 1 {
+                unwrap!(dots.push('*'));
             }
+            let last_char = if self.show_last_digit {
+                unwrap!(self.textbox.content().chars().last())
+            } else {
+                '*'
+            };
+            unwrap!(dots.push(last_char));
             dots
         };
         self.passphrase_dots.mutate(ctx, |ctx, passphrase_dots| {
@@ -332,10 +343,17 @@ where
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        // Any event when showing real passphrase should hide it
-        if self.show_plain_passphrase {
-            self.show_plain_passphrase = false;
-            self.update_passphrase_dots(ctx);
+        // Any non-timer event when showing real passphrase should hide it
+        // Same with showing last digit
+        if !matches!(event, Event::Timer(_)) {
+            if self.show_plain_passphrase {
+                self.show_plain_passphrase = false;
+                self.update_passphrase_dots(ctx);
+            }
+            if self.show_last_digit {
+                self.show_last_digit = false;
+                self.update_passphrase_dots(ctx);
+            }
         }
 
         if let Some(action) = self.choice_page.event(ctx, event) {
@@ -373,6 +391,7 @@ where
                 }
                 PassphraseAction::Character(ch) if !self.is_full() => {
                     self.append_char(ctx, ch);
+                    self.show_last_digit = true;
                     self.update_passphrase_dots(ctx);
                     self.randomize_category_position(ctx);
                     ctx.request_paint();