Fix wording and amount display

LedgerHQ · Oct 29, 2024 · a84c9cf · a84c9cf
1 parent 5179c76
commit a84c9cf
Show file tree

Hide file tree

Showing 73 changed files with 42 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/starknet/Cargo.toml b/starknet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starknet"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2021"
 authors = ["Ledger"]
 

diff --git a/starknet/src/display.rs b/starknet/src/display.rs
@@ -91,7 +91,7 @@ pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
 
                 let review = NbglReview::new()
                     .tx_type(TransactionType::Transaction)
-                    .titles("Review", "Transaction", "Sign Transaction")
+                    .titles("Review transaction", "", "Sign Transaction ?")
                     .glyph(&APP_ICON);
 
                 Some(review.show(&my_fields))
@@ -171,7 +171,7 @@ pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
 
                         let review = NbglReview::new()
                             .tx_type(TransactionType::Transaction)
-                            .titles("Review", "Transaction", "Sign Transaction")
+                            .titles("Review transaction", "", "Sign Transaction ?")
                             .glyph(&APP_ICON);
 
                         Some(review.show(&my_fields))
@@ -413,7 +413,7 @@ pub fn main_ui_nbgl(_comm: &mut Comm) -> NbglHomeAndSettings {
     // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
     const APP_ICON: NbglGlyph = NbglGlyph::from_include(include_gif!("starknet_64x64.gif", NBGL));
 
-    let settings_strings = [["Enable Blind signing", "Allow blind signing"]];
+    let settings_strings = [["Blind signing", "Enable transaction blind signing"]];
     let mut settings: Settings = Default::default();
 
     // Display the home screen.
@@ -427,6 +427,7 @@ pub fn main_ui_nbgl(_comm: &mut Comm) -> NbglHomeAndSettings {
         .settings(settings.get_mut(), &settings_strings)
 }
 
+#[allow(unused_variables)]
 pub fn blind_signing_enable_ui(ctx: &mut Ctx) {
     #[cfg(not(any(target_os = "stax", target_os = "flex")))]
     {

diff --git a/starknet/src/types.rs b/starknet/src/types.rs
@@ -89,11 +89,15 @@ impl FieldElement {
     #[allow(clippy::wrong_self_convention)]
     pub fn to_dec_string(&self, decimals: Option<usize>) -> String {
         let bn = BigUint::from_bytes_be(self.value.as_ref());
+        if bn == BigUint::ZERO {
+            return "0".to_string();
+        }
         match decimals {
             Some(d) => {
-                let bn_str = bn.to_string();
+                let mut bn_str = bn.to_string();
                 let len = bn_str.len();
                 if len <= d {
+                    bn_str = bn_str.trim_end_matches('0').to_string();
                     let mut s = String::from("0.");
                     s.push_str(&"0".repeat(d - len));
                     s.push_str(&bn_str);
@@ -102,6 +106,7 @@ impl FieldElement {
                     let (int_part, dec_part) = bn_str.split_at(len - d);
                     let mut s = String::from(int_part);
                     s.push('.');
+                    let dec_part = dec_part.trim_end_matches('0');
                     s.push_str(dec_part);
                     s
                 }

diff --git a/tests/snapshots/flex/test_app_mainmenu/00001.png b/tests/snapshots/flex/test_app_mainmenu/00001.png
diff --git a/tests/snapshots/flex/test_app_mainmenu/00002.png b/tests/snapshots/flex/test_app_mainmenu/00002.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00000.png b/tests/snapshots/flex/test_clear_sign_tx_0/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00001.png b/tests/snapshots/flex/test_clear_sign_tx_0/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00002.png b/tests/snapshots/flex/test_clear_sign_tx_0/00002.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00003.png b/tests/snapshots/flex/test_clear_sign_tx_0/00003.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00000.png b/tests/snapshots/flex/test_clear_sign_tx_1/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00001.png b/tests/snapshots/flex/test_clear_sign_tx_1/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00003.png b/tests/snapshots/flex/test_clear_sign_tx_1/00003.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00000.png b/tests/snapshots/flex/test_clear_sign_tx_2/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00001.png b/tests/snapshots/flex/test_clear_sign_tx_2/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00002.png b/tests/snapshots/flex/test_clear_sign_tx_2/00002.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00003.png b/tests/snapshots/flex/test_clear_sign_tx_2/00003.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00000.png b/tests/snapshots/flex/test_clear_sign_tx_3/00000.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00001.png b/tests/snapshots/flex/test_clear_sign_tx_3/00001.png
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00003.png b/tests/snapshots/flex/test_clear_sign_tx_3/00003.png
diff --git a/tests/snapshots/nanosp/test_app_mainmenu/00001.png b/tests/snapshots/nanosp/test_app_mainmenu/00001.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png b/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png b/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png
diff --git a/tests/snapshots/nanox/test_app_mainmenu/00001.png b/tests/snapshots/nanox/test_app_mainmenu/00001.png
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png b/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png b/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00001.png b/tests/snapshots/stax/test_app_mainmenu/00001.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00002.png b/tests/snapshots/stax/test_app_mainmenu/00002.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00005.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00005.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00005.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00005.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00000.png b/tests/snapshots/stax/test_clear_sign_tx_0/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00001.png b/tests/snapshots/stax/test_clear_sign_tx_0/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00002.png b/tests/snapshots/stax/test_clear_sign_tx_0/00002.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00003.png b/tests/snapshots/stax/test_clear_sign_tx_0/00003.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00000.png b/tests/snapshots/stax/test_clear_sign_tx_1/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00001.png b/tests/snapshots/stax/test_clear_sign_tx_1/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00003.png b/tests/snapshots/stax/test_clear_sign_tx_1/00003.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00000.png b/tests/snapshots/stax/test_clear_sign_tx_2/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00001.png b/tests/snapshots/stax/test_clear_sign_tx_2/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00002.png b/tests/snapshots/stax/test_clear_sign_tx_2/00002.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00003.png b/tests/snapshots/stax/test_clear_sign_tx_2/00003.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00000.png b/tests/snapshots/stax/test_clear_sign_tx_3/00000.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00001.png b/tests/snapshots/stax/test_clear_sign_tx_3/00001.png
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00003.png b/tests/snapshots/stax/test_clear_sign_tx_3/00003.png
diff --git a/tests/test_clear_sign_deploy.py b/tests/test_clear_sign_deploy.py
@@ -37,13 +37,21 @@ def test_clear_sign_deploy_v3(firmware, backend, navigator, test_name):
                                                     ROOT_SCREENSHOT_PATH,
                                                     test_name)
         else:
-            instructions = [
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.USE_CASE_REVIEW_CONFIRM,
-                NavInsID.USE_CASE_STATUS_DISMISS
-            ]
+            if firmware.device == "stax":
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
+            else:
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                            test_name,
                                            instructions)
@@ -97,13 +105,21 @@ def test_clear_sign_deploy_v1(firmware, backend, navigator, test_name):
                                                     ROOT_SCREENSHOT_PATH,
                                                     test_name)
         else:
-            instructions = [
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.USE_CASE_REVIEW_CONFIRM,
-                NavInsID.USE_CASE_STATUS_DISMISS
-            ]
+            if firmware.device == "stax":
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
+            else:
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                            test_name,
                                            instructions)