lower Mk4 default wrap-around from 16 to 10 (same as Q)

releases/Next-ChangeLog.md

@@ -29,7 +29,7 @@ This lists the new changes that have not yet been published in a normal release.
 ## 5.4.4 - 2025-09-1x
 
 - Bugfix: Part of extended keys in stories were not always visible.
-
+- Change: Mk4 default menu wrap-around lowered from 16 to 10
 
 # Q Specific Changes
 

shared/flow.py

@@ -187,9 +187,9 @@ The signed transaction will be named <TXID>.txn, so the file name does not leak
 MS-DOS tools should not be able to find the PSBT data (ie. undelete), but forensic tools \
 which take apart the flash chips of the SDCard may still be able to find the \
 data or filenames.'''),
-    ToggleMenuItem('Menu Wrapping', 'wa', ['Default Off', 'Enable'],
+    ToggleMenuItem('Menu Wrapping', 'wa', ['Default', 'Always Wrap'],
            story='''When enabled, allows scrolling past menu top/bottom \
-(wrap around). By default, this only happens in very large menus.'''),
+(wrap around). By default, this only happens in menus whose length is greater than 10.'''),
     ToggleMenuItem('Home Menu XFP', 'hmx', ['Only Tmp', 'Always Show'],
                    story=('Forces display of XFP (seed fingerprint) '
                           'at top of main menu. Normally, XFP is shown only when '

shared/menu.py

@@ -331,9 +331,8 @@ class MenuSystem:
         if wrap: return True
 
         # Do wrap-around (by request from NVK) if longer than the screen itself (on Q),
-        # for mk4, limit is 16 which hits mostly the seed word menus.
-        limit = 10 if has_qwerty else 16
-        return self.count > limit
+        # Mk4: same limit
+        return self.count > 10
 
     def down(self):
         if self.cursor < self.count-1:

testing/core_fixtures.py

@@ -55,7 +55,7 @@ def _dev_hw_label(device):
 
 def _pick_menu_item(device, is_Q, text):
     print(f"PICK menu item: {text}")
-    WRAP_IF_OVER = 16  # see ../shared/menu.py .. this is larger of 10 or 16
+    WRAP_IF_OVER = 10  # see ../shared/menu.py
 
     _need_keypress(device, KEY_HOME if is_Q else "0")
     m = _cap_menu(device)

testing/test_ux.py

@@ -715,11 +715,14 @@ def test_destroy_seed(goto_home, pick_menu_item, cap_story, press_select,
 
 def test_menu_wrapping(goto_home, pick_menu_item, cap_story, cap_menu,
                        press_select, press_up, press_down, press_cancel,
-                       is_q1):
+                       is_q1, settings_remove):
+    settings_remove("wa")  # disable
     goto_home()
     # first try that infinite scroll is turned off
     # home
-    for i in range(10):  # settings on 5th in home (10 is way past that)
+    assert len(cap_menu()) < 10
+
+    for i in range(10):
         press_down()
 
     # sitting at Logout
@@ -730,7 +733,7 @@ def test_menu_wrapping(goto_home, pick_menu_item, cap_story, cap_menu,
     press_select()
     pick_menu_item("Menu Wrapping")
     press_select()
-    pick_menu_item("Enable")
+    pick_menu_item("Always Wrap")
     time.sleep(1)
     press_cancel()  # back to home menu
     press_cancel()  # at Ready To Sign
@@ -741,7 +744,7 @@ def test_menu_wrapping(goto_home, pick_menu_item, cap_story, cap_menu,
     press_select()
 
     pick_menu_item("Menu Wrapping")
-    pick_menu_item("Default Off")
+    pick_menu_item("Default")
     time.sleep(1)
     press_cancel()  # back in home menu
     press_cancel()  # at Ready To Sign