Merge pull request #1017 from soramitsu/staging

staging

Author: PankraSerg

app/src/main/java/jp/co/soramitsu/app/root/di/RootFeatureModule.kt

@@ -4,11 +4,11 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Named
+import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
 import jp.co.soramitsu.app.root.domain.RootInteractor
-import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.core.updater.UpdateSystem
 import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletRepository
-import javax.inject.Named
 
 @InstallIn(SingletonComponent::class)
 @Module
@@ -17,11 +17,13 @@ class RootFeatureModule {
     @Provides
     fun provideRootInteractor(
         walletRepository: WalletRepository,
-        @Named("BalancesUpdateSystem") walletUpdateSystem: UpdateSystem
+        @Named("BalancesUpdateSystem") walletUpdateSystem: UpdateSystem,
+        pendulumPreInstalledAccountsScenario: PendulumPreInstalledAccountsScenario
     ): RootInteractor {
         return RootInteractor(
             walletUpdateSystem,
-            walletRepository
+            walletRepository,
+            pendulumPreInstalledAccountsScenario
         )
     }
 }

app/src/main/java/jp/co/soramitsu/app/root/domain/RootInteractor.kt

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.app.root.domain
 
+import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
 import jp.co.soramitsu.common.domain.model.toDomain
 import jp.co.soramitsu.common.utils.inBackground
 import jp.co.soramitsu.core.updater.UpdateSystem
@@ -11,7 +12,8 @@ import kotlinx.coroutines.flow.flowOf
 
 class RootInteractor(
     private val updateSystem: UpdateSystem,
-    private val walletRepository: WalletRepository
+    private val walletRepository: WalletRepository,
+    private val pendulumPreInstalledAccountsScenario: PendulumPreInstalledAccountsScenario
 ) {
 
     fun runBalancesUpdate(): Flow<Updater.SideEffect> = updateSystem.start().inBackground()
@@ -30,5 +32,5 @@ class RootInteractor(
 
     fun chainRegistrySyncUp() = walletRepository.chainRegistrySyncUp()
 
-    suspend fun fetchFeatureToggle() = walletRepository.fetchFeatureToggle()
+    suspend fun fetchFeatureToggle() = pendulumPreInstalledAccountsScenario.fetchFeatureToggle()
 }

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootViewModel.kt

@@ -64,6 +64,7 @@ class RootViewModel @Inject constructor(
 
     private fun checkAppVersion() {
         viewModelScope.launch {
+            interactor.fetchFeatureToggle()
             val appConfigResult = interactor.getRemoteConfig()
             when {
                 appConfigResult.isFailure -> {
@@ -76,7 +77,6 @@ class RootViewModel @Inject constructor(
                 }
 
                 else -> {
-                    interactor.fetchFeatureToggle()
                     runBalancesUpdate()
                 }
             }

build.gradle

@@ -4,8 +4,8 @@ apply plugin: "detekt-setup"
 buildscript {
     ext {
         // App version
-        versionName = '3.0.1'
-        versionCode = 115
+        versionName = '3.0.2'
+        versionCode = 116
 
         // SDK and tools
         compileSdkVersion = 33

feature-account-api/src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt

@@ -1,19 +1,21 @@
 package jp.co.soramitsu.account.api.domain
 
 import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
-import jp.co.soramitsu.common.BuildConfig
+import jp.co.soramitsu.common.data.network.config.RemoteConfigFetcher
 import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.common.utils.DEFAULT_DERIVATION_PATH
 import jp.co.soramitsu.core.models.CryptoType
+import jp.co.soramitsu.feature_account_api.BuildConfig
 import jp.co.soramitsu.shared_utils.encrypt.junction.BIP32JunctionDecoder
 import jp.co.soramitsu.shared_utils.extensions.fromHex
 
 class PendulumPreInstalledAccountsScenario(
     private val accountRepository: AccountRepository,
-    private val preferences: Preferences
+    private val preferences: Preferences,
+    private val remoteConfigFetcher: RemoteConfigFetcher,
 ) {
 
-    companion object{
+    companion object {
         private const val PENDULUM_CASE_KEY_PREFIX = "pendulum_mode"
         const val PENDULUM_FEATURE_TOGGLE_KEY = "pendulumCaseEnabled"
     }
@@ -53,4 +55,13 @@ class PendulumPreInstalledAccountsScenario(
             false
         ))
     }
+
+    suspend fun fetchFeatureToggle() {
+        val configResult = kotlin.runCatching {
+            remoteConfigFetcher.getFeatureToggle()
+        }.getOrNull() ?: return
+
+        val (pendulumCaseEnabled) = configResult
+        preferences.putBoolean(PENDULUM_FEATURE_TOGGLE_KEY, pendulumCaseEnabled)
+    }
 }

feature-onboarding-impl/src/main/java/jp/co/soramitsu/onboarding/impl/di/OnboardingFeatureModule.kt

@@ -6,6 +6,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
 import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.common.data.network.config.RemoteConfigFetcher
 import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.onboarding.api.domain.OnboardingInteractor
 import jp.co.soramitsu.onboarding.impl.domain.OnboardingInteractorImpl
@@ -22,7 +23,8 @@ class OnboardingFeatureModule {
     @Provides
     fun provideImportPreInstalledAccount(
         accountRepository: AccountRepository,
-        preferences: Preferences
+        preferences: Preferences,
+        remoteConfigFetcher: RemoteConfigFetcher
     ) =
-        PendulumPreInstalledAccountsScenario(accountRepository, preferences)
+        PendulumPreInstalledAccountsScenario(accountRepository, preferences, remoteConfigFetcher)
 }

feature-splash/src/main/java/jp/co/soramitsu/splash/presentation/SplashViewModel.kt

@@ -3,6 +3,7 @@ package jp.co.soramitsu.splash.presentation
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
 import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
 import jp.co.soramitsu.common.base.BaseViewModel
 import jp.co.soramitsu.common.domain.GetEducationalStoriesUseCase
@@ -18,7 +19,8 @@ class SplashViewModel @Inject constructor(
     private val router: SplashRouter,
     private val repository: AccountRepository,
     shouldShowEducationalStoriesUseCase: ShouldShowEducationalStoriesUseCase,
-    private val getEducationalStories: GetEducationalStoriesUseCase
+    private val getEducationalStories: GetEducationalStoriesUseCase,
+    private val pendulumPreInstalledAccountsScenario: PendulumPreInstalledAccountsScenario
 ) : BaseViewModel() {
 
     private var shouldShowEducationalStories by shouldShowEducationalStoriesUseCase
@@ -47,6 +49,7 @@ class SplashViewModel @Inject constructor(
 
     fun openInitialDestination() {
         viewModelScope.launch {
+            pendulumPreInstalledAccountsScenario.fetchFeatureToggle()
             if (repository.isAccountSelected()) {
                 if (repository.isCodeSet()) {
                     router.openInitialCheckPincode()

feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/impl/domain/interfaces/WalletRepository.kt

@@ -1,12 +1,15 @@
 package jp.co.soramitsu.wallet.impl.domain.interfaces
 
+import java.math.BigDecimal
+import java.math.BigInteger
 import jp.co.soramitsu.account.api.domain.model.MetaAccount
 import jp.co.soramitsu.common.data.network.config.AppConfigRemote
 import jp.co.soramitsu.common.data.network.runtime.binding.EqAccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.EqOraclePricePoint
 import jp.co.soramitsu.coredb.model.AssetUpdateItem
 import jp.co.soramitsu.coredb.model.PhishingLocal
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
+import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId
 import jp.co.soramitsu.shared_utils.runtime.AccountId
 import jp.co.soramitsu.shared_utils.runtime.extrinsic.ExtrinsicBuilder
 import jp.co.soramitsu.wallet.impl.domain.model.Asset
@@ -15,9 +18,6 @@ import jp.co.soramitsu.wallet.impl.domain.model.Fee
 import jp.co.soramitsu.wallet.impl.domain.model.Transfer
 import jp.co.soramitsu.wallet.impl.domain.model.TransferValidityStatus
 import kotlinx.coroutines.flow.Flow
-import java.math.BigDecimal
-import java.math.BigInteger
-import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId
 import jp.co.soramitsu.core.models.Asset as CoreAsset
 
 interface WalletRepository {
@@ -28,9 +28,19 @@ interface WalletRepository {
 
     suspend fun syncAssetsRates(currencyId: String)
 
-    fun assetFlow(metaId: Long, accountId: AccountId, chainAsset: CoreAsset, minSupportedVersion: String?): Flow<Asset>
+    fun assetFlow(
+        metaId: Long,
+        accountId: AccountId,
+        chainAsset: CoreAsset,
+        minSupportedVersion: String?
+    ): Flow<Asset>
 
-    suspend fun getAsset(metaId: Long, accountId: AccountId, chainAsset: CoreAsset, minSupportedVersion: String?): Asset?
+    suspend fun getAsset(
+        metaId: Long,
+        accountId: AccountId,
+        chainAsset: CoreAsset,
+        minSupportedVersion: String?
+    ): Asset?
 
     suspend fun updateAssetHidden(
         metaId: Long,
@@ -93,7 +103,10 @@ interface WalletRepository {
     suspend fun getSingleAssetPriceCoingecko(priceId: String, currency: String): BigDecimal?
     suspend fun getControllerAccount(chainId: ChainId, accountId: AccountId): AccountId?
     suspend fun getStashAccount(chainId: ChainId, accountId: AccountId): AccountId?
-    suspend fun fetchFeatureToggle()
 
-    suspend fun getTotalBalance(chainAsset: jp.co.soramitsu.core.models.Asset, chain: Chain, accountId: ByteArray): BigInteger
+    suspend fun getTotalBalance(
+        chainAsset: jp.co.soramitsu.core.models.Asset,
+        chain: Chain,
+        accountId: ByteArray
+    ): BigInteger
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/repository/WalletRepositoryImpl.kt

@@ -3,7 +3,6 @@ package jp.co.soramitsu.wallet.impl.data.repository
 import com.opencsv.CSVReaderHeaderAware
 import java.math.BigDecimal
 import java.math.BigInteger
-import jp.co.soramitsu.account.api.domain.PendulumPreInstalledAccountsScenario
 import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
 import jp.co.soramitsu.account.api.domain.model.MetaAccount
 import jp.co.soramitsu.account.api.domain.model.accountId
@@ -13,9 +12,9 @@ import jp.co.soramitsu.common.data.network.HttpExceptionHandler
 import jp.co.soramitsu.common.data.network.coingecko.CoingeckoApi
 import jp.co.soramitsu.common.data.network.config.AppConfigRemote
 import jp.co.soramitsu.common.data.network.config.RemoteConfigFetcher
-import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.common.data.secrets.v2.KeyPairSchema
 import jp.co.soramitsu.common.data.secrets.v2.MetaAccountSecrets
+import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.common.domain.GetAvailableFiatCurrencies
 import jp.co.soramitsu.common.mixin.api.UpdatesMixin
 import jp.co.soramitsu.common.mixin.api.UpdatesProviderUi
@@ -520,15 +519,5 @@ class WalletRepositoryImpl(
     override suspend fun getStashAccount(chainId: ChainId, accountId: AccountId): AccountId? {
         return substrateSource.getStashAccount(chainId, accountId)
     }
-
-    override suspend fun fetchFeatureToggle() {
-        val configResult = kotlin.runCatching {
-            remoteConfigFetcher.getFeatureToggle()
-        }.getOrNull() ?: return
-
-        val (pendulumCaseEnabled) = configResult
-
-        preferences.putBoolean(PendulumPreInstalledAccountsScenario.PENDULUM_FEATURE_TOGGLE_KEY, pendulumCaseEnabled)
-    }
 }