diff --git a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt index 7afe67bf43..e762a3dabe 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt @@ -36,7 +36,7 @@ import com.tangem.domain.redux.domainStore import com.tangem.domain.redux.global.DomainGlobalAction import com.tangem.domain.redux.global.DomainGlobalState import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter -import com.tangem.tap.features.tokens.addCustomToken.compose.SelectTokenNetworkDialog +import com.tangem.tap.features.addCustomToken.compose.SelectTokenNetworkDialog import com.tangem.wallet.R import org.rekotlin.StoreSubscriber diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt index f6e77e9af9..7ad24431c6 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt @@ -9,6 +9,7 @@ import com.tangem.feature.referral.ReferralFragment import com.tangem.feature.swap.presentation.SwapFragment import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.FragmentShareTransition +import com.tangem.tap.features.addCustomToken.AddCustomTokenFragment import com.tangem.tap.features.details.ui.appsettings.AppSettingsFragment import com.tangem.tap.features.details.ui.cardsettings.CardSettingsFragment import com.tangem.tap.features.details.ui.details.DetailsFragment @@ -25,9 +26,8 @@ import com.tangem.tap.features.onboarding.products.wallet.ui.OnboardingWalletFra import com.tangem.tap.features.saveWallet.ui.SaveWalletBottomSheetFragment import com.tangem.tap.features.send.ui.SendFragment import com.tangem.tap.features.shop.ui.ShopFragment -import com.tangem.tap.features.tokens.addCustomToken.AddCustomTokenFragment -import com.tangem.tap.features.tokens.presentation.AddTokensFragment -import com.tangem.tap.features.tokens.presentation.TokensListFragment +import com.tangem.tap.features.tokens.impl.presentation.TokensListFragment +import com.tangem.tap.features.tokens.legacy.AddTokensFragment import com.tangem.tap.features.wallet.ui.WalletDetailsFragment import com.tangem.tap.features.wallet.ui.WalletFragment import com.tangem.tap.features.walletSelector.ui.WalletSelectorBottomSheetFragment diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt index cb18e36047..7210599e41 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt @@ -15,7 +15,7 @@ import com.tangem.tap.features.send.redux.reducers.SendScreenReducer import com.tangem.tap.features.shop.redux.ShopReducer import com.tangem.tap.features.signin.redux.SignInReducer import com.tangem.tap.features.sprinklr.redux.SprinklrReducer -import com.tangem.tap.features.tokens.redux.TokensReducer +import com.tangem.tap.features.tokens.legacy.redux.TokensReducer import com.tangem.tap.features.wallet.redux.reducers.WalletReducer import com.tangem.tap.features.walletSelector.redux.WalletSelectorReducer import com.tangem.tap.features.welcome.redux.WelcomeReducer diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt index d3000eb374..2efd12e515 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt @@ -35,8 +35,8 @@ import com.tangem.tap.features.signin.redux.SignInMiddleware import com.tangem.tap.features.signin.redux.SignInState import com.tangem.tap.features.sprinklr.redux.SprinklrMiddleware import com.tangem.tap.features.sprinklr.redux.SprinklrState -import com.tangem.tap.features.tokens.redux.TokensMiddleware -import com.tangem.tap.features.tokens.redux.TokensState +import com.tangem.tap.features.tokens.legacy.redux.TokensMiddleware +import com.tangem.tap.features.tokens.legacy.redux.TokensState import com.tangem.tap.features.wallet.redux.WalletState import com.tangem.tap.features.wallet.redux.middlewares.WalletMiddleware import com.tangem.tap.features.walletSelector.redux.WalletSelectorMiddleware diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/AddCustomTokenFragment.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/AddCustomTokenFragment.kt index 2a41a990b6..39689b35e5 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/AddCustomTokenFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken +package com.tangem.tap.features.addCustomToken import android.os.Bundle import android.view.View @@ -19,7 +19,7 @@ import com.tangem.tap.common.compose.ClosePopupTrigger import com.tangem.tap.features.BaseStoreFragment import com.tangem.tap.features.FragmentOnBackPressedHandler import com.tangem.tap.features.addBackPressHandler -import com.tangem.tap.features.tokens.addCustomToken.compose.AddCustomTokenScreen +import com.tangem.tap.features.addCustomToken.compose.AddCustomTokenScreen import com.tangem.wallet.R import org.rekotlin.StoreSubscriber diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/AddCustomTokenScreen.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/AddCustomTokenScreen.kt index d5c9bfe9c0..9342b868d1 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/AddCustomTokenScreen.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose +package com.tangem.tap.features.addCustomToken.compose import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -52,17 +52,11 @@ import com.tangem.tap.common.compose.AddCustomTokenWarning import com.tangem.tap.common.compose.ClosePopupTrigger import com.tangem.tap.common.compose.ComposeDialogManager import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter -import com.tangem.tap.features.tokens.addCustomToken.compose.test.TestCase -import com.tangem.tap.features.tokens.addCustomToken.compose.test.TestCasesList +import com.tangem.tap.features.addCustomToken.compose.test.TestCase +import com.tangem.tap.features.addCustomToken.compose.test.TestCasesList import com.tangem.wallet.R import kotlinx.coroutines.launch -/** -[REDACTED_AUTHOR] - */ -@Suppress("UnusedPrivateClass") -private class AddCustomTokenScreen // for simple search - @OptIn(ExperimentalMaterialApi::class) @Composable fun AddCustomTokenScreen(state: MutableState, closePopupTrigger: ClosePopupTrigger) { diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/FormFieldViews.kt similarity index 99% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/FormFieldViews.kt index 7a14ca2d85..069d9f6823 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/FormFieldViews.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose +package com.tangem.tap.features.addCustomToken.compose import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/HangingOverKeyboardView.kt similarity index 93% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/HangingOverKeyboardView.kt index a330583a8b..54f0d74243 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/HangingOverKeyboardView.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose +package com.tangem.tap.features.addCustomToken.compose import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/SelectTokenNetworkDialog.kt similarity index 92% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/SelectTokenNetworkDialog.kt index 5dc938ed1c..b30ab3c9e9 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/SelectTokenNetworkDialog.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose +package com.tangem.tap.features.addCustomToken.compose import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/ContractAddressTests.kt similarity index 98% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/ContractAddressTests.kt index 581af5a8df..6ba18d8a22 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/ContractAddressTests.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose.test +package com.tangem.tap.features.addCustomToken.compose.test import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/TestCasesList.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt rename to app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/TestCasesList.kt index ef6a3bc4cd..7f92a0a666 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt +++ b/app/src/main/java/com/tangem/tap/features/addCustomToken/compose/test/TestCasesList.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.addCustomToken.compose.test +package com.tangem.tap.features.addCustomToken.compose.test import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 372866fafc..64ea0798e0 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -20,7 +20,7 @@ import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.home.compose.StoriesScreen import com.tangem.tap.features.home.redux.HomeAction import com.tangem.tap.features.home.redux.HomeState -import com.tangem.tap.features.tokens.redux.TokensAction +import com.tangem.tap.features.tokens.legacy.redux.TokensAction import com.tangem.tap.store import org.rekotlin.StoreSubscriber diff --git a/app/src/main/java/com/tangem/tap/features/tokens/data/DefaultTokensListRepository.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt similarity index 91% rename from app/src/main/java/com/tangem/tap/features/tokens/data/DefaultTokensListRepository.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt index ba522709c6..7ff7b78228 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/data/DefaultTokensListRepository.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.data +package com.tangem.tap.features.tokens.impl.data import androidx.paging.Pager import androidx.paging.PagingConfig @@ -6,8 +6,8 @@ import androidx.paging.PagingData import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.datasource.local.testnet.TestnetTokensStorage import com.tangem.domain.common.TapWorkarounds.isTestCard -import com.tangem.tap.features.tokens.domain.TokensListRepository -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.domain.TokensListRepository +import com.tangem.tap.features.tokens.impl.domain.models.Token import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/tangem/tap/features/tokens/data/TangemApiTokensPagingSource.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt similarity index 92% rename from app/src/main/java/com/tangem/tap/features/tokens/data/TangemApiTokensPagingSource.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt index d9d63213bd..2cae031963 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/data/TangemApiTokensPagingSource.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.data +package com.tangem.tap.features.tokens.impl.data import androidx.paging.PagingSource import androidx.paging.PagingState @@ -6,8 +6,8 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.domain.common.extensions.supportedBlockchains import com.tangem.domain.common.extensions.toNetworkId -import com.tangem.tap.features.tokens.data.converters.CoinsResponseConverter -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.data.converters.CoinsResponseConverter +import com.tangem.tap.features.tokens.impl.domain.models.Token import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.coroutines.runCatching diff --git a/app/src/main/java/com/tangem/tap/features/tokens/data/TestnetTokensPagingSource.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TestnetTokensPagingSource.kt similarity index 87% rename from app/src/main/java/com/tangem/tap/features/tokens/data/TestnetTokensPagingSource.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/data/TestnetTokensPagingSource.kt index 87943ee140..9525c329ba 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/data/TestnetTokensPagingSource.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TestnetTokensPagingSource.kt @@ -1,11 +1,11 @@ -package com.tangem.tap.features.tokens.data +package com.tangem.tap.features.tokens.impl.data import androidx.paging.PagingSource import androidx.paging.PagingState import com.tangem.datasource.local.testnet.TestnetTokensStorage import com.tangem.datasource.local.testnet.models.TestnetTokensConfig -import com.tangem.tap.features.tokens.data.converters.TestnetTokensConfigConverter -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.data.converters.TestnetTokensConfigConverter +import com.tangem.tap.features.tokens.impl.domain.models.Token /** * Paging source that get tokens by testnet tokens config diff --git a/app/src/main/java/com/tangem/tap/features/tokens/data/converters/CoinsResponseConverter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/CoinsResponseConverter.kt similarity index 91% rename from app/src/main/java/com/tangem/tap/features/tokens/data/converters/CoinsResponseConverter.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/CoinsResponseConverter.kt index d8b9477c16..64739f61a7 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/data/converters/CoinsResponseConverter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/CoinsResponseConverter.kt @@ -1,10 +1,10 @@ -package com.tangem.tap.features.tokens.data.converters +package com.tangem.tap.features.tokens.impl.data.converters import com.tangem.blockchain.common.Blockchain import com.tangem.datasource.api.tangemTech.models.CoinsResponse import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.domain.tokens.getIconUrl -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.domain.models.Token import com.tangem.utils.converter.Converter /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/data/converters/TestnetTokensConfigConverter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/TestnetTokensConfigConverter.kt similarity index 91% rename from app/src/main/java/com/tangem/tap/features/tokens/data/converters/TestnetTokensConfigConverter.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/TestnetTokensConfigConverter.kt index b010b81704..269690c18b 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/data/converters/TestnetTokensConfigConverter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/converters/TestnetTokensConfigConverter.kt @@ -1,10 +1,10 @@ -package com.tangem.tap.features.tokens.data.converters +package com.tangem.tap.features.tokens.impl.data.converters import com.tangem.blockchain.common.Blockchain import com.tangem.datasource.local.testnet.models.TestnetTokensConfig import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.domain.tokens.getIconUrl -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.domain.models.Token import com.tangem.utils.converter.Converter /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListFeatureTogglesModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListFeatureTogglesModule.kt similarity index 82% rename from app/src/main/java/com/tangem/tap/features/tokens/di/TokensListFeatureTogglesModule.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListFeatureTogglesModule.kt index be1a69cc5b..d2b8ae0470 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListFeatureTogglesModule.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListFeatureTogglesModule.kt @@ -1,8 +1,8 @@ -package com.tangem.tap.features.tokens.di +package com.tangem.tap.features.tokens.impl.di import com.tangem.core.featuretoggle.manager.FeatureTogglesManager import com.tangem.tap.features.tokens.api.featuretoggles.TokensListFeatureToggles -import com.tangem.tap.features.tokens.featuretoggles.DefaultTokensListFeatureToggles +import com.tangem.tap.features.tokens.impl.featuretoggles.DefaultTokensListFeatureToggles import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListInteractorModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt similarity index 81% rename from app/src/main/java/com/tangem/tap/features/tokens/di/TokensListInteractorModule.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt index c27bc5f8e0..ddc7a2a15b 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListInteractorModule.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt @@ -1,10 +1,10 @@ -package com.tangem.tap.features.tokens.di +package com.tangem.tap.features.tokens.impl.di import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.datasource.local.testnet.TestnetTokensStorage -import com.tangem.tap.features.tokens.data.DefaultTokensListRepository -import com.tangem.tap.features.tokens.domain.DefaultTokensListInteractor -import com.tangem.tap.features.tokens.domain.TokensListInteractor +import com.tangem.tap.features.tokens.impl.data.DefaultTokensListRepository +import com.tangem.tap.features.tokens.impl.domain.DefaultTokensListInteractor +import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.CoroutineDispatcherProvider import dagger.Module diff --git a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRepositoryModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt similarity index 84% rename from app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRepositoryModule.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt index e71a3a6531..dbba8fe0dd 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRepositoryModule.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt @@ -1,9 +1,9 @@ -package com.tangem.tap.features.tokens.di +package com.tangem.tap.features.tokens.impl.di import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.datasource.local.testnet.TestnetTokensStorage -import com.tangem.tap.features.tokens.data.DefaultTokensListRepository -import com.tangem.tap.features.tokens.domain.TokensListRepository +import com.tangem.tap.features.tokens.impl.data.DefaultTokensListRepository +import com.tangem.tap.features.tokens.impl.domain.TokensListRepository import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.CoroutineDispatcherProvider import dagger.Module diff --git a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRouterModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt similarity index 65% rename from app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRouterModule.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt index 9716a3e027..2a7da5cca4 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/di/TokensListRouterModule.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt @@ -1,7 +1,7 @@ -package com.tangem.tap.features.tokens.di +package com.tangem.tap.features.tokens.impl.di -import com.tangem.tap.features.tokens.presentation.router.DefaultTokensListRouter -import com.tangem.tap.features.tokens.presentation.router.TokensListRouter +import com.tangem.tap.features.tokens.impl.presentation.router.DefaultTokensListRouter +import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/tangem/tap/features/tokens/domain/DefaultTokensListInteractor.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt similarity index 97% rename from app/src/main/java/com/tangem/tap/features/tokens/domain/DefaultTokensListInteractor.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt index 5012ccebc5..290dfa225f 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/domain/DefaultTokensListInteractor.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.domain +package com.tangem.tap.features.tokens.impl.domain import androidx.paging.PagingData import com.tangem.blockchain.common.Blockchain @@ -18,9 +18,9 @@ import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.TapError import com.tangem.tap.domain.model.WalletDataModel -import com.tangem.tap.features.tokens.domain.models.Token -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.redux.TokensMiddleware +import com.tangem.tap.features.tokens.impl.domain.models.Token +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.TokensMiddleware import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.proxy.AppStateHolder import com.tangem.tap.store diff --git a/app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListInteractor.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt similarity index 76% rename from app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListInteractor.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt index 6ffe49b885..fee08220bf 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListInteractor.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt @@ -1,9 +1,9 @@ -package com.tangem.tap.features.tokens.domain +package com.tangem.tap.features.tokens.impl.domain import androidx.paging.PagingData import com.tangem.blockchain.common.Blockchain -import com.tangem.tap.features.tokens.domain.models.Token -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.impl.domain.models.Token +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain import kotlinx.coroutines.flow.Flow /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListRepository.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListRepository.kt similarity index 75% rename from app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListRepository.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListRepository.kt index 95fdde59ff..11fea0d2fc 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/domain/TokensListRepository.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListRepository.kt @@ -1,7 +1,7 @@ -package com.tangem.tap.features.tokens.domain +package com.tangem.tap.features.tokens.impl.domain import androidx.paging.PagingData -import com.tangem.tap.features.tokens.domain.models.Token +import com.tangem.tap.features.tokens.impl.domain.models.Token import kotlinx.coroutines.flow.Flow /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/domain/models/Token.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/models/Token.kt similarity index 94% rename from app/src/main/java/com/tangem/tap/features/tokens/domain/models/Token.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/domain/models/Token.kt index 750dfc94f5..72c6ecfdae 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/domain/models/Token.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/models/Token.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.domain.models +package com.tangem.tap.features.tokens.impl.domain.models import com.tangem.blockchain.common.Blockchain diff --git a/app/src/main/java/com/tangem/tap/features/tokens/featuretoggles/DefaultTokensListFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/featuretoggles/DefaultTokensListFeatureToggles.kt similarity index 91% rename from app/src/main/java/com/tangem/tap/features/tokens/featuretoggles/DefaultTokensListFeatureToggles.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/featuretoggles/DefaultTokensListFeatureToggles.kt index eedb10b4a9..b9aa44c70f 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/featuretoggles/DefaultTokensListFeatureToggles.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/featuretoggles/DefaultTokensListFeatureToggles.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.featuretoggles +package com.tangem.tap.features.tokens.impl.featuretoggles import com.tangem.core.featuretoggle.manager.FeatureTogglesManager import com.tangem.tap.features.tokens.api.featuretoggles.TokensListFeatureToggles diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/TokensListFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt similarity index 85% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/TokensListFragment.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt index 55615e908b..0a455118c1 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/TokensListFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation +package com.tangem.tap.features.tokens.impl.presentation import android.os.Bundle import android.view.LayoutInflater @@ -10,8 +10,8 @@ import androidx.fragment.app.Fragment import androidx.hilt.navigation.compose.hiltViewModel import androidx.transition.TransitionInflater import com.tangem.core.ui.res.TangemTheme -import com.tangem.tap.features.tokens.presentation.ui.TokensListScreen -import com.tangem.tap.features.tokens.presentation.viewmodels.TokensListViewModel +import com.tangem.tap.features.tokens.impl.presentation.ui.TokensListScreen +import com.tangem.tap.features.tokens.impl.presentation.viewmodels.TokensListViewModel import com.tangem.wallet.R import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/models/TokensListArgs.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt similarity index 82% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/models/TokensListArgs.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt index de2b9a97bf..88fdf58dd7 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/models/TokensListArgs.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt @@ -1,7 +1,7 @@ -package com.tangem.tap.features.tokens.presentation.models +package com.tangem.tap.features.tokens.impl.presentation.models import com.tangem.blockchain.common.Blockchain -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain import com.tangem.tap.store /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt similarity index 93% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/router/DefaultTokensListRouter.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt index f266e0805f..73e09a433e 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/router/DefaultTokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt @@ -1,10 +1,10 @@ -package com.tangem.tap.features.tokens.presentation.router +package com.tangem.tap.features.tokens.impl.presentation.router import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.extensions.dispatchNotification import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.common.redux.navigation.NavigationAction -import com.tangem.tap.features.tokens.redux.TokensAction +import com.tangem.tap.features.tokens.legacy.redux.TokensAction import com.tangem.tap.features.wallet.redux.models.WalletDialog import com.tangem.tap.store import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/router/TokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt similarity index 93% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/router/TokensListRouter.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt index ccc7ed37cb..cc4f49409c 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/router/TokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.router +package com.tangem.tap.features.tokens.impl.presentation.router /** Tokens list feature router */ internal interface TokensListRouter { diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/NetworkItemState.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/NetworkItemState.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/states/NetworkItemState.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/NetworkItemState.kt index c6967c78e4..081a399e06 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/NetworkItemState.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/NetworkItemState.kt @@ -1,10 +1,10 @@ -package com.tangem.tap.features.tokens.presentation.states +package com.tangem.tap.features.tokens.impl.presentation.states import androidx.compose.runtime.MutableState import com.tangem.blockchain.common.Blockchain import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.tap.common.extensions.getGreyedOutIconRes -import com.tangem.tap.features.tokens.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress /** * Network item state diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokenItemState.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokenItemState.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokenItemState.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokenItemState.kt index e3ab7e2553..603989d157 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokenItemState.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokenItemState.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.states +package com.tangem.tap.features.tokens.impl.presentation.states import kotlinx.collections.immutable.ImmutableList diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListStateHolder.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListStateHolder.kt similarity index 97% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListStateHolder.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListStateHolder.kt index a7368f383d..669242641f 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListStateHolder.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListStateHolder.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.states +package com.tangem.tap.features.tokens.impl.presentation.states import androidx.paging.LoadState import androidx.paging.PagingData diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListToolbarState.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListToolbarState.kt similarity index 97% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListToolbarState.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListToolbarState.kt index 0fff69aabd..b4104f692b 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/states/TokensListToolbarState.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/states/TokensListToolbarState.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.states +package com.tangem.tap.features.tokens.impl.presentation.states /** Toolbar state */ sealed interface TokensListToolbarState { diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/BriefNetworksList.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt similarity index 94% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/BriefNetworksList.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt index bd3605c70e..9ef5db3888 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/BriefNetworksList.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -18,7 +18,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme -import com.tangem.tap.features.tokens.presentation.states.NetworkItemState +import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState import kotlinx.collections.immutable.ImmutableCollection /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/DetailedNetworksList.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/DetailedNetworksList.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt index bdf39d31e9..28efb5d313 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/DetailedNetworksList.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -34,8 +34,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme -import com.tangem.tap.features.tokens.presentation.states.NetworkItemState -import com.tangem.tap.features.tokens.presentation.states.TokenItemState +import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState import kotlinx.collections.immutable.ImmutableCollection /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/NetworkItemArrow.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt similarity index 97% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/NetworkItemArrow.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt index 5aadb66fa1..6e9be1c229 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/NetworkItemArrow.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt similarity index 98% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenItem.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt index bd6b760fd5..3545c6a2a5 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenItem.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -38,7 +38,7 @@ import coil.compose.SubcomposeAsyncImage import coil.request.ImageRequest import com.tangem.core.ui.res.TangemTheme import com.tangem.tap.common.compose.extensions.toPx -import com.tangem.tap.features.tokens.presentation.states.TokenItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState import com.tangem.wallet.R /** diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenListPreviewData.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt similarity index 92% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenListPreviewData.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt index efed29fd37..3fb8f93097 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokenListPreviewData.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt @@ -1,9 +1,9 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.runtime.mutableStateOf import com.tangem.blockchain.common.Blockchain -import com.tangem.tap.features.tokens.presentation.states.NetworkItemState -import com.tangem.tap.features.tokens.presentation.states.TokenItemState +import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState import com.tangem.wallet.R import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListScreen.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt index 57f720ee1c..6d4494dcf5 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility @@ -30,9 +30,9 @@ import androidx.paging.compose.items import com.tangem.core.ui.components.PrimaryButton import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme -import com.tangem.tap.features.tokens.presentation.states.TokenItemState -import com.tangem.tap.features.tokens.presentation.states.TokensListStateHolder -import com.tangem.tap.features.tokens.presentation.states.TokensListToolbarState +import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListStateHolder +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState import com.tangem.wallet.R import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flow diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListToolbar.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListToolbar.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt index f3bb8bbafd..03ae578e8a 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/ui/TokensListToolbar.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.ui +package com.tangem.tap.features.tokens.impl.presentation.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -33,9 +33,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme -import com.tangem.tap.features.tokens.presentation.states.TokensListToolbarState -import com.tangem.tap.features.tokens.presentation.states.TokensListToolbarState.InputField -import com.tangem.tap.features.tokens.presentation.states.TokensListToolbarState.Title +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState.InputField +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState.Title import com.tangem.wallet.R import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListAnalyticsSender.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListAnalyticsSender.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListAnalyticsSender.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListAnalyticsSender.kt index 615f039a8f..8e839d1ddd 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListAnalyticsSender.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListAnalyticsSender.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.viewmodels +package com.tangem.tap.features.tokens.impl.presentation.viewmodels import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt similarity index 94% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListViewModel.kt rename to app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt index 6917f88b1e..d709e49df6 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/viewmodels/TokensListViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation.viewmodels +package com.tangem.tap.features.tokens.impl.presentation.viewmodels import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -16,16 +16,16 @@ import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.common.extensions.fullNameWithoutTestnet import com.tangem.tap.common.extensions.getGreyedOutIconRes import com.tangem.tap.common.extensions.getNetworkName -import com.tangem.tap.features.tokens.domain.TokensListInteractor -import com.tangem.tap.features.tokens.domain.models.Token -import com.tangem.tap.features.tokens.domain.models.Token.Network -import com.tangem.tap.features.tokens.presentation.models.TokensListArgs -import com.tangem.tap.features.tokens.presentation.router.TokensListRouter -import com.tangem.tap.features.tokens.presentation.states.NetworkItemState -import com.tangem.tap.features.tokens.presentation.states.TokenItemState -import com.tangem.tap.features.tokens.presentation.states.TokensListStateHolder -import com.tangem.tap.features.tokens.presentation.states.TokensListToolbarState -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor +import com.tangem.tap.features.tokens.impl.domain.models.Token +import com.tangem.tap.features.tokens.impl.domain.models.Token.Network +import com.tangem.tap.features.tokens.impl.presentation.models.TokensListArgs +import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter +import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListStateHolder +import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider import com.tangem.utils.coroutines.Debouncer diff --git a/app/src/main/java/com/tangem/tap/features/tokens/presentation/AddTokensFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/AddTokensFragment.kt similarity index 94% rename from app/src/main/java/com/tangem/tap/features/tokens/presentation/AddTokensFragment.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/AddTokensFragment.kt index c2e0aa1302..3d6216bf22 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/presentation/AddTokensFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/AddTokensFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.presentation +package com.tangem.tap.features.tokens.legacy import android.os.Bundle import android.view.Menu @@ -22,11 +22,11 @@ import com.tangem.tap.common.extensions.getString import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.BaseFragment import com.tangem.tap.features.addBackPressHandler -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.redux.TokensAction -import com.tangem.tap.features.tokens.redux.TokensState -import com.tangem.tap.features.tokens.ui.compose.CurrenciesScreen +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.TokensAction +import com.tangem.tap.features.tokens.legacy.redux.TokensState +import com.tangem.tap.features.tokens.legacy.ui.compose.CurrenciesScreen import com.tangem.tap.mainScope import com.tangem.tap.store import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt index 0c87bc313a..2831a00547 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.redux +package com.tangem.tap.features.tokens.legacy.redux import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.DerivationStyle diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt similarity index 99% rename from app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt index e275b0c072..dfb76ced9e 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.redux +package com.tangem.tap.features.tokens.legacy.redux import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.DerivationStyle @@ -8,9 +8,9 @@ import com.tangem.common.extensions.ByteArrayKey import com.tangem.common.extensions.guard import com.tangem.common.extensions.toMapKey import com.tangem.common.flatMap -import com.tangem.crypto.hdWallet.DerivationPath import com.tangem.common.services.Result import com.tangem.core.analytics.Analytics +import com.tangem.crypto.hdWallet.DerivationPath import com.tangem.domain.DomainWrapped import com.tangem.domain.common.ScanResponse import com.tangem.domain.common.TapWorkarounds.derivationStyle diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt similarity index 97% rename from app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt index c792805d9b..7b5d5eaef5 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.redux +package com.tangem.tap.features.tokens.legacy.redux import com.tangem.tap.common.redux.AppState import org.rekotlin.Action diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt similarity index 98% rename from app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt index 8015b9d1d5..432b422128 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.redux +package com.tangem.tap.features.tokens.legacy.redux import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.DerivationStyle diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesScreen.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesScreen.kt index f236111d4a..6088fde47a 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesScreen.kt @@ -1,6 +1,6 @@ @file:Suppress("MagicNumber") -package com.tangem.tap.features.tokens.ui.compose +package com.tangem.tap.features.tokens.legacy.ui.compose import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -40,10 +40,10 @@ import com.tangem.tap.common.compose.extensions.removeAndNotify import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.LoadCoinsState -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.redux.TokensState +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.LoadCoinsState +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.TokensState import com.tangem.tap.features.wallet.redux.models.WalletDialog import com.tangem.tap.store import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesWarning.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesWarning.kt index bfd230a1c7..b4b94b8edb 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrenciesWarning.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose +package com.tangem.tap.features.tokens.legacy.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrencyPlaceholderIcon.kt similarity index 95% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrencyPlaceholderIcon.kt index 188c75e57b..43a2885497 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/CurrencyPlaceholderIcon.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose +package com.tangem.tap.features.tokens.legacy.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/ListOfCurrencies.kt similarity index 90% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/ListOfCurrencies.kt index 1c5ba31d04..4f067daa9d 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/ListOfCurrencies.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose +package com.tangem.tap.features.tokens.legacy.ui.compose import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -15,9 +15,9 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.tap.common.compose.extensions.HideKeyboardOnScroll import com.tangem.tap.common.compose.extensions.OnBottomReached import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.ui.compose.currencyItem.CurrencyItem +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.ui.compose.currencyItem.CurrencyItem @Suppress("LongParameterList") @Composable diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyExpandedContent.kt similarity index 91% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyExpandedContent.kt index 4783c5ac67..9ea93f61d6 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyExpandedContent.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose.currencyItem +package com.tangem.tap.features.tokens.legacy.ui.compose.currencyItem import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import com.tangem.blockchain.common.Blockchain import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain @Suppress("LongParameterList") @Composable diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItem.kt similarity index 84% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItem.kt index c2aa9f238f..a15c17000f 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItem.kt @@ -1,11 +1,11 @@ -package com.tangem.tap.features.tokens.ui.compose.currencyItem +package com.tangem.tap.features.tokens.legacy.ui.compose.currencyItem import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import com.tangem.blockchain.common.Blockchain import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain @Suppress("LongParameterList") @Composable diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItemHeader.kt similarity index 96% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItemHeader.kt index bcc681addb..bf5fc63457 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/CurrencyItemHeader.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose.currencyItem +package com.tangem.tap.features.tokens.legacy.ui.compose.currencyItem import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -36,9 +36,9 @@ import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.common.extensions.getGreyedOutIconRes import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon -import com.tangem.tap.features.tokens.ui.compose.fullName +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.ui.compose.CurrencyPlaceholderIcon +import com.tangem.tap.features.tokens.legacy.ui.compose.fullName import com.tangem.wallet.R @Suppress("LongMethod", "MagicNumber") diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/NetworkItem.kt similarity index 94% rename from app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt rename to app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/NetworkItem.kt index ceb4e333c7..4d7eab3fb6 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/ui/compose/currencyItem/NetworkItem.kt @@ -1,4 +1,4 @@ -package com.tangem.tap.features.tokens.ui.compose.currencyItem +package com.tangem.tap.features.tokens.legacy.ui.compose.currencyItem import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -37,10 +37,10 @@ import com.tangem.tap.common.extensions.getGreyedOutIconRes import com.tangem.tap.common.extensions.getNetworkName import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency -import com.tangem.tap.features.tokens.presentation.ui.NetworkItemArrow -import com.tangem.tap.features.tokens.redux.ContractAddress -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon +import com.tangem.tap.features.tokens.impl.presentation.ui.NetworkItemArrow +import com.tangem.tap.features.tokens.legacy.redux.ContractAddress +import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain +import com.tangem.tap.features.tokens.legacy.ui.compose.CurrencyPlaceholderIcon @Suppress("LongParameterList", "LongMethod", "MagicNumber") @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt index f981a8beca..dfe3f32704 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt @@ -14,7 +14,7 @@ import com.tangem.tap.common.extensions.show import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.domain.model.TotalFiatBalance -import com.tangem.tap.features.tokens.redux.TokensAction +import com.tangem.tap.features.tokens.legacy.redux.TokensAction import com.tangem.tap.features.wallet.redux.ErrorType import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.features.wallet.redux.WalletState