Add intent on the last screen (#206)

* add intent in sign screen

* bump version

Author: abenso

app/ui/view_nbgl.c

@@ -53,6 +53,7 @@ const char *intro_message = NULL;
 const char *intro_submessage = NULL;
 char intro_msg_buf[MAX_CHARS_PER_VALUE1_LINE];
 char intro_submsg_buf[MAX_CHARS_SUBMSG_LINE];
+char approval_label_buf[MAX_CHARS_SUBMSG_LINE];
 
 #define REVIEW_STANDALONE_SIZE 22
 #define REVIEW_MESSAGE_SIZE 18
@@ -470,13 +471,13 @@ static void config_useCaseReview(nbgl_operationType_t type) {
 
     if (app_mode_blindsign_required()) {
         nbgl_useCaseReviewBlindSigning(type, &pairList, &C_icon_stax_64,
-                                       (intro_message == NULL ? "Review transaction" : intro_message),
-                                       (intro_submessage == NULL ? NULL : intro_submessage),
+                                       (intro_message == NULL ? "Review transaction" : intro_message), intro_submessage,
                                        "Accept risk and sign transaction ?", NULL, reviewTransactionChoice);
     } else {
-        nbgl_useCaseReview(
-            type, &pairList, &C_icon_stax_64, (intro_message == NULL ? "Review transaction" : intro_message),
-            (intro_submessage == NULL ? NULL : intro_submessage), APPROVE_LABEL_NBGL, reviewTransactionChoice);
+        nbgl_useCaseReview(type, &pairList, &C_icon_stax_64,
+                           (intro_message == NULL ? "Review transaction" : intro_message), intro_submessage,
+                           (approval_label_buf[0] != '\0' ? approval_label_buf : APPROVE_LABEL_NBGL),
+                           reviewTransactionChoice);
     }
 }
 
@@ -497,9 +498,9 @@ static void config_useCaseMessageReview() {
                                        (intro_message == NULL ? "Review Message" : intro_message), NULL,
                                        "Accept risk and sign message ?", NULL, reviewMessageChoice);
     } else {
-        nbgl_useCaseReview(TYPE_MESSAGE, &pairList, &C_Review_64px,
-                           (intro_message == NULL ? "Review Message" : intro_message), NULL, APPROVE_LABEL_NBGL_MSG,
-                           reviewMessageChoice);
+        nbgl_useCaseReview(
+            TYPE_MESSAGE, &pairList, &C_Review_64px, (intro_message == NULL ? "Review Message" : intro_message), NULL,
+            (approval_label_buf[0] != '\0' ? approval_label_buf : APPROVE_LABEL_NBGL_MSG), reviewMessageChoice);
     }
 }
 
@@ -528,6 +529,7 @@ void view_review_show_impl(unsigned int requireReply, const char *title, const c
     intro_submessage = NULL;
     intro_msg_buf[0] = '\0';
     intro_submsg_buf[0] = '\0';
+    approval_label_buf[0] = '\0';
     viewdata.key = viewdata.keys[0];
     viewdata.value = viewdata.values[0];
     // Retrieve intro text for transaction
@@ -574,6 +576,7 @@ void view_review_show_with_intent_impl(unsigned int requireReply, const char *in
     intro_submessage = NULL;
     intro_msg_buf[0] = '\0';
     intro_submsg_buf[0] = '\0';
+    approval_label_buf[0] = '\0';
     viewdata.key = viewdata.keys[0];
     viewdata.value = viewdata.values[0];
 
@@ -583,8 +586,14 @@ void view_review_show_with_intent_impl(unsigned int requireReply, const char *in
         const char *review_text = (review_type == REVIEW_MSG) ? "Review message" : "Review transaction";
         int ret = snprintf(intro_msg_buf, sizeof(intro_msg_buf), "%s to %s", review_text, intent);
 
+        // Check for snprintf error
+        if (ret < 0) {
+            // Handle encoding error - use a default message
+            strncpy(intro_msg_buf, review_text, sizeof(intro_msg_buf) - 1);
+            intro_msg_buf[sizeof(intro_msg_buf) - 1] = '\0';
+        }
         // Check if truncation occurred and add ellipsis if needed
-        if (ret >= (int)sizeof(intro_msg_buf)) {
+        else if ((size_t)ret >= sizeof(intro_msg_buf)) {
             const size_t buf_len = sizeof(intro_msg_buf);
             if (buf_len >= 4) {
                 intro_msg_buf[buf_len - 4] = '.';
@@ -595,6 +604,31 @@ void view_review_show_with_intent_impl(unsigned int requireReply, const char *in
         }
         intro_message = intro_msg_buf;
         intro_submessage = NULL;  // No second line for NBGL
+
+        // Format the approval label with intent for the final approval screen
+        const char *sign_text = (review_type == REVIEW_MSG) ? "Sign message" : "Sign transaction";
+        ret = snprintf(approval_label_buf, sizeof(approval_label_buf), "%s to %s?", sign_text, intent);
+
+        // Check for snprintf error
+        if (ret < 0) {
+            // Handle encoding error - use a default message
+            strncpy(approval_label_buf, sign_text, sizeof(approval_label_buf) - 1);
+            approval_label_buf[sizeof(approval_label_buf) - 1] = '\0';
+        }
+        // Check if truncation occurred and add ellipsis if needed
+        else if ((size_t)ret >= sizeof(approval_label_buf)) {
+            const size_t buf_len = sizeof(approval_label_buf);
+            if (buf_len >= 4) {
+                approval_label_buf[buf_len - 4] = '.';
+                approval_label_buf[buf_len - 3] = '.';
+                approval_label_buf[buf_len - 2] = '.';
+                approval_label_buf[buf_len - 1] = '\0';
+            }
+        }
+    } else {
+        // Use default labels if no intent
+        snprintf(approval_label_buf, sizeof(approval_label_buf), "%s",
+                 (review_type == REVIEW_MSG) ? APPROVE_LABEL_NBGL_MSG : APPROVE_LABEL_NBGL);
     }
 
     h_paging_init();

include/zxversion.h

@@ -17,4 +17,4 @@
 
 #define ZXLIB_MAJOR 36
 #define ZXLIB_MINOR 0
-#define ZXLIB_PATCH 2
+#define ZXLIB_PATCH 3