Updated on 2026-08-14

data/account/src/main/kotlin/com/tangem/data/account/di/AccountDataModule.kt

@@ -26,14 +26,13 @@ import com.tangem.datasource.utils.setTypes
 import com.tangem.domain.account.repository.AccountsCRUDRepository
 import com.tangem.domain.account.repository.AccountsExpandedRepository
 import com.tangem.domain.account.tokens.MainAccountTokensMigration
+import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import javax.inject.Singleton
 
 @Module
@@ -69,7 +68,7 @@ internal object AccountDataModule {
     fun provideAccountsExpandedRepository(
         @NetworkMoshi moshi: Moshi,
         @ApplicationContext context: Context,
-        dispatchers: CoroutineDispatcherProvider,
+        appScope: AppCoroutineScope,
     ): AccountsExpandedRepository {
         val store = DataStoreFactory.create<Map<String, Set<AccountsExpandedDTO>>>(
             serializer = MoshiDataStoreSerializer(
@@ -78,7 +77,7 @@ internal object AccountDataModule {
                 defaultValue = emptyMap(),
             ),
             produceFile = { context.dataStoreFile(fileName = "account_expanded_store") },
-            scope = CoroutineScope(context = dispatchers.io + SupervisorJob()),
+            scope = appScope,
         )
 
         return DefaultAccountsExpandedRepository(
@@ -107,14 +106,14 @@ internal object AccountDataModule {
         userTokensSaver: UserTokensSaver,
         accountTokenMigrationStore: AccountTokenMigrationStore,
         eTagsStore: ETagsStore,
-        dispatchers: CoroutineDispatcherProvider,
+        appScope: AppCoroutineScope,
     ): DefaultMainAccountTokensMigration {
         return DefaultMainAccountTokensMigration(
             accountsResponseStoreFactory = accountsResponseStoreFactory,
             accountTokenMigrationStore = accountTokenMigrationStore,
             userTokensSaver = userTokensSaver,
             eTagsStore = eTagsStore,
-            dispatchers = dispatchers,
+            coroutineScope = appScope,
         )
     }
 }

data/account/src/main/kotlin/com/tangem/data/account/store/AccountsResponseStoreFactory.kt

@@ -10,11 +10,9 @@ import com.squareup.moshi.adapter
 import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.datasource.utils.MoshiDataStoreSerializer
+import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -35,7 +33,7 @@ typealias AccountsResponseStore = DataStore<GetWalletAccountsResponse?>
 internal class AccountsResponseStoreFactory @Inject constructor(
     @ApplicationContext private val context: Context,
     @NetworkMoshi private val moshi: Moshi,
-    private val dispatchers: CoroutineDispatcherProvider,
+    private val appScope: AppCoroutineScope,
 ) {
 
     @OptIn(ExperimentalStdlibApi::class)
@@ -53,7 +51,7 @@ internal class AccountsResponseStoreFactory @Inject constructor(
             DataStoreFactory.create(
                 serializer = MoshiDataStoreSerializer(defaultValue = null, adapter = adapter),
                 produceFile = { context.dataStoreFile(fileName = "wallet_accounts_${userWalletId.stringValue}") },
-                scope = CoroutineScope(context = dispatchers.io + SupervisorJob()),
+                scope = appScope,
             )
         }
     }

data/account/src/main/kotlin/com/tangem/data/account/tokens/DefaultMainAccountTokensMigration.kt

@@ -20,12 +20,10 @@ import com.tangem.datasource.api.tangemTech.models.account.toUserTokensResponse
 import com.tangem.datasource.local.accounts.AccountTokenMigrationStore
 import com.tangem.datasource.utils.getSyncOrNull
 import com.tangem.domain.account.tokens.MainAccountTokensMigration
+import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.domain.models.account.DerivationIndex
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.lib.crypto.derivation.AccountNodeRecognizer
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -43,11 +41,9 @@ internal class DefaultMainAccountTokensMigration(
     private val accountTokenMigrationStore: AccountTokenMigrationStore,
     private val userTokensSaver: UserTokensSaver,
     private val eTagsStore: ETagsStore,
-    dispatchers: CoroutineDispatcherProvider,
+    private val coroutineScope: AppCoroutineScope,
 ) : MainAccountTokensMigration {
 
-    private val coroutineScope = CoroutineScope(dispatchers.default + SupervisorJob())
-
     internal suspend fun migrate(userWalletId: UserWalletId): Either<Throwable, GetWalletAccountsResponse> = either {
         val store = accountsResponseStoreFactory.create(userWalletId)
         val response = store.getSyncOrNull()

data/account/src/test/java/com/tangem/data/account/store/AccountsResponseStoreFactoryTest.kt

@@ -3,8 +3,8 @@ package com.tangem.data.account.store
 import android.content.Context
 import com.google.common.truth.Truth
 import com.squareup.moshi.Moshi
+import com.tangem.common.test.TestAppCoroutineScope
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
 import io.mockk.clearMocks
 import io.mockk.mockk
 import org.junit.jupiter.api.AfterEach
@@ -19,7 +19,7 @@ class AccountsResponseStoreFactoryTest {
     private val factory: AccountsResponseStoreFactory = AccountsResponseStoreFactory(
         context = context,
         moshi = moshi,
-        dispatchers = TestingCoroutineDispatcherProvider(),
+        appScope = TestAppCoroutineScope(),
     )
 
     @AfterEach

data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt

@@ -1,6 +1,7 @@
 package com.tangem.data.account.token
 
 import arrow.core.right
+import com.tangem.common.test.TestAppCoroutineScope
 import com.tangem.data.account.converter.createGetWalletAccountsResponse
 import com.tangem.data.account.converter.createWalletAccountDTO
 import com.tangem.data.account.store.AccountsResponseStore
@@ -18,7 +19,6 @@ import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.test.core.assertEither
 import com.tangem.test.core.assertEitherLeft
 import com.tangem.test.core.assertEitherRight
-import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
 import io.mockk.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
@@ -43,7 +43,7 @@ class DefaultMainAccountTokensMigrationTest {
         accountTokenMigrationStore = accountTokenMigrationStore,
         userTokensSaver = userTokensSaver,
         eTagsStore = eTagsStore,
-        dispatchers = TestingCoroutineDispatcherProvider(),
+        coroutineScope = TestAppCoroutineScope(),
     )
 
     private val userWalletId = UserWalletId("011")