Updated on 2026-08-14

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

@@ -103,14 +103,18 @@ internal class DefaultYieldSupplyRepository(
         }
 
     override suspend fun saveTokenProtocolStatus(
+        userWalletId: UserWalletId,
         cryptoCurrency: CryptoCurrency,
         yieldSupplyEnterStatus: YieldSupplyEnterStatus,
     ) {
-        statusMap[cryptoCurrency.id.value] = yieldSupplyEnterStatus
+        statusMap["${userWalletId}_${cryptoCurrency.id.value}"] = yieldSupplyEnterStatus
     }
 
-    override fun getTokenProtocolStatus(cryptoCurrency: CryptoCurrency): YieldSupplyEnterStatus? {
+    override fun getTokenProtocolStatus(
-        return statusMap[cryptoCurrency.id.value]
+        userWalletId: UserWalletId,
+        cryptoCurrency: CryptoCurrency,
+    ): YieldSupplyEnterStatus? {
+        return statusMap["${userWalletId}_${cryptoCurrency.id.value}"]
     }
 
     private fun List<YieldMarketToken>.enrichNetworkIds(): List<YieldMarketToken> {

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

@@ -59,25 +59,32 @@ interface YieldSupplyRepository {
     suspend fun deactivateProtocol(cryptoCurrencyToken: CryptoCurrency.Token, address: String): Boolean
 
     /**
-     * Save the last user-initiated yield protocol action for the given currency.
+     * Save the last user‑initiated yield protocol action for the given wallet and currency.
      *
      * The saved value helps the UI render an intermediate "processing" state while waiting
      * for the definitive protocol status to be fetched from the network. This information
-     * is transient and not intended to be persisted across app restarts.
+     * is transient (in‑memory only) and is not persisted across app restarts.
      *
+     * @param userWalletId the wallet the action was performed with
      * @param cryptoCurrency the currency or token the action relates to
      * @param yieldSupplyEnterStatus the last action intent: [YieldSupplyEnterStatus.Enter] or [YieldSupplyEnterStatus.Exit]
      */
-    suspend fun saveTokenProtocolStatus(cryptoCurrency: CryptoCurrency, yieldSupplyEnterStatus: YieldSupplyEnterStatus)
+    suspend fun saveTokenProtocolStatus(
+        userWalletId: UserWalletId,
+        cryptoCurrency: CryptoCurrency,
+        yieldSupplyEnterStatus: YieldSupplyEnterStatus,
+    )
 
     /**
-     * Get the last saved user-initiated yield protocol action for the given currency, if any.
+     * Get the last saved user‑initiated yield protocol action for the given wallet and currency, if any.
      *
      * Used to determine whether the UI should display an intermediate "processing" state
-     * until the protocol status retrieved from backend reflects the change.
+     * until the protocol status retrieved from backend reflects the change. The value is
+     * transient (in‑memory only) and is not persisted across app restarts.
      *
+     * @param userWalletId the wallet to query
      * @param cryptoCurrency the currency or token to query
      * @return the last action intent or null if nothing has been recorded
      */
-    fun getTokenProtocolStatus(cryptoCurrency: CryptoCurrency): YieldSupplyEnterStatus?
+    fun getTokenProtocolStatus(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): YieldSupplyEnterStatus?
 }

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

@@ -185,7 +185,10 @@ internal class YieldSupplyModel @Inject constructor(
     @Suppress("MaximumLineLength")
     private fun onCryptoCurrencyStatusUpdated(cryptoCurrencyStatus: CryptoCurrencyStatus) {
         val yieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
-        val tokenProtocolStatus = yieldSupplyRepository.getTokenProtocolStatus(cryptoCurrency)
+        val tokenProtocolStatus = yieldSupplyRepository.getTokenProtocolStatus(
+            userWallet.walletId,
+            cryptoCurrency,
+        )
         val isActive = yieldSupplyStatus?.isActive == true
         val isCryptoCurrencyStatusFromCache = cryptoCurrencyStatus.value.sources.networkSource != StatusSource.ACTUAL
         val processing = uiState.value is YieldSupplyUM.Processing

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

@@ -244,16 +244,29 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
                     )
                 },
                 ifRight = {
-                    yieldSupplyRepository.saveTokenProtocolStatus(cryptoCurrency, YieldSupplyEnterStatus.Enter)
+                    onStartEarningTransactionSuccess(yieldSupplyFeeUM)
+                },
+            )
+        }
+    }
+
+    private suspend fun onStartEarningTransactionSuccess(yieldSupplyFeeUM: YieldSupplyFeeUM.Content) {
+        yieldSupplyRepository.saveTokenProtocolStatus(
+            userWallet.walletId,
+            cryptoCurrency,
+            YieldSupplyEnterStatus.Enter,
+        )
         val event = AnalyticsParam.TxSentFrom.Earning(
             blockchain = cryptoCurrency.network.name,
             token = cryptoCurrency.symbol,
             feeType = AnalyticsParam.FeeType.Normal,
         )
-                    analytics.send(YieldSupplyAnalytics.FundsEarned(
+        analytics.send(
+            YieldSupplyAnalytics.FundsEarned(
                 blockchain = cryptoCurrency.network.name,
                 token = cryptoCurrency.symbol,
-                    ))
+            ),
+        )
         yieldSupplyFeeUM.transactionDataList.forEach {
             analytics.send(
                 Basic.TransactionSent(
@@ -271,9 +284,6 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
         modelScope.launch {
             params.callback.onTransactionSent()
         }
-                },
-            )
-        }
     }
 
     private fun subscribeOnCurrencyStatusUpdates() {

features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/YieldSupplyStopEarningModel.kt

@@ -165,7 +165,18 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
                     )
                 },
                 ifRight = {
-                    yieldSupplyRepository.saveTokenProtocolStatus(cryptoCurrency, YieldSupplyEnterStatus.Exit)
+                    onStopEarningTransactionSuccess()
+                },
+            )
+        }
+    }
+
+    private suspend fun onStopEarningTransactionSuccess() {
+        yieldSupplyRepository.saveTokenProtocolStatus(
+            userWallet.walletId,
+            cryptoCurrency,
+            YieldSupplyEnterStatus.Exit,
+        )
         analytics.send(
             YieldSupplyAnalytics.FundsWithdrawn(
                 token = cryptoCurrency.symbol,
@@ -191,9 +202,6 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
         modelScope.launch {
             params.callback.onTransactionSent()
         }
-                },
-            )
-        }
     }
 
     private fun subscribeOnCurrencyStatusUpdates() {