From 4087f8f25b82e24bc8b05b6eec3ef1eaa37d1675 Mon Sep 17 00:00:00 2001
From: "Peter D. Gray" <peter@conalgo.com>
Date: Tue, 1 Oct 2024 08:58:34 -0400
Subject: [PATCH] cleanup

---
 shared/seed.py   | 6 ++++--
 shared/ux.py     | 4 ++--
 shared/ux_q1.py  | 5 -----
 shared/web2fa.py | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/shared/seed.py b/shared/seed.py
index 2d95ea35..d603c0c9 100644
--- a/shared/seed.py
+++ b/shared/seed.py
@@ -16,7 +16,7 @@ from menu import MenuItem, MenuSystem
 from utils import xfp2str, parse_extended_key, swab32, pad_raw_secret, problem_file_line
 from uhashlib import sha256
 from ux import ux_show_story, the_ux, ux_dramatic_pause, ux_confirm, OK, X
-from ux import PressRelease, ux_input_numbers, ux_input_text, show_qr_code
+from ux import PressRelease, ux_input_text, show_qr_code
 from actions import goto_top_menu
 from stash import SecretStash, ZeroSecretException
 from ubinascii import hexlify as b2a_hex
@@ -1208,7 +1208,9 @@ class PassphraseMenu(MenuSystem):
     @classmethod
     async def add_numbers(cls, *a):
         # Mk4 only: add some digits (quick, easy)
-        pw = await ux_input_numbers(cls.pp_sofar)
+        from ux_mk4 import ux_input_digits
+
+        pw = await ux_input_digits(cls.pp_sofar)
         if pw is not None:
             cls.pp_sofar = pw
             cls.check_length()
diff --git a/shared/ux.py b/shared/ux.py
index 5fbefd90..a92dc4bb 100644
--- a/shared/ux.py
+++ b/shared/ux.py
@@ -18,7 +18,7 @@ if version.has_qwerty:
     from lcd_display import CHARS_W, CHARS_H
     CH_PER_W = CHARS_W
     STORY_H = CHARS_H
-    from ux_q1 import PressRelease, ux_enter_number, ux_input_numbers, ux_input_text, ux_show_pin
+    from ux_q1 import PressRelease, ux_enter_number, ux_input_text, ux_show_pin
     from ux_q1 import ux_login_countdown, ux_confirm, ux_dice_rolling, ux_render_words
     from ux_q1 import ux_show_phish_words
     OK = "ENTER"
@@ -29,7 +29,7 @@ else:
     # (using FontSmall) .. except it's an approximation since variable-width font.
     CH_PER_W = 19
     STORY_H = 5
-    from ux_mk4 import PressRelease, ux_enter_number, ux_input_numbers, ux_input_text, ux_show_pin
+    from ux_mk4 import PressRelease, ux_enter_number, ux_input_text, ux_show_pin
     from ux_mk4 import ux_login_countdown, ux_confirm, ux_dice_rolling, ux_render_words
     from ux_mk4 import ux_show_phish_words
     OK = "OK"
diff --git a/shared/ux_q1.py b/shared/ux_q1.py
index fd73fb9d..dc427c61 100644
--- a/shared/ux_q1.py
+++ b/shared/ux_q1.py
@@ -141,11 +141,6 @@ async def ux_enter_number(prompt, max_value, can_cancel=False):
             # cleanup leading zeros and such
             value = str(min(int(value), max_value))
 
-async def ux_input_numbers(val, **kws):
-    # collect a series of digits
-    # - not wanted on Q1; just get the digits mixed in w/ the text.
-    raise NotImplementedError
-
 async def ux_input_text(value, confirm_exit=False, hex_only=False, max_len=100,
             prompt='Enter value', min_len=0, b39_complete=False, scan_ok=False,
             placeholder=None, funct_keys=None, force_xy=None):
diff --git a/shared/web2fa.py b/shared/web2fa.py
index bf54f559..8950637c 100644
--- a/shared/web2fa.py
+++ b/shared/web2fa.py
@@ -59,7 +59,7 @@ async def perform_web2fa(label, shared_secret):
         #
         # Mk4 and other devices w/o QR scanner, require user to enter 8 digits
         #
-        from ux_mk4 import ux_input_numbers
+        from ux_mk4 import ux_input_digits
 
         def limit_len(n):
             ll = len(n)
@@ -70,10 +70,10 @@ async def perform_web2fa(label, shared_secret):
             return ''
 
         while 1:
-            got = await ux_input_numbers('', limit_len, maxlen=8, prompt="8-digits From Web")
+            got = await ux_input_digits('', limit_len, maxlen=8, prompt="8-digits From Web")
 
             if not got:
-                # abort w/ empty entry
+                # abort if empty entry
                 return False
 
             if got == expect: