Merge pull request #806 from soramitsu/merge/staging-to-master

merge/staging-to-master

Author: PankraSerg

app/proguard-rules.pro

@@ -25,6 +25,11 @@
 -keep class jp.co.soramitsu.common.data.** { *; }
 -keep class jp.co.soramitsu.common.domain.** { *; }
 
+-keep class jp.co.soramitsu.crowdloan.api.data.** { *; }
+
+-keep class jp.co.soramitsu.crowdloan.impl.data.** { *; }
+-keep class jp.co.soramitsu.crowdloan.impl.domain.** { *; }
+
 -keep class jp.co.soramitsu.core_db.** { *; }
 -keep class jp.co.soramitsu.coredb.** { *; }
 -keep class jp.co.soramitsu.core.** { *; }

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         // App version
         versionName = '2.1.0'
-        versionCode = 82
+        versionCode = 83
 
         // SDK and tools
         compileSdkVersion = 33

feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadataApi.kt

@@ -5,7 +5,7 @@ import retrofit2.http.Url
 
 interface ParachainMetadataApi {
 
-    @GET()
+    @GET
     suspend fun getParachainMetadata(
         @Url url: String
     ): List<ParachainMetadataRemote>

feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/data/StakingSharedState.kt

@@ -95,7 +95,10 @@ class StakingSharedState(
     }
 
     suspend fun availableToSelect(): List<StakingAssetSelection> {
-        val allChains = chainRegistry.currentChains.first()
+        val wallet = accountRepository.getSelectedMetaAccount()
+        val allChains = chainRegistry.currentChains.first().filter {
+            wallet.accountId(it) != null
+        }
 
         return allChains.map { chain ->
             val staking = chain.assets.filter { chainAsset ->

feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/scenarios/parachain/StakingParachainScenarioInteractor.kt

@@ -11,6 +11,7 @@ import jp.co.soramitsu.common.address.AddressModel
 import jp.co.soramitsu.common.address.createAddressModel
 import jp.co.soramitsu.common.address.createEthereumAddressModel
 import jp.co.soramitsu.common.resources.ResourceManager
+import jp.co.soramitsu.common.utils.flowOf
 import jp.co.soramitsu.common.utils.orZero
 import jp.co.soramitsu.common.utils.sumByBigInteger
 import jp.co.soramitsu.common.validation.CompositeValidation
@@ -25,6 +26,7 @@ import jp.co.soramitsu.runtime.ext.accountIdOf
 import jp.co.soramitsu.runtime.ext.utilityAsset
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId
+import jp.co.soramitsu.runtime.multiNetwork.chain.model.polkadotChainId
 import jp.co.soramitsu.runtime.state.SingleAssetSharedState
 import jp.co.soramitsu.staking.api.data.StakingSharedState
 import jp.co.soramitsu.staking.api.domain.api.AccountIdMap
@@ -144,8 +146,23 @@ class StakingParachainScenarioInteractor(
     )
 
     override val stakingStateFlow = stakingInteractor.selectedChainFlow().flatMapConcat { chain ->
-        val accountId = accountRepository.getSelectedMetaAccount().accountId(chain) ?: error("cannot find accountId")
-        stakingParachainScenarioRepository.stakingStateFlow(chain, accountId)
+        val availableStakingSelection = stakingSharedState.availableToSelect()
+        val isSelectedChainAvailable = availableStakingSelection.any { it.chainId == chain.id }
+
+        val useChain = if (isSelectedChainAvailable) {
+            chain
+        } else {
+            val chainId = with(availableStakingSelection) {
+                firstOrNull { it.chainId == polkadotChainId } ?: first()
+            }.chainId
+            availableStakingSelection.firstOrNull { it.chainId == chainId }?.let { newSelection ->
+                stakingSharedState.update(newSelection)
+            }
+            val availableChain = stakingInteractor.getChain(chainId)
+            availableChain
+        }
+        val accountId = accountRepository.getSelectedMetaAccount().accountId(useChain) ?: error("cannot find accountId")
+        stakingParachainScenarioRepository.stakingStateFlow(useChain, accountId)
     }
 
     suspend fun getIdentities(collatorsIds: List<AccountId>): Map<String, Identity?> {
@@ -416,7 +433,7 @@ class StakingParachainScenarioInteractor(
     override suspend fun getUnstakeAvailableAmount(asset: Asset, collatorId: AccountId?): BigDecimal {
         collatorId ?: error("cannot find collatorId")
 
-        val chainToAccountIdFlow = jp.co.soramitsu.common.utils.flowOf {
+        val chainToAccountIdFlow = flowOf {
             val chain = stakingInteractor.getSelectedChain()
             val accountId = accountRepository.getSelectedMetaAccount().accountId(chain) ?: error("cannot find accountId")
             chain to accountId