Changed order of app settings + fixed client

Author: apaillier-ledger

client/src/ledger_app_clients/ethereum/settings.py

@@ -5,22 +5,25 @@
 
 
 class SettingID(Enum):
+    BLIND_SIGNING = auto()
     VERBOSE_ENS = auto()
-    VERBOSE_EIP712 = auto()
     NONCE = auto()
+    VERBOSE_EIP712 = auto()
     DEBUG_DATA = auto()
 
 
 def get_device_settings(firmware: Firmware) -> list[SettingID]:
     if firmware == Firmware.NANOS:
         return [
+            SettingID.BLIND_SIGNING,
             SettingID.NONCE,
             SettingID.DEBUG_DATA,
         ]
     return [
+        SettingID.BLIND_SIGNING,
         SettingID.VERBOSE_ENS,
-        SettingID.VERBOSE_EIP712,
         SettingID.NONCE,
+        SettingID.VERBOSE_EIP712,
         SettingID.DEBUG_DATA,
     ]
 

src_bagl/ui_flow.c

@@ -12,22 +12,22 @@
 // No risk of collision as this buffer is unused in the settings menu
 #define SETTING_BLIND_SIGNING_STATE       (strings.common.fullAmount + (BUF_INCREMENT * 0))
 #define SETTING_VERBOSE_DOMAIN_NAME_STATE (strings.common.fullAmount + (BUF_INCREMENT * 1))
-#define SETTING_VERBOSE_EIP712_STATE      (strings.common.fullAmount + (BUF_INCREMENT * 2))
-#define SETTING_DISPLAY_NONCE_STATE       (strings.common.fullAmount + (BUF_INCREMENT * 3))
+#define SETTING_DISPLAY_NONCE_STATE       (strings.common.fullAmount + (BUF_INCREMENT * 2))
+#define SETTING_VERBOSE_EIP712_STATE      (strings.common.fullAmount + (BUF_INCREMENT * 3))
 #define SETTING_DISPLAY_DATA_STATE        (strings.common.fullAmount + (BUF_INCREMENT * 4))
 
 #define BOOL_TO_STATE_STR(b) (b ? ENABLED_STR : DISABLED_STR)
 
 static void display_settings(const ux_flow_step_t* const start_step);
 static void switch_settings_blind_signing(void);
+#ifdef HAVE_DOMAIN_NAME
+static void switch_settings_verbose_domain_name(void);
+#endif  // HAVE_DOMAIN_NAME
 static void switch_settings_display_data(void);
 static void switch_settings_display_nonce(void);
 #ifdef HAVE_EIP712_FULL_SUPPORT
 static void switch_settings_verbose_eip712(void);
 #endif  // HAVE_EIP712_FULL_SUPPORT
-#ifdef HAVE_DOMAIN_NAME
-static void switch_settings_verbose_domain_name(void);
-#endif  // HAVE_DOMAIN_NAME
 
 //////////////////////////////////////////////////////////////////////
 // clang-format off
@@ -105,19 +105,6 @@ UX_STEP_CB(
     });
 #endif // HAVE_DOMAIN_NAME
 
-#ifdef HAVE_EIP712_FULL_SUPPORT
-UX_STEP_CB(
-    ux_settings_flow_verbose_eip712_step,
-    bnnn,
-    switch_settings_verbose_eip712(),
-    {
-      "Raw messages",
-      "Displays raw content",
-      "from EIP712 messages",
-      SETTING_VERBOSE_EIP712_STATE
-    });
-#endif // HAVE_EIP712_FULL_SUPPORT
-
 UX_STEP_CB(
     ux_settings_flow_display_nonce_step,
 #ifdef TARGET_NANOS
@@ -138,6 +125,19 @@ UX_STEP_CB(
       SETTING_DISPLAY_NONCE_STATE
     });
 
+#ifdef HAVE_EIP712_FULL_SUPPORT
+UX_STEP_CB(
+    ux_settings_flow_verbose_eip712_step,
+    bnnn,
+    switch_settings_verbose_eip712(),
+    {
+      "Raw messages",
+      "Displays raw content",
+      "from EIP712 messages",
+      SETTING_VERBOSE_EIP712_STATE
+    });
+#endif // HAVE_EIP712_FULL_SUPPORT
+
 UX_STEP_CB(
     ux_settings_flow_display_data_step,
 #ifdef TARGET_NANOS
@@ -173,10 +173,10 @@ UX_FLOW(ux_settings_flow,
 #ifdef HAVE_DOMAIN_NAME
         &ux_settings_flow_verbose_domain_name_step,
 #endif  // HAVE_DOMAIN_NAME
+        &ux_settings_flow_display_nonce_step,
 #ifdef HAVE_EIP712_FULL_SUPPORT
         &ux_settings_flow_verbose_eip712_step,
 #endif  // HAVE_EIP712_FULL_SUPPORT
-        &ux_settings_flow_display_nonce_step,
         &ux_settings_flow_display_data_step,
         &ux_settings_flow_back_step);
 

src_nbgl/ui_home.c

@@ -15,25 +15,25 @@
 
 enum {
     BLIND_SIGNING_TOKEN = FIRST_USER_TOKEN,
-    DEBUG_TOKEN,
+#ifdef HAVE_DOMAIN_NAME
+    DOMAIN_NAME_VERBOSE_TOKEN,
+#endif
     NONCE_TOKEN,
 #ifdef HAVE_EIP712_FULL_SUPPORT
     EIP712_VERBOSE_TOKEN,
 #endif
-#ifdef HAVE_DOMAIN_NAME
-    DOMAIN_NAME_VERBOSE_TOKEN
-#endif
+    DEBUG_TOKEN,
 };
 
 enum {
     BLIND_SIGNING_ID,
 #ifdef HAVE_DOMAIN_NAME
     DOMAIN_NAME_VERBOSE_ID,
 #endif
+    NONCE_ID,
 #ifdef HAVE_EIP712_FULL_SUPPORT
     EIP712_VERBOSE_ID,
 #endif
-    NONCE_ID,
     DEBUG_ID,
     SETTINGS_SWITCHES_NB
 };
@@ -61,11 +61,13 @@ static void setting_toggle_callback(int token, uint8_t index, int page) {
             switches[BLIND_SIGNING_ID].initState = (nbgl_state_t) value;
             nvm_write((void *) &N_storage.dataAllowed, (void *) &value, sizeof(value));
             break;
-        case DEBUG_TOKEN:
-            value = !N_storage.contractDetails;
-            switches[DEBUG_ID].initState = (nbgl_state_t) value;
-            nvm_write((void *) &N_storage.contractDetails, (void *) &value, sizeof(value));
+#ifdef HAVE_DOMAIN_NAME
+        case DOMAIN_NAME_VERBOSE_TOKEN:
+            value = !N_storage.verbose_domain_name;
+            switches[DOMAIN_NAME_VERBOSE_ID].initState = (nbgl_state_t) value;
+            nvm_write((void *) &N_storage.verbose_domain_name, (void *) &value, sizeof(value));
             break;
+#endif  // HAVE_DOMAIN_NAME
         case NONCE_TOKEN:
             value = !N_storage.displayNonce;
             switches[NONCE_ID].initState = (nbgl_state_t) value;
@@ -78,13 +80,11 @@ static void setting_toggle_callback(int token, uint8_t index, int page) {
             nvm_write((void *) &N_storage.verbose_eip712, (void *) &value, sizeof(value));
             break;
 #endif  // HAVE_EIP712_FULL_SUPPORT
-#ifdef HAVE_DOMAIN_NAME
-        case DOMAIN_NAME_VERBOSE_TOKEN:
-            value = !N_storage.verbose_domain_name;
-            switches[DOMAIN_NAME_VERBOSE_ID].initState = (nbgl_state_t) value;
-            nvm_write((void *) &N_storage.verbose_domain_name, (void *) &value, sizeof(value));
+        case DEBUG_TOKEN:
+            value = !N_storage.contractDetails;
+            switches[DEBUG_ID].initState = (nbgl_state_t) value;
+            nvm_write((void *) &N_storage.contractDetails, (void *) &value, sizeof(value));
             break;
-#endif  // HAVE_DOMAIN_NAME
     }
 }
 
@@ -132,6 +132,12 @@ static void prepare_and_display_home(const char *appname, const char *tagline, u
     switches[DOMAIN_NAME_VERBOSE_ID].tuneId = TUNE_TAP_CASUAL;
 #endif  // HAVE_DOMAIN_NAME
 
+    switches[NONCE_ID].initState = N_storage.displayNonce ? ON_STATE : OFF_STATE;
+    switches[NONCE_ID].text = "Nonce";
+    switches[NONCE_ID].subText = "Display nonce in transactions.";
+    switches[NONCE_ID].token = NONCE_TOKEN;
+    switches[NONCE_ID].tuneId = TUNE_TAP_CASUAL;
+
 #ifdef HAVE_EIP712_FULL_SUPPORT
     switches[EIP712_VERBOSE_ID].initState = N_storage.verbose_eip712 ? ON_STATE : OFF_STATE;
     switches[EIP712_VERBOSE_ID].text = "Raw messages";
@@ -140,12 +146,6 @@ static void prepare_and_display_home(const char *appname, const char *tagline, u
     switches[EIP712_VERBOSE_ID].tuneId = TUNE_TAP_CASUAL;
 #endif  // HAVE_EIP712_FULL_SUPPORT
 
-    switches[NONCE_ID].initState = N_storage.displayNonce ? ON_STATE : OFF_STATE;
-    switches[NONCE_ID].text = "Nonce";
-    switches[NONCE_ID].subText = "Display nonce in transactions.";
-    switches[NONCE_ID].token = NONCE_TOKEN;
-    switches[NONCE_ID].tuneId = TUNE_TAP_CASUAL;
-
     switches[DEBUG_ID].initState = N_storage.contractDetails ? ON_STATE : OFF_STATE;
     switches[DEBUG_ID].text = "Debug smart contracts";
     switches[DEBUG_ID].subText = "Display contract data details.";