Merge pull request #18 from LedgerHQ/develop

Merge into master

rust-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sui"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Obsidian Systems"]
 edition = "2018"
 autobins = false
@@ -28,14 +28,14 @@ extra_debug = ["ledger-log/log_trace"]
 pending_review_screen = []
 
 [target.'cfg(target_family = "bolos")'.dependencies]
-ledger_device_sdk = "1.19.1"
-ledger_secure_sdk_sys = "1.6.1"
+ledger_device_sdk = "1.19.5"
+ledger_secure_sdk_sys = "1.6.2"
 
 [target.'cfg(any(target_os = "nanosplus", target_os = "nanox"))'.dependencies]
 ledger-prompts-ui = { git = "https://github.com/alamgu/ledger-prompts-ui" }
 
 [target.'cfg(target_family = "bolos")'.dev-dependencies.ledger_device_sdk]
-version = "1.19.1"
+version = "1.19.5"
 features = [ "speculos" ]
 
 [[bin]]

rust-app/src/main_nanos.rs

@@ -116,7 +116,7 @@ pub fn app_main() {
             }
             io::Event::Ticker => {
                 if UxEvent::Event.request() != BOLOS_UX_OK {
-                    UxEvent::block();
+                    UxEvent::block_and_get_event::<Dummy>(&mut comm.borrow_mut());
                     // Redisplay application menu here
                     menu(states.borrow(), &idle_menu, &busy_menu);
                 }
@@ -125,3 +125,13 @@ pub fn app_main() {
         }
     }
 }
+
+// Trick to manage pin code
+use core::convert::TryFrom;
+struct Dummy {}
+impl TryFrom<io::ApduHeader> for Dummy {
+    type Error = io::StatusWords;
+    fn try_from(_header: io::ApduHeader) -> Result<Self, Self::Error> {
+        Ok(Self {})
+    }
+}

rust-app/src/ui/nbgl.rs

@@ -77,8 +77,15 @@ impl UserInterface {
 
         let success = NbglReview::new()
             .glyph(&APP_ICON)
-            .titles("Transfer SUI", "", "Sign Transaction?")
+            .titles(
+                "Review transaction to transfer SUI",
+                "",
+                "Sign transaction to transfer SUI",
+            )
             .show(&tx_fields);
+        NbglReviewStatus::new()
+            .status_type(StatusType::Transaction)
+            .show(success);
         if success {
             Some(())
         } else {
@@ -96,7 +103,7 @@ impl UserInterface {
         let success = NbglReview::new()
             .glyph(&APP_ICON)
             .blind()
-            .titles("Blind Sign Transaction", "", "Sign Transaction?")
+            .titles("Review transaction", "", "Sign transaction")
             .show(&tx_fields);
         NbglReviewStatus::new()
             .status_type(StatusType::Transaction)