Merge pull request #297 from Zondax/feat/intent

Add intent on review screen

Author: chcmedeiros

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=4
 # This is the minor version of this release
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=7
+APPVERSION_P=8

app/rust/include/rslib.h

@@ -27,4 +27,7 @@ parser_error_t rs_getItem(int8_t displayIdx, char *outKey, uint16_t outKeyLen, c
 // use to clear resources after certificate verification and signing
 void rs_clear_resources(void);
 void rs_get_signing_hash(uint8_t *hash);
+
+// Get the intent string from the parsed consent message
+parser_error_t rs_get_intent(char *out_intent, uint16_t intent_len);
 #endif

app/rust/src/ffi/ui.rs

@@ -66,3 +66,34 @@ pub unsafe extern "C" fn rs_getItem(
         Err(_) => ParserError::NoData as _,
     }
 }
+
+#[no_mangle]
+pub unsafe extern "C" fn rs_get_intent(out_intent: *mut i8, intent_len: u16) -> u32 {
+    if out_intent.is_null() || intent_len == 0 {
+        return ParserError::NoData as u32;
+    }
+
+    // Clear the output buffer first
+    let out_slice = core::slice::from_raw_parts_mut(out_intent as *mut u8, intent_len as usize);
+    out_slice[0] = 0;
+
+    if !UI.is_some() {
+        return ParserError::ContextMismatch as u32;
+    }
+
+    // Safe to unwrap due to previous check
+    let ui = UI.as_ref().unwrap();
+
+    // Access the intent using the public method
+    if let Some(intent) = ui.message.get_intent() {
+        let intent_bytes = intent.as_bytes();
+        let copy_len = core::cmp::min(intent_bytes.len(), intent_len as usize - 1);
+
+        out_slice[..copy_len].copy_from_slice(&intent_bytes[..copy_len]);
+        out_slice[copy_len] = 0; // Null terminate
+
+        return ParserError::Ok as u32;
+    }
+
+    ParserError::NoData as u32
+}

app/rust/src/parser/certificate/cert.rs

@@ -423,11 +423,10 @@ mod test_certificate {
         let msg = &ui.message;
 
         // Test number of items (should be 4 fields)
-        assert_eq!(msg.num_items().unwrap(), 5);
+        assert_eq!(msg.num_items().unwrap(), 4);
 
         // Expected field pairs from the encoded data
         let expected_fields = [
-            ("Transaction Type", "Greet user"),
             ("User", "Hello, world!"),
             ("created_at", "2025-07-11 07:27:44"),
             ("active_for", "10 minutes"),

app/rust/src/parser/consent_message/msg.rs

@@ -65,6 +65,15 @@ pub struct Msg<'a> {
     msg: ConsentMessage<'a>,
 }
 
+impl<'a> Msg<'a> {
+    pub fn get_intent(&self) -> Option<&'a str> {
+        match &self.msg {
+            ConsentMessage::FieldsDisplayMessage { intent, .. } => Some(intent),
+            _ => None,
+        }
+    }
+}
+
 #[repr(u8)] // Important: same representation as MessageType
 #[cfg_attr(any(feature = "derive-debug", test), derive(Debug))]
 pub enum ConsentMessage<'a> {
@@ -111,8 +120,8 @@ impl<'a> FromCandidHeader<'a> for Msg<'a> {
             let m = consent_msg.assume_init_ref();
             match m {
                 ConsentMessage::FieldsDisplayMessage { field_count, .. } => {
-                    // Add 1 to field_count to include intent as item 0
-                    addr_of_mut!((*out).num_items).write(*field_count + 1);
+                    // Don't include intent in the count
+                    addr_of_mut!((*out).num_items).write(*field_count);
                 }
                 ConsentMessage::GenericDisplayMessage(_) => {
                     // Do not accept generic messages
@@ -351,7 +360,7 @@ impl DisplayableItem for ConsentMessage<'_> {
     fn num_items(&self) -> Result<u8, ViewError> {
         check_canary();
         match self {
-            ConsentMessage::FieldsDisplayMessage { field_count, .. } => Ok(*field_count + 1), // +1 for intent
+            ConsentMessage::FieldsDisplayMessage { field_count, .. } => Ok(*field_count), // intent not included in count
             ConsentMessage::GenericDisplayMessage(_) => Ok(1),
         }
     }
@@ -370,30 +379,17 @@ impl DisplayableItem for ConsentMessage<'_> {
             ConsentMessage::FieldsDisplayMessage {
                 fields,
                 field_count,
-                intent,
+                intent: _,
             } => {
-                // Item 0 is the intent
-                if item_n == 0 {
-                    let title_text = b"Transaction Type";
-                    let title_len = title_text.len().min(title.len() - 1);
-                    title[..title_len].copy_from_slice(&title_text[..title_len]);
-                    title[title_len] = 0;
-
-                    // Set message to the intent text
-                    return handle_ui_message(intent.as_bytes(), message, page);
-                }
-
-                // Adjust item_n for field access (subtract 1 since intent is item 0)
-                let field_index = item_n - 1;
-
-                if field_index >= *field_count {
+                // Intent is no longer displayed as an item
+                if item_n >= *field_count {
                     return Err(ViewError::NoData);
                 }
 
                 let mut current = *fields;
 
                 // Skip to the desired field
-                for _ in 0..field_index {
+                for _ in 0..item_n {
                     // Skip key
                     let (rem, _) = parse_text(current).map_err(|_| ViewError::NoData)?;
                     // Skip value - need to properly skip the variant

app/rust/src/parser/consent_message/snapshots/rslib__parser__consent_message__msg_response__msg_response_test__ui.snap

@@ -6,7 +6,6 @@ input_file: src/parser/consent_message/testvectors/ui_data.json
 snapshot_kind: text
 ---
 [
-    "Transaction Type": "Greet user",
     "User": "Hello, world!",
     "created_at": "2025-07-11 07:27:44",
     "active_for": "10 minutes",

app/src/candid/candid_types.h

@@ -385,7 +385,6 @@ typedef struct {
         candid_RegisterVote_t vote;
         candid_Follow_t follow;
         candid_RefreshVotingPower_t refresh_voting_power;
-        // candid_SetVisibility_t set_visibility;
 
         sns_NeuronPermissions_t neuronPermissions;
         sns_Disburse_t sns_disburse;

app/src/common/parser.h

@@ -49,6 +49,8 @@ parser_error_t parser_certNumItems(uint8_t *num_items);
 
 parser_error_t parser_certGetItem(uint8_t displayIdx, char *outKey, uint16_t outKeyLen, char *outVal, uint16_t outValLen,
                                   uint8_t pageIdx, uint8_t *pageCount);
+
+parser_error_t parser_getIntent(char *outIntent, uint16_t intentLen);
 #endif
 
 #ifdef __cplusplus

app/src/handlers/handle_bls.h

@@ -31,6 +31,7 @@
 #include "coin.h"
 #include "crypto.h"
 #include "nvdata.h"
+#include "parser.h"
 #include "parser_impl.h"
 #include "path.h"
 #include "process_chunks.h"
@@ -39,6 +40,9 @@
 #include "view_internal.h"
 #include "zxmacros.h"
 
+// Static buffer to hold intent string for async UX flow
+static char G_intent_buffer[64];
+
 __Z_INLINE void handleConsentRequest(__unused volatile uint32_t *flags, volatile uint32_t *tx, uint32_t rx) {
     zemu_log_stack("handleConsentRequest");
     if (!process_chunk(tx, rx)) {
@@ -98,7 +102,20 @@ __Z_INLINE void handleSignBls(volatile uint32_t *flags, volatile uint32_t *tx, u
 
     CHECK_APP_CANARY()
     view_review_init(tx_certGetItem, tx_certNumItems, app_sign_bls);
-    view_review_show(REVIEW_TXN);
+
+    // Try to get the intent from the parsed consent message
+    // Clear the global buffer first
+    MEMZERO(G_intent_buffer, sizeof(G_intent_buffer));
+    parser_error_t intent_err = parser_getIntent(G_intent_buffer, sizeof(G_intent_buffer));
+
+    if (intent_err == parser_ok && strlen(G_intent_buffer) > 0) {
+        // Use the intent from the parsed message (from global buffer)
+        view_review_show_with_intent(REVIEW_TXN, G_intent_buffer);
+    } else {
+        // Fallback to generic message if no intent available
+        view_review_show(REVIEW_TXN);
+    }
+
     *flags |= IO_ASYNCH_REPLY;
 }
 #endif

app/src/parser.c

@@ -249,4 +249,11 @@ parser_error_t parser_certGetItem(uint8_t displayIdx, char *outKey, uint16_t out
     *pageCount = 1;
     return rs_getItem(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
 }
+
+parser_error_t parser_getIntent(char *outIntent, uint16_t intentLen) {
+    if (outIntent == NULL || intentLen == 0) {
+        return parser_no_data;
+    }
+    return rs_get_intent(outIntent, intentLen);
+}
 #endif