release soralution v3.8.5.0 140; mwr-968

app/build.gradle.kts

@@ -19,7 +19,7 @@ kotlin {
     jvmToolchain(17)
 }
 
-// soralution 138 3.8.5.0 2024.09.06
+// soralution 140 3.8.6.0 2024.10.21
 // sora dae 108 3.8.0.0 2023.12.04
 
 android {
@@ -30,8 +30,8 @@ android {
         applicationId = "jp.co.soramitsu.sora"
         minSdk = 26
         targetSdk = 34
-        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 139
-        versionName = "3.8.5.0"
+        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 140
+        versionName = "3.8.6.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
         // resConfigs "en", "ru", "es", "fr", "de", "nb", "in", "tr", "ar"
@@ -172,7 +172,7 @@ play {
     serviceAccountCredentials = file(System.getenv("CI_PLAY_KEY") ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.8.5.0 - SORA Card Improvements"
+    releaseName = "3.8.6.0 - SORA Card Improvements"
     defaultToAppBundles = true
 }
 

common/src/main/java/jp/co/soramitsu/common/domain/AssetHolder.kt

@@ -70,27 +70,20 @@ object AssetHolder {
                 true, true,
                 3,
             ),
-        // xst
-        "0x0200090000000000000000000000000000000000000000000000000000000000" to
+        // dai
+        "0x0200060000000000000000000000000000000000000000000000000000000000" to
             AssetDefault(
-                "SORA Synthetics", "XST",
+                "Dai", "DAI",
                 true, true,
                 4,
             ),
-        // xstusd
-        "0x0200080000000000000000000000000000000000000000000000000000000000" to
+        // eth
+        "0x0200070000000000000000000000000000000000000000000000000000000000" to
             AssetDefault(
-                "SORA Synthetic USD", "XSTUSD",
+                "Ether", "ETH",
                 true, true,
                 5,
             ),
-        // tbcd
-        "0x02000a0000000000000000000000000000000000000000000000000000000000" to
-            AssetDefault(
-                "SORA TBC Dollar", "TBCD",
-                true, true,
-                6,
-            ),
     )
     private val defaultAsset: AssetDefault = AssetDefault(
         name = "",

feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt

@@ -49,11 +49,11 @@ import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.fullassetsettings.FullAssetSettingsViewModel
 import jp.co.soramitsu.feature_assets_impl.presentation.states.AssetSettingsState
 import jp.co.soramitsu.test_data.TestAssets
+import jp.co.soramitsu.test_data.TestTokens.daiToken
+import jp.co.soramitsu.test_data.TestTokens.ethToken
 import jp.co.soramitsu.test_data.TestTokens.pswapToken
 import jp.co.soramitsu.test_data.TestTokens.valToken
 import jp.co.soramitsu.test_data.TestTokens.xorToken
-import jp.co.soramitsu.test_data.TestTokens.xstToken
-import jp.co.soramitsu.test_data.TestTokens.xstusdToken
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
@@ -367,7 +367,7 @@ class AssetSettingsViewModelTest {
         verify(assetsInteractor).tokenFavoriteOff(listOf("0x0200050000000000000000000000000000000000000000000000000000000000"))
         viewModel.onFavoriteClick(mappedModels[3])
         advanceUntilIdle()
-        verify(assetsInteractor).tokenFavoriteOff(listOf("0x0200080000000000000000000000000000000000000000000000000000000000"))
+        verify(assetsInteractor).tokenFavoriteOff(listOf("0x0200060000000000000000000000000000000000000000000000000000000000"))
         viewModel.onFavoriteClick(mappedModels[5])
         advanceUntilIdle()
         verify(assetsInteractor).tokenFavoriteOff(listOf("token_id"))
@@ -521,14 +521,14 @@ class AssetSettingsViewModelTest {
             true,
         ),
         Asset(
-            xstusdToken,
+            daiToken,
             visibility[3],
             4,
             TestAssets.balance(BigDecimal.ONE),
             true
         ),
         Asset(
-            xstToken,
+            ethToken,
             visibility[4],
             5,
             TestAssets.balance(BigDecimal.ONE),

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
-agp = "8.7.0"
+agp = "8.7.1"
 kotlin = "1.9.24"
 appcompat = "1.7.0"
 coroutines = "1.8.1"
 coreKtx = "1.13.1"
 constraint = "2.2.0-alpha05"
 biometric = "1.1.0"
-navigation = "2.8.2"
-navigationCompose = "2.8.2"
+navigation = "2.8.3"
+navigationCompose = "2.8.3"
 lottie = "4.2.0"
 insetter = "0.6.1"
 workManager = "2.9.1"
@@ -24,11 +24,11 @@ androidxTestExtJunit = "1.2.1"
 androidxTestEspressoCore = "3.6.1"
 archCoreTest = "2.2.0"
 archComponents = "2.8.6"
-activityCompose = "1.9.2"
+activityCompose = "1.9.3"
 material = "1.12.0"
 fragmentKtx = "1.8.4"
 permission = "1.7.1"
-compose-bom = "2024.09.03"
+compose-bom = "2024.10.00"
 composeLifecycle = "2.8.6"
 composeConstraintLayout = "1.1.0-alpha05"
 firebasebom = "32.7.0"
@@ -48,21 +48,21 @@ webSocketLib = "2.14"
 web3j = "4.6.0-android"
 zXing = "3.3.3"
 zXingEmbedded = "4.3.0"
-activityKtx = "1.9.2"
+activityKtx = "1.9.3"
 xserializationjson = "1.6.3"
 gson = "2.10.1"
 datastore = "1.0.0"
 room = "2.6.1"
 lazySodium = "5.0.2"
 jna = "5.8.0"
 kover = "0.8.3"
-soramitsuSoracard = "1.1.18"
+soramitsuSoracard = "1.1.20"
 soramitsuXnetworking = "1.0.10"
 soramitsuXsubstrate = "1.2.7"
 soramitsuUicore = "0.2.37"
 soramitsuXbackup = "1.2.2"
 soramitsuXcrypto = "1.2.6"
-soramitsuAndroidFoundation = "0.0.1"
+soramitsuAndroidFoundation = "0.0.2"
 
 [libraries]
 soramitsu-android-foundation = { module = "jp.co.soramitsu:android-foundation", version.ref = "soramitsuAndroidFoundation" }

test_data/src/main/java/jp/co/soramitsu/test_data/Tokens.kt

@@ -85,7 +85,7 @@ object TestTokens {
     )
 
     val ethToken = Token(
-        "0x0200060000000000000000000000000000000000000000000000000000000000",
+        "0x0200070000000000000000000000000000000000000000000000000000000000",
         "ethereum",
         "ETH",
         18,
@@ -145,7 +145,7 @@ object TestTokens {
     )
 
     val daiToken = Token(
-        "0x020009",
+        "0x0200060000000000000000000000000000000000000000000000000000000000",
         "dai stable",
         "DAI",
         18,