Updated on 2026-08-14

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/di/WalletConnectDataModule.kt

@@ -17,7 +17,6 @@ import com.tangem.data.walletconnect.respond.WcRespondService
 import com.tangem.data.walletconnect.sessions.DefaultWcSessionsManager
 import com.tangem.data.walletconnect.utils.WcNamespaceConverter
 import com.tangem.data.walletconnect.utils.WcNetworksConverter
-import com.tangem.data.walletconnect.utils.WcScope
 import com.tangem.datasource.di.SdkMoshi
 import com.tangem.datasource.local.walletconnect.WalletConnectStore
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
@@ -33,6 +32,7 @@ import com.tangem.domain.walletconnect.usecase.initialize.WcInitializeUseCase
 import com.tangem.domain.walletconnect.usecase.pair.WcPairUseCase
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
+import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -79,8 +79,8 @@ internal object WalletConnectDataModule {
 
     @Provides
     @Singleton
-    fun sdkDelegate(wcScope: WcScope, store: WalletConnectStore): WcPairSdkDelegate = WcPairSdkDelegate(
-        scope = wcScope,
+    fun sdkDelegate(appScope: AppCoroutineScope, store: WalletConnectStore): WcPairSdkDelegate = WcPairSdkDelegate(
+        scope = appScope,
         store = store,
     )
 
@@ -93,7 +93,7 @@ internal object WalletConnectDataModule {
         wcNetworksConverter: WcNetworksConverter,
         multiAccountListSupplier: MultiAccountListSupplier,
         analytics: AnalyticsEventHandler,
-        wcScope: WcScope,
+        appScope: AppCoroutineScope,
     ): DefaultWcSessionsManager {
         return DefaultWcSessionsManager(
             store = store,
@@ -101,7 +101,7 @@ internal object WalletConnectDataModule {
             getWallets = getWallets,
             wcNetworksConverter = wcNetworksConverter,
             analytics = analytics,
-            scope = wcScope,
+            scope = appScope,
             multiAccountListSupplier = multiAccountListSupplier,
         )
     }
@@ -110,10 +110,6 @@ internal object WalletConnectDataModule {
     @Singleton
     fun wcSessionsManager(default: DefaultWcSessionsManager): WcSessionsManager = default
 
-    @Provides
-    @Singleton
-    fun wcScope(dispatchers: CoroutineDispatcherProvider): WcScope = WcScope(dispatchers)
-
     @Provides
     @Singleton
     fun wcRequestService(default: DefaultWcRequestService): WcRequestService = default

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/ethereum/WcEthTxHelper.kt

@@ -1,5 +1,6 @@
 package com.tangem.data.walletconnect.network.ethereum
 
+import arrow.core.getOrElse
 import com.domain.blockaid.models.transaction.CheckTransactionResult
 import com.domain.blockaid.models.transaction.SimulationResult
 import com.domain.blockaid.models.transaction.simultation.ApproveInfo
@@ -17,16 +18,17 @@ import com.tangem.blockchainsdk.utils.toBlockchain
 import com.tangem.blockchainsdk.utils.toCoinId
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.data.common.currency.getCoinId
+import com.tangem.domain.account.status.utils.CryptoCurrencyOperations.getCryptoCurrency
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.transaction.usecase.GetEthSpecificFeeUseCase
 import com.tangem.domain.walletconnect.model.WcApprovedAmount
 import com.tangem.domain.walletconnect.model.WcEthTransactionParams
 import javax.inject.Inject
 
 internal class WcEthTxHelper @Inject constructor(
-    private val getSingleCryptoCurrency: GetSingleCryptoCurrencyStatusUseCase,
+    private val singleAccountListSupplier: SingleAccountListSupplier,
     private val ethSpecificFee: GetEthSpecificFeeUseCase,
 ) {
 
@@ -34,10 +36,19 @@ internal class WcEthTxHelper @Inject constructor(
         val gasLimit = txParams.gas?.hexToBigInteger() ?: return null
         val gasPrice = txParams.gasPrice?.hexToBigInteger()
         val coinId = getCoinId(network, network.toBlockchain().toCoinId())
-        val currency = getSingleCryptoCurrency.invokeMultiWalletSync(userWallet.walletId, coinId)
-            .map { it.currency }
-            .getOrNull() ?: return null
-        return ethSpecificFee(userWallet, currency, gasLimit, gasPrice)
+
+        val currency = singleAccountListSupplier.getSyncOrNull(userWalletId = userWallet.walletId)
+            .getCryptoCurrency(currencyId = coinId, network = network)
+            .getOrElse {
+                return null
+            }
+
+        return ethSpecificFee(
+            userWallet = userWallet,
+            cryptoCurrency = currency,
+            gasLimit = gasLimit,
+            gasPrice = gasPrice,
+        )
             .map { it.minimum }
             .getOrNull()
     }

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/pair/WcPairSdkDelegate.kt

@@ -6,13 +6,13 @@ import arrow.core.right
 import com.reown.walletkit.client.Wallet
 import com.reown.walletkit.client.WalletKit
 import com.tangem.data.walletconnect.utils.WC_TAG
-import com.tangem.data.walletconnect.utils.WcScope
 import com.tangem.data.walletconnect.utils.WcSdkObserver
 import com.tangem.datasource.local.walletconnect.WalletConnectStore
 import com.tangem.data.walletconnect.utils.getDappOriginUrl
 import com.tangem.domain.walletconnect.model.WcPairError
 import com.tangem.domain.walletconnect.model.WcPairError.ApprovalFailed
 import com.tangem.domain.walletconnect.model.WcPendingApprovalSessionDTO
+import com.tangem.utils.coroutines.AppCoroutineScope
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.awaitClose
@@ -22,7 +22,7 @@ import kotlin.coroutines.resume
 import kotlin.time.Duration.Companion.seconds
 
 internal class WcPairSdkDelegate(
-    private val scope: WcScope,
+    private val scope: AppCoroutineScope,
     private val store: WalletConnectStore,
 ) : WcSdkObserver {
 

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/sessions/DefaultWcSessionsManager.kt

@@ -8,7 +8,6 @@ import com.reown.walletkit.client.WalletKit
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.data.walletconnect.utils.WC_TAG
 import com.tangem.data.walletconnect.utils.WcNetworksConverter
-import com.tangem.data.walletconnect.utils.WcScope
 import com.tangem.data.walletconnect.utils.WcSdkObserver
 import com.tangem.data.walletconnect.utils.WcSdkSessionConverter
 import com.tangem.datasource.local.walletconnect.WalletConnectStore
@@ -22,6 +21,7 @@ import com.tangem.domain.walletconnect.model.WcSession
 import com.tangem.domain.walletconnect.model.WcSessionDTO
 import com.tangem.domain.walletconnect.repository.WcSessionsManager
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
+import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
@@ -40,7 +40,7 @@ internal class DefaultWcSessionsManager(
     private val dispatchers: CoroutineDispatcherProvider,
     private val wcNetworksConverter: WcNetworksConverter,
     private val analytics: AnalyticsEventHandler,
-    private val scope: WcScope,
+    private val scope: AppCoroutineScope,
 ) : WcSessionsManager, WcSdkObserver {
 
     private val onSessionDelete = Channel<Wallet.Model.SessionDelete>(capacity = Channel.BUFFERED)

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/utils/WcScope.kt

@@ -1,13 +0,0 @@
-package com.tangem.data.walletconnect.utils
-
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
-import kotlin.coroutines.CoroutineContext
-
-internal class WcScope(
-    dispatchers: CoroutineDispatcherProvider,
-) : CoroutineScope {
-
-    override val coroutineContext: CoroutineContext = SupervisorJob() + dispatchers.io
-}