trilitech · spalmer25 · Oct 8, 2024 · Sep 27, 2024 · Oct 7, 2024 · Oct 7, 2024
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ PATH_APP_LOAD_PARAMS  = "44'/1729'"
 
 APPVERSION_M=2
 APPVERSION_N=5
-APPVERSION_P=0
+APPVERSION_P=1
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 # COMMIT

diff --git a/README.md b/README.md
@@ -510,6 +510,11 @@ Following is a sample of measurements obtained with this app (Tezos Baking app v
 
 | Device | Derivation Type   | Avg time/signature(milliseconds) |
 |--------|-------------------|----------------------------------|
+| Flex   | SECP256K1_tz2     | 214                              |
+| Flex   | SECP256R1_tz3     | 215                              |
+| Flex   | ED25519_tz1       | 456                              |
+| Flex   | BIP32_ED25519_tz1 | 783                              |
+|        |                   |                                  |
 | Nanos+ | SECP256K1_tz2     | 229                              |
 | Nanos+ | SECP256R1_tz3     | 226                              |
 | Nanos+ | ED25519_tz1       | 465                              |

diff --git a/src/ui_nbgl.c b/src/ui_nbgl.c
@@ -48,11 +48,12 @@ typedef enum {
     VERSION_IDX,
     DEVELOPER_IDX,
     COPYRIGHT_IDX,
+    CONTACT_IDX,
     INFO_NB
 } tz_infoIndex_t;
 
 static const char* const infoTypes[INFO_NB] =
-    {"Chain", "Public Key Hash", "High Watermark", "Version", "Developer", "Copyright"};
+    {"Chain", "Public Key Hash", "High Watermark", "Version", "Developer", "Copyright", "Contact"};
 
 #define MAX_LENGTH 200
 static const char* infoContents[INFO_NB];
@@ -92,11 +93,16 @@ static void initInfo(void) {
     TZ_ASSERT(copy_string(infoContentsBridge[VERSION_IDX], MAX_LENGTH, APPVERSION) >= 0,
               EXC_WRONG_LENGTH);
 
-    TZ_ASSERT(copy_string(infoContentsBridge[DEVELOPER_IDX], MAX_LENGTH, "Ledger") >= 0,
-              EXC_WRONG_LENGTH);
+    TZ_ASSERT(
+        copy_string(infoContentsBridge[DEVELOPER_IDX], MAX_LENGTH, "Trilitech Kanvas Ltd. et al") >=
+            0,
+        EXC_WRONG_LENGTH);
 
-    TZ_ASSERT(copy_string(infoContentsBridge[COPYRIGHT_IDX], MAX_LENGTH, "(c) 2023 Ledger") >= 0,
+    TZ_ASSERT(copy_string(infoContentsBridge[COPYRIGHT_IDX], MAX_LENGTH, "(c) 2024 Trilitech") >= 0,
               EXC_WRONG_LENGTH);
+    TZ_ASSERT(
+        copy_string(infoContentsBridge[CONTACT_IDX], MAX_LENGTH, "[email protected]") >= 0,
+        EXC_WRONG_LENGTH);
 
 end:
     TZ_EXC_PRINT(exc);

diff --git a/src/version.h b/src/version.h
@@ -23,18 +23,6 @@
 
 #define CLASS 1
 
-#ifndef MAJOR_VERSION
-#define MAJOR_VERSION 0
-#endif
-
-#ifndef MINOR_VERSION
-#define MINOR_VERSION 0
-#endif
-
-#ifndef PATCH_VERSION
-#define PATCH_VERSION 0
-#endif
-
 /**
  * @brief This structure represents the version
  *

diff --git a/test/snapshots/flex/description.png b/test/snapshots/flex/description.png
diff --git a/test/snapshots/flex/description_2.png b/test/snapshots/flex/description_2.png
diff --git a/test/snapshots/flex/test_reset_app_context/00000.png b/test/snapshots/flex/test_reset_app_context/00000.png
diff --git a/test/snapshots/flex/test_reset_app_context/00001.png b/test/snapshots/flex/test_reset_app_context/00001.png
diff --git a/test/snapshots/flex/test_reset_app_context/00002.png b/test/snapshots/flex/test_reset_app_context/00002.png
diff --git a/...eview_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_2.png b/...eview_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_2.png
diff --git a/...test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_2.png b/...test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_2.png
diff --git a/...test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_2.png b/...test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_2.png
diff --git a/...st_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_2.png b/...st_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_2.png
diff --git a/...st_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_2.png b/...st_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_2.png
diff --git a/test/snapshots/flex/test_review_home/app_context_2.png b/test/snapshots/flex/test_review_home/app_context_2.png
diff --git a/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00000.png b/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00000.png
diff --git a/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png b/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png
diff --git a/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png b/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png
diff --git a/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00000.png b/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00000.png
diff --git a/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png b/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png
diff --git a/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png b/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png
diff --git a/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00000.png b/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00000.png
diff --git a/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png b/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png
diff --git a/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png b/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png
diff --git a/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00000.png b/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00000.png
diff --git a/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png b/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png
diff --git a/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png b/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png
diff --git a/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00000.png b/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00000.png
diff --git a/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png b/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png
diff --git a/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png b/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png
diff --git a/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...ign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...ign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...ign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...ign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...n_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...n_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...n_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...n_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...ation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...ation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...testation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...testation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...testation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...testation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...ign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...ign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...st_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...st_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...st_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...st_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00000.png b/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00000.png
diff --git a/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png b/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png
diff --git a/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png b/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00000.png b/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00000.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png b/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png b/...lex/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00000.png b/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00000.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png b/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png
diff --git a/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png b/...lex/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png
diff --git a/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00000.png b/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00000.png
diff --git a/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png b/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png
diff --git a/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png b/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png
diff --git a/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00000.png b/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00000.png
diff --git a/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png b/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png
diff --git a/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png b/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_1/00000.png b/test/snapshots/flex/test_sign_delegation_fee/fee_1/00000.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_1/00001.png b/test/snapshots/flex/test_sign_delegation_fee/fee_1/00001.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_1/00002.png b/test/snapshots/flex/test_sign_delegation_fee/fee_1/00002.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00000.png b/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00000.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00001.png b/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00001.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00002.png b/test/snapshots/flex/test_sign_delegation_fee/fee_20000/00002.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00000.png b/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00000.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00001.png b/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00001.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00002.png b/test/snapshots/flex/test_sign_delegation_fee/fee_300000000/00002.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00000.png b/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00000.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00001.png b/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00001.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00002.png b/test/snapshots/flex/test_sign_delegation_fee/fee_50000060000/00002.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00000.png b/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00000.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00001.png b/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00001.png
diff --git a/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00002.png b/test/snapshots/flex/test_sign_delegation_fee/fee_789789789/00002.png
diff --git a/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/..._preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/..._preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/..._preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/..._preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...reattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...reattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...reattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...reattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/test/snapshots/nanos/version.png b/test/snapshots/nanos/version.png
diff --git a/test/snapshots/nanosp/version.png b/test/snapshots/nanosp/version.png
diff --git a/test/snapshots/nanox/version.png b/test/snapshots/nanox/version.png
diff --git a/test/snapshots/stax/description.png b/test/snapshots/stax/description.png
diff --git a/test/snapshots/stax/description_2.png b/test/snapshots/stax/description_2.png
diff --git a/...t_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png b/...t_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png
diff --git a/...t_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png b/...t_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png
diff --git a/...ax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png b/...ax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png
diff --git a/...ax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png b/...ax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png
diff --git a/...ax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png b/...ax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png
diff --git a/...ax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png b/...ax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png
diff --git a/.../test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png b/.../test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png
diff --git a/.../test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png b/.../test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png
diff --git a/.../test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png b/.../test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png
diff --git a/.../test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png b/.../test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png
diff --git a/..._public_key_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png b/..._public_key_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png
diff --git a/..._public_key_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png b/..._public_key_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png
diff --git a/...st_get_public_key_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png b/...st_get_public_key_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png
diff --git a/...st_get_public_key_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png b/...st_get_public_key_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png
diff --git a/...st_get_public_key_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png b/...st_get_public_key_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png
diff --git a/...st_get_public_key_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png b/...st_get_public_key_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png
diff --git a/..._get_public_key_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png b/..._get_public_key_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png
diff --git a/..._get_public_key_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png b/..._get_public_key_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png
diff --git a/..._get_public_key_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png b/..._get_public_key_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png
diff --git a/..._get_public_key_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png b/..._get_public_key_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png
diff --git a/..._public_key_prompt/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png b/..._public_key_prompt/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00001.png
diff --git a/..._public_key_prompt/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png b/..._public_key_prompt/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00003.png
diff --git a/...st_get_public_key_prompt/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png b/...st_get_public_key_prompt/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00001.png
diff --git a/...st_get_public_key_prompt/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png b/...st_get_public_key_prompt/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00003.png
diff --git a/...st_get_public_key_prompt/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png b/...st_get_public_key_prompt/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00001.png
diff --git a/...st_get_public_key_prompt/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png b/...st_get_public_key_prompt/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00003.png
diff --git a/..._get_public_key_prompt/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png b/..._get_public_key_prompt/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00001.png
diff --git a/..._get_public_key_prompt/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png b/..._get_public_key_prompt/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00003.png
diff --git a/..._get_public_key_prompt/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png b/..._get_public_key_prompt/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00001.png
diff --git a/..._get_public_key_prompt/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png b/..._get_public_key_prompt/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00003.png
diff --git a/test/snapshots/stax/test_reset_app_context/00002.png b/test/snapshots/stax/test_reset_app_context/00002.png
diff --git a/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png b/..._setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png
diff --git a/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png b/...x/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png
diff --git a/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png b/...x/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png
diff --git a/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png b/...test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png
diff --git a/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png b/...test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png
diff --git a/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png b/...st_sign_delegation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/00002.png
diff --git a/...tax/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png b/...tax/test_sign_delegation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/00002.png
diff --git a/...tax/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png b/...tax/test_sign_delegation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/00002.png
diff --git a/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png b/...x/test_sign_delegation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/00002.png
diff --git a/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png b/...x/test_sign_delegation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/00002.png
diff --git a/test/snapshots/stax/test_sign_delegation_fee/fee_1/00002.png b/test/snapshots/stax/test_sign_delegation_fee/fee_1/00002.png
diff --git a/test/snapshots/stax/test_sign_delegation_fee/fee_20000/00002.png b/test/snapshots/stax/test_sign_delegation_fee/fee_20000/00002.png
diff --git a/test/snapshots/stax/test_sign_delegation_fee/fee_300000000/00002.png b/test/snapshots/stax/test_sign_delegation_fee/fee_300000000/00002.png
diff --git a/test/snapshots/stax/test_sign_delegation_fee/fee_50000060000/00002.png b/test/snapshots/stax/test_sign_delegation_fee/fee_50000060000/00002.png
diff --git a/test/snapshots/stax/test_sign_delegation_fee/fee_789789789/00002.png b/test/snapshots/stax/test_sign_delegation_fee/fee_789789789/00002.png
diff --git a/test/test_instructions.py b/test/test_instructions.py
@@ -210,6 +210,12 @@ def test_review_home(account: Optional[Account],
         tezos_navigator.settings.next()
         backend.wait_for_screen_change()
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
+        tezos_navigator.settings.next()
+        backend.wait_for_screen_change()
+        tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION_2)
+        tezos_navigator.settings.previous()
+        backend.wait_for_screen_change()
+        tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
         tezos_navigator.settings.previous()
         backend.wait_for_screen_change()
         if tezos_navigator.firmware == Firmware.STAX:
@@ -428,7 +434,7 @@ def test_automatic_low_cost_screensaver_exited_by_display(
 def test_version(client: TezosClient) -> None:
     """Test the VERSION instruction."""
 
-    expected_version = Version(Version.AppKind.BAKING, 2, 5, 0)
+    expected_version = Version(Version.AppKind.BAKING, 2, 5, 1)
 
     version = client.version()
 

diff --git a/test/utils/navigator.py b/test/utils/navigator.py
@@ -96,6 +96,7 @@ class TouchFixedScreen(FixedScreen):
     SETTINGS_HMW_DISABLED  = "hwm_status_disabled"
     SETTINGS_HMW_ENABLED   = "hwm_status_enabled"
     SETTINGS_DESCRIPTION   = "description"
+    SETTINGS_DESCRIPTION_2 = "description_2"
 
 
 class UseCaseReview(OriginalUseCaseReview):