Updated on 2026-08-14

core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/YieldSupplyApi.kt

@@ -8,6 +8,7 @@ import com.tangem.datasource.api.tangemTech.models.YieldSupplyMarketTokenDto
 import com.tangem.datasource.api.tangemTech.models.YieldTokenChartResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.Header
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -34,6 +35,7 @@ interface YieldSupplyApi {
     @POST("api/v1/module/activate")
     suspend fun activateYieldModule(
         @Body body: YieldSupplyChangeTokenStatusBody,
+        @Header("userWalletId") userWalletId: String,
     ): ApiResponse<YieldModuleStatusResponse>
 
     @POST("api/v1/module/deactivate")

data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyRepository.kt

@@ -76,18 +76,22 @@ internal class DefaultYieldSupplyRepository(
             (walletManager as? YieldSupplyProvider)?.isSupported() ?: false
         }
 
-    override suspend fun activateProtocol(cryptoCurrencyToken: CryptoCurrency.Token, address: String): Boolean =
+    override suspend fun activateProtocol(
-        withContext(dispatchers.io) {
+        userWalletId: UserWalletId,
-            val chainId = Blockchain.fromNetworkId(cryptoCurrencyToken.network.backendId)?.getChainId()
+        cryptoCurrencyToken: CryptoCurrency.Token,
-                ?: error("Chain id is required for evm's")
+        address: String,
-            yieldSupplyApi.activateYieldModule(
+    ): Boolean = withContext(dispatchers.io) {
-                YieldSupplyChangeTokenStatusBody(
+        val chainId = Blockchain.fromNetworkId(cryptoCurrencyToken.network.backendId)?.getChainId()
-                    tokenAddress = cryptoCurrencyToken.contractAddress,
+            ?: error("Chain id is required for evm's")
-                    chainId = chainId,
+        yieldSupplyApi.activateYieldModule(
-                    userAddress = address,
+            body = YieldSupplyChangeTokenStatusBody(
-                ),
+                tokenAddress = cryptoCurrencyToken.contractAddress,
-            ).getOrThrow().isActive
+                chainId = chainId,
-        }
+                userAddress = address,
+            ),
+            userWalletId = userWalletId.stringValue,
+        ).getOrThrow().isActive
+    }
 
     override suspend fun deactivateProtocol(cryptoCurrencyToken: CryptoCurrency.Token, address: String): Boolean =
         withContext(dispatchers.io) {

domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyRepository.kt

@@ -46,7 +46,11 @@ interface YieldSupplyRepository {
      * May throw on network/backend errors or if required chain id cannot be resolved.
      */
     @Throws
-    suspend fun activateProtocol(cryptoCurrencyToken: CryptoCurrency.Token, address: String): Boolean
+    suspend fun activateProtocol(
+        userWalletId: UserWalletId,
+        cryptoCurrencyToken: CryptoCurrency.Token,
+        address: String,
+    ): Boolean
 
     /**
      * Deactivate yield protocol for the specified token.

domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyActivateUseCase.kt

@@ -2,15 +2,23 @@ package com.tangem.domain.yield.supply.usecase
 
 import arrow.core.Either
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.yield.supply.YieldSupplyRepository
 
 class YieldSupplyActivateUseCase(
     private val yieldSupplyRepository: YieldSupplyRepository,
 ) {
 
-    suspend operator fun invoke(cryptoCurrency: CryptoCurrency, address: String): Either<Throwable, Boolean> =
+    suspend operator fun invoke(
-        Either.catch {
+        userWalletId: UserWalletId,
-            val token = cryptoCurrency as? CryptoCurrency.Token ?: error("Token expected")
+        cryptoCurrency: CryptoCurrency,
-            yieldSupplyRepository.activateProtocol(token, address)
+        address: String,
-        }
+    ): Either<Throwable, Boolean> = Either.catch {
+        val token = cryptoCurrency as? CryptoCurrency.Token ?: error("Token expected")
+        yieldSupplyRepository.activateProtocol(
+            userWalletId = userWalletId,
+            cryptoCurrencyToken = token,
+            address = address,
+        )
+    }
 }

features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt

@@ -311,7 +311,11 @@ internal class YieldSupplyModel @Inject constructor(
         val address = cryptoCurrencyStatus.value.networkAddress?.defaultAddress?.value ?: return
         modelScope.launch(dispatchers.default) {
             if (cryptoCurrencyStatus.value.yieldSupplyStatus?.isActive == true) {
-                yieldSupplyActivateUseCase(token, address).onRight {
+                yieldSupplyActivateUseCase(
+                    userWalletId = userWallet.walletId,
+                    cryptoCurrency = token,
+                    address = address,
+                ).onRight {
                     lastYieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
                 }
             } else {

features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt

@@ -278,7 +278,11 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
 
         val address = cryptoCurrencyStatus.value.networkAddress?.defaultAddress?.value
         if (address != null) {
-            yieldSupplyActivateUseCase(cryptoCurrency, address)
+            yieldSupplyActivateUseCase(
+                userWalletId = userWallet.walletId,
+                cryptoCurrency = cryptoCurrency,
+                address = address,
+            )
         }
 
         modelScope.launch {

features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt

@@ -37,11 +37,11 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
         val feeFiat = feeFiatRate?.let(feeValue::multiply)
         val feeFiatValueText = feeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
 
-        val estimatedFeeFiat = feeFiatRate?.let(estimatedFeeValue::multiply)
+        val estimatedFeeFiat = estimatedFeeValue
         val estimatedFeeFiatValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
 
         val tokenCryptoFee = tokenFiatRate?.let { rate ->
-            estimatedFeeFiat?.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
+            estimatedFeeFiat.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
         }
         val tokenCryptoFeeValueText = tokenCryptoFee.format { crypto(cryptoCurrency) }
         val tokenFiatFeeValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }