Fix PIN keyboard overlay: respect initial_keyboard in SeedAddPassphraseScreen._run()

The _run() loop always started with the lowercase letter keyboard regardless of which keyboard was rendered initially, causing arrow key navigation to operate on a hidden letter overlay instead of the visible digits keyboard.

Also pass initial_keyboard='123' to all PIN/PUK entry screens so they start on digits.

Author: 3rdIteration

src/seedsigner/gui/screens/seed_screens.py

@@ -890,9 +890,29 @@ def _render(self):
 
     def _run(self):
         cursor_position = len(self.passphrase)
-        cur_keyboard = self.keyboard_abc
-        cur_button1_text = self.KEYBOARD__UPPERCASE_BUTTON_TEXT
-        cur_button2_text = self.KEYBOARD__DIGITS_BUTTON_TEXT
+
+        # Respect initial_keyboard so the interactive loop starts on the same
+        # keyboard that was rendered (e.g. digits for PIN entry screens).
+        if self.initial_keyboard == self.KEYBOARD__UPPERCASE_BUTTON_TEXT:
+            cur_keyboard = self.keyboard_ABC
+            cur_button1_text = self.KEYBOARD__LOWERCASE_BUTTON_TEXT
+            cur_button2_text = self.KEYBOARD__DIGITS_BUTTON_TEXT
+        elif self.initial_keyboard == self.KEYBOARD__DIGITS_BUTTON_TEXT:
+            cur_keyboard = self.keyboard_digits
+            cur_button1_text = self.KEYBOARD__UPPERCASE_BUTTON_TEXT
+            cur_button2_text = self.KEYBOARD__SYMBOLS_1_BUTTON_TEXT
+        elif self.initial_keyboard == self.KEYBOARD__SYMBOLS_1_BUTTON_TEXT:
+            cur_keyboard = self.keyboard_symbols_1
+            cur_button1_text = self.KEYBOARD__UPPERCASE_BUTTON_TEXT
+            cur_button2_text = self.KEYBOARD__SYMBOLS_2_BUTTON_TEXT
+        elif self.initial_keyboard == self.KEYBOARD__SYMBOLS_2_BUTTON_TEXT:
+            cur_keyboard = self.keyboard_symbols_2
+            cur_button1_text = self.KEYBOARD__UPPERCASE_BUTTON_TEXT
+            cur_button2_text = self.KEYBOARD__DIGITS_BUTTON_TEXT
+        else:
+            cur_keyboard = self.keyboard_abc
+            cur_button1_text = self.KEYBOARD__UPPERCASE_BUTTON_TEXT
+            cur_button2_text = self.KEYBOARD__DIGITS_BUTTON_TEXT
 
         # Start the interactive update loop
         while True:

src/seedsigner/helpers/seedkeeper_utils.py

@@ -213,7 +213,9 @@ def prompt_for_pin(
     """Prompt for a PIN and enforce configurable PIN requirements."""
 
     while True:
-        ret = seed_screens.SeedAddPassphraseScreen(title=title).display()
+        ret = seed_screens.SeedAddPassphraseScreen(
+            title=title, initial_keyboard="123"
+        ).display()
         if isinstance(ret, dict) and "is_back_button" in ret:
             return None
 

src/seedsigner/views/smartcard_views.py

@@ -1385,7 +1385,9 @@ def common_reset_factory_new(self, Satochip_Connector):
             if ret == RET_CODE__BACK_BUTTON:
                 return resetStatus
 
-            puk = seed_screens.SeedAddPassphraseScreen(title="Enter PUK").display()
+            puk = seed_screens.SeedAddPassphraseScreen(
+                title="Enter PUK", initial_keyboard="123"
+            ).display()
 
             if "is_back_button" in puk:
                 return resetStatus
@@ -3053,7 +3055,9 @@ def run(self):
         if not connector:
             return Destination(BackStackView)
 
-        puk_ret = seed_screens.SeedAddPassphraseScreen(title="PUK").display()
+        puk_ret = seed_screens.SeedAddPassphraseScreen(
+            title="PUK", initial_keyboard="123"
+        ).display()
         if "is_back_button" in puk_ret:
             return Destination(BackStackView)
         puk_str = puk_ret.get("passphrase", "")
@@ -4415,7 +4419,9 @@ def run(self):
                 return Destination(BackStackView)
 
             # PIN is set; prompt for the current PIN once, then the new PIN.
-            ret = seed_screens.SeedAddPassphraseScreen(title="Current PIN").display()
+            ret = seed_screens.SeedAddPassphraseScreen(
+                title="Current PIN", initial_keyboard="123"
+            ).display()
             if isinstance(ret, dict) and "is_back_button" in ret:
                 return Destination(BackStackView)
             old_pin = ret.get("passphrase", "")
@@ -4699,7 +4705,9 @@ def _show_specter_incorrect_pin_warning(parent_view, secure_applet, secure_chann
 
 def _prompt_specter_pin_once(parent_view, title: str) -> str | None:
     while True:
-        ret = seed_screens.SeedAddPassphraseScreen(title=title).display()
+        ret = seed_screens.SeedAddPassphraseScreen(
+            title=title, initial_keyboard="123"
+        ).display()
         if isinstance(ret, dict) and "is_back_button" in ret:
             return None
 
@@ -4748,7 +4756,9 @@ def _prompt_specter_new_pin(parent_view, title: str) -> str | None:
 
 def _prompt_keycard_digits_once(parent_view, title: str, *, length: int, label: str) -> str | None:
     while True:
-        ret = seed_screens.SeedAddPassphraseScreen(title=title).display()
+        ret = seed_screens.SeedAddPassphraseScreen(
+            title=title, initial_keyboard="123"
+        ).display()
         if isinstance(ret, dict) and "is_back_button" in ret:
             return None
 
@@ -4821,7 +4831,9 @@ def _unlock_specter_card_if_needed(parent_view, secure_applet, secure_channel) -
     if status.get("status") != "locked":
         return True
 
-    ret = seed_screens.SeedAddPassphraseScreen(title="Card PIN").display()
+    ret = seed_screens.SeedAddPassphraseScreen(
+        title="Card PIN", initial_keyboard="123"
+    ).display()
     if isinstance(ret, dict) and "is_back_button" in ret:
         return False
     pin = ret.get("passphrase", "")