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

merge/staging-to-master

Author: PankraSerg

build.gradle

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

common/src/main/java/jp/co/soramitsu/common/validation/Exceptions.kt

@@ -56,3 +56,8 @@ class FeeInsufficientBalanceException(resourceManager: ResourceManager) : Valida
     resourceManager.getString(R.string.common_not_enough_funds_title),
     resourceManager.getString(R.string.common_not_enough_funds_message)
 )
+
+class AmountTooLowToStakeException(resourceManager: ResourceManager, minimumAmount: String) : ValidationException(
+    resourceManager.getString(R.string.common_error_general_title),
+    resourceManager.getString(R.string.staking_setup_amount_too_low, minimumAmount)
+)

common/src/main/res/values/strings.xml

@@ -250,7 +250,7 @@ Derivation path: %s</string>
     <string name="staking_recommended_custom_title">Choose custom validators </string>
     <string name="fee_not_yet_loaded_title">Fee calculation is in progress</string>
     <string name="fee_not_yet_loaded_message">Please wait until fee is calculated</string>
-    <string name="staking_setup_amount_too_low">Can\'t stake less than minimal value (%s)</string>
+    <string name="staking_setup_amount_too_low">You can\'t stake less than the minimum value (%s)</string>
     <string name="common_confirm_title">Confirmation</string>
     <string name="staking_confirm_reward_destination">Rewards destination</string>
     <string name="staking_stash_title">Wallet account</string>

feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/setup/pool/join/SetupStakingPoolViewModel.kt

@@ -21,6 +21,7 @@ import jp.co.soramitsu.common.utils.applyFiatRate
 import jp.co.soramitsu.common.utils.format
 import jp.co.soramitsu.common.utils.formatAsCurrency
 import jp.co.soramitsu.common.utils.orZero
+import jp.co.soramitsu.common.validation.AmountTooLowToStakeException
 import jp.co.soramitsu.common.validation.StakeInsufficientBalanceException
 import jp.co.soramitsu.feature_staking_impl.R
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
@@ -39,6 +40,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class SetupStakingPoolViewModel @Inject constructor(
@@ -144,35 +146,40 @@ class SetupStakingPoolViewModel @Inject constructor(
         val setupFlow = stakingPoolSharedStateProvider.requireJoinState
         val amount = enteredAmountFlow.value.toBigDecimalOrNull().orZero()
 
-        isValid(amount).fold({
-            stakingPoolSharedStateProvider.joinFlowState.set(setupFlow.copy(amount = amount))
-            router.openSelectPool()
-        }, { throwable ->
-            val message =
-                throwable.localizedMessage ?: throwable.message ?: resourceManager.getString(R.string.common_undefined_error_message)
-            val errorAlertViewState = (throwable as? ValidationException)?.let { (title, message) ->
-                AlertViewState(
-                    title = title,
+        viewModelScope.launch {
+            isValid(amount).fold({
+                stakingPoolSharedStateProvider.joinFlowState.set(setupFlow.copy(amount = amount))
+                router.openSelectPool()
+            }, { throwable ->
+                val message =
+                    throwable.localizedMessage ?: throwable.message ?: resourceManager.getString(R.string.common_undefined_error_message)
+                val errorAlertViewState = (throwable as? ValidationException)?.let { (title, message) ->
+                    AlertViewState(
+                        title = title,
+                        message = message,
+                        buttonText = resourceManager.getString(R.string.common_got_it),
+                        iconRes = R.drawable.ic_status_warning_16
+                    )
+                } ?: AlertViewState(
+                    title = resourceManager.getString(R.string.common_error_general_title),
                     message = message,
                     buttonText = resourceManager.getString(R.string.common_got_it),
                     iconRes = R.drawable.ic_status_warning_16
                 )
-            } ?: AlertViewState(
-                title = resourceManager.getString(R.string.common_error_general_title),
-                message = message,
-                buttonText = resourceManager.getString(R.string.common_got_it),
-                iconRes = R.drawable.ic_status_warning_16
-            )
-            router.openAlert(errorAlertViewState)
-        })
+                router.openAlert(errorAlertViewState)
+            })
+        }
     }
 
-    private fun isValid(amount: BigDecimal): Result<Any> {
+    private suspend fun isValid(amount: BigDecimal): Result<Any> {
         val amountInPlanks = asset.token.planksFromAmount(amount)
         val transferableInPlanks = asset.token.planksFromAmount(asset.transferable)
+        val minToJoinInPlanks = stakingPoolInteractor.getMinToJoinPool(chain.id)
+        val minToJoinFormatted = asset.token.amountFromPlanks(minToJoinInPlanks).formatTokenAmount(asset.token.configuration)
 
         return when {
             amountInPlanks >= transferableInPlanks -> Result.failure(StakeInsufficientBalanceException(resourceManager))
+            amountInPlanks < minToJoinInPlanks -> Result.failure(AmountTooLowToStakeException(resourceManager, minToJoinFormatted))
             else -> Result.success(Unit)
         }
     }

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/WalletInteractorImpl.kt

@@ -278,10 +278,19 @@ class WalletInteractorImpl(
     }
 
     override suspend fun markAssetAsHidden(chainId: ChainId, chainAssetId: String) {
+        manageAssetHidden(chainId, chainAssetId, true)
+    }
+
+    override suspend fun markAssetAsShown(chainId: ChainId, chainAssetId: String) {
+        manageAssetHidden(chainId, chainAssetId, false)
+    }
+
+    private suspend fun manageAssetHidden(chainId: ChainId, chainAssetId: String, isHidden: Boolean) {
         val metaAccount = accountRepository.getSelectedMetaAccount()
         val chain = chainRegistry.getChain(chainId)
         val accountId = metaAccount.accountId(chain)
         val chainAsset = chain.assetsById[chainAssetId] ?: return
+
         val tokenChains = chainRegistry.currentChains.first().filter {
             it.assets.any { it.symbolToShow == chainAsset.symbolToShow }
         }
@@ -296,28 +305,12 @@ class WalletInteractorImpl(
                     chainAsset = it,
                     metaId = metaAccount.id,
                     accountId = accountId,
-                    isHidden = true
+                    isHidden = isHidden
                 )
             }
         }
     }
 
-    override suspend fun markAssetAsShown(chainId: ChainId, chainAssetId: String) {
-        val metaAccount = accountRepository.getSelectedMetaAccount()
-        val chain = chainRegistry.getChain(chainId)
-        val accountId = metaAccount.accountId(chain)
-        val chainAsset = chain.assetsById[chainAssetId] ?: return
-
-        accountId?.let {
-            walletRepository.updateAssetHidden(
-                chainAsset = chainAsset,
-                metaId = metaAccount.id,
-                accountId = it,
-                isHidden = false
-            )
-        }
-    }
-
     override fun selectedMetaAccountFlow(): Flow<MetaAccount> {
         return accountRepository.selectedMetaAccountFlow()
     }