fix tests

Author: OBorce

src/app_ui/sign.rs

@@ -29,9 +29,9 @@ use crate::{
 use messages::{
     encode,
     mlcp::{
-        AccountCommand, Amount, CoinType, Destination, IsTokenFreezable, IsTokenUnfreezable,
-        NftIssuance, OrderAccountCommand, OutputTimeLock, OutputValue, PublicKey, TokenIssuance,
-        TokenTotalSupply, TxOutput, VrfPublicKey, H256,
+        AccountCommand, AccountSpending, Amount, CoinType, Destination, IsTokenFreezable,
+        IsTokenUnfreezable, NftIssuance, OrderAccountCommand, OutputTimeLock, OutputValue,
+        PublicKey, TokenIssuance, TokenTotalSupply, TxOutput, VrfPublicKey, H256,
     },
     AddrType,
 };
@@ -104,14 +104,9 @@ pub fn ui_streaming_review_show_output(
 
 pub fn ui_approve_streaming_review(
     review: &NbglStreamingReview,
-    output: &TxOutput,
     ctx: &TxParsingOutputsContext,
 ) -> Result<bool, StatusWord> {
     let coin = ctx.coin();
-    if !ui_streaming_review_show_output(review, output, coin)? {
-        return Ok(false);
-    }
-
     let fees = ctx.summary().fees_iter().try_fold(
         String::new(),
         |mut acc, res| -> Result<_, StatusWord> {
@@ -473,6 +468,20 @@ fn format_output(output: &TxOutput, coin: CoinType) -> Result<FormatedOutput, St
 
 fn format_input(input: &InputCommand, coin: CoinType) -> Result<FormatedOutput, StatusWord> {
     let (name, value) = match input {
+        InputCommand::AccountSpending(cmd) => match cmd {
+            AccountSpending::DelegationBalance(delegation_id, amount) => {
+                let address_short = format!(
+                    "Delegation ID: {}\nAmount: {}",
+                    id_to_address(delegation_id.hash(), coin.delegation_id_address_prefix())?,
+                    format_amount(*amount, coin)
+                );
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Del Wdrwl", address_short)
+                } else {
+                    ("Delegation withdrawl", address_short)
+                }
+            }
+        },
         InputCommand::AccountCommand(cmd) => match cmd {
             AccountCommand::MintTokens(token_id, amount) => {
                 let address_short = format!(
@@ -494,7 +503,11 @@ fn format_input(input: &InputCommand, coin: CoinType) -> Result<FormatedOutput,
                     "Token ID: {}",
                     id_to_address(token_id.hash(), coin.token_id_address_prefix())?
                 );
-                ("Lock token supply", address_short)
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Lock token", address_short)
+                } else {
+                    ("Lock token supply", address_short)
+                }
             }
             AccountCommand::FreezeToken(token_id, is_unfreezable) => {
                 let address_short = format!(
@@ -513,23 +526,35 @@ fn format_input(input: &InputCommand, coin: CoinType) -> Result<FormatedOutput,
                     "Token ID: {}",
                     id_to_address(token_id.hash(), coin.token_id_address_prefix())?,
                 );
-                ("Unfreeze token", address_short)
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Unfrz token", address_short)
+                } else {
+                    ("Unfreeze token", address_short)
+                }
             }
             AccountCommand::ChangeTokenAuthority(token_id, new_authority) => {
                 let address_short = format!(
                     "Token ID: {}\nNew authority: {}",
                     id_to_address(token_id.hash(), coin.token_id_address_prefix())?,
                     to_address(new_authority, coin)?
                 );
-                ("Change token authority", address_short)
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Chg token auth", address_short)
+                } else {
+                    ("Change token authority", address_short)
+                }
             }
             AccountCommand::ChangeTokenMetadataUri(token_id, new_metadata_uri) => {
                 let address_short = format!(
                     "Token ID: {}\nNew metadata URI: {}",
                     id_to_address(token_id.hash(), coin.token_id_address_prefix())?,
                     String::from_utf8_lossy(new_metadata_uri)
                 );
-                ("Change token metadata URI", address_short)
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Chg token meta", address_short)
+                } else {
+                    ("Change token metadata URI", address_short)
+                }
             }
             AccountCommand::ConcludeOrder(_) | AccountCommand::FillOrder(_, _, _) => {
                 return Err(StatusWord::OrdersV0NotSupported)
@@ -556,7 +581,11 @@ fn format_input(input: &InputCommand, coin: CoinType) -> Result<FormatedOutput,
                     "Order ID: {}",
                     id_to_address(order_id.hash(), coin.order_id_address_prefix())?
                 );
-                ("Conclude order", address_short)
+                if cfg!(any(target_os = "nanosplus", target_os = "nanox")) {
+                    ("Conclude ord", address_short)
+                } else {
+                    ("Conclude order", address_short)
+                }
             }
         },
     };

src/handlers/sign_tx/mod.rs

@@ -30,7 +30,7 @@ use crate::{
 };
 use messages::{
     encode_as_compact, encode_to,
-    mlcp::{CoinType as PCoinType, SighashInputCommitment, TxOutput, H256},
+    mlcp::{CoinType as PCoinType, SighashInputCommitment, H256},
     CoinType, Encode, InputAddressPath, Response, SignTxReq, SignatureResponse, TxInputReq,
     TxInputSignatureResponse, TxMetadataReq, TxMetadataV1Req, TxMetadataVersionReq, TxOutputReq,
 };
@@ -202,7 +202,7 @@ impl TxParsingInputsContext {
                     summary: self.summary,
                     inputs: self.inputs,
                     spinner: self.spinner,
-                    num_inputs_parsed: self.num_inputs_parsed,
+                    num_inputs_parsed: 0,
                 },
             ))
         } else {
@@ -236,7 +236,6 @@ impl TxParsingOutputsContext {
     fn advance_next_output_state(
         mut self,
         review: &NbglStreamingReview,
-        output: &TxOutput,
     ) -> Result<TxParsingContext, StatusWord> {
         if self.num_outputs_parsed < (self.metadata.num_outputs - 1) {
             self.num_outputs_parsed += 1;
@@ -250,7 +249,7 @@ impl TxParsingOutputsContext {
 
             let tx_hash = mintlayer_hash(&message_hash[0..32])?;
 
-            if ui_approve_streaming_review(review, output, &self)? {
+            if ui_approve_streaming_review(review, &self)? {
                 Ok(TxParsingContext::Signing(TxSigningContext {
                     metadata: self.metadata,
                     inputs: self.inputs,
@@ -441,7 +440,7 @@ fn handle_output_req(
     if ui_streaming_review_show_output(review, &req.out, ctx.metadata.coin)? {
         ctx.summary.process_output(&req.out)?;
         update_hash(&req.out, &mut ctx.tx_hasher)?;
-        ctx.advance_next_output_state(review, &req.out)
+        ctx.advance_next_output_state(review)
     } else {
         Err(StatusWord::Deny)
     }

src/handlers/sign_tx/summary_collector.rs

@@ -59,6 +59,7 @@ pub enum TxType {
 }
 
 pub enum InputCommand {
+    AccountSpending(AccountSpending),
     AccountCommand(AccountCommand),
     OrderCommand(OrderAccountCommand),
 }
@@ -207,10 +208,13 @@ impl TxSummaryCollector {
                     };
                 }
             },
-            TxInputWithAdditionalInfo::Account(acc) => match acc.spending {
-                AccountSpending::DelegationBalance(_, amount) => {
-                    self.tx_type = merge_tx_type(self.tx_type, TxType::DelegationWithdrawl);
-                    self.increase_input_totals(CoinOrTokenId::Coin, amount)?;
+            TxInputWithAdditionalInfo::Account(acc) => {
+                self.input_command = Some(InputCommand::AccountSpending(acc.spending.clone()));
+                match acc.spending {
+                    AccountSpending::DelegationBalance(_, amount) => {
+                        self.tx_type = merge_tx_type(self.tx_type, TxType::DelegationWithdrawl);
+                        self.increase_input_totals(CoinOrTokenId::Coin, amount)?;
+                    }
                 }
             },
             TxInputWithAdditionalInfo::AccountCommand(_, cmd) => {

src/main.rs

@@ -303,13 +303,13 @@ fn handle_command(cmd: &Command, ctx: &mut AppContext) -> Result<Response, Statu
                 Ok(Response::TxSetup)
             }
             SignP1::Next => {
-                let req = decode_all(data).ok_or(StatusWord::DeserializeFail)?;
-
                 let (mut tx_ctx, mut review) = match ctx.data_context.take() {
                     Some(DataContext::TxContext(c, r)) => (c, r),
                     _ => return Err(StatusWord::WrongContext),
                 };
 
+                let req = decode_all(data).ok_or(StatusWord::DeserializeFail)?;
+
                 tx_ctx.show_spinner();
 
                 match handle_sign_tx(req, *tx_ctx, &mut review) {
@@ -335,7 +335,8 @@ fn handle_command(cmd: &Command, ctx: &mut AppContext) -> Result<Response, Statu
                     Some(DataContext::SignMessageContext(ctx)) => ctx,
                     _ => return Err(StatusWord::WrongContext),
                 };
-                handle_sign_message(data, msg_ctx).map(Response::MessageSignature)
+                let response = handle_sign_message(data, msg_ctx).map(Response::MessageSignature);
+                response
             }
         },
         Command::Ping => Ok(Response::Pong),