From 480b66a179a6d2668f6e83df602f951e01d6f35f Mon Sep 17 00:00:00 2001
From: Gianmarco Fraccaroli <gianmarco.fraccaroli@gmail.com>
Date: Mon, 3 Jun 2024 15:59:35 +0200
Subject: [PATCH] fixup! Merge branch 'grarco/masp-custom-epoch' (#3318)

---
 crates/apps_lib/src/client/tx.rs | 2 +-
 crates/sdk/src/tx.rs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/apps_lib/src/client/tx.rs b/crates/apps_lib/src/client/tx.rs
index 49a76249e8..80e6e52e09 100644
--- a/crates/apps_lib/src/client/tx.rs
+++ b/crates/apps_lib/src/client/tx.rs
@@ -795,7 +795,7 @@ pub async fn submit_shielding_transfer(
                 {
                     let submission_masp_epoch = rpc::query_and_print_masp_epoch(namada).await;
                     // And its submission epoch doesn't match construction epoch
-                    if tx_epoch.unwrap() != submission_masp_epoch {
+                    if tx_epoch != submission_masp_epoch {
                         // Then we probably straddled an epoch boundary. Let's retry...
                         edisplay_line!(namada.io(),
                             "Shielding transaction rejected and this may be due to the \
diff --git a/crates/sdk/src/tx.rs b/crates/sdk/src/tx.rs
index a57642be02..b9daabeca2 100644
--- a/crates/sdk/src/tx.rs
+++ b/crates/sdk/src/tx.rs
@@ -2989,7 +2989,7 @@ pub async fn build_shielded_transfer<N: Namada>(
 pub async fn build_shielding_transfer<N: Namada>(
     context: &N,
     args: &mut args::TxShieldingTransfer,
-) -> Result<(Tx, SigningTxData, Epoch)> {
+) -> Result<(Tx, SigningTxData, MaspEpoch)> {
     let source = &args.source;
     let default_signer = Some(source.clone());
     let signing_data = signing::aux_signing_data(