diff --git a/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt b/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt index 9f77e55922..29320dd427 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt +++ b/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt @@ -3,15 +3,9 @@ package com.tangem.features.account.di import com.tangem.features.account.AccountCreateEditComponent import com.tangem.features.account.AccountDetailsComponent import com.tangem.features.account.ArchivedAccountListComponent -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.PortfolioSelectorController import com.tangem.features.account.archived.DefaultArchivedAccountListComponent import com.tangem.features.account.createedit.DefaultAccountCreateEditComponent import com.tangem.features.account.details.DefaultAccountDetailsComponent -import com.tangem.features.account.fetcher.DefaultPortfolioFetcher -import com.tangem.features.account.selector.DefaultPortfolioSelectorComponent -import com.tangem.features.account.selector.DefaultPortfolioSelectorController import dagger.Binds import dagger.Module import dagger.hilt.InstallIn @@ -21,17 +15,6 @@ import dagger.hilt.components.SingletonComponent @InstallIn(SingletonComponent::class) internal interface AccountFeatureModule { - @Binds - fun bindPortfolioFetcherFactory(impl: DefaultPortfolioFetcher.Factory): PortfolioFetcher.Factory - - @Binds - fun bindPortfolioSelectorController(impl: DefaultPortfolioSelectorController): PortfolioSelectorController - - @Binds - fun bindPortfolioSelectorComponentFactory( - impl: DefaultPortfolioSelectorComponent.Factory, - ): PortfolioSelectorComponent.Factory - @Binds fun bindAccountCreateEditComponentFactory( impl: DefaultAccountCreateEditComponent.Factory, diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/di/PortfolioSelectorModule.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/di/PortfolioSelectorModule.kt deleted file mode 100644 index d28a1c305e..0000000000 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/di/PortfolioSelectorModule.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.tangem.features.account.selector.di - -import com.tangem.core.decompose.di.ModelComponent -import com.tangem.core.decompose.model.Model -import com.tangem.features.account.selector.PortfolioSelectorModel -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.multibindings.ClassKey -import dagger.multibindings.IntoMap - -@Module -@InstallIn(ModelComponent::class) -internal interface PortfolioSelectorModule { - - @Binds - @IntoMap - @ClassKey(PortfolioSelectorModel::class) - fun portfolioSelectorModel(model: PortfolioSelectorModel): Model -} \ No newline at end of file diff --git a/features/common-features/api/build.gradle.kts b/features/common-features/api/build.gradle.kts index f46795f50f..2d20ac5683 100644 --- a/features/common-features/api/build.gradle.kts +++ b/features/common-features/api/build.gradle.kts @@ -10,12 +10,11 @@ android { } dependencies { - /** Api */ // todo swap delete after move portfolio selector - implementation(projects.features.account.api) /* Project - Domain */ implementation(projects.domain.models) implementation(projects.domain.markets) + implementation(projects.domain.account) /* Project - Core */ implementation(projects.core.decompose) diff --git a/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/addtoportfolio/AddToPortfolioManager.kt b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/addtoportfolio/AddToPortfolioManager.kt index 9ab9c5a86c..e1d58b5033 100644 --- a/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/addtoportfolio/AddToPortfolioManager.kt +++ b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/addtoportfolio/AddToPortfolioManager.kt @@ -5,7 +5,7 @@ import com.tangem.domain.markets.TokenMarketParams import com.tangem.domain.models.account.AccountStatus import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet -import com.tangem.features.account.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager.AnalyticsParams import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel diff --git a/features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioFetcher.kt similarity index 96% rename from features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt rename to features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioFetcher.kt index a56d06a5dd..2428a8c030 100644 --- a/features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt +++ b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioFetcher.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account +package com.tangem.features.commonfeatures.api.portfolioselector import com.tangem.domain.account.models.AccountStatusList import com.tangem.domain.appcurrency.model.AppCurrency diff --git a/features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioSelectorComponent.kt similarity index 97% rename from features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt rename to features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioSelectorComponent.kt index 7d8627e929..8d658a65ac 100644 --- a/features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt +++ b/features/common-features/api/src/main/java/com/tangem/features/commonfeatures/api/portfolioselector/PortfolioSelectorComponent.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account +package com.tangem.features.commonfeatures.api.portfolioselector import com.tangem.core.decompose.factory.ComponentFactory import com.tangem.core.ui.decompose.ComposableBottomSheetComponent diff --git a/features/common-features/impl/build.gradle.kts b/features/common-features/impl/build.gradle.kts index 01aef9c2e7..afa9fcfb58 100644 --- a/features/common-features/impl/build.gradle.kts +++ b/features/common-features/impl/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { implementation(projects.features.commonFeatures.api) // todo swap delete after move portfolio selector implementation(projects.features.account.api) + implementation(projects.features.wallet.api) implementation(projects.features.tokenRecieve.api) /** Core modules */ diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/AddToPortfolioBottomSheet.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/AddToPortfolioBottomSheet.kt index c649a267f2..0a20db5947 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/AddToPortfolioBottomSheet.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/AddToPortfolioBottomSheet.kt @@ -20,7 +20,7 @@ import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.commonfeatures.impl.addtoportfolio.model.AddToPortfolioRoutes @Composable diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioComponent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioComponent.kt index 6ce1279b9d..d69a90e75d 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioComponent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioComponent.kt @@ -11,7 +11,7 @@ import com.tangem.core.decompose.context.child import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioComponent import com.tangem.features.commonfeatures.impl.addtoportfolio.model.AddToPortfolioModel import com.tangem.features.commonfeatures.impl.addtoportfolio.model.AddToPortfolioRoutes diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioPreselectedDataComponent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioPreselectedDataComponent.kt index f298a48b32..7ba255d6e8 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioPreselectedDataComponent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/DefaultAddToPortfolioPreselectedDataComponent.kt @@ -9,7 +9,7 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.child import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioPreselectedDataComponent import com.tangem.features.commonfeatures.impl.addtoportfolio.model.AddToPortfolioPreselectedDataModel import com.tangem.features.commonfeatures.impl.addtoportfolio.model.AddToPortfolioRoutes diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/converter/AvailableToAddDataConverter.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/converter/AvailableToAddDataConverter.kt index 32f382fdcb..fd5664787d 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/converter/AvailableToAddDataConverter.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/converter/AvailableToAddDataConverter.kt @@ -12,7 +12,7 @@ import com.tangem.domain.models.account.filterCryptoPortfolio import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.features.account.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher import com.tangem.features.commonfeatures.api.addtoportfolio.AvailableToAddAccount import com.tangem.features.commonfeatures.api.addtoportfolio.AvailableToAddData import com.tangem.features.commonfeatures.api.addtoportfolio.AvailableToAddWallet diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt index a0b119a4ab..18071b731c 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt @@ -19,8 +19,8 @@ import com.tangem.domain.markets.TokenMarketInfo import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.features.commonfeatures.api.addtoportfolio.* import com.tangem.features.commonfeatures.impl.R import com.tangem.features.commonfeatures.impl.addtoportfolio.AddTokenComponent diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioPreselectedDataModel.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioPreselectedDataModel.kt index 10e935ada2..a2a388b7b2 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioPreselectedDataModel.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioPreselectedDataModel.kt @@ -20,8 +20,8 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.features.commonfeatures.impl.addtoportfolio.AddTokenComponent import com.tangem.features.commonfeatures.api.addtoportfolio.* import com.tangem.features.commonfeatures.impl.R @@ -33,7 +33,6 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.* import java.math.BigDecimal import javax.inject.Inject -import kotlin.collections.get import kotlin.collections.mapNotNull @Suppress("LongParameterList") diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/DefaultAddToPortfolioManager.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/DefaultAddToPortfolioManager.kt index a0aa017d17..e0f328c406 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/DefaultAddToPortfolioManager.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/DefaultAddToPortfolioManager.kt @@ -2,7 +2,7 @@ package com.tangem.features.commonfeatures.impl.addtoportfolio.ui import com.tangem.domain.markets.TokenMarketInfo import com.tangem.domain.markets.TokenMarketParams -import com.tangem.features.account.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager.AnalyticsParams import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager.Settings diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorComponent.kt similarity index 85% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorComponent.kt index 2f0229f8f3..b76d6089cc 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorComponent.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.selector +package com.tangem.features.commonfeatures.impl.portfolioselector import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -7,9 +7,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.extensions.TextReference -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.selector.ui.PortfolioSelectorBS -import com.tangem.features.account.selector.ui.PortfolioSelectorContent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.impl.portfolioselector.ui.PortfolioSelectorBS +import com.tangem.features.commonfeatures.impl.portfolioselector.ui.PortfolioSelectorContent import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorController.kt similarity index 90% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorController.kt index e2da9828c4..69065a9436 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/DefaultPortfolioSelectorController.kt @@ -1,12 +1,12 @@ -package com.tangem.features.account.selector +package com.tangem.features.commonfeatures.impl.portfolioselector import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase import com.tangem.domain.models.account.AccountId import com.tangem.domain.models.account.AccountStatus import com.tangem.domain.models.account.filterCryptoPortfolio import com.tangem.domain.models.wallet.UserWallet -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/PortfolioSelectorModel.kt similarity index 95% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/PortfolioSelectorModel.kt index 58b5fd61ca..deb65e62a0 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/PortfolioSelectorModel.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.selector +package com.tangem.features.commonfeatures.impl.portfolioselector import com.tangem.common.ui.account.AccountPortfolioItemUMConverter import com.tangem.common.ui.userwallet.converter.UserWalletItemUMConverter @@ -15,11 +15,11 @@ import com.tangem.domain.models.account.AccountStatus import com.tangem.domain.models.account.filterCryptoPortfolio import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.impl.R -import com.tangem.features.account.selector.entity.PortfolioSelectorItemUM -import com.tangem.features.account.selector.entity.PortfolioSelectorUM +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.impl.R +import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorItemUM +import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorUM import com.tangem.features.wallet.utils.UserWalletImageFetcher import com.tangem.operations.attestation.ArtworkSize import com.tangem.utils.coroutines.CoroutineDispatcherProvider diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/di/PortfolioSelectorModule.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/di/PortfolioSelectorModule.kt new file mode 100644 index 0000000000..976eeb78d1 --- /dev/null +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/di/PortfolioSelectorModule.kt @@ -0,0 +1,43 @@ +package com.tangem.features.commonfeatures.impl.portfolioselector.di + +import com.tangem.core.decompose.di.ModelComponent +import com.tangem.core.decompose.model.Model +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController +import com.tangem.features.commonfeatures.impl.portfolioselector.DefaultPortfolioSelectorComponent +import com.tangem.features.commonfeatures.impl.portfolioselector.DefaultPortfolioSelectorController +import com.tangem.features.commonfeatures.impl.portfolioselector.PortfolioSelectorModel +import com.tangem.features.commonfeatures.impl.portfolioselector.fetcher.DefaultPortfolioFetcher +import dagger.Binds +import dagger.Module +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import dagger.multibindings.ClassKey +import dagger.multibindings.IntoMap + +@Module +@InstallIn(ModelComponent::class) +internal interface PortfolioSelectorModule { + + @Binds + @IntoMap + @ClassKey(PortfolioSelectorModel::class) + fun portfolioSelectorModel(model: PortfolioSelectorModel): Model +} + +@Module +@InstallIn(SingletonComponent::class) +internal interface PortfolioSelectorSingletonModule { + + @Binds + fun bindPortfolioFetcherFactory(impl: DefaultPortfolioFetcher.Factory): PortfolioFetcher.Factory + + @Binds + fun bindPortfolioSelectorController(impl: DefaultPortfolioSelectorController): PortfolioSelectorController + + @Binds + fun bindPortfolioSelectorComponentFactory( + impl: DefaultPortfolioSelectorComponent.Factory, + ): PortfolioSelectorComponent.Factory +} \ No newline at end of file diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/entity/PortfolioSelectorUM.kt similarity index 90% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/entity/PortfolioSelectorUM.kt index 83d3979381..109e9e4fd1 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/entity/PortfolioSelectorUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.selector.entity +package com.tangem.features.commonfeatures.impl.portfolioselector.entity import androidx.compose.runtime.Immutable import com.tangem.common.ui.userwallet.state.UserWalletItemUM diff --git a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/fetcher/DefaultPortfolioFetcher.kt similarity index 94% rename from features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/fetcher/DefaultPortfolioFetcher.kt index 9fb0924c4a..5bb30cc8f2 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/fetcher/DefaultPortfolioFetcher.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.fetcher +package com.tangem.features.commonfeatures.impl.portfolioselector.fetcher import com.tangem.domain.account.models.AccountStatusList import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer @@ -9,8 +9,8 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.models.wallet.isMultiCurrency import com.tangem.domain.wallets.usecase.GetWalletsUseCase -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioFetcher.* +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher.* import com.tangem.utils.coroutines.CoroutineDispatcherProvider import dagger.assisted.Assisted import dagger.assisted.AssistedFactory diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt similarity index 91% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt index 5e63cd75cc..cd69452b68 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.selector.ui +package com.tangem.features.commonfeatures.impl.portfolioselector.ui import android.content.res.Configuration import androidx.compose.foundation.layout.PaddingValues @@ -14,8 +14,8 @@ import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheet import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.features.account.impl.R -import com.tangem.features.account.selector.entity.PortfolioSelectorUM +import com.tangem.features.commonfeatures.impl.R +import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorUM @Composable internal fun PortfolioSelectorBS( diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt similarity index 91% rename from features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt rename to features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt index 6b8f1872fd..d739e4d5a9 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt @@ -1,4 +1,4 @@ -package com.tangem.features.account.selector.ui +package com.tangem.features.commonfeatures.impl.portfolioselector.ui import android.content.res.Configuration import androidx.compose.foundation.BorderStroke @@ -32,13 +32,9 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.features.account.impl.R -import com.tangem.features.account.selector.entity.PortfolioSelectorItemUM -import com.tangem.features.account.selector.entity.PortfolioSelectorUM -import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.firstList -import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.lockedWalletList -import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.secondList -import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.walletList +import com.tangem.features.commonfeatures.impl.R +import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorItemUM +import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorUM import kotlinx.collections.immutable.toImmutableList import java.util.UUID @@ -207,19 +203,19 @@ internal class PortfolioSelectorPreviewStateProvider : CollectionPreviewParamete listOf( PortfolioSelectorUM( title = resourceReference(R.string.common_choose_account), - items = firstList.toImmutableList(), + items = PortfolioSelectorPreviewData.firstList.toImmutableList(), ), PortfolioSelectorUM( title = resourceReference(R.string.common_choose_account), - items = secondList.toImmutableList(), + items = PortfolioSelectorPreviewData.secondList.toImmutableList(), ), PortfolioSelectorUM( title = resourceReference(R.string.common_choose_wallet), - items = walletList.toImmutableList(), + items = PortfolioSelectorPreviewData.walletList.toImmutableList(), ), PortfolioSelectorUM( title = resourceReference(R.string.common_choose_wallet), - items = lockedWalletList.toImmutableList(), + items = PortfolioSelectorPreviewData.lockedWalletList.toImmutableList(), ), ), ) \ No newline at end of file diff --git a/features/nft/impl/build.gradle.kts b/features/nft/impl/build.gradle.kts index be33a37a7f..797564dd0e 100644 --- a/features/nft/impl/build.gradle.kts +++ b/features/nft/impl/build.gradle.kts @@ -13,7 +13,7 @@ android { dependencies { /** Api */ - implementation(projects.features.account.api) + implementation(projects.features.commonFeatures.api) implementation(projects.features.nft.api) implementation(projects.features.tokenRecieve.api) diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/common/DefaultNFTComponent.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/common/DefaultNFTComponent.kt index 25d54e0d9f..2d94110b50 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/common/DefaultNFTComponent.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/common/DefaultNFTComponent.kt @@ -20,9 +20,9 @@ import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.navigation.inner.InnerRouter import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher import com.tangem.features.nft.collections.NFTCollectionsComponent import com.tangem.features.nft.common.ui.NFTContent import com.tangem.features.nft.component.NFTComponent diff --git a/features/onramp/impl/build.gradle.kts b/features/onramp/impl/build.gradle.kts index 4d66407671..60286429b9 100644 --- a/features/onramp/impl/build.gradle.kts +++ b/features/onramp/impl/build.gradle.kts @@ -12,11 +12,9 @@ android { } dependencies { - /** Api */ - implementation(projects.features.commonFeatures.api) /** Project - API */ - implementation(projects.features.account.api) + implementation(projects.features.commonFeatures.api) implementation(projects.features.onramp.api) implementation(projects.features.swap.api) implementation(projects.features.swap.domain) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/DefaultHotCryptoComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/DefaultHotCryptoComponent.kt index 1112152d60..50fb0e3040 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/DefaultHotCryptoComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/DefaultHotCryptoComponent.kt @@ -31,7 +31,7 @@ import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.onramp.hottokens.model.HotCryptoModel import com.tangem.features.onramp.hottokens.portfolio.OnrampAddToPortfolioComponent import com.tangem.features.onramp.hottokens.portfolio.OnrampAddTokenComponent diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/model/HotCryptoModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/model/HotCryptoModel.kt index cf1badae14..e25061f64d 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/model/HotCryptoModel.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/model/HotCryptoModel.kt @@ -22,8 +22,8 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.onramp.model.HotCryptoCurrency -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.features.onramp.hottokens.HotCryptoComponent import com.tangem.features.onramp.hottokens.converter.HotTokenItemStateConverter import com.tangem.features.onramp.hottokens.entity.HotCryptoUM diff --git a/features/referral/impl/build.gradle.kts b/features/referral/impl/build.gradle.kts index 8f23358f8f..626b3f81d3 100644 --- a/features/referral/impl/build.gradle.kts +++ b/features/referral/impl/build.gradle.kts @@ -13,7 +13,7 @@ android { dependencies { /** Api */ api(projects.features.referral.api) - api(projects.features.account.api) + api(projects.features.commonFeatures.api) /** Core modules */ implementation(projects.core.analytics) diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt index d85d5291f1..fba435fa4c 100644 --- a/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt +++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt @@ -13,16 +13,16 @@ import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.feature.referral.api.ReferralComponent import com.tangem.feature.referral.model.ReferralModel import com.tangem.feature.referral.ui.ReferralScreen -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import kotlinx.serialization.builtins.serializer class DefaultReferralComponent @AssistedInject constructor( - private val portfolioSelectorComponentFactory: PortfolioSelectorComponent.Factory, @Assisted appComponentContext: AppComponentContext, @Assisted params: ReferralComponent.Params, + private val portfolioSelectorComponentFactory: PortfolioSelectorComponent.Factory, ) : ReferralComponent, AppComponentContext by appComponentContext { private val model: ReferralModel = getOrCreateModel(params) diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt index f928bf5249..6bf34b1050 100644 --- a/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt +++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt @@ -37,9 +37,9 @@ import com.tangem.feature.referral.domain.models.ReferralInfo import com.tangem.feature.referral.models.DemoModeException import com.tangem.feature.referral.models.ReferralStateHolder import com.tangem.feature.referral.models.ReferralStateHolder.* -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.* @@ -53,14 +53,14 @@ import javax.inject.Inject internal class ReferralModel @Inject constructor( paramsContainer: ParamsContainer, override val dispatchers: CoroutineDispatcherProvider, + val portfolioSelectorController: PortfolioSelectorController, + private val portfolioFetcherFactory: PortfolioFetcher.Factory, private val referralInteractor: ReferralInteractor, private val analyticsEventHandler: AnalyticsEventHandler, private val shareManager: ShareManager, private val urlOpener: UrlOpener, private val getUserWalletUseCase: GetUserWalletUseCase, private val isDemoCardUseCase: IsDemoCardUseCase, - private val portfolioFetcherFactory: PortfolioFetcher.Factory, - val portfolioSelectorController: PortfolioSelectorController, private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier, private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase, private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase, diff --git a/features/swap-v2/impl/build.gradle.kts b/features/swap-v2/impl/build.gradle.kts index 76f57cbad9..0b55164642 100644 --- a/features/swap-v2/impl/build.gradle.kts +++ b/features/swap-v2/impl/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { implementation(projects.features.swapV2.api) implementation(projects.features.manageTokens.api) implementation(projects.features.sendV2.api) + implementation(projects.features.commonFeatures.api) /** Core */ implementation(projects.core.decompose) diff --git a/features/wallet/impl/build.gradle.kts b/features/wallet/impl/build.gradle.kts index c91c083d7d..60c99dd9a8 100644 --- a/features/wallet/impl/build.gradle.kts +++ b/features/wallet/impl/build.gradle.kts @@ -128,6 +128,7 @@ dependencies { implementation(projects.domain.assetsdiscovery) /** Feature Apis */ + implementation(projects.features.commonFeatures.api) implementation(projects.features.account.api) implementation(projects.features.details.api) implementation(projects.features.hotWallet.api) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/AddAndManageBottomSheetComponent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/AddAndManageBottomSheetComponent.kt index 3cd335e5c5..22715d7bb5 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/AddAndManageBottomSheetComponent.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/AddAndManageBottomSheetComponent.kt @@ -13,7 +13,7 @@ import com.tangem.domain.models.account.AccountId import com.tangem.domain.models.wallet.UserWalletId import com.tangem.feature.wallet.child.managetokens.model.AddAndManageModel import com.tangem.feature.wallet.child.managetokens.ui.AddAndManageBottomSheetContent -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import kotlinx.serialization.builtins.serializer internal class AddAndManageBottomSheetComponent( diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/model/AddAndManageModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/model/AddAndManageModel.kt index 13df43dd76..9600a357f8 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/model/AddAndManageModel.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/managetokens/model/AddAndManageModel.kt @@ -8,9 +8,9 @@ import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer import com.tangem.domain.models.account.AccountId import com.tangem.feature.wallet.child.managetokens.AddAndManageBottomSheetComponent -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt index 72e1976879..d6f6a2e7bc 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt @@ -25,7 +25,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.domain.tokens.model.details.TokenAction import com.tangem.feature.wallet.child.managetokens.AddAndManageBottomSheetComponent import com.tangem.feature.wallet.child.organizetokens.OrganizeTokensComponent -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.feature.wallet.child.tokenActions.DefaultTokenActionsComponent import com.tangem.feature.wallet.child.tokenActions.TokenActionsComponent import com.tangem.feature.wallet.child.wallet.model.WalletModel diff --git a/features/walletconnect/impl/build.gradle.kts b/features/walletconnect/impl/build.gradle.kts index 3c857c76b5..2548c1f7b0 100644 --- a/features/walletconnect/impl/build.gradle.kts +++ b/features/walletconnect/impl/build.gradle.kts @@ -12,7 +12,7 @@ android { } dependencies { - implementation(projects.features.account.api) + implementation(projects.features.commonFeatures.api) implementation(projects.features.wallet.api) implementation(projects.features.walletconnect.api) implementation(projects.features.sendV2.api) diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcPairComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcPairComponent.kt index a160555493..0ab64bd444 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcPairComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcPairComponent.kt @@ -16,7 +16,7 @@ import com.tangem.core.ui.components.bottomsheets.message.MessageBottomSheetUM import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.domain.walletconnect.model.WcPairRequest -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.walletconnect.connections.model.WcPairModel import com.tangem.features.walletconnect.connections.routes.WcAppInfoRoutes import com.tangem.features.walletconnect.connections.routes.WcAppInfoRoutes.Alert diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt index d51b17e8c5..c6c3e4f486 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt @@ -34,9 +34,9 @@ import com.tangem.domain.walletconnect.model.WcSessionProposal import com.tangem.domain.walletconnect.model.sdkcopy.WcAppMetaData import com.tangem.domain.walletconnect.usecase.pair.WcPairState import com.tangem.domain.walletconnect.usecase.pair.WcPairUseCase -import com.tangem.features.account.PortfolioFetcher -import com.tangem.features.account.PortfolioSelectorComponent -import com.tangem.features.account.PortfolioSelectorController +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioFetcher +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorController import com.tangem.features.walletconnect.connections.components.WcPairComponent import com.tangem.features.walletconnect.connections.components.WcSelectNetworksComponent import com.tangem.features.walletconnect.connections.entity.WcAppInfoUM diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt index 5b44bc3973..ca9fe402ed 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt @@ -14,7 +14,7 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.account.PortfolioSelectorComponent +import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent import com.tangem.features.send.v2.api.FeeSelectorBlockComponent import com.tangem.features.send.v2.api.FeeSelectorComponent import com.tangem.features.walletconnect.components.WcRoutingComponent