Merge pull request #631 from LedgerHQ/fix/apa/client_settings_toggle

Revert back to the simpler settings_toggle function in the Python client
LedgerHQ · Aug 23, 2024 · 4c9b91d · 4c9b91d
2 parents 47c726b + 1abe011
commit 4c9b91d
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/client/src/ledger_app_clients/ethereum/settings.py b/client/src/ledger_app_clients/ethereum/settings.py
@@ -31,28 +31,20 @@ def get_device_settings(firmware: Firmware) -> list[SettingID]:
 def get_setting_position(firmware: Firmware, setting_idx: int, per_page: int) -> tuple[int, int]:
     if firmware == Firmware.STAX:
         screen_height = 672  # px
+        screen_width = 400  # px
         header_height = 88  # px
         footer_height = 92  # px
-        x_offset = 350  # px
     else:
         screen_height = 600  # px
-        header_height = 92  # px
-        footer_height = 97  # px
-        x_offset = 420  # px
+        screen_width = 480  # px
+        header_height = 96  # px
+        footer_height = 96  # px
+
     index_in_page = setting_idx % per_page
-    if index_in_page == 0:
-        y_offset = header_height + 10
-    elif per_page == 3:
-        if setting_idx == 1:
-            # 2nd setting over 3: middle of the screen
-            y_offset = screen_height // 2
-        else:
-            # Last setting
-            y_offset = screen_height - footer_height - 10
-    else:
-        # 2 per page, requesting the 2nd one; middle of screen is ok
-        y_offset = screen_height // 2
-    return x_offset, y_offset
+    usable_height = screen_height - (header_height + footer_height)
+    setting_height = usable_height // per_page
+    offset = (setting_height * index_in_page) + (setting_height // 2)
+    return screen_width // 2, header_height + offset
 
 
 def settings_toggle(firmware: Firmware, nav: Navigator, to_toggle: list[SettingID]):