diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
index eb9e2a434c..9fe41bf3a5 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
@@ -18,6 +18,7 @@ interface TangemTechApi {
         @Query("contractAddress") contractAddress: String? = null,
         @Query("exchangeable") exchangeable: Boolean? = null,
         @Query("networkIds") networkIds: String? = null,
+        @Query("networkId") networkId: String? = null,
         @Query("active") active: Boolean? = null,
         @Query("searchText") searchText: String? = null,
         @Query("offset") offset: Int? = null,
diff --git a/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt b/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
index e48f0e6933..94a184fb73 100644
--- a/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
+++ b/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
@@ -33,19 +33,17 @@ internal class DefaultPromoRepository(
     }
 
     override suspend fun getOkxPromoBanner(): PromoBanner? {
-        // TODO disabled for 5.12, enable for 5.12.1
-        return null
-        // return runCatching(dispatchers.io) {
-        //     promoResponseConverter.convert(
-        //         tangemApi.getPromotionInfo(OKX)
-        //             .getOrThrow(),
-        //     )
-        // }.getOrNull()
+        return runCatching(dispatchers.io) {
+            promoResponseConverter.convert(
+                tangemApi.getPromotionInfo(OKX)
+                    .getOrThrow(),
+            )
+        }.getOrNull()
     }
 
     private companion object {
         private const val CHANGELLY_NAME = "changelly"
         private const val TRAVALA = "travala"
-        // private const val OKX = "okx"
+        private const val OKX = "okx"
     }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index 214d9721e1..653b731d38 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -429,22 +429,12 @@ internal class DefaultCurrenciesRepository(
         val token = withContext(dispatchers.io) {
             val foundToken = tangemTechApi.getCoins(
                 contractAddress = contractAddress,
-                networkIds = networkId,
+                networkId = networkId,
             )
                 .getOrThrow()
                 .coins
-                .firstNotNullOfOrNull { coin ->
-                    val networksWithTheSameAddress = coin.networks.filter { network ->
-                        (network.contractAddress != null || network.decimalCount != null) &&
-                            network.contractAddress?.equals(contractAddress, ignoreCase = true) == true
-                    }
-
-                    if (networksWithTheSameAddress.isNotEmpty()) {
-                        coin.copy(networks = networksWithTheSameAddress)
-                    } else {
-                        null
-                    }
-                } ?: error("Token not found")
+                .firstOrNull()
+                ?: error("Token not found")
             val network = foundToken.networks.firstOrNull { it.networkId == networkId } ?: error("Network not found")
             CryptoCurrencyFactory.Token(
                 symbol = foundToken.symbol,
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
index 54d15b83ea..12a65e1e6b 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
@@ -142,9 +142,9 @@ internal class TokenDetailsSwapTransactionsStateConverter(
         txUrl: String?,
         refundToken: CryptoCurrency?,
     ): ExchangeStatusNotifications? {
-        if (txUrl == null) return null
         return when (status) {
             ExchangeStatus.Failed -> {
+                if (txUrl == null) return null
                 ExchangeStatusNotifications.Failed {
                     analyticsEventsHandlerProvider().send(
                         TokenExchangeAnalyticsEvent.GoToProviderFail(cryptoCurrency.symbol),
@@ -153,6 +153,7 @@ internal class TokenDetailsSwapTransactionsStateConverter(
                 }
             }
             ExchangeStatus.Verifying -> {
+                if (txUrl == null) return null
                 ExchangeStatusNotifications.NeedVerification {
                     analyticsEventsHandlerProvider().send(
                         TokenExchangeAnalyticsEvent.GoToProviderKYC(cryptoCurrency.symbol),