add ticker and change wordings

LedgerHQ · May 24, 2024 · fb7fc6f · fb7fc6f
1 parent e31e709
commit fb7fc6f
Show file tree

Hide file tree

Showing 30 changed files with 23 additions and 18 deletions.
diff --git a/src/monero_nvram.c b/src/monero_nvram.c
@@ -22,8 +22,8 @@
 #include "monero_api.h"
 #include "monero_vars.h"
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
-const monero_nv_state_t N_state_pic;
-#else
+#if defined(TARGET_NANOS)
 monero_nv_state_t N_state_pic;
+#else
+const monero_nv_state_t N_state_pic;
 #endif
diff --git a/src/monero_prehash.c b/src/monero_prehash.c
@@ -56,6 +56,9 @@ int monero_apdu_mlsag_prehash_init() {
         // fee str
         monero_vamount2str(G_monero_vstate.io_buffer + G_monero_vstate.io_offset,
                            G_monero_vstate.ux_amount, 15);
+
+        snprintf(G_monero_vstate.ux_amount + strlen(G_monero_vstate.ux_amount),
+                 sizeof(G_monero_vstate.ux_amount) - strlen(G_monero_vstate.ux_amount), " XMR");
         // ask user
         monero_io_discard(1);
         ui_menu_fee_validation_display(0);
@@ -212,6 +215,8 @@ int monero_apdu_mlsag_prehash_update() {
         amount = monero_bamount2uint64(v, sizeof(v));
         if (amount) {
             monero_amount2str(amount, G_monero_vstate.ux_amount, 15);
+            snprintf(G_monero_vstate.ux_amount + strlen(G_monero_vstate.ux_amount),
+                     sizeof(G_monero_vstate.ux_amount) - strlen(G_monero_vstate.ux_amount), " XMR");
 
             if ((G_monero_vstate.options & IN_OPTION_MORE_COMMAND) == 0) {
                 if (!is_change) {

diff --git a/src/monero_ux_nano.c b/src/monero_ux_nano.c
@@ -181,7 +181,7 @@ UX_STEP_NOCB(ux_menu_validation_timelock_1_step, bn,
 UX_STEP_CB(ux_menu_validation_cf_2_step, pb, ui_menu_amount_validation_action(ACCEPT),
            {
                &C_icon_validate_14,
-               "Accept",
+               "Sign transaction",
            });
 
 UX_STEP_CB(ux_menu_validation_cf_3_step, pb, ui_menu_amount_validation_action(REJECT),
@@ -241,7 +241,7 @@ UX_STEP_NOCB(ux_menu_validation_2_step,
              {"Destination", G_monero_vstate.ux_address});
 
 UX_STEP_CB(ux_menu_validation_3_step, pb, ui_menu_validation_action(ACCEPT),
-           {&C_icon_validate_14, "Accept"});
+           {&C_icon_validate_14, "Sign transaction"});
 
 UX_STEP_CB(ux_menu_validation_4_step, pb, ui_menu_validation_action(REJECT),
            {&C_icon_crossmark, "Reject"});

diff --git a/src/monero_ux_nbgl.c b/src/monero_ux_nbgl.c
@@ -160,13 +160,13 @@ void ui_menu_change_validation_display_last(unsigned int value __attribute__((un
     transactionContext.tagValueList.nbPairs++;
 
     transactionContext.infoLongPress.icon = &C_Monero_64px;
-    transactionContext.infoLongPress.longPressText = "Approve";
+    transactionContext.infoLongPress.longPressText = "Hold to sign";
     transactionContext.infoLongPress.longPressToken = 0;
     transactionContext.infoLongPress.tuneId = TUNE_TAP_CASUAL;
-    transactionContext.infoLongPress.text = "Hold to confirm";
+    transactionContext.infoLongPress.text = "Sign transaction";
 
     nbgl_useCaseStaticReview(&transactionContext.tagValueList, &transactionContext.infoLongPress,
-                             "Cancel", ui_menu_validation_action);
+                             "Reject transaction", ui_menu_validation_action);
 }
 
 static void timelock_callback(void) {
@@ -234,7 +234,7 @@ static void continue_display(int token, unsigned char index) {
                                       .navWithTap.backButton = false,
                                       .navWithTap.nextPageText = NEXT_PAGE_TEXT,
                                       .navWithTap.nextPageToken = CONTINUE_TOKEN,
-                                      .navWithTap.quitText = "Cancel",
+                                      .navWithTap.quitText = "Reject transaction",
                                       .quitToken = QUIT_TOKEN,
                                       .tuneId = TUNE_TAP_CASUAL};
 
@@ -255,13 +255,13 @@ static void continue_display_last(int token, unsigned char index) {
 
     fill_amount_and_destination();
     transactionContext.infoLongPress.icon = &C_Monero_64px;
-    transactionContext.infoLongPress.longPressText = "Approve";
+    transactionContext.infoLongPress.longPressText = "Hold to sign";
     transactionContext.infoLongPress.longPressToken = 0;
     transactionContext.infoLongPress.tuneId = TUNE_TAP_CASUAL;
-    transactionContext.infoLongPress.text = "Hold to confirm";
+    transactionContext.infoLongPress.text = "Sign transaction";
 
     nbgl_useCaseStaticReview(&transactionContext.tagValueList, &transactionContext.infoLongPress,
-                             "Cancel", ui_menu_validation_action);
+                             "Reject transaction", ui_menu_validation_action);
 }
 
 static void display_previous_infos(bool last) {
@@ -274,7 +274,7 @@ static void display_previous_infos(bool last) {
                                       .navWithTap.backButton = false,
                                       .navWithTap.nextPageText = NEXT_PAGE_TEXT,
                                       .navWithTap.nextPageToken = CONTINUE_TOKEN,
-                                      .navWithTap.quitText = "Cancel",
+                                      .navWithTap.quitText = "Reject transaction",
                                       .quitToken = QUIT_TOKEN,
                                       .tuneId = TUNE_TAP_CASUAL};
 
@@ -380,7 +380,7 @@ void display_account(void) {
     transactionContext.tagValueList.pairs = transactionContext.tagValuePair;
 
     nbgl_useCaseAddressReview(G_monero_vstate.ux_address, &transactionContext.tagValueList,
-                              &C_Monero_64px, "Review Address", NULL, ui_menu_pubaddr_action);
+                              &C_Monero_64px, "Verify Monero\naddress", NULL, ui_menu_pubaddr_action);
 }
 
 int ui_menu_any_pubaddr_display(unsigned int value __attribute__((unused)), unsigned char* pub_view,

diff --git a/src/monero_vars.h b/src/monero_vars.h
@@ -28,12 +28,12 @@
 
 extern monero_v_state_t G_monero_vstate;
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
-extern const monero_nv_state_t N_state_pic;
-#define N_monero_pstate ((volatile monero_nv_state_t *)PIC(&N_state_pic))
-#else
+#if defined(TARGET_NANOS)
 extern monero_nv_state_t N_state_pic;
 #define N_monero_pstate ((WIDE monero_nv_state_t *)PIC(&N_state_pic))
+#else
+extern const monero_nv_state_t N_state_pic;
+#define N_monero_pstate ((volatile monero_nv_state_t *)PIC(&N_state_pic))
 #endif
 
 #ifdef MONERO_DEBUG_MAIN

diff --git a/tests/snapshots/flex/test_display_address/00000.png b/tests/snapshots/flex/test_display_address/00000.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00000.png b/tests/snapshots/flex/test_display_subaddress/00000.png
diff --git a/tests/snapshots/flex/test_validate_prehash_update/00000.png b/tests/snapshots/flex/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/flex/test_validate_prehash_update/00001.png b/tests/snapshots/flex/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/flex/test_validate_prehash_update/00002.png b/tests/snapshots/flex/test_validate_prehash_update/00002.png
diff --git a/tests/snapshots/nanos/test_prefix_hash_hash_init/00001.png b/tests/snapshots/nanos/test_prefix_hash_hash_init/00001.png
diff --git a/tests/snapshots/nanos/test_validate_prehash_init/00000.png b/tests/snapshots/nanos/test_validate_prehash_init/00000.png
diff --git a/tests/snapshots/nanos/test_validate_prehash_init/00001.png b/tests/snapshots/nanos/test_validate_prehash_init/00001.png
diff --git a/tests/snapshots/nanos/test_validate_prehash_update/00000.png b/tests/snapshots/nanos/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/nanos/test_validate_prehash_update/00007.png b/tests/snapshots/nanos/test_validate_prehash_update/00007.png
diff --git a/tests/snapshots/nanosp/test_prefix_hash_hash_init/00001.png b/tests/snapshots/nanosp/test_prefix_hash_hash_init/00001.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_init/00000.png b/tests/snapshots/nanosp/test_validate_prehash_init/00000.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_init/00001.png b/tests/snapshots/nanosp/test_validate_prehash_init/00001.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00000.png b/tests/snapshots/nanosp/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00003.png b/tests/snapshots/nanosp/test_validate_prehash_update/00003.png
diff --git a/tests/snapshots/nanox/test_prefix_hash_hash_init/00001.png b/tests/snapshots/nanox/test_prefix_hash_hash_init/00001.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_init/00000.png b/tests/snapshots/nanox/test_validate_prehash_init/00000.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_init/00001.png b/tests/snapshots/nanox/test_validate_prehash_init/00001.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00000.png b/tests/snapshots/nanox/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00003.png b/tests/snapshots/nanox/test_validate_prehash_update/00003.png
diff --git a/tests/snapshots/stax/test_display_address/00000.png b/tests/snapshots/stax/test_display_address/00000.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00000.png b/tests/snapshots/stax/test_display_subaddress/00000.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00000.png b/tests/snapshots/stax/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00001.png b/tests/snapshots/stax/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00002.png b/tests/snapshots/stax/test_validate_prehash_update/00002.png