Merge pull request #1197 from soramitsu/staging

staging to master

Author: PankraSerg

app/build.gradle

@@ -199,6 +199,7 @@ dependencies {
     kapt libs.lifecycle.compiler
 
     implementation libs.lifecycle.runtime.ktx
+    implementation libs.lifecycle.livedata.ktx
 
     implementation libs.converter.gson
 
@@ -212,8 +213,6 @@ dependencies {
 
     implementation libs.insetter.widgets
 
-    implementation libs.lifecycle.livedata.ktx
-
     implementation libs.jna
     implementation libs.beacon.android.sdk, withoutJna
 

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

@@ -937,6 +937,7 @@ class Navigator :
     }
 
     override fun <T> observeResult(key: String): Flow<T> {
+        @Suppress("UNCHECKED_CAST")
         return observeResultInternal<T>(key)
             .onStart { removeSavedStateHandle(key) }
             .onCompletion { removeSavedStateHandle(key) }

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

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.app.root.presentation.stories
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
@@ -36,6 +37,7 @@ class StoryFragment : BaseFragment<StoryViewModel>(R.layout.fragment_story), Sto
 
     private var lastActionDown = 0L
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun initViews() {
         binding.storyCloseIcon.setOnClickListener { viewModel.backClicked() }
 

build.gradle

@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.7.1'
-        versionCode = 200
+        versionName = '3.7.2'
+        versionCode = 201
 
         // SDK and tools
         compileSdkVersion = 34

common/build.gradle

@@ -124,15 +124,15 @@ dependencies {
     implementation libs.coroutines.core
     implementation libs.lifecycle.livedata.ktx
     implementation libs.lifecycle.runtime.ktx
-
     implementation libs.lifecycle.viewmodel.ktx
+    implementation libs.lifecycle.process
+    kapt libs.lifecycle.compiler
 
     implementation libs.hilt.android
     implementation libs.navigation.fragment.ktx
     kapt libs.hilt.compiler
 
-    implementation libs.lifecycle.process
-    kapt libs.lifecycle.compiler
+    implementation libs.play.services.base
 
     implementation libs.converter.gson
     implementation libs.converter.scalars

common/src/main/java/jp/co/soramitsu/common/utils/ContextExt.kt

@@ -9,6 +9,7 @@ import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import com.google.android.gms.common.GoogleApiAvailability
 import jp.co.soramitsu.common.R
 
 fun Context.getDrawableCompat(@DrawableRes drawableRes: Int) =
@@ -50,3 +51,8 @@ fun Context.getColorFromAttr(
 
 @ColorInt
 fun Context.getPrimaryColor() = getColorFromAttr(R.attr.colorPrimary)
+
+fun Context.isGooglePlayServicesAvailable(): Boolean {
+    return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) ==
+            com.google.android.gms.common.ConnectionResult.SUCCESS
+}

common/src/main/java/jp/co/soramitsu/common/utils/NumberFormatters.kt

@@ -111,7 +111,7 @@ fun decimalFormatterFor(pattern: String) = DecimalFormat(pattern).apply {
 
 fun fiatAbbreviatedFormatter() = CompoundNumberFormatter(
     abbreviations = listOf(
-        NumberAbbreviation(BigDecimal.ZERO, BigDecimal.ONE, "", fiatSmallAmountFormatter),
+        NumberAbbreviation(BigDecimal.ZERO, BigDecimal.ONE, "", fiatAmountFormatter),
         NumberAbbreviation(BigDecimal.ONE, BigDecimal.ONE, "", fiatAmountFormatter),
         NumberAbbreviation(BigDecimal("1E+3"), BigDecimal.ONE, "", fiatAmountFormatter),
         NumberAbbreviation(BigDecimal("1E+6"), BigDecimal("1E+6"), "M", fiatAmountFormatter),

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

@@ -74,6 +74,7 @@ import jp.co.soramitsu.coredb.migrations.Migration_65_66
 import jp.co.soramitsu.coredb.migrations.Migration_66_67
 import jp.co.soramitsu.coredb.migrations.Migration_67_68
 import jp.co.soramitsu.coredb.migrations.Migration_68_69
+import jp.co.soramitsu.coredb.migrations.Migration_69_70
 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
@@ -102,7 +103,7 @@ import jp.co.soramitsu.coredb.model.chain.FavoriteChainLocal
 import jp.co.soramitsu.coredb.model.chain.MetaAccountLocal
 
 @Database(
-    version = 69,
+    version = 70,
     entities = [
         AccountLocal::class,
         AddressBookContact::class,
@@ -195,6 +196,7 @@ abstract class AppDatabase : RoomDatabase() {
                     .addMigrations(Migration_66_67)
                     .addMigrations(Migration_67_68)
                     .addMigrations(Migration_68_69)
+                    .addMigrations(Migration_69_70)
                     .build()
             }
             return instance!!

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

@@ -3,6 +3,12 @@ package jp.co.soramitsu.coredb.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
+val Migration_69_70 = object : Migration(69, 70) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM storage")
+    }
+}
+
 val Migration_68_69 = object : Migration(68, 69) {
     override fun migrate(db: SupportSQLiteDatabase) {
         db.execSQL(

feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/data/mappers/Mappers.kt

@@ -88,7 +88,7 @@ fun mapMetaAccountLocalToMetaAccount(
         valueTransform = {
             MetaAccount.ChainAccount(
                 metaId = joinedMetaAccountInfo.metaAccount.id,
-                chain = chainsById[it.chainId],
+                chain = chainsById.getOrDefault(it.chainId, null),
                 publicKey = it.publicKey,
                 accountId = it.accountId,
                 cryptoType = it.cryptoType,
@@ -101,7 +101,7 @@ fun mapMetaAccountLocalToMetaAccount(
         keySelector = FavoriteChainLocal::chainId,
         valueTransform = {
             MetaAccount.FavoriteChain(
-                chain = chainsById[it.chainId],
+                chain = chainsById.getOrDefault(it.chainId, null),
                 isFavorite = it.isFavorite
             )
         }