feat: propagate expert mode error to client

app/src/app_ui/menu.rs

@@ -59,7 +59,7 @@ pub fn ui_menu_main(comm: &mut Comm) -> Event<Instruction> {
             false => "Disabled",
         };
 
-        app_version = String::from("x");
+        // app_version = String::from("x");
         let pages = [
             &Page::from((_first_page_label, &APP_ICON)),
             &Page::from((["Expert Mode", expert_mode_label], true, true)),

app/src/app_ui/run_action.rs

@@ -41,9 +41,7 @@ pub fn ui_review_transaction<'a>(
 
     #[cfg(not(any(target_os = "stax", target_os = "flex")))]
     {
-        let field_pairs = transaction
-            .review_fields(ovk)
-            .map_err(|_| AppSW::BufferOutOfBounds)?;
+        let field_pairs = transaction.review_fields(ovk)?;
 
         // Create a vector to hold the Field structs
         let fields: Vec<Field> = field_pairs
@@ -77,9 +75,7 @@ pub fn ui_review_transaction<'a>(
         #[cfg(target_os = "flex")]
         const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("flex_icon.gif", NBGL));
 
-        let field_pairs = transaction
-            .review_fields(ovk)
-            .map_err(|_| AppSW::BufferOutOfBounds)?;
+        let field_pairs = transaction.review_fields(ovk)?;
 
         // Create a vector to hold the Field structs
         let fields: Vec<Field> = field_pairs

app/src/ironfish/errors.rs

@@ -50,5 +50,6 @@ pub enum IronfishError {
     RandomnessError,
     RoundTwoSigningFailure,
     TryFromInt,
+    ErrExpertModeMustBeEnabled,
     Utf8,
 }

app/src/parser/error.rs

@@ -24,6 +24,7 @@ pub enum ParserError {
     BufferFull,
     InvalidTokenList,
     UnknownToken,
+    ErrExpertModeMustBeEnabled,
 
     UnexpectedError,
 }

app/src/parser/note.rs

@@ -182,7 +182,7 @@ impl Note {
 
             #[cfg(feature = "ledger")]
             if !Settings.app_expert_mode() {
-                return Err(ParserError::UnknownToken);
+                return Err(ParserError::ErrExpertModeMustBeEnabled);
             }
 
             let amount_label = String::from("Raw Amount ");

app/src/status.rs

@@ -13,11 +13,9 @@ pub enum AppSW {
     WrongP1P2 = 0x6A86,
     InsNotSupported = 0x6D00,
     ClaNotSupported = 0x6E00,
-    TxDisplayFail = 0xB001,
     AddrDisplayFail = 0xB002,
     TxWrongLength = 0xB004,
     TxParsingFail = 0xB005,
-    TxHashFail = 0xB006,
     TxSignFail = 0xB008,
     KeyDeriveFail = 0xB009,
     VersionParsingFail = 0xB00A,
@@ -43,6 +41,7 @@ pub enum AppSW {
     TooManyParticipants = 0xB024,
     InvalidTxHash = 0xB025,
     InvalidToken = 0xB026,
+    ErrExpertModeMustBeEnabled = 0xB027,
     #[cfg(feature = "ledger")]
     WrongApduLength = StatusWords::BadLen as u16,
     Ok = 0x9000,
@@ -61,6 +60,7 @@ impl From<IronfishError> for AppSW {
             IronfishError::RoundTwoSigningFailure => AppSW::DkgRound2Fail,
             IronfishError::InvalidSigningKey => AppSW::KeyDeriveFail,
             IronfishError::InvalidSecret => AppSW::InvalidGroupSecretKey,
+            IronfishError::ErrExpertModeMustBeEnabled => AppSW::ErrExpertModeMustBeEnabled,
             // For errors that don't have a direct mapping, use a generic error
             _ => AppSW::Deny,
         }
@@ -89,6 +89,7 @@ impl From<ParserError> for AppSW {
             ParserError::BufferFull => AppSW::BufferOutOfBounds,
             ParserError::InvalidTokenList => AppSW::InvalidPublicPackage,
             ParserError::UnknownToken => AppSW::InvalidToken,
+            ParserError::ErrExpertModeMustBeEnabled => AppSW::ErrExpertModeMustBeEnabled,
         }
     }
 }
@@ -133,6 +134,7 @@ impl From<ParserError> for IronfishError {
             ParserError::InvalidTokenList => IronfishError::InvalidAssetIdentifier,
             ParserError::UnexpectedError => IronfishError::InvalidData,
             ParserError::UnknownToken => IronfishError::InvalidData,
+            ParserError::ErrExpertModeMustBeEnabled => IronfishError::ErrExpertModeMustBeEnabled,
         }
     }
 }

tests_zemu/tests/failures.test.ts

@@ -234,13 +234,14 @@ describe.each(models)('wrong actions', function (m) {
               } catch (error) {
                 // Convert unknown error to string for comparison
                 const errorStr = String(error)
-                if (errorStr.includes('Unknown Return Code: 0xB010') || errorStr.includes('Timeout waiting for screen')) {
+                console.log('ErrorStr ', errorStr)
+                if (errorStr.includes('Unknown Return Code: 0xB027') || errorStr.includes('Timeout waiting for screen')) {
                   throw new Error(errorStr)
                 }
                 throw error
               }
             }),
-          ).rejects.toThrow(/Unknown Return Code: 0xB010|Timeout waiting for screen/)
+          ).rejects.toThrow(/Error: Unknown Return Code: 0xB027|Timeout waiting for screen/)
         }
       } finally {
         for (let i = 0; i < globalSims.length; i++) await globalSims[i].close()