diff --git a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
index 92a3fbf830..6211063758 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
@@ -417,10 +417,11 @@ class TokenItemStateConverter(
             if (promoCryptoCurrencyStatus == null || status.currency.id != promoCryptoCurrencyStatus.currency.id) {
                 return TokenItemState.PromoBannerState.Empty
             }
-            val tokenKey = "${token.network.rawId}_${token.contractAddress}"
-            val shouldIgnoreCase = BlockchainUtils.isCaseInsensitiveContractAddress(token.network.rawId)
             val yieldSupplyApy = yieldModuleApyMap.entries.firstOrNull { (key, _) ->
-                key.equals(tokenKey, shouldIgnoreCase)
+                key.equals(
+                    other = token.yieldSupplyKey(),
+                    ignoreCase = BlockchainUtils.isCaseInsensitiveContractAddress(token.network.rawId),
+                )
             }?.value ?: return TokenItemState.PromoBannerState.Empty
 
             return TokenItemState.PromoBannerState.Content(
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverter.kt
index ef64e543bd..26c9df46a3 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverter.kt
@@ -2,6 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.currency.yieldSupplyKey
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.TokenConverterParams
 import com.tangem.lib.crypto.BlockchainUtils
 import com.tangem.utils.converter.Converter
@@ -30,11 +31,11 @@ internal class YieldSupplyPromoBannerConverter(
         val max = cryptoCurrencyStatuses.asSequence()
             .mapNotNull { status ->
                 val token = status.currency as? CryptoCurrency.Token ?: return@mapNotNull null
-                val shouldIgnoreCase = BlockchainUtils.isCaseInsensitiveContractAddress(token.network.rawId)
-                val tokenKey = "${token.network.rawId}_${token.contractAddress}"
-
                 val matchedKey = yieldModuleApyMap.keys.firstOrNull { mapKey ->
-                    mapKey.equals(tokenKey, shouldIgnoreCase)
+                    mapKey.equals(
+                        other = token.yieldSupplyKey(),
+                        ignoreCase = BlockchainUtils.isCaseInsensitiveContractAddress(token.network.rawId),
+                    )
                 } ?: return@mapNotNull null
 
                 status to matchedKey
diff --git a/features/wallet/impl/src/test/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverterTest.kt b/features/wallet/impl/src/test/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverterTest.kt
index b9e4370853..efb582f714 100644
--- a/features/wallet/impl/src/test/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverterTest.kt
+++ b/features/wallet/impl/src/test/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/YieldSupplyPromoBannerConverterTest.kt
@@ -26,7 +26,7 @@ class YieldSupplyPromoBannerConverterTest {
             tokenList = tokenList,
         )
         val converter = YieldSupplyPromoBannerConverter(
-            yieldModuleApyMap = mapOf("${token.network.rawId}_${token.contractAddress}" to BigDecimal("0.10")),
+            yieldModuleApyMap = mapOf("${token.network.backendId}_${token.contractAddress}" to BigDecimal("0.10")),
             shouldShowMainPromo = false,
         )
 
@@ -62,7 +62,7 @@ class YieldSupplyPromoBannerConverterTest {
             tokenList = ungroupedTokenList(statusActive),
         )
         val converter = YieldSupplyPromoBannerConverter(
-            yieldModuleApyMap = mapOf("${token.network.rawId}_${token.contractAddress}" to BigDecimal("0.12")),
+            yieldModuleApyMap = mapOf("${token.network.backendId}_${token.contractAddress}" to BigDecimal("0.12")),
             shouldShowMainPromo = true,
         )
 
@@ -81,8 +81,8 @@ class YieldSupplyPromoBannerConverterTest {
         val statusBig = createLoadedStatus(token = tokenBig, amount = BigDecimal("10.00"), isYieldActive = false)
 
         val apyMap = mapOf(
-            "${tokenSmall.network.rawId}_${tokenSmall.contractAddress.lowercase()}" to BigDecimal("0.05"),
-            "${tokenBig.network.rawId}_${tokenBig.contractAddress.uppercase()}" to BigDecimal("0.15"),
+            "${tokenSmall.network.backendId}_${tokenSmall.contractAddress.lowercase()}" to BigDecimal("0.05"),
+            "${tokenBig.network.backendId}_${tokenBig.contractAddress.uppercase()}" to BigDecimal("0.15"),
         )
 
         val params = TokenConverterParams.Wallet(
@@ -105,7 +105,7 @@ class YieldSupplyPromoBannerConverterTest {
         val token = createToken(networkId = nonEvmId, backendId = nonEvmId, contract = "rAbC123")
         val status = createLoadedStatus(token = token, amount = BigDecimal("3"), isYieldActive = false)
 
-        val mismatchedKey = "${token.network.rawId}_${token.contractAddress.lowercase()}"
+        val mismatchedKey = "${token.network.backendId}_${token.contractAddress.lowercase()}"
         val apyMap = mapOf(mismatchedKey to BigDecimal("0.07"))
 
         val params = TokenConverterParams.Wallet(
@@ -131,7 +131,7 @@ class YieldSupplyPromoBannerConverterTest {
             tokenList = ungroupedTokenList(status),
         )
         val converter = YieldSupplyPromoBannerConverter(
-            yieldModuleApyMap = mapOf("${token.network.rawId}_${token.contractAddress}" to BigDecimal("0.10")),
+            yieldModuleApyMap = mapOf("${token.network.backendId}_${token.contractAddress}" to BigDecimal("0.10")),
             shouldShowMainPromo = true,
         )