Updated on 2026-08-14

data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt

@@ -38,7 +38,7 @@ internal class DefaultTransactionRepository(
 
     override suspend fun createTransaction(
         amount: Amount,
-        fee: Fee,
+        fee: Fee?,
         memo: String?,
         destination: String,
         userWalletId: UserWalletId,
@@ -52,13 +52,25 @@ internal class DefaultTransactionRepository(
             derivationPath = network.derivationPath.value,
         ) ?: error("Wallet manager not found")
 
-        return@withContext walletManager.createTransaction(
+        val extras = txExtras ?: getMemoExtras(networkId = network.id.value, memo)
-            amount = amount,
+
-            fee = fee,
+        return@withContext if (fee != null) {
-            destination = destination,
+            walletManager.createTransaction(
-        ).copy(
+                amount = amount,
-            extras = txExtras ?: getMemoExtras(networkId = network.id.value, memo),
+                fee = fee,
-        )
+                destination = destination,
+            ).copy(
+                extras = extras,
+            )
+        } else {
+            TransactionData.Uncompiled(
+                amount = amount,
+                sourceAddress = walletManager.wallet.address,
+                destinationAddress = destination,
+                extras = extras,
+                fee = null,
+            )
+        }
     }
 
     override suspend fun createTransferTransaction(
@@ -102,7 +114,7 @@ internal class DefaultTransactionRepository(
     override suspend fun createApprovalTransaction(
         amount: Amount,
         approvalAmount: Amount?,
-        fee: Fee,
+        fee: Fee?,
         contractAddress: String,
         spenderAddress: String,
         userWalletId: UserWalletId,

domain/transaction/src/main/java/com/tangem/domain/transaction/TransactionRepository.kt

@@ -16,7 +16,7 @@ interface TransactionRepository {
     @Suppress("LongParameterList")
     suspend fun createTransaction(
         amount: Amount,
-        fee: Fee,
+        fee: Fee?,
         memo: String?,
         destination: String,
         userWalletId: UserWalletId,
@@ -38,7 +38,7 @@ interface TransactionRepository {
     suspend fun createApprovalTransaction(
         amount: Amount,
         approvalAmount: Amount?,
-        fee: Fee,
+        fee: Fee?,
         contractAddress: String,
         spenderAddress: String,
         userWalletId: UserWalletId,

domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/CreateApprovalTransactionUseCase.kt

@@ -20,7 +20,7 @@ class CreateApprovalTransactionUseCase(
         cryptoCurrency: CryptoCurrency.Token,
         userWalletId: UserWalletId,
         amount: BigDecimal?,
-        fee: Fee,
+        fee: Fee?,
         contractAddress: String,
         spenderAddress: String,
     ) = Either.catch {

domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/GetFeeUseCase.kt

@@ -33,7 +33,7 @@ class GetFeeUseCase(
                     walletManagersFacade.getOrCreateWalletManager(
                         userWalletId = userWallet.walletId,
                         network = network,
-                    ) as? TransactionSender
+                    )
                 }
                 val result = transactionSender?.getFee(transactionData = transactionData)
                     ?: error("Fee is null")

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingFeeTransactionLoader.kt

@@ -14,9 +14,11 @@ import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType
 import com.tangem.domain.staking.model.stakekit.transaction.ActionParams
 import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.staking.getCurrentToken
 import com.tangem.domain.transaction.error.GetFeeError
+import com.tangem.domain.transaction.usecase.CreateApprovalTransactionUseCase
 import com.tangem.domain.transaction.usecase.GetFeeUseCase
 import com.tangem.domain.transaction.usecase.IsFeeApproximateUseCase
 import com.tangem.domain.wallets.models.UserWallet
@@ -40,6 +42,7 @@ internal class StakingFeeTransactionLoader @AssistedInject constructor(
     private val getFeeUseCase: GetFeeUseCase,
     private val estimateGasUseCase: EstimateGasUseCase,
     private val isFeeApproximateUseCase: IsFeeApproximateUseCase,
+    private val createApprovalTransactionUseCase: CreateApprovalTransactionUseCase,
     @Assisted private val cryptoCurrencyStatus: CryptoCurrencyStatus,
     @Assisted private val userWallet: UserWallet,
     @Assisted private val yield: Yield,
@@ -183,11 +186,22 @@ internal class StakingFeeTransactionLoader @AssistedInject constructor(
         onApprovalFee: (TransactionFee) -> Unit,
         onApprovalFeeError: (GetFeeError) -> Unit,
     ) {
-        getFeeUseCase(
+        val tokenCurrency = cryptoCurrencyStatus.currency as? CryptoCurrency.Token
+            ?: return onApprovalFeeError(GetFeeError.UnknownError)
+        val approvalTransactionData = createApprovalTransactionUseCase(
+            cryptoCurrency = tokenCurrency,
+            userWalletId = userWallet.walletId,
             amount = amount,
-            destination = validatorAddress,
+            fee = null,
+            contractAddress = tokenCurrency.contractAddress,
+            spenderAddress = validatorAddress,
+        ).getOrElse {
+            return onApprovalFeeError(GetFeeError.DataError(it))
+        }
+        getFeeUseCase(
             userWallet = userWallet,
-            cryptoCurrency = cryptoCurrencyStatus.currency,
+            network = tokenCurrency.network,
+            transactionData = approvalTransactionData,
         ).fold(
             ifRight = { fee ->
                 onApprovalFee(fee)