Merge pull request #311 from soramitsu/rc/1.8.2

Rc/1.8.2

Author: valentunn

app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt

@@ -45,6 +45,8 @@ import jp.co.soramitsu.feature_staking_impl.presentation.payouts.detail.PayoutDe
 import jp.co.soramitsu.feature_staking_impl.presentation.payouts.model.PendingPayoutParcelable
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.confirm.ConfirmBondMoreFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.confirm.ConfirmBondMorePayload
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.select.SelectBondMoreFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.select.SelectBondMorePayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.controller.confirm.ConfirmSetControllerFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.controller.confirm.ConfirmSetControllerPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.main.model.StakingStoryModel
@@ -200,8 +202,8 @@ class Navigator :
         navController?.navigate(R.id.action_mainFragment_to_stakingBalanceFragment)
     }
 
-    override fun openBondMore() {
-        navController?.navigate(R.id.action_stakingBalanceFragment_to_selectBondMoreFragment)
+    override fun openBondMore(payload: SelectBondMorePayload) {
+        navController?.navigate(R.id.action_open_selectBondMoreFragment, SelectBondMoreFragment.getBundle(payload))
     }
 
     override fun openConfirmBondMore(payload: ConfirmBondMorePayload) {

app/src/main/res/navigation/main_nav_graph.xml

@@ -536,13 +536,6 @@
         android:label="StakingBalanceFragment"
         tools:layout="@layout/fragment_staking_balance">
 
-        <action
-            android:id="@+id/action_stakingBalanceFragment_to_selectBondMoreFragment"
-            app:destination="@id/selectBondMoreFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
         <action
             android:id="@+id/action_stakingBalanceFragment_to_selectUnbondFragment"
             app:destination="@id/selectUnbondFragment"
@@ -551,7 +544,6 @@
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
 
-
         <action
             android:id="@+id/action_stakingBalanceFragment_to_customRebondFragment"
             app:destination="@id/customRebondFragment"
@@ -606,6 +598,14 @@
             app:popExitAnim="@anim/fragment_close_exit" />
     </fragment>
 
+    <action
+        android:id="@+id/action_open_selectBondMoreFragment"
+        app:destination="@id/selectBondMoreFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
     <fragment
         android:id="@+id/confirmBondMoreFragment"
         android:name="jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.confirm.ConfirmBondMoreFragment"

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.8.1'
-        versionCode = 15
+        versionName = '1.8.2'
+        versionCode = 17
 
         // SDK and tools
         compileSdkVersion = 29

common/src/main/java/jp/co/soramitsu/common/navigation/PendingNavigationAction.kt

@@ -0,0 +1,3 @@
+package jp.co.soramitsu.common.navigation
+
+typealias PendingNavigationAction<ROUTER> = (ROUTER) -> Unit

common/src/main/java/jp/co/soramitsu/common/utils/formatting/CompoundNumberFormatter.kt

@@ -22,7 +22,7 @@ class CompoundNumberFormatter(
     }
 
     override fun format(number: BigDecimal): String {
-        val lastAbbreviationMatching = abbreviations.lastOrNull { number > it.threshold } ?: abbreviations.first()
+        val lastAbbreviationMatching = abbreviations.lastOrNull { number >= it.threshold } ?: abbreviations.first()
 
         val scaled = number.divide(lastAbbreviationMatching.divisor, MathContext.UNLIMITED)
 

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

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
+    <string name="staking_alert_bond_more_title">Bond more tokens.</string>
+    <string name="staking_alert_bond_more_message">Staking is inactive. Current minimal stake is %s</string>
     <string name="staking_alert_redeem_title">Redeem unbonded tokens.</string>
 
     <string name="staking_alert_title">Alerts</string>
     <string name="staking_alert_no_alerts_now">Everything is fine now. Alerts will appear here.</string>
-    <string name="staking_alert_start_next_era">Your staking will start in the next era.</string>
-    <string name="staking_alert_start_next_era_extra_message">Please wait for the next era to start.</string>
+    <string name="staking_alert_start_next_era_message">Please wait for the next era to start.</string>
     <string name="staking_alert_election">Staking actions are currently unavailable.</string>
-    <string name="staking_alert_start_election_extra_message">The network is electing validators. Usually it takes less than 10 minutes.</string>
+    <string name="staking_alert_election_message">The network is electing validators.\nUsually it takes less than 10 minutes.</string>
     <string name="staking_alert_change_validators">Change your validators.</string>
-    <string name="staking_alert_change_validators_extra_message">Staking was inactive. None of your validators were elected by network.</string>
+    <string name="staking_alert_change_validators_message">Staking is inactive. None of your validators were elected by network.</string>
 
     <string name="crodloan_private_crowdloan_title">Private crowdloan</string>
     <string name="crodloan_private_crowdloan_message">Private crowdloans are not yet supported.</string>

common/src/test/java/jp/co/soramitsu/common/utils/formatting/CompoundNumberFormatterTest.kt

@@ -14,6 +14,7 @@ class CompoundNumberFormatterTest {
         testFormatter(formatter, "0.315", "0.315000041811")
         testFormatter(formatter, "0.99999", "0.99999999999")
         testFormatter(formatter, "999.99999", "999.99999999")
+        testFormatter(formatter, "1M", "1000000")
         testFormatter(formatter, "888,888.12", "888888.1234")
         testFormatter(formatter, "1.24M", "1243000")
         testFormatter(formatter, "1.24M", "1243011")

core-api/src/main/java/jp/co/soramitsu/core/model/Node.kt

@@ -2,8 +2,6 @@
 
 package jp.co.soramitsu.core.model
 
-const val REAL_ROCOCO_ADDRESS_BYTE = 42.toByte()
-
 data class Node(
     val id: Int,
     val name: String,

feature-crowdloan-api/src/test/java/jp/co/soramitsu/feature_crowdloan_api/ExampleUnitTest.kt

@@ -14,6 +14,8 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "KARURA_FEALRESS_REFERRAL", "\"0x9642d0db9f3b301b44df74b63b0b930011e3f52154c5ca24b4dc67b3c7322f15\""
+        buildConfigField "String", "BIFROST_FEALRESS_REFERRAL", "\"FRLS69\""
+        buildConfigField "String", "BIFROST_TERMS_LINKS", "\"https://docs.google.com/document/d/1PDpgHnIcAmaa7dEFusmLYgjlvAbk2VKtMd755bdEsf4\""
     }
 
     buildTypes {