Merge pull request #296 from Zondax/feat/intent

Feat/intent

Author: chcmedeiros

.github/workflows/main.yml

@@ -156,7 +156,9 @@ jobs:
           submodules: true
 
       - name: Install node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
 
       - name: Install yarn
         run: npm install -g yarn
@@ -194,7 +196,9 @@ jobs:
           submodules: recursive
       - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
       - name: Install node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install yarn
         run: |
           npm install -g yarn

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=6
+APPVERSION_P=7

app/rust/src/constants.rs

@@ -66,7 +66,7 @@ pub const MAX_TABLE_FIELDS: usize = 15;
 
 // Maximum fields per type entry
 // Analysis of ICRC-21 test vectors shows max 4 fields per type
-pub const MAX_FIELDS_PER_TYPE: usize = 10;
+pub const MAX_FIELDS_PER_TYPE: usize = 8;
 // the max number of candid arguments in memory
 pub const MAX_ARGS: usize = 5;
 

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

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

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

@@ -111,7 +111,8 @@ impl<'a> FromCandidHeader<'a> for Msg<'a> {
             let m = consent_msg.assume_init_ref();
             match m {
                 ConsentMessage::FieldsDisplayMessage { field_count, .. } => {
-                    addr_of_mut!((*out).num_items).write(*field_count);
+                    // Add 1 to field_count to include intent as item 0
+                    addr_of_mut!((*out).num_items).write(*field_count + 1);
                 }
                 ConsentMessage::GenericDisplayMessage(_) => {
                     // Do not accept generic messages
@@ -350,7 +351,7 @@ impl DisplayableItem for ConsentMessage<'_> {
     fn num_items(&self) -> Result<u8, ViewError> {
         check_canary();
         match self {
-            ConsentMessage::FieldsDisplayMessage { field_count, .. } => Ok(*field_count),
+            ConsentMessage::FieldsDisplayMessage { field_count, .. } => Ok(*field_count + 1), // +1 for intent
             ConsentMessage::GenericDisplayMessage(_) => Ok(1),
         }
     }
@@ -369,16 +370,30 @@ impl DisplayableItem for ConsentMessage<'_> {
             ConsentMessage::FieldsDisplayMessage {
                 fields,
                 field_count,
-                ..
+                intent,
             } => {
-                if item_n >= *field_count {
+                // 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 {
                     return Err(ViewError::NoData);
                 }
 
                 let mut current = *fields;
 
                 // Skip to the desired field
-                for _ in 0..item_n {
+                for _ in 0..field_index {
                     // Skip key
                     let (rem, _) = parse_text(current).map_err(|_| ViewError::NoData)?;
                     // Skip value - need to properly skip the variant
@@ -450,9 +465,8 @@ impl DisplayableItem for ConsentMessage<'_> {
                         }
 
                         // Use a portion of the message buffer for formatting
-                        let format_len =
-                            crate::utils::format_timestamp(timestamp, message)
-                                .map_err(|_| ViewError::NoData)?;
+                        let format_len = crate::utils::format_timestamp(timestamp, message)
+                            .map_err(|_| ViewError::NoData)?;
 
                         // Null terminate
                         message[format_len] = 0;
@@ -474,9 +488,8 @@ impl DisplayableItem for ConsentMessage<'_> {
                         }
 
                         // Use a portion of the message buffer for formatting
-                        let format_len =
-                            crate::utils::format_duration(duration, message)
-                                .map_err(|_| ViewError::NoData)?;
+                        let format_len = crate::utils::format_duration(duration, message)
+                            .map_err(|_| ViewError::NoData)?;
 
                         // Null terminate
                         message[format_len] = 0;

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

@@ -6,6 +6,7 @@ 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",

deps/ledger-zxlib

@@ -29,7 +29,7 @@
     "@ledgerhq/hw-transport-node-hid": "^6.29.7",
     "@ledgerhq/logs": "^6.13.0",
     "@zondax/ledger-icp": "^3.2.8",
-    "@zondax/zemu": "^0.55.3"
+    "@zondax/zemu": "^0.61.1"
   },
   "devDependencies": {
     "@matteoh2o1999/github-actions-jest-reporter": "^3.0.0",