Merge pull request #1137 from soramitsu/staging

staging

Author: Deneath

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootViewModel.kt

@@ -174,9 +174,10 @@ class RootViewModel @Inject constructor(
     }
 
     fun onNetworkAvailable() {
-        viewModelScope.launch {
-            checkAppVersion()
-        }
+        // todo this code triggers redundant requests and balance updates. Needs research
+//        viewModelScope.launch {
+//            checkAppVersion()
+//        }
     }
 
     private fun observeWalletConnectEvents() {

build.gradle

@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.4.1'
-        versionCode = 163
+        versionName = '3.4.2'
+        versionCode = 166
 
         // SDK and tools
         compileSdkVersion = 34

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/binding/AccountInfo.kt

@@ -53,7 +53,8 @@ class EqAccountInfo(
 ) : AssetBalanceData
 
 class AssetsAccountInfo(
-    val balance: BigInteger
+    val balance: BigInteger,
+    val status: String?
 ) : AssetBalanceData
 
 class SimpleBalanceData(val balance: BigInteger) : AssetBalanceData
@@ -120,7 +121,8 @@ fun bindAssetsAccountInfo(scale: String, runtime: RuntimeSnapshot): AssetsAccoun
 
     return dynamicInstance?.let {
         AssetsAccountInfo(
-            balance = bindNumber(dynamicInstance["balance"])
+            balance = bindNumber(dynamicInstance["balance"]),
+            status = dynamicInstance.get<DictEnum.Entry<*>>("status")?.name
         )
     }
 }

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

@@ -49,9 +49,9 @@ class TransferToTheSameAddressException(resourceManager: ResourceManager) : Vali
     null
 )
 
-class DeadRecipientException(resourceManager: ResourceManager) : ValidationException(
+class DeadRecipientException(resourceManager: ResourceManager, resultAmount: String, edAmount: String, topUpAmount: String) : ValidationException(
     resourceManager.getString(R.string.common_amount_low),
-    resourceManager.getString(R.string.wallet_send_dead_recipient_message)
+    resourceManager.getString(R.string.wallet_send_dead_recipient_message_v2, resultAmount, edAmount, topUpAmount)
 )
 
 class InsufficientStakeBalanceException(resourceManager: ResourceManager) : ValidationException(

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

@@ -1112,6 +1112,7 @@
   <string name="wallet_send_balance_minimal">Minimal balance</string>
   <string name="wallet_send_confirm_transfer">Confirm transfer</string>
   <string name="wallet_send_dead_recipient_message">Your transfer will fail since the final amount on the destination account will be less than the minimal balance. Please try to increase the amount.</string>
+  <string name="wallet_send_dead_recipient_message_v2">Your transfer will fail since the final amount (%s) on the destination account will be less than the minimal balance (%s). Please increase the amount by %s</string>
   <string name="wallet_send_eth_dead_recipient_message">Insufficient Ethereum balance in the recipient\'s account prevents the completion of ERC20 token transfer. Please ensure the receiver has enough Ethereum to proceed with the transfer.</string>
   <string name="wallet_send_existential_warning_message">Your transfer will remove the account from blockstore since it will make the total balance lower than the minimal balance.</string>
   <string name="wallet_send_existential_warning_title">The transfer will remove the account</string>

core-db/src/androidTest/java/jp/co/soramitsu/coredb/dao/MetaAccountDaoTest.kt

@@ -79,7 +79,9 @@ class MetaAccountDaoTest : DaoTest<MetaAccountDao>(AppDatabase::metaAccountDao)
         isSelected = false,
         substrateAccountId = byteArrayOf(),
         ethereumAddress = null,
-        position = 0
+        position = 0,
+        googleBackupAddress = null,
+        isBackedUp = false
     )
 
     private fun chainAccount(metaId: Long) = ChainAccountLocal(

core-db/src/main/java/jp/co/soramitsu/coredb/AppDatabase.kt

@@ -65,6 +65,7 @@ import jp.co.soramitsu.coredb.migrations.Migration_58_59
 import jp.co.soramitsu.coredb.migrations.Migration_59_60
 import jp.co.soramitsu.coredb.migrations.Migration_60_61
 import jp.co.soramitsu.coredb.migrations.Migration_61_62
+import jp.co.soramitsu.coredb.migrations.Migration_62_63
 import jp.co.soramitsu.coredb.migrations.RemoveAccountForeignKeyFromAsset_17_18
 import jp.co.soramitsu.coredb.migrations.RemoveLegacyData_35_36
 import jp.co.soramitsu.coredb.migrations.RemoveStakingRewardsTable_22_23
@@ -90,7 +91,7 @@ import jp.co.soramitsu.coredb.model.chain.FavoriteChainLocal
 import jp.co.soramitsu.coredb.model.chain.MetaAccountLocal
 
 @Database(
-    version = 62,
+    version = 63,
     entities = [
         AccountLocal::class,
         AddressBookContact::class,
@@ -173,6 +174,7 @@ abstract class AppDatabase : RoomDatabase() {
                     .addMigrations(Migration_59_60)
                     .addMigrations(Migration_60_61)
                     .addMigrations(Migration_61_62)
+                    .addMigrations(Migration_62_63)
                     .build()
             }
             return instance!!