Fix final hash calculation for the subintents; Fix settings menu; Bum…

…p application version

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "babylon-ledger-app"
-version = "0.7.29"
+version = "0.7.30"
 authors = ["siy"]
 edition = "2021"
 description = "Radix Babylon"

sbor/src/digest/hash_calculator.rs

@@ -439,10 +439,10 @@ impl<T: Digester> HashCalculator<T> {
 
     fn si_finalize(&mut self) -> Result<Digest, T::Error> {
         let digest = self.output_digester.finalize()?;
-        self.work_digester.reset();
-        self.work_digester.update(&Self::SI_INITIAL_VECTOR)?;
-        self.work_digester.update(digest.as_bytes())?;
-        self.work_digester.finalize()
+        self.output_digester.init()?;
+        self.output_digester.update(&Self::SI_INITIAL_VECTOR)?;
+        self.output_digester.update(digest.as_bytes())?;
+        self.output_digester.finalize()
     }
 }
 

src/sign/tx_state.rs

@@ -207,12 +207,11 @@ impl<T: Copy> TxState<T> {
         comm: &mut Comm,
         sign_mode: SignMode,
     ) -> Result<SignOutcome, AppError> {
-        let digest = self.processor.finalize()?;
-
         if !(Settings::get().blind_signing) {
             return Err(AppError::BadSubintentSignState);
         }
 
+        let digest = self.processor.finalize()?;
         self.finalize_sign_si(comm, sign_mode, &digest)
     }
 

src/ui/menu.rs

@@ -9,6 +9,7 @@ use crate::ui::multiline_scroller::LINE2_Y;
 use crate::ui::utils::{CenteredText, TopCenter};
 
 pub enum MenuFeature<'a> {
+    Plain,
     Icon(&'a Icon<'a>),
     OnOffState(fn() -> bool),
 }
@@ -48,6 +49,9 @@ impl<'a, const N: usize> Menu<'a, N> {
         let item = &self.items[self.current];
 
         match item.feature {
+            MenuFeature::Plain => {
+                item.text.draw_centered(true);
+            }
             MenuFeature::Icon(icon) => {
                 item.text.place(
                     Location::Custom(LINE2_Y + icon.icon.height as usize / 2),

src/ui/utils.rs

@@ -1,7 +1,7 @@
 use crate::ui::multiline_scroller::{LINE1_Y, LINE2_Y, LINE3_Y};
 use include_gif::include_gif;
 use ledger_device_sdk::ui::bagls::Icon;
-use ledger_device_sdk::ui::bitmaps::{Glyph, BACK};
+use ledger_device_sdk::ui::bitmaps::Glyph;
 use ledger_device_sdk::ui::layout::{Draw, Layout, Location, StringPlace};
 use ledger_device_sdk::ui::{SCREEN_HEIGHT, SCREEN_WIDTH};
 
@@ -49,4 +49,3 @@ impl TopCenter for Icon<'_> {
 
 pub const RADIX_LOGO: Glyph = Glyph::from_include(include_gif!("icons/nanox_app_radix.gif"));
 pub const RADIX_LOGO_ICON: Icon = Icon::from(&RADIX_LOGO);
-pub const BACK_ICON: Icon = Icon::from(&BACK);

src/xui/menu.rs

@@ -4,7 +4,7 @@ pub mod main_menu {
     use crate::ui::menu::{Menu, MenuFeature, MenuItem};
     use crate::ui::multipage_validator::MultipageValidator;
     use crate::ui::single_message::SingleMessage;
-    use crate::ui::utils::{BACK_ICON, RADIX_LOGO_ICON};
+    use crate::ui::utils::RADIX_LOGO_ICON;
     use ledger_device_sdk::ui::bagls::{
         CERTIFICATE_ICON, COGGLE_ICON, DASHBOARD_X_ICON, PROCESSING_ICON,
     };
@@ -48,11 +48,7 @@ pub mod main_menu {
                 "\nBlind Signing",
                 blind_signing_setting_action,
             ),
-            MenuItem::new(
-                MenuFeature::Icon(&BACK_ICON),
-                "\nBack",
-                back_from_setting_action,
-            ),
+            MenuItem::new(MenuFeature::Plain, "\nBack", back_from_setting_action),
         ];
 
         Menu::new(menu).event_loop();