workflow: split fee function

Author: benma

src/rust/bitbox02-rust/src/hww/api/bitcoin/signtx.rs

@@ -1073,7 +1073,7 @@ async fn _process(request: &pb::BtcSignInitRequest) -> Result<Response, Error> {
     } else {
         Some(100. * (fee as f64) / (outputs_sum_out as f64))
     };
-    transaction::verify_total_fee(
+    transaction::verify_total_fee_maybe_warn(
         &format_amount(coin_params, format_unit, total_out)?,
         &format_amount(coin_params, format_unit, fee)?,
         fee_percentage,

src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction.rs

@@ -257,7 +257,7 @@ async fn _process(request: &pb::CardanoSignTransactionRequest) -> Result<Respons
         .await?;
     } else {
         let fee_percentage: f64 = 100. * (request.fee as f64) / (total as f64);
-        transaction::verify_total_fee(
+        transaction::verify_total_fee_maybe_warn(
             &format_value(params, total + request.fee),
             &format_value(params, request.fee),
             Some(fee_percentage),

src/rust/bitbox02-rust/src/hww/api/ethereum/sign.rs

@@ -227,7 +227,7 @@ async fn verify_erc20_transaction(
         None => ("Unknown token".into(), "Unknown amount".into()),
     };
     transaction::verify_recipient(&recipient_address, &formatted_value).await?;
-    transaction::verify_total_fee(&formatted_total, &formatted_fee, None).await?;
+    transaction::verify_total_fee_maybe_warn(&formatted_total, &formatted_fee, None).await?;
     Ok(())
 }
 
@@ -286,7 +286,7 @@ async fn verify_standard_transaction(
         value: (&amount.value).add(&fee.value),
     };
     let percentage = calculate_percentage(&fee.value, &amount.value);
-    transaction::verify_total_fee(&total.format(), &fee.format(), percentage).await?;
+    transaction::verify_total_fee_maybe_warn(&total.format(), &fee.format(), percentage).await?;
     Ok(())
 }
 

src/rust/bitbox02-rust/src/workflow/transaction.rs

@@ -39,16 +39,9 @@ fn format_percentage(p: f64) -> String {
     util::decimal::format_no_trim(int, 1)
 }
 
-pub async fn verify_total_fee(
-    total: &str,
-    fee: &str,
-    fee_percentage: Option<f64>,
-) -> Result<(), UserAbort> {
+pub async fn verify_total_fee(total: &str, fee: &str, longtouch: bool) -> Result<(), UserAbort> {
     let result = RefCell::new(None as Option<Result<(), UserAbort>>);
 
-    const FEE_WARNING_THRESHOLD: f64 = 10.;
-    let fee_percentage = fee_percentage.filter(|&f| f >= FEE_WARNING_THRESHOLD);
-    let longtouch = fee_percentage.is_none();
     let mut component = bitbox02::ui::confirm_transaction_fee_create(
         total,
         fee,
@@ -58,7 +51,18 @@ pub async fn verify_total_fee(
         }),
     );
     component.screen_stack_push();
-    option_no_screensaver(&result).await?;
+    option_no_screensaver(&result).await
+}
+
+pub async fn verify_total_fee_maybe_warn(
+    total: &str,
+    fee: &str,
+    fee_percentage: Option<f64>,
+) -> Result<(), UserAbort> {
+    const FEE_WARNING_THRESHOLD: f64 = 10.;
+    let fee_percentage = fee_percentage.filter(|&f| f >= FEE_WARNING_THRESHOLD);
+    let longtouch = fee_percentage.is_none();
+    verify_total_fee(total, fee, longtouch).await?;
 
     if let Some(fee_percentage) = fee_percentage {
         match super::confirm::confirm(&super::confirm::Params {