Merge pull request #647 from soramitsu/staging

fix moonriver

Author: Deneath

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/confirm/ConfirmStakingViewModel.kt

@@ -227,7 +227,12 @@ class ConfirmStakingViewModel(
                     is SetupStakingProcess.ReadyToSubmit.Parachain -> {
                         val collator = currentProcessState.payload.blockProducers.first()
                         val amount = bondPayload?.amount ?: error("Amount cant be null")
-                        val delegationCount = (scenarioInteractor.stakingStateFlow.first() as StakingState.Parachain.Delegator).delegations.size
+                        val delegationCount = when (val state = scenarioInteractor.stakingStateFlow.first()) {
+                            is StakingState.Parachain.Delegator -> state.delegations.size
+                            is StakingState.Parachain.Collator -> 0 // todo add collators support
+                            is StakingState.Parachain.None -> 0
+                            else -> 0
+                        }
                         setupStakingInteractor.estimateFinalParachainFee(collator, it.planksFromAmount(amount), delegationCount)
                     }
                 }
@@ -287,7 +292,12 @@ class ConfirmStakingViewModel(
                 val token = controllerAssetFlow.first().token
                 val collator = currentProcessState.payload.blockProducers.first()
                 val amount = bondPayload?.amount ?: error("Amount cant be null")
-                val delegationCount = (scenarioInteractor.stakingStateFlow.first() as StakingState.Parachain.Delegator).delegations.size
+                val delegationCount = when (val state = scenarioInteractor.stakingStateFlow.first()) {
+                    is StakingState.Parachain.Delegator -> state.delegations.size
+                    is StakingState.Parachain.Collator -> 0 // todo add collators support
+                    is StakingState.Parachain.None -> 0
+                    else -> 0
+                }
                 val accountAddress = (scenarioInteractor.stakingStateFlow.first() as StakingState.Parachain).accountAddress
                 setupStakingInteractor.setupStaking(collator, token.planksFromAmount(amount), delegationCount, accountAddress)
             }

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/balance/StakingBalanceFragment.kt

@@ -94,6 +94,12 @@ class StakingBalanceFragment : BaseFragment<StakingBalanceViewModel>(R.layout.fr
             binding.stakingBalanceUnbondings.unbondingsMoreAction.isEnabled = it
         }
 
+        viewModel.pendingAction.observe {
+            binding.stakingBalanceActions.bondMore.isEnabled = it.not()
+            binding.stakingBalanceActions.unbond.isEnabled = it.not()
+            binding.stakingBalanceActions.redeem.isEnabled = it.not()
+        }
+
         viewModel.redeemEnabledLiveData.observe {
             binding.stakingBalanceActions.redeem.isEnabled = it
         }

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/balance/StakingBalanceViewModel.kt

@@ -68,6 +68,8 @@ class StakingBalanceViewModel(
         it.redeemable.amount > BigDecimal.ZERO
     }.asLiveData()
 
+    val pendingAction = MutableLiveData(false)
+
     val shouldBlockActionButtons = stakingBalanceModelLiveData.map {
         val isParachain = assetFlow.first().token.configuration.staking == Chain.Asset.StakingType.PARACHAIN
         (it.redeemable.amount + it.unstaking.amount > BigDecimal.ZERO).and(isParachain)
@@ -167,10 +169,16 @@ class StakingBalanceViewModel(
         block: (ManageStakingValidationPayload) -> Unit,
     ) {
         launch {
+            pendingAction.value = true
             val stakingState = stakingScenarioInteractor.getSelectedAccountStakingState()
             validationExecutor.requireValid(
                 validationSystem,
                 ManageStakingValidationPayload(stakingState as? StakingState.Stash),
+                progressConsumer = {
+                    if (it.not()) {
+                        pendingAction.value = false
+                    }
+                },
                 validationFailureTransformer = { manageStakingActionValidationFailure(it, resourceManager) },
                 block = block
             )

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/bond/select/SelectBondMoreFragment.kt

@@ -67,6 +67,7 @@ class SelectBondMoreFragment : BaseFragment<SelectBondMoreViewModel>(R.layout.fr
         observeValidations(viewModel)
 
         viewModel.showNextProgress.observe(binding.bondMoreContinue::setProgress)
+        viewModel.showNextProgress.observe(binding.bondMoreConfirm::setProgress)
 
         viewModel.assetModelFlow.observe {
             binding.bondMoreAmount.setAssetBalance(it.assetBalance)

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/main/StakingViewState.kt

@@ -115,10 +115,6 @@ sealed class StakeViewState<S>(
     private val availableManageActions: Set<ManageStakeAction>
 ) : StakingViewState() {
 
-    init {
-        syncStakingRewards()
-    }
-
     val manageStakingActionsButtonVisible = availableManageActions.isNotEmpty()
 
     private val _showManageActionsEvent = MutableLiveData<Event<ManageStakingBottomSheet.Payload>>()
@@ -156,7 +152,7 @@ sealed class StakeViewState<S>(
         _showStatusAlertEvent.value = Event(titleAndMessage)
     }
 
-    private fun syncStakingRewards() {
+    protected fun syncStakingRewards() {
         scope.launch {
             val syncResult = stakingInteractor.syncStakingRewards(stakeState.chain.id, stakeState.rewardsAddress)
 
@@ -207,7 +203,11 @@ class ValidatorViewState(
     summaryFlowProvider = { relayChainScenarioInteractor.observeValidatorSummary(validatorState).shareIn(scope, SharingStarted.Eagerly, replay = 1) },
     statusMessageProvider = { getValidatorStatusTitleAndMessage(resourceManager, it) },
     availableManageActions = ManageStakeAction.values().toSet() - ManageStakeAction.VALIDATORS
-)
+) {
+    init {
+        syncStakingRewards()
+    }
+}
 
 private fun getValidatorStatusTitleAndMessage(
     resourceManager: ResourceManager,
@@ -237,7 +237,11 @@ class StashNoneViewState(
     summaryFlowProvider = { relayChainScenarioInteractor.observeStashSummary(stashState).shareIn(scope, SharingStarted.Eagerly, replay = 1) },
     statusMessageProvider = { getStashStatusTitleAndMessage(resourceManager, it) },
     availableManageActions = ManageStakeAction.values().toSet() - ManageStakeAction.PAYOUTS
-)
+) {
+    init {
+        syncStakingRewards()
+    }
+}
 
 private fun getStashStatusTitleAndMessage(
     resourceManager: ResourceManager,
@@ -265,7 +269,11 @@ class NominatorViewState(
     summaryFlowProvider = { relayChainScenarioInteractor.observeNominatorSummary(nominatorState).shareIn(scope, SharingStarted.Eagerly, replay = 1) },
     statusMessageProvider = { getNominatorStatusTitleAndMessage(resourceManager, it) },
     availableManageActions = ManageStakeAction.values().toSet()
-)
+) {
+    init {
+        syncStakingRewards()
+    }
+}
 
 private fun getNominatorStatusTitleAndMessage(
     resourceManager: ResourceManager,

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/unbond/select/SelectUnbondFragment.kt

@@ -66,6 +66,7 @@ class SelectUnbondFragment : BaseFragment<SelectUnbondViewModel>(R.layout.fragme
         observeValidations(viewModel)
 
         viewModel.showNextProgress.observe(binding.unbondContinue::setProgress)
+        viewModel.showNextProgress.observe(binding.unbondConfirm::setProgress)
 
         viewModel.assetModelFlow.observe {
             binding.unbondAmount.setAssetBalance(it.assetBalance)