From 16a83cf56d88d536be5fd582aae42eb441c8e4c7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 13 Mar 2026 12:13:11 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../data/account/producer/WalletAccountListFlowFactory.kt | 2 +- .../data/account/producer/WalletAccountListFlowFactoryTest.kt | 2 +- .../data/common/currency/DefaultCardCryptoCurrencyFactory.kt | 1 + .../main/kotlin/com/tangem/data/common/di/DataCommonModule.kt | 1 + .../main/java/com/tangem/data/networks/di/NetworkDataModule.kt | 2 +- .../data/networks/multi/DefaultMultiNetworkStatusFetcher.kt | 2 +- .../data/networks/repository/DefaultNetworksRepository.kt | 2 +- .../data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt | 2 +- .../data/networks/repository/DefaultNetworksRepositoryTest.kt | 2 +- data/tokens/build.gradle.kts | 1 + .../main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt | 2 +- .../data/tokens/repository/DefaultCurrenciesRepository.kt | 2 +- .../tangem/domain/common/tokens}/CardCryptoCurrencyFactory.kt | 2 +- 13 files changed, 13 insertions(+), 10 deletions(-) rename {data/common/src/main/kotlin/com/tangem/data/common/currency => domain/common/src/main/java/com/tangem/domain/common/tokens}/CardCryptoCurrencyFactory.kt (98%) diff --git a/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt b/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt index fbc60cc6c6..49d1b90eec 100644 --- a/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt +++ b/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt @@ -3,7 +3,7 @@ package com.tangem.data.account.producer import com.tangem.data.account.converter.AccountListConverter import com.tangem.data.account.store.AccountsResponseStore import com.tangem.data.account.store.AccountsResponseStoreFactory -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.domain.account.models.AccountList import com.tangem.domain.card.common.util.cardTypesResolver import com.tangem.domain.common.wallets.UserWalletsListRepository diff --git a/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt b/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt index 335516f9fd..0605ae7761 100644 --- a/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt +++ b/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt @@ -7,7 +7,7 @@ import com.tangem.data.account.converter.AccountListConverter import com.tangem.data.account.converter.createGetWalletAccountsResponse import com.tangem.data.account.store.AccountsResponseStore import com.tangem.data.account.store.AccountsResponseStoreFactory -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse import com.tangem.domain.account.models.AccountList import com.tangem.domain.common.wallets.UserWalletsListRepository diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/DefaultCardCryptoCurrencyFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/DefaultCardCryptoCurrencyFactory.kt index 8dfe637ba5..f56f43a761 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/DefaultCardCryptoCurrencyFactory.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/DefaultCardCryptoCurrencyFactory.kt @@ -1,6 +1,7 @@ package com.tangem.data.common.currency import com.tangem.blockchainsdk.utils.ExcludedBlockchains +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.blockchainsdk.utils.toBlockchain import com.tangem.blockchainsdk.utils.toNetworkId import com.tangem.data.common.account.WalletAccountsFetcher diff --git a/data/common/src/main/kotlin/com/tangem/data/common/di/DataCommonModule.kt b/data/common/src/main/kotlin/com/tangem/data/common/di/DataCommonModule.kt index e963742c1b..19298725b0 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/di/DataCommonModule.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/di/DataCommonModule.kt @@ -5,6 +5,7 @@ import com.tangem.data.common.account.WalletAccountsFetcher import com.tangem.data.common.cache.etag.DefaultETagsStore import com.tangem.data.common.cache.etag.ETagsStore import com.tangem.data.common.currency.* +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.common.quote.DefaultQuotesFetcher import com.tangem.data.common.quote.QuotesFetcher import com.tangem.data.common.wallet.DefaultWalletServerBinder diff --git a/data/networks/src/main/java/com/tangem/data/networks/di/NetworkDataModule.kt b/data/networks/src/main/java/com/tangem/data/networks/di/NetworkDataModule.kt index e97384ee27..f9425d8385 100644 --- a/data/networks/src/main/java/com/tangem/data/networks/di/NetworkDataModule.kt +++ b/data/networks/src/main/java/com/tangem/data/networks/di/NetworkDataModule.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.datastore.core.DataStoreFactory import androidx.datastore.dataStoreFile import com.squareup.moshi.Moshi -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.networks.repository.DefaultNetworksRepository import com.tangem.data.networks.store.DefaultNetworksStatusesStore import com.tangem.data.networks.store.NetworksStatusesStore diff --git a/data/networks/src/main/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcher.kt b/data/networks/src/main/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcher.kt index d94944b2a4..b039edc5ba 100644 --- a/data/networks/src/main/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcher.kt +++ b/data/networks/src/main/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcher.kt @@ -2,7 +2,7 @@ package com.tangem.data.networks.multi import arrow.core.raise.catch import arrow.core.raise.ensure -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.networks.fetcher.CommonNetworkStatusFetcher import com.tangem.data.networks.store.NetworksStatusesStore import com.tangem.data.networks.store.setSourceAsCache diff --git a/data/networks/src/main/java/com/tangem/data/networks/repository/DefaultNetworksRepository.kt b/data/networks/src/main/java/com/tangem/data/networks/repository/DefaultNetworksRepository.kt index 0ec3c30598..4755e55248 100644 --- a/data/networks/src/main/java/com/tangem/data/networks/repository/DefaultNetworksRepository.kt +++ b/data/networks/src/main/java/com/tangem/data/networks/repository/DefaultNetworksRepository.kt @@ -1,6 +1,6 @@ package com.tangem.data.networks.repository -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.networks.store.NetworksStatusesStore import com.tangem.data.networks.store.storeStatus import com.tangem.data.networks.utils.NetworkStatusFactory diff --git a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt index 76bdc3f68a..f02bcd3cd3 100644 --- a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt +++ b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt @@ -3,7 +3,7 @@ package com.tangem.data.networks.multi import arrow.core.Either import arrow.core.left import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.networks.fetcher.CommonNetworkStatusFetcher import com.tangem.data.networks.store.NetworksStatusesStore import com.tangem.data.networks.store.setSourceAsCache diff --git a/data/networks/src/test/java/com/tangem/data/networks/repository/DefaultNetworksRepositoryTest.kt b/data/networks/src/test/java/com/tangem/data/networks/repository/DefaultNetworksRepositoryTest.kt index f4045d21f9..bc28fb4244 100644 --- a/data/networks/src/test/java/com/tangem/data/networks/repository/DefaultNetworksRepositoryTest.kt +++ b/data/networks/src/test/java/com/tangem/data/networks/repository/DefaultNetworksRepositoryTest.kt @@ -4,7 +4,7 @@ import com.google.common.truth.Truth import com.tangem.blockchainsdk.models.UpdateWalletManagerResult import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory import com.tangem.common.test.domain.walletmanager.MockUpdateWalletManagerResultFactory -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.networks.store.NetworksStatusesStore import com.tangem.data.networks.store.storeStatus import com.tangem.data.networks.utils.NetworkStatusFactory diff --git a/data/tokens/build.gradle.kts b/data/tokens/build.gradle.kts index 1a97b297ef..96158e5dfb 100644 --- a/data/tokens/build.gradle.kts +++ b/data/tokens/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { // region Project - Domain implementation(projects.domain.account) implementation(projects.domain.card) + implementation(projects.domain.common) implementation(projects.domain.core) implementation(projects.domain.demo) implementation(projects.domain.express) diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt index 161b3fdd48..6a9b6ec68a 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt @@ -2,7 +2,7 @@ package com.tangem.data.tokens.di import com.tangem.blockchainsdk.utils.ExcludedBlockchains import com.tangem.data.common.cache.CacheRegistry -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.tokens.repository.DefaultCurrenciesRepository import com.tangem.data.tokens.repository.DefaultCurrencyChecksRepository import com.tangem.data.tokens.repository.DefaultTokenReceiveWarningsViewedRepository 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 d50a1e412b..e61f2b466d 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 @@ -6,7 +6,7 @@ import com.tangem.blockchainsdk.utils.ExcludedBlockchains import com.tangem.blockchainsdk.utils.fromNetworkId import com.tangem.blockchainsdk.utils.toBlockchain import com.tangem.data.common.cache.CacheRegistry -import com.tangem.data.common.currency.CardCryptoCurrencyFactory +import com.tangem.domain.common.tokens.CardCryptoCurrencyFactory import com.tangem.data.common.currency.CryptoCurrencyFactory import com.tangem.data.common.currency.getTokenId import com.tangem.datasource.api.common.response.getOrThrow diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/CardCryptoCurrencyFactory.kt b/domain/common/src/main/java/com/tangem/domain/common/tokens/CardCryptoCurrencyFactory.kt similarity index 98% rename from data/common/src/main/kotlin/com/tangem/data/common/currency/CardCryptoCurrencyFactory.kt rename to domain/common/src/main/java/com/tangem/domain/common/tokens/CardCryptoCurrencyFactory.kt index 44ecdbb935..232903f38f 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/CardCryptoCurrencyFactory.kt +++ b/domain/common/src/main/java/com/tangem/domain/common/tokens/CardCryptoCurrencyFactory.kt @@ -1,4 +1,4 @@ -package com.tangem.data.common.currency +package com.tangem.domain.common.tokens import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.network.Network