Fixed enshrine-logic

Signed-off-by: Andrei Baltariu <[email protected]>
multiversx · Jan 9, 2025 · 4762bd6 · 4762bd6
1 parent 7fa065d
commit 4762bd6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs
@@ -114,13 +114,13 @@ pub trait CreateTxModule:
 
         let fee_market_address = self.fee_market_address().get();
         let fee_enabled = self.external_fee_enabled(fee_market_address).get();
-        let opt_transfer_data = if fee_enabled {
-            OptionalValue::Some(self.pop_first_payment(payments.clone()).0)
-        } else {
-            OptionalValue::None
-        };
 
-        MultiValue2::from((opt_transfer_data, payments))
+        if !fee_enabled {
+            return MultiValue2::from((OptionalValue::None, payments));
+        } else {
+            let (fee_payment, no_fee_payments) = self.pop_first_payment(payments.clone());
+            return MultiValue2::from((OptionalValue::Some(fee_payment), no_fee_payments));
+        }
     }
 
     fn refund_tokens(