Updated on 2026-08-14

app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt

@@ -1,6 +1,5 @@
 package com.tangem.tap.proxy
 
-import com.tangem.TangemSdk
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.core.navigation.NavigationStateHolder
 import com.tangem.domain.models.scan.CardDTO
@@ -41,7 +40,6 @@ class AppStateHolder @Inject constructor() : WalletsStateHolder, NavigationState
     var userTokensRepository: UserTokensRepository? = null
     var mainStore: Store<AppState>? = null
     var tangemSdkManager: TangemSdkManager? = null
-    var tangemSdk: TangemSdk? = null
     var walletStoresManager: WalletStoresManager? = null
     var appFiatCurrency: FiatCurrency = FiatCurrency.Default
 

app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt

@@ -6,12 +6,15 @@ import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
 import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
 import com.tangem.blockchain.blockchains.optimism.OptimismWalletManager
 import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.transaction.Fee
+import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchain.extensions.Result
 import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.blockchain.extensions.isNetworkError
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.lib.crypto.TransactionManager
@@ -22,7 +25,6 @@ import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TangemSigner
-import com.tangem.tap.tangemSdk
 import java.math.BigDecimal
 import java.math.BigInteger
 import java.math.MathContext
@@ -32,6 +34,7 @@ import java.math.RoundingMode
 class TransactionManagerImpl(
     private val appStateHolder: AppStateHolder,
     private val analytics: AnalyticsEventHandler,
+    private val cardSdkConfigRepository: CardSdkConfigRepository,
 ) : TransactionManager {
 
     override suspend fun sendApproveTransaction(
@@ -112,7 +115,7 @@ class TransactionManagerImpl(
     ): SendTxResult {
         val txData = walletManager.createTransaction(
             amount = amount,
-            fee = Amount(value = feeAmount, blockchain = blockchain),
+            fee = Fee.Common(Amount(value = feeAmount, blockchain = blockchain)),
             destination = destinationAddress,
         ).copy(hash = dataToSign, extras = createExtras(walletManager, gasLimit, dataToSign))
 
@@ -214,24 +217,37 @@ class TransactionManagerImpl(
         return when (fee) {
             is Result.Success -> {
                 // for not EVM blockchains set gasLimit ZERO for now
-                val firstFee = fee.data.firstOrNull() ?: error("no fee found")
-                val minFee = ProxyFee(
-                    gasLimit = BigInteger.ZERO,
-                    fee = convertToProxyAmount(amount = firstFee),
-                )
-                val normalFee = ProxyFee(
-                    gasLimit = BigInteger.ZERO,
-                    fee = convertToProxyAmount(fee.data.getOrNull(index = 1) ?: firstFee),
-                )
-                val priorityFee = ProxyFee(
-                    gasLimit = BigInteger.ZERO,
-                    fee = convertToProxyAmount(fee.data.getOrNull(index = 2) ?: firstFee),
-                )
-                ProxyFees(
-                    minFee = minFee,
-                    normalFee = normalFee,
-                    priorityFee = priorityFee,
-                )
+                when (fee.data) {
+                    is TransactionFee.Single -> {
+                        val fee = (fee.data as TransactionFee.Single).normal
+                        val singleFee = ProxyFee(
+                            gasLimit = BigInteger.ZERO,
+                            fee = convertToProxyAmount(amount = fee.amount),
+                        )
+                        ProxyFees(
+                            minFee = singleFee,
+                            normalFee = singleFee,
+                            priorityFee = singleFee,
+                        )
+                    }
+                    is TransactionFee.Choosable -> {
+                        val choosableFee = fee.data as TransactionFee.Choosable
+                        ProxyFees(
+                            minFee = ProxyFee(
+                                gasLimit = BigInteger.ZERO,
+                                fee = convertToProxyAmount(amount = choosableFee.minimum.amount),
+                            ),
+                            normalFee = ProxyFee(
+                                gasLimit = BigInteger.ZERO,
+                                fee = convertToProxyAmount(amount = choosableFee.normal.amount),
+                            ),
+                            priorityFee = ProxyFee(
+                                gasLimit = BigInteger.ZERO,
+                                fee = convertToProxyAmount(amount = choosableFee.priority.amount),
+                            ),
+                        )
+                    }
+                }
             }
             is Result.Failure -> {
                 error(fee.error.message ?: fee.error.customMessage)
@@ -280,19 +296,21 @@ class TransactionManagerImpl(
         }
         return when (fee) {
             is Result.Success -> {
-                val minFee = fee.data.firstOrNull() ?: error("no fee found")
+                val choosableFee = fee.data
+
                 val minProxyFee = ProxyFee(
-                    gasLimit = walletManager.gasLimit ?: BigInteger.ZERO,
-                    fee = convertToProxyAmount(minFee),
+                    gasLimit = (choosableFee.minimum as Fee.Ethereum).gasLimit,
+                    fee = convertToProxyAmount(amount = choosableFee.minimum.amount),
                 )
                 val normalProxyFee = ProxyFee(
-                    gasLimit = walletManager.gasLimit ?: BigInteger.ZERO,
-                    fee = convertToProxyAmount(fee.data.getOrNull(index = 1) ?: minFee),
+                    gasLimit = (choosableFee.normal as Fee.Ethereum).gasLimit,
+                    fee = convertToProxyAmount(amount = choosableFee.normal.amount),
                 )
                 val priorityProxyFee = ProxyFee(
-                    gasLimit = walletManager.gasLimit ?: BigInteger.ZERO,
-                    fee = convertToProxyAmount(fee.data.lastOrNull() ?: minFee),
+                    gasLimit = (choosableFee.priority as Fee.Ethereum).gasLimit,
+                    fee = convertToProxyAmount(amount = choosableFee.priority.amount),
                 )
+
                 ProxyFees(
                     minFee = minProxyFee,
                     normalFee = normalProxyFee,
@@ -378,7 +396,7 @@ class TransactionManagerImpl(
         val actualCard = requireNotNull(appStateHolder.getActualCard()) { "no card found" }
         return TangemSigner(
             card = actualCard,
-            tangemSdk = tangemSdk,
+            tangemSdk = cardSdkConfigRepository.sdk,
             initialMessage = Message(),
         ) { signResponse ->
             appStateHolder.mainStore?.dispatch(

app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt

@@ -10,6 +10,7 @@ import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.domain.userwallets.UserWalletIdBuilder
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.Currency
 import com.tangem.lib.crypto.models.Currency.NativeToken
@@ -17,7 +18,6 @@ import com.tangem.lib.crypto.models.Currency.NonNativeToken
 import com.tangem.lib.crypto.models.ProxyAmount
 import com.tangem.lib.crypto.models.ProxyFiatCurrency
 import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.userWalletsListManager
 import com.tangem.tap.walletCurrenciesManager

app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt

@@ -2,6 +2,7 @@ package com.tangem.tap.proxy.di
 
 import androidx.compose.ui.text.intl.Locale
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider
@@ -43,8 +44,13 @@ class ProxyModule {
     fun provideTransactionManager(
         appStateHolder: AppStateHolder,
         analytics: AnalyticsEventHandler,
+        cardSdkConfigRepository: CardSdkConfigRepository,
     ): TransactionManager {
-        return TransactionManagerImpl(appStateHolder, analytics)
+        return TransactionManagerImpl(
+            appStateHolder = appStateHolder,
+            analytics = analytics,
+            cardSdkConfigRepository = cardSdkConfigRepository,
+        )
     }
 
     @Provides

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphAction.kt

@@ -1,6 +1,7 @@
 package com.tangem.tap.proxy.redux
 
 import com.tangem.domain.card.ScanCardUseCase
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.features.tester.api.TesterRouter
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.features.wallet.navigation.WalletRouter
@@ -15,5 +16,6 @@ sealed interface DaggerGraphAction : Action {
         val walletRouter: WalletRouter,
         val walletConnectInteractor: WalletConnectInteractor,
         val tokenDetailsRouter: TokenDetailsRouter,
+        val cardSdkConfigRepository: CardSdkConfigRepository,
     ) : DaggerGraphAction
 }

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphReducer.kt

@@ -18,6 +18,7 @@ object DaggerGraphReducer {
                 walletRouter = action.walletRouter,
                 walletConnectInteractor = action.walletConnectInteractor,
                 tokenDetailsRouter = action.tokenDetailsRouter,
+                cardSdkConfigRepository = action.cardSdkConfigRepository,
             )
         }
     }

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt

@@ -2,7 +2,9 @@ package com.tangem.tap.proxy.redux
 
 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.connection.NetworkConnectionManager
+import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.features.tester.api.TesterRouter
 import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
@@ -27,6 +29,8 @@ data class DaggerGraphState(
     val walletConnectInteractor: WalletConnectInteractor? = null,
     val tokenDetailsFeatureToggles: TokenDetailsFeatureToggles? = null,
     val tokenDetailsRouter: TokenDetailsRouter? = null,
+    val scanCardProcessor: ScanCardProcessor? = null,
+    val cardSdkConfigRepository: CardSdkConfigRepository? = null,
 ) : StateType {
 
     inline fun <reified T> get(getDependency: DaggerGraphState.() -> T?): T {