diff --git a/app/src/main/java/jp/co/soramitsu/sora/di/app/modules/NavigationModule.kt b/app/src/main/java/jp/co/soramitsu/sora/di/app/modules/NavigationModule.kt index 5ffd3e5d4..b8b366cd8 100644 --- a/app/src/main/java/jp/co/soramitsu/sora/di/app/modules/NavigationModule.kt +++ b/app/src/main/java/jp/co/soramitsu/sora/di/app/modules/NavigationModule.kt @@ -37,7 +37,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter import jp.co.soramitsu.feature_referral_api.ReferralRouter diff --git a/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt b/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt index 0cb9aab10..0bf5dfe6a 100644 --- a/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt +++ b/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt @@ -51,7 +51,7 @@ import jp.co.soramitsu.common.presentation.compose.webview.title import jp.co.soramitsu.common.presentation.compose.webview.url import jp.co.soramitsu.common.util.BuildUtils import jp.co.soramitsu.common.util.StringPair -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.screens.assetdetails.AssetDetailsFragment import jp.co.soramitsu.feature_assets_impl.presentation.screens.receiverequest.QRCodeFlowFragment import jp.co.soramitsu.feature_assets_impl.presentation.screens.send.TransferAmountFragment @@ -73,7 +73,13 @@ import jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.GetSoraCardF import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter import jp.co.soramitsu.sora.R -class Navigator : MainRouter, WalletRouter, ReferralRouter, SelectNodeRouter, PolkaswapRouter, AssetsRouter { +class Navigator : + MainRouter, + WalletRouter, + ReferralRouter, + SelectNodeRouter, + PolkaswapRouter, + AssetsRouter { private var navController: NavController? = null diff --git a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/interfaces/AssetsRepository.kt b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.kt similarity index 98% rename from feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/interfaces/AssetsRepository.kt rename to feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.kt index 1cc5d2372..f72d2408a 100644 --- a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/interfaces/AssetsRepository.kt +++ b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.kt @@ -30,7 +30,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package jp.co.soramitsu.feature_assets_api.data.interfaces +package jp.co.soramitsu.feature_assets_api.data import java.math.BigDecimal import jp.co.soramitsu.common.account.SoraAccount diff --git a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/AssetsInteractor.kt b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.kt similarity index 98% rename from feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/AssetsInteractor.kt rename to feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.kt index e7d971d69..771c9bc61 100644 --- a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/AssetsInteractor.kt +++ b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.kt @@ -30,7 +30,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package jp.co.soramitsu.feature_assets_api.domain.interfaces +package jp.co.soramitsu.feature_assets_api.domain import java.math.BigDecimal import jp.co.soramitsu.common.account.SoraAccount diff --git a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/QrCodeInteractor.kt b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/QrCodeInteractor.kt similarity index 97% rename from feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/QrCodeInteractor.kt rename to feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/QrCodeInteractor.kt index e7818b393..fb77a4908 100644 --- a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/QrCodeInteractor.kt +++ b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/QrCodeInteractor.kt @@ -30,7 +30,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package jp.co.soramitsu.feature_assets_api.domain.interfaces +package jp.co.soramitsu.feature_assets_api.domain interface QrCodeInteractor { diff --git a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/launcher/AssetsRouter.kt b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/AssetsRouter.kt similarity index 96% rename from feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/launcher/AssetsRouter.kt rename to feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/AssetsRouter.kt index 4d1ac837e..03baf2311 100644 --- a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/launcher/AssetsRouter.kt +++ b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/AssetsRouter.kt @@ -30,7 +30,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package jp.co.soramitsu.feature_assets_api.presentation.launcher +package jp.co.soramitsu.feature_assets_api.presentation interface AssetsRouter { diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt index 330be5427..b7e92b224 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt @@ -55,7 +55,7 @@ import jp.co.soramitsu.core_db.AppDatabase import jp.co.soramitsu.core_db.model.AssetLocal import jp.co.soramitsu.core_db.model.AssetTokenWithFiatLocal import jp.co.soramitsu.core_db.model.TokenLocal -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager import jp.co.soramitsu.shared_utils.encrypt.keypair.substrate.Sr25519Keypair import jp.co.soramitsu.sora.substrate.models.ExtrinsicSubmitStatus diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/di/AssetsFeatureModule.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/di/AssetsFeatureModule.kt index 56fc7287b..6639e36ff 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/di/AssetsFeatureModule.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/di/AssetsFeatureModule.kt @@ -40,9 +40,9 @@ import javax.inject.Singleton import jp.co.soramitsu.common.domain.CoroutineManager import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor import jp.co.soramitsu.feature_assets_impl.data.AssetsRepositoryImpl import jp.co.soramitsu.feature_assets_impl.domain.AssetsInteractorImpl import jp.co.soramitsu.feature_assets_impl.domain.QrCodeInteractorImpl diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt index 4373e7370..9e5282152 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt @@ -46,8 +46,8 @@ import jp.co.soramitsu.common.util.ext.orZero import jp.co.soramitsu.common_wallet.data.XorAssetBalance import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionStatus diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorImpl.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorImpl.kt index bcc3f77f7..88bef23e3 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorImpl.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorImpl.kt @@ -37,8 +37,8 @@ import javax.inject.Inject import jp.co.soramitsu.common.domain.OptionsProvider import jp.co.soramitsu.common_wallet.domain.model.QrException import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository -import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository +import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt index d87b6ab8c..eac96bf70 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt @@ -58,8 +58,8 @@ import jp.co.soramitsu.common.util.ext.isZero import jp.co.soramitsu.common_wallet.data.XorAssetBalance import jp.co.soramitsu.common_wallet.domain.model.fiatSymbol import jp.co.soramitsu.common_wallet.presentation.compose.states.mapPoolsData -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.states.AssetCardState import jp.co.soramitsu.feature_assets_impl.presentation.states.FrozenXorDetailsModel import jp.co.soramitsu.feature_assets_impl.presentation.states.emptyAssetCardState diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt index 5eba2c68e..04663d8a0 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt @@ -46,8 +46,8 @@ import jp.co.soramitsu.common.domain.isMatchFilter import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.states.FullAssetListState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.catch diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetsettings/FullAssetSettingsViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetsettings/FullAssetSettingsViewModel.kt index 6e26c5600..8c1591f65 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetsettings/FullAssetSettingsViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetsettings/FullAssetSettingsViewModel.kt @@ -46,8 +46,8 @@ import jp.co.soramitsu.common.domain.formatFiatAmount import jp.co.soramitsu.common.domain.isMatchFilter import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.states.AssetSettingsState import kotlinx.coroutines.launch diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt index 9e73c9e1a..a1f51bbc5 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt @@ -61,8 +61,8 @@ import jp.co.soramitsu.common_wallet.domain.model.QrException import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearchAssetState import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState import jp.co.soramitsu.common_wallet.presentation.compose.util.AmountFormat.getAssetBalanceText -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor import jp.co.soramitsu.feature_assets_impl.presentation.components.compose.receiverequest.ReceiveTokenByQrScreenState import jp.co.soramitsu.feature_assets_impl.presentation.components.compose.receiverequest.RequestTokenConfirmScreenState import jp.co.soramitsu.feature_assets_impl.presentation.components.compose.receiverequest.RequestTokenScreenState diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt index ee34c9935..066b4294c 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt @@ -61,8 +61,8 @@ import jp.co.soramitsu.common.util.ext.orZero import jp.co.soramitsu.common.view.ViewHelper import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.states.SendState import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/txlist/TxListViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/txlist/TxListViewModel.kt index a621fec57..c7df329b6 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/txlist/TxListViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/txlist/TxListViewModel.kt @@ -39,8 +39,8 @@ import dagger.assisted.AssistedInject import jp.co.soramitsu.common.R import jp.co.soramitsu.common.presentation.compose.components.initSmallTitle2 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.launchIn diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryTest.kt index 3729aa084..02937d1b1 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryTest.kt @@ -42,7 +42,7 @@ import jp.co.soramitsu.core_db.dao.AssetDao import jp.co.soramitsu.core_db.model.AssetLocal import jp.co.soramitsu.core_db.model.AssetTokenWithFiatLocal import jp.co.soramitsu.core_db.model.TokenLocal -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager import jp.co.soramitsu.shared_utils.encrypt.keypair.substrate.Sr25519Keypair import jp.co.soramitsu.sora.substrate.models.ExtrinsicSubmitStatus diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorTest.kt index c1ec9e2e6..3e4eec481 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorTest.kt @@ -45,8 +45,8 @@ import jp.co.soramitsu.common.domain.OptionsProvider import jp.co.soramitsu.common.domain.Token import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.Transaction import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBase diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorTest.kt index 08257223d..9e773ad7f 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorTest.kt @@ -32,14 +32,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package jp.co.soramitsu.feature_assets_impl.domain -import io.mockk.every -import io.mockk.mockkObject import jp.co.soramitsu.common.account.SoraAccount -import jp.co.soramitsu.common.domain.OptionsProvider import jp.co.soramitsu.common_wallet.domain.model.QrException import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository -import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository +import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest @@ -47,7 +44,6 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.BDDMockito import org.mockito.Mock import org.mockito.junit.MockitoJUnitRunner import org.mockito.kotlin.given diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt index 3ddfee50e..d44a3d11f 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt @@ -42,8 +42,8 @@ import jp.co.soramitsu.common.domain.AssetHolder import jp.co.soramitsu.common.domain.Token import jp.co.soramitsu.common.domain.iconUri import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.screens.fullassetsettings.FullAssetSettingsViewModel import jp.co.soramitsu.feature_assets_impl.presentation.states.AssetSettingsState import jp.co.soramitsu.test_data.TestAssets diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt index 684089c8c..7876393cc 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt @@ -53,8 +53,8 @@ import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common.util.QrCodeGenerator import jp.co.soramitsu.common.util.ext.Big100 -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor import jp.co.soramitsu.feature_assets_impl.presentation.screens.receiverequest.QRCodeFlowViewModel import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter import jp.co.soramitsu.test_data.TestAssets diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt index 9895723bd..67f8c50b1 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt @@ -50,8 +50,8 @@ import jp.co.soramitsu.common.domain.iconUri import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common.util.ext.equalTo -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.screens.send.TransferAmountViewModel import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter import jp.co.soramitsu.test_data.PolkaswapTestData diff --git a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/txlist/AssetSettingsViewModelTest.kt b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/txlist/AssetSettingsViewModelTest.kt index 09f036d9c..64fd6eb1e 100644 --- a/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/txlist/AssetSettingsViewModelTest.kt +++ b/feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/txlist/AssetSettingsViewModelTest.kt @@ -41,8 +41,8 @@ import io.mockk.junit4.MockKRule import io.mockk.verify import jp.co.soramitsu.common.R import jp.co.soramitsu.common.resourses.ResourceManager -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_assets_impl.presentation.screens.txlist.TxListViewModel import jp.co.soramitsu.feature_blockexplorer_api.domain.HistoryState import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler diff --git a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerImpl.kt b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerImpl.kt index a360f82dd..1c2618913 100644 --- a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerImpl.kt +++ b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerImpl.kt @@ -41,7 +41,7 @@ import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.DateTimeUtils import jp.co.soramitsu.common.util.ext.safeCast import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.domain.HistoryState import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler diff --git a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModel.kt b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModel.kt index 8c9bef05e..2189b1431 100644 --- a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModel.kt +++ b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModel.kt @@ -36,8 +36,8 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor diff --git a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModel.kt b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModel.kt index 9cfb15233..57ef3afd2 100644 --- a/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModel.kt +++ b/feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModel.kt @@ -51,7 +51,7 @@ import jp.co.soramitsu.common.presentation.trigger import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler import jp.co.soramitsu.feature_blockexplorer_api.presentation.txdetails.BasicTxDetailsItem import jp.co.soramitsu.feature_blockexplorer_api.presentation.txdetails.BasicTxDetailsState diff --git a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerTest.kt b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerTest.kt index 0fb3635a7..778f99c15 100644 --- a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerTest.kt +++ b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/domain/TransactionHistoryHandlerTest.kt @@ -51,7 +51,7 @@ import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common.util.ext.safeCast import jp.co.soramitsu.common.util.ext.unsafeCast import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.domain.HistoryState import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler diff --git a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModelTest.kt b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModelTest.kt index 410b4caa8..a84828bc8 100644 --- a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModelTest.kt +++ b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/screen/ActivitiesViewModelTest.kt @@ -38,8 +38,8 @@ import io.mockk.coVerify import io.mockk.every import io.mockk.impl.annotations.MockK import io.mockk.junit4.MockKRule -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_blockexplorer_api.domain.HistoryState import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler import jp.co.soramitsu.feature_main_api.launcher.MainRouter @@ -57,7 +57,6 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TestRule import org.junit.runner.RunWith -import org.mockito.Mock import org.mockito.junit.MockitoJUnitRunner @ExperimentalCoroutinesApi diff --git a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModelTest.kt b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModelTest.kt index 94b1a50e9..16adbf192 100644 --- a/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModelTest.kt +++ b/feature_blockexplorer_impl/src/test/java/jp/co/soramitsu/feature_blockexplorer_impl/presentation/txdetails/TxDetailsViewModelTest.kt @@ -49,7 +49,7 @@ import jp.co.soramitsu.common.domain.iconUri import jp.co.soramitsu.common.domain.printFiat import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.domain.TransactionHistoryHandler import jp.co.soramitsu.feature_blockexplorer_api.presentation.txdetails.BasicTxDetailsItem import jp.co.soramitsu.feature_blockexplorer_api.presentation.txdetails.BasicTxDetailsState diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/di/EcoSystemModule.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/di/EcoSystemModule.kt index 7c85b08a2..084445d8e 100644 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/di/EcoSystemModule.kt +++ b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/di/EcoSystemModule.kt @@ -38,7 +38,7 @@ import dagger.hilt.InstallIn import dagger.hilt.android.components.ViewModelComponent import dagger.hilt.android.scopes.ViewModelScoped import jp.co.soramitsu.common.domain.CoroutineManager -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.BlockExplorerManager import jp.co.soramitsu.feature_ecosystem_impl.domain.EcoSystemPoolsInteractor import jp.co.soramitsu.feature_ecosystem_impl.domain.EcoSystemPoolsInteractorImpl diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt index f742227fd..ecd820e51 100644 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt +++ b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt @@ -35,7 +35,7 @@ package jp.co.soramitsu.feature_ecosystem_impl.domain import jp.co.soramitsu.common.util.ext.compareNullDesc import jp.co.soramitsu.common.util.ext.multiplyNullable import jp.co.soramitsu.common.util.mapBalance -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.BlockExplorerManager import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt index 3b760cddb..d1b1f4cdf 100644 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt +++ b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt @@ -36,7 +36,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.util.StringPair -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_ecosystem_impl.presentation.ExploreRoutes import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider diff --git a/feature_ecosystem_impl/src/test/java/jp/co/soramitsu/feature_ecosystem_impl/explore/ExploreViewModelTest.kt b/feature_ecosystem_impl/src/test/java/jp/co/soramitsu/feature_ecosystem_impl/explore/ExploreViewModelTest.kt index 1ced51113..6efa6dfba 100644 --- a/feature_ecosystem_impl/src/test/java/jp/co/soramitsu/feature_ecosystem_impl/explore/ExploreViewModelTest.kt +++ b/feature_ecosystem_impl/src/test/java/jp/co/soramitsu/feature_ecosystem_impl/explore/ExploreViewModelTest.kt @@ -37,7 +37,7 @@ import io.mockk.every import io.mockk.impl.annotations.MockK import io.mockk.junit4.MockKRule import io.mockk.verify -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_ecosystem_impl.presentation.explore.ExploreViewModel import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter import jp.co.soramitsu.test_shared.MainCoroutineRule diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/domain/subs/BalanceFeatureStorageManager.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/domain/subs/BalanceFeatureStorageManager.kt index 10f0b4cf8..7f1f871a0 100644 --- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/domain/subs/BalanceFeatureStorageManager.kt +++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/domain/subs/BalanceFeatureStorageManager.kt @@ -34,7 +34,7 @@ package jp.co.soramitsu.feature_main_impl.domain.subs import javax.inject.Inject import jp.co.soramitsu.common.domain.SingleFeatureStorageManager -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onEach diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModel.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModel.kt index 0ca723e33..d84ca28ee 100644 --- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModel.kt +++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModel.kt @@ -42,7 +42,7 @@ import jp.co.soramitsu.common.domain.RepeatStrategyBuilder import jp.co.soramitsu.common.presentation.SingleLiveEvent import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.util.ext.setValueIfNew -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.data.BlockExplorerManager import jp.co.soramitsu.feature_main_impl.domain.PinCodeInteractor import jp.co.soramitsu.feature_main_impl.domain.subs.GlobalSubscriptionManager diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt index 232b6e5d5..3d7ce44de 100644 --- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt +++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt @@ -43,7 +43,7 @@ import jp.co.soramitsu.common.R import jp.co.soramitsu.common.presentation.SingleLiveEvent import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.util.BuildUtils -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_main_impl.domain.MainInteractor diff --git a/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModelTest.kt b/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModelTest.kt index b11dadb5a..05b1d3ad8 100644 --- a/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModelTest.kt +++ b/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/MainViewModelTest.kt @@ -43,7 +43,7 @@ import io.mockk.verify import jp.co.soramitsu.common.domain.CoroutineManager import jp.co.soramitsu.common.domain.RepeatStrategy import jp.co.soramitsu.common.domain.RepeatStrategyBuilder -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_main_impl.domain.PinCodeInteractor import jp.co.soramitsu.feature_main_impl.domain.subs.GlobalSubscriptionManager import jp.co.soramitsu.feature_select_node_api.NodeManager diff --git a/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt b/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt index dd43fcd69..f051d3b07 100644 --- a/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt +++ b/feature_main_impl/src/test/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModelTest.kt @@ -39,7 +39,7 @@ import io.mockk.impl.annotations.MockK import io.mockk.junit4.MockKRule import io.mockk.verify import jp.co.soramitsu.common.domain.ChainNode -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_main_impl.domain.MainInteractor diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractor.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractor.kt index 2898ec99c..3e5ddf59b 100644 --- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractor.kt +++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractor.kt @@ -39,7 +39,7 @@ import jp.co.soramitsu.common.io.FileManager import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository import jp.co.soramitsu.feature_account_api.domain.model.OnboardingState -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.shared_utils.encrypt.keypair.Keypair import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager import kotlinx.coroutines.flow.Flow diff --git a/feature_multiaccount_impl/src/test/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractorTest.kt b/feature_multiaccount_impl/src/test/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractorTest.kt index c36142792..b593d9c31 100644 --- a/feature_multiaccount_impl/src/test/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractorTest.kt +++ b/feature_multiaccount_impl/src/test/java/jp/co/soramitsu/feature_multiaccount_impl/domain/MultiaccountInteractorTest.kt @@ -44,7 +44,7 @@ import jp.co.soramitsu.common.io.FileManager import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository import jp.co.soramitsu.feature_account_api.domain.model.OnboardingState -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.shared_utils.encrypt.keypair.substrate.Sr25519Keypair import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager import jp.co.soramitsu.test_shared.MainCoroutineRule diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/di/PolkaswapFeatureModule.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/di/PolkaswapFeatureModule.kt index 26ef4e8dc..705b10bb3 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/di/PolkaswapFeatureModule.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/di/PolkaswapFeatureModule.kt @@ -39,7 +39,7 @@ import dagger.hilt.components.SingletonComponent import javax.inject.Singleton import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PolkaswapExtrinsicRepository diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt index 727d0c3b3..ad900b9a1 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt @@ -48,7 +48,7 @@ import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas.estimateAddingShareOfPool import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionLiquidityType diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorImpl.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorImpl.kt index ad94c1cbe..011ed6d7b 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorImpl.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorImpl.kt @@ -43,7 +43,7 @@ import jp.co.soramitsu.common.util.ext.isZero import jp.co.soramitsu.common_wallet.domain.model.WithDesired import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionStatus diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt index a0a55798e..df1a0ab35 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt @@ -61,8 +61,8 @@ import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearc import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState import jp.co.soramitsu.common_wallet.presentation.compose.util.AmountFormat import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_polkaswap_impl.presentation.states.LiquidityAddConfirmState diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveViewModel.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveViewModel.kt index 645f69337..1c7e2e73b 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveViewModel.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveViewModel.kt @@ -56,8 +56,8 @@ import jp.co.soramitsu.common_wallet.domain.model.CommonUserPoolData import jp.co.soramitsu.common_wallet.presentation.compose.util.AmountFormat import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas import jp.co.soramitsu.demeter.domain.DemeterFarmingInteractor -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_polkaswap_impl.presentation.states.LiquidityRemoveConfirmState import jp.co.soramitsu.feature_polkaswap_impl.presentation.states.LiquidityRemoveEstimatedState diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt index 3eae9450a..93d1e55be 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt @@ -68,8 +68,8 @@ import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearc import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState import jp.co.soramitsu.common_wallet.presentation.compose.util.AmountFormat import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.SwapInteractor import jp.co.soramitsu.feature_polkaswap_api.domain.model.SwapDetails @@ -90,7 +90,6 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch diff --git a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorTest.kt b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorTest.kt index 5024490e4..cf516afbf 100644 --- a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorTest.kt +++ b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorTest.kt @@ -37,7 +37,7 @@ import jp.co.soramitsu.common.account.SoraAccount import jp.co.soramitsu.common_wallet.domain.model.WithDesired import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PolkaswapExtrinsicRepository diff --git a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorTest.kt b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorTest.kt index f360cd5f8..c0175b723 100644 --- a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorTest.kt +++ b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/domain/SwapInteractorTest.kt @@ -35,7 +35,7 @@ package jp.co.soramitsu.feature_polkaswap_impl.domain import androidx.arch.core.executor.testing.InstantTaskExecutorRule import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PolkaswapExtrinsicRepository diff --git a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/SwapViewModelTest.kt b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/SwapViewModelTest.kt index f9f587b56..b56b9144e 100644 --- a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/SwapViewModelTest.kt +++ b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/SwapViewModelTest.kt @@ -47,8 +47,8 @@ import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearchAssetState import jp.co.soramitsu.common_wallet.presentation.compose.states.AssetItemCardState import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.SwapInteractor import jp.co.soramitsu.feature_polkaswap_api.domain.model.SwapDetails diff --git a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/add/AddLiquidityViewModelTest.kt b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/add/AddLiquidityViewModelTest.kt index 458dde500..cf22a5ab2 100644 --- a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/add/AddLiquidityViewModelTest.kt +++ b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/add/AddLiquidityViewModelTest.kt @@ -47,8 +47,8 @@ import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common.util.ext.equalTo import jp.co.soramitsu.common_wallet.domain.model.LiquidityData -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_polkaswap_impl.presentation.screens.liquidityadd.LiquidityAddViewModel @@ -82,7 +82,6 @@ import org.mockito.Mockito import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnitRunner import org.mockito.kotlin.any -import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.times import java.math.BigDecimal import org.mockito.kotlin.verify as kVerify diff --git a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/remove/RemoveLiquidityViewModelTest.kt b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/remove/RemoveLiquidityViewModelTest.kt index bd0bab202..ae226fc29 100644 --- a/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/remove/RemoveLiquidityViewModelTest.kt +++ b/feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/remove/RemoveLiquidityViewModelTest.kt @@ -36,10 +36,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import jp.co.soramitsu.common.R import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor -import jp.co.soramitsu.demeter.domain.DemeterFarmingInteractor import jp.co.soramitsu.feature_polkaswap_impl.presentation.screens.liquidityremove.LiquidityRemoveViewModel import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter @@ -68,7 +67,6 @@ import org.mockito.BDDMockito.given import org.mockito.Mock import org.mockito.junit.MockitoJUnitRunner import org.mockito.kotlin.any -import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.times import org.mockito.kotlin.verify import java.math.BigDecimal diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractor.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractor.kt index e21b2a512..130ffcccf 100644 --- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractor.kt +++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractor.kt @@ -40,7 +40,7 @@ import jp.co.soramitsu.common.util.ext.truncateUserAddress import jp.co.soramitsu.common.util.mapBalance import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_referral_api.data.ReferralRepository import jp.co.soramitsu.feature_referral_impl.domain.model.Referral diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModel.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModel.kt index 0884654ac..6828b9461 100644 --- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModel.kt +++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModel.kt @@ -50,8 +50,8 @@ import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter import jp.co.soramitsu.common.util.ext.lazyAsync import jp.co.soramitsu.common.util.ext.orZero -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_referral_impl.domain.ReferralInteractor import jp.co.soramitsu.feature_referral_impl.presentation.ReferralFeatureRoutes.BOND_XOR diff --git a/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractorTest.kt b/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractorTest.kt index 046ece96d..03a84bffc 100644 --- a/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractorTest.kt +++ b/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/domain/ReferralInteractorTest.kt @@ -36,7 +36,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import jp.co.soramitsu.common.account.SoraAccount import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_referral_api.data.ReferralRepository import jp.co.soramitsu.feature_referral_impl.domain.model.Referral diff --git a/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModelTest.kt b/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModelTest.kt index b6738a39a..c9292c05e 100644 --- a/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModelTest.kt +++ b/feature_referral_impl/src/test/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralViewModelTest.kt @@ -46,8 +46,8 @@ import jp.co.soramitsu.common.R import jp.co.soramitsu.common.domain.Asset import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_referral_impl.domain.ReferralInteractor import jp.co.soramitsu.feature_referral_impl.domain.model.Referral diff --git a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt index 3a6bc82eb..cdf3339e7 100644 --- a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt +++ b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt @@ -42,7 +42,7 @@ import jp.co.soramitsu.common.util.ext.divideBy import jp.co.soramitsu.common.util.ext.greaterThan import jp.co.soramitsu.common.util.ext.safeDivide import jp.co.soramitsu.demeter.domain.DemeterFarmingInteractor -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor import jp.co.soramitsu.feature_blockexplorer_api.data.BlockExplorerManager import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor diff --git a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModel.kt b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModel.kt index 15cf00c9e..8897ab62e 100644 --- a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModel.kt +++ b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModel.kt @@ -44,7 +44,7 @@ import jp.co.soramitsu.common.presentation.SingleLiveEvent import jp.co.soramitsu.common.presentation.compose.components.initSmallTitle2 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel import jp.co.soramitsu.common.resourses.ResourceManager -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor diff --git a/feature_sora_card_impl/src/test/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModelTest.kt b/feature_sora_card_impl/src/test/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModelTest.kt index ff3835152..70d242e0e 100644 --- a/feature_sora_card_impl/src/test/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModelTest.kt +++ b/feature_sora_card_impl/src/test/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardViewModelTest.kt @@ -38,7 +38,7 @@ import io.mockk.mockkObject import jp.co.soramitsu.common.R import jp.co.soramitsu.common.domain.OptionsProvider import jp.co.soramitsu.common.resourses.ResourceManager -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter import jp.co.soramitsu.feature_sora_card_api.domain.SoraCardInteractor diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/di/WalletFeatureModule.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/di/WalletFeatureModule.kt index 697124d57..e765ed5d8 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/di/WalletFeatureModule.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/di/WalletFeatureModule.kt @@ -43,7 +43,7 @@ import jp.co.soramitsu.common.domain.POOLS_HUB_NAME import jp.co.soramitsu.common.domain.SingleFeatureStorageManager import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_wallet_api.data.BuyCryptoDataSource import jp.co.soramitsu.feature_wallet_api.domain.interfaces.BuyCryptoRepository diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorImpl.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorImpl.kt index 71e986ec6..5e210d597 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorImpl.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorImpl.kt @@ -36,7 +36,7 @@ import jp.co.soramitsu.common.account.SoraAccount import jp.co.soramitsu.common.domain.Token import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/CardsHubViewModel.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/CardsHubViewModel.kt index 1442222c5..b264250b0 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/CardsHubViewModel.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/CardsHubViewModel.kt @@ -62,8 +62,8 @@ import jp.co.soramitsu.common_wallet.presentation.compose.states.SoraCardState import jp.co.soramitsu.common_wallet.presentation.compose.states.TitledAmountCardState import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCardState import jp.co.soramitsu.common_wallet.presentation.compose.states.mapPoolsData -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter diff --git a/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorTest.kt b/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorTest.kt index f357bbbbc..57f4006d6 100644 --- a/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorTest.kt +++ b/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorTest.kt @@ -43,7 +43,7 @@ import jp.co.soramitsu.common.domain.OptionsProvider import jp.co.soramitsu.common.domain.Token import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository -import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository +import jp.co.soramitsu.feature_assets_api.data.AssetsRepository import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor diff --git a/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/presentation/wallet/CardsHubViewModelTest.kt b/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/presentation/wallet/CardsHubViewModelTest.kt index 8d279b635..bfa8e0d6b 100644 --- a/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/presentation/wallet/CardsHubViewModelTest.kt +++ b/feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/presentation/wallet/CardsHubViewModelTest.kt @@ -58,8 +58,8 @@ import jp.co.soramitsu.common.domain.iconUri import jp.co.soramitsu.common.interfaces.WithProgress import jp.co.soramitsu.common.resourses.ResourceManager import jp.co.soramitsu.common.util.NumbersFormatter -import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor -import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter +import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor +import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter import jp.co.soramitsu.feature_main_api.launcher.MainRouter import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PoolsInteractor import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter