Fix/min stake relaychain logic (#1115)

* Fixed minStake calculation logic for relaychains * Update StartStakingLandingViewModel.kt
novasamatech · Sep 13, 2023 · 0745b02 · 0745b02
1 parent 5afe1b9
commit 0745b02
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="TypographyEllipsis">
+
+    <string name="start_staking_fragment_min_stake_condition_no_min_stake">Stake anytime. Your stake will actively earn rewards %s</string>
+
     <string name="pool_full_failure_title">Pool is full</string>
     <string name="pool_full_failure_message">You cannot join pool since it reached maximum number of members</string>
 

diff --git a/.../src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt b/.../src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt
@@ -67,7 +67,7 @@ fun minimumStake(
     bagListSize: BigInteger?,
     maxElectingVoters: BigInteger?
 ): BigInteger {
-    if (bagListSize != null && maxElectingVoters != null && bagListSize < maxElectingVoters) return minimumNominatorBond
+    if (bagListSize == null || maxElectingVoters == null || bagListSize < maxElectingVoters) return minimumNominatorBond
 
     val stakeByNominator = exposures
         .fold(mutableMapOf<AccountIdKey, BigInteger>()) { acc, exposure ->

diff --git a/...a/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt b/...a/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt
@@ -58,6 +58,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import java.math.BigInteger
+import jp.co.soramitsu.fearless_utils.hash.isPositive
 import kotlin.time.Duration
 
 class StartStakingInfoModel(
@@ -261,17 +262,25 @@ class StartStakingLandingViewModel(
         eraDuration: Duration,
         themeColor: Int
     ): StakingConditionRVItem {
-        val minStake = minStakeAmount.formatPlanks(asset.token.configuration)
-            .toSpannable(colorSpan(themeColor))
         val time = resourceManager.getString(
             R.string.start_staking_fragment_min_stake_condition_duration,
             resourceManager.formatDuration(eraDuration, false)
         ).toSpannable(colorSpan(themeColor))
 
-        return StakingConditionRVItem(
-            iconId = R.drawable.ic_stake_anytime,
-            text = resourceManager.getString(R.string.start_staking_fragment_min_stake_condition).formatAsSpannable(minStake, time),
-        )
+        return if (minStakeAmount.isPositive()) {
+            val minStake = minStakeAmount.formatPlanks(asset.token.configuration)
+                .toSpannable(colorSpan(themeColor))
+
+            StakingConditionRVItem(
+                iconId = R.drawable.ic_stake_anytime,
+                text = resourceManager.getString(R.string.start_staking_fragment_min_stake_condition).formatAsSpannable(minStake, time),
+            )
+        } else {
+            StakingConditionRVItem(
+                iconId = R.drawable.ic_stake_anytime,
+                text = resourceManager.getString(R.string.start_staking_fragment_min_stake_condition_no_min_stake).formatAsSpannable(time),
+            )
+        }
     }
 
     private fun createUnstakeCondition(
@@ -304,17 +313,21 @@ class StartStakingLandingViewModel(
             isRestakeOnlyCase(payouts) -> {
                 resourceManager.getString(R.string.start_staking_fragment_reward_frequency_condition_restake_only).formatAsSpannable(time)
             }
+
             isPayoutsOnlyCase(payouts) -> {
                 resourceManager.getString(R.string.start_staking_fragment_reward_frequency_condition_payout_only).formatAsSpannable(time)
             }
+
             payoutTypes.containsOnly(PayoutType.Manual) -> {
                 resourceManager.getString(R.string.start_staking_fragment_reward_frequency_condition_manual).formatAsSpannable(time)
             }
+
             payoutTypes.containsManualAndAutomatic() -> {
                 val automaticPayoutFormattedAmount = payouts.automaticPayoutMinAmount?.formatPlanks(asset.token.configuration).orEmpty()
                 resourceManager.getString(R.string.start_staking_fragment_reward_frequency_condition_automatic_and_manual)
                     .formatAsSpannable(time, automaticPayoutFormattedAmount)
             }
+
             else -> {
                 resourceManager.getString(R.string.start_staking_fragment_reward_frequency_condition_fallback)
                     .formatAsSpannable(time)