Merge pull request #4544 from anoma/grarco/masp-fee-payment-msg

Improve message for failing atomic batch

Author: mergify[bot]

.changelog/unreleased/improvements/4544-masp-fee-payment-msg.md

@@ -0,0 +1,3 @@
+- Improved the display of a transaction's result to account
+  for shielded fee payment in a failing atomic batch.
+  ([\#4544](https://github.com/anoma/namada/pull/4544))

crates/sdk/src/tx.rs

@@ -480,14 +480,36 @@ pub fn display_batch_resp(context: &impl Namada, resp: &TxResponse) {
         false
     };
     let batch_results = resp.batch_result();
-    if !batch_results.is_empty() {
+    // If the batch contains at least one transaction
+    if let Some((first_inner_hash, first_result)) = batch_results.first() {
         if !wrapper_successful {
-            display_line!(
-                context.io(),
-                "Since the batch in its entirety failed, none of the \
-                 transactions listed below have been committed. Their results \
-                 are provided for completeness.",
+            // Check if fees were paid via the shielded pool, in this case the
+            // first transaction of the batch was committed regardless of the
+            // batch failure (even for atomic batches)
+            let masp_fee_payment = matches!(
+                first_result,
+                InnerTxResult::Success(res)
+                    if res.events.iter().any(|event| {
+                        event.kind() == &namada_tx::event::masp_types::FEE_PAYMENT
+                    })
             );
+            if masp_fee_payment {
+                display_line!(
+                    context.io(),
+                    "The first transaction of the batch ({}) was applied to \
+                     pay the fees via the MASP. Since the batch failed, none \
+                     of the remaining transactions listed below have been \
+                     committed. Their results are provided for completeness.",
+                    first_inner_hash
+                );
+            } else {
+                display_line!(
+                    context.io(),
+                    "Since the batch in its entirety failed, none of the \
+                     transactions listed below have been committed. Their \
+                     results are provided for completeness.",
+                );
+            }
         }
         display_line!(context.io(), "Batch results:");
     }