Update code + test snapshots following C string conversion support in…

… Rust SDK.

src/app_ui/address.rs

@@ -24,7 +24,10 @@ use ledger_device_sdk::ui::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
 use ledger_device_sdk::ui::gadgets::{Field, MultiFieldReview};
 
 #[cfg(target_os = "stax")]
-use ledger_device_sdk::nbgl::NbglAddressConfirm;
+use ledger_device_sdk::nbgl::{NbglAddressConfirm, NbglGlyph};
+
+#[cfg(target_os = "stax")]
+use include_gif::include_gif;
 
 // Display only the last 20 bytes of the address
 const DISPLAY_ADDR_BYTES_LEN: usize = 20;
@@ -62,6 +65,9 @@ pub fn ui_display_pk(addr: &[u8]) -> Result<bool, AppSW> {
 
     #[cfg(target_os = "stax")]
     {
-        Ok(NbglAddressConfirm::new().show(addr_hex))
+        // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
+        const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("crab_64x64.gif", NBGL));
+        // Display the address confirmation screen.
+        Ok(NbglAddressConfirm::new().glyph(&FERRIS).show(addr_hex))
     }
 }

src/app_ui/menu.rs

@@ -66,9 +66,11 @@ pub fn ui_menu_main(comm: &mut Comm) -> Event<Instruction> {
 
 #[cfg(target_os = "stax")]
 pub fn ui_menu_main(comm: &mut Comm) -> Event<Instruction> {
+    // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
     const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("crab_64x64.gif", NBGL));
+    // Display the home screen.
     NbglHome::new(comm)
-        .app_name("Boilerplate\0")
+        .app_name("Boilerplate")
         .info_contents(env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_AUTHORS"))
         .glyph(&FERRIS)
         .show()

src/app_ui/sign.rs

@@ -18,8 +18,6 @@ use crate::handlers::sign_tx::Tx;
 use crate::utils::concatenate;
 use crate::AppSW;
 
-use ledger_secure_sdk_sys::*;
-
 #[cfg(not(target_os = "stax"))]
 use ledger_device_sdk::ui::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
 #[cfg(not(target_os = "stax"))]
@@ -92,18 +90,17 @@ pub fn ui_display_tx(tx: &Tx) -> Result<bool, AppSW> {
 
     #[cfg(target_os = "stax")]
     {
-        // This will copy the fields into the nbgl format, not ideal
-        // memory-wise...
-        let nbgl_fields: [nbgl_layoutTagValue_t; 3] = [
-            my_fields[0].into(),
-            my_fields[1].into(),
-            my_fields[2].into(),
-        ];
-
+        // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
         const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("crab_64x64.gif", NBGL));
-        Ok(NbglReview::new()
-            .status_strings("TRANSACTION\nSIGNED\0", "Transaction\nRejected\0")
-            .glyph(&FERRIS)
-            .show(&nbgl_fields))
+        // Create NBGL review. Maximum number of fields and string buffer length can be customised
+        // with constant generic parameters of NbglReview. Default values are 32 and 1024 respectively.
+        let mut review: NbglReview = NbglReview::new()
+            .titles(
+                "Please review transaction",
+                "To send CRAB",
+                "Sign transaction\nto send CRAB",
+            )
+            .glyph(&FERRIS);
+        Ok(review.show(&my_fields))
     }
 }

tests/test_app_mainmenu.py

@@ -14,8 +14,8 @@ def test_app_mainmenu(firmware, navigator, test_name):
         ]
     else:
         instructions = [
-            NavInsID.USE_CASE_HOME_INFO,
-            NavInsID.USE_CASE_SETTINGS_SINGLE_PAGE_EXIT
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavInsID.USE_CASE_SUB_SETTINGS_EXIT
         ]
     navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, instructions,
                                    screen_change_before_first_instruction=False)

tests/test_sign_cmd.py

@@ -45,7 +45,8 @@ def test_sign_tx_short_tx(firmware, backend, navigator, test_name):
                                                       test_name)
         else:
             navigator.navigate_until_text_and_compare(NavInsID.USE_CASE_REVIEW_TAP,
-                                                      [NavInsID.USE_CASE_REVIEW_CONFIRM],
+                                                      [NavInsID.USE_CASE_REVIEW_CONFIRM,
+                                                       NavInsID.WAIT_FOR_HOME_SCREEN],
                                                       "Hold to sign",
                                                       ROOT_SCREENSHOT_PATH,
                                                       test_name)
@@ -88,7 +89,8 @@ def test_sign_tx_long_tx(firmware, backend, navigator, test_name):
                                                       test_name)
         else:
             navigator.navigate_until_text_and_compare(NavInsID.USE_CASE_REVIEW_TAP,
-                                                      [NavInsID.USE_CASE_REVIEW_CONFIRM],
+                                                      [NavInsID.USE_CASE_REVIEW_CONFIRM,
+                                                       NavInsID.WAIT_FOR_HOME_SCREEN],
                                                       "Hold to sign",
                                                       ROOT_SCREENSHOT_PATH,
                                                       test_name)
@@ -130,7 +132,10 @@ def test_sign_tx_refused(firmware, backend, navigator, test_name):
     else:
         instructions = [NavInsID.USE_CASE_REVIEW_TAP,
                         NavInsID.USE_CASE_REVIEW_TAP,
-                        NavInsID.USE_CASE_REVIEW_REJECT]
+                        NavInsID.USE_CASE_REVIEW_REJECT,
+                        NavInsID.USE_CASE_CHOICE_CONFIRM,
+                        NavInsID.WAIT_FOR_HOME_SCREEN
+                        ]
         with pytest.raises(ExceptionRAPDU) as e:
             with client.sign_tx(path=path, transaction=transaction):
                 navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,