Merge pull request #909 from soramitsu/master

master

Author: PankraSerg

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext {
         // App version
         versionName = '2.2.3'
-        versionCode = 91
+        versionCode = 92
 
         // SDK and tools
         compileSdkVersion = 33

feature-polkaswap-impl/src/main/kotlin/jp/co/soramitsu/polkaswap/impl/presentation/swap_tokens/SwapTokensViewModel.kt

@@ -476,7 +476,7 @@ class SwapTokensViewModel @Inject constructor(
         val isToFeeAsset = toAsset.value?.token?.configuration?.id == feeAsset.token.configuration.id
 
         return when {
-            amountToSwap >= available -> {
+            amountToSwap > available -> {
                 SpendInsufficientBalanceException(resourceManager)
             }
             isToFeeAsset.not() && feeAsset.transferable <= fee -> {

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

@@ -2,8 +2,6 @@ package jp.co.soramitsu.staking.impl.presentation.staking.main
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import java.math.BigDecimal
-import java.math.BigInteger
 import jp.co.soramitsu.common.base.TitleAndMessage
 import jp.co.soramitsu.common.mixin.api.Validatable
 import jp.co.soramitsu.common.presentation.LoadingState
@@ -78,6 +76,8 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import java.math.BigDecimal
+import java.math.BigInteger
 import jp.co.soramitsu.core.models.Asset as CoreAsset
 
 @Deprecated("All ViewStates should be provided and created in staking type aware ViewModels")
@@ -727,9 +727,9 @@ class DelegatorViewState(
                 collatorAddress = collator.collatorId.toHexString(true),
                 collatorName = identity?.display ?: collatorIdHex,
                 staked = staked.formatCryptoDetail(asset.token.configuration.symbolToShow),
-                stakedFiat = staked.applyFiatRate(asset.fiatAmount)?.formatFiat(asset.token.fiatSymbol),
+                stakedFiat = staked.applyFiatRate(asset.token.fiatRate)?.formatFiat(asset.token.fiatSymbol),
                 rewardApy = rewardApy.formatAsPercentage(),
-                rewardedFiat = rewarded.applyFiatRate(asset.fiatAmount)?.formatFiat(asset.token.fiatSymbol),
+                rewardedFiat = rewarded.applyFiatRate(asset.token.fiatRate)?.formatFiat(asset.token.fiatSymbol),
                 status = candidateInfo.toModelStatus(millisecondsTillTheEndOfRound, millisecondsTillCandidateWillLeave, isReadyToUnlock),
                 candidateInfo
             )

feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/validators/change/custom/review/ReviewCustomValidatorsFragment.kt

@@ -5,7 +5,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import jp.co.soramitsu.common.base.BaseFragment
 import jp.co.soramitsu.common.utils.setTextColorRes
 import jp.co.soramitsu.common.utils.toggle
-import jp.co.soramitsu.common.view.ButtonState
 import jp.co.soramitsu.common.view.viewBinding
 import jp.co.soramitsu.feature_staking_impl.R
 import jp.co.soramitsu.feature_staking_impl.databinding.FragmentReviewCustomValidatorsBinding
@@ -51,7 +50,7 @@ class ReviewCustomValidatorsFragment :
             binding.reviewCustomValidatorsAccounts.setTextColorRes(if (it.isOverflow) R.color.red else R.color.gray1)
             binding.reviewCustomValidatorsAccounts.text = it.selectedHeaderText
 
-            binding.reviewCustomValidatorsNext.setState(if (it.isOverflow) ButtonState.DISABLED else ButtonState.NORMAL)
+            binding.reviewCustomValidatorsNext.setState(it.buttonState)
             binding.reviewCustomValidatorsNext.text = it.nextButtonText
         }
 

feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/validators/change/custom/review/ReviewCustomValidatorsViewModel.kt

@@ -1,12 +1,12 @@
 package jp.co.soramitsu.staking.impl.presentation.validators.change.custom.review
 
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import jp.co.soramitsu.common.address.AddressIconGenerator
 import jp.co.soramitsu.common.base.BaseViewModel
 import jp.co.soramitsu.common.resources.ResourceManager
 import jp.co.soramitsu.common.utils.flowOf
 import jp.co.soramitsu.common.utils.inBackground
+import jp.co.soramitsu.common.view.ButtonState
 import jp.co.soramitsu.feature_staking_impl.R
 import jp.co.soramitsu.staking.api.domain.model.Validator
 import jp.co.soramitsu.staking.impl.domain.StakingInteractor
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 import javax.inject.Named
 
 @HiltViewModel
@@ -55,10 +56,13 @@ class ReviewCustomValidatorsViewModel @Inject constructor(
         stakingRelayChainScenarioInteractor.maxValidatorsPerNominator()
     }.share()
 
+    val isInEditMode = MutableStateFlow(false)
+
     val selectionStateFlow = combine(
         selectedValidators,
-        maxValidatorsPerNominatorFlow
-    ) { validators, maxValidatorsPerNominator ->
+        maxValidatorsPerNominatorFlow,
+        isInEditMode
+    ) { validators, maxValidatorsPerNominator, isInEditMode ->
         val isOverflow = validators.size > maxValidatorsPerNominator
 
         ValidatorsSelectionState(
@@ -68,7 +72,8 @@ class ReviewCustomValidatorsViewModel @Inject constructor(
                 resourceManager.getString(R.string.staking_custom_proceed_button_disabled_title, maxValidatorsPerNominator)
             } else {
                 resourceManager.getString(R.string.common_continue)
-            }
+            },
+            buttonState = if (isOverflow || isInEditMode) ButtonState.DISABLED else ButtonState.NORMAL
         )
     }
 
@@ -85,8 +90,6 @@ class ReviewCustomValidatorsViewModel @Inject constructor(
         .inBackground()
         .share()
 
-    val isInEditMode = MutableStateFlow(false)
-
     fun deleteClicked(validatorModel: ValidatorModel) {
         launch {
             val validators = selectedValidators.first()

feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/validators/change/custom/review/model/ValidatorsSelectionState.kt

@@ -1,7 +1,10 @@
 package jp.co.soramitsu.staking.impl.presentation.validators.change.custom.review.model
 
+import jp.co.soramitsu.common.view.ButtonState
+
 class ValidatorsSelectionState(
     val selectedHeaderText: String,
     val nextButtonText: String,
-    val isOverflow: Boolean
+    val isOverflow: Boolean,
+    val buttonState: ButtonState
 )