Merge pull request #917 from soramitsu/fixes/pankra

fixes/3337, 3208

Author: PankraSerg

common/src/main/java/jp/co/soramitsu/common/compose/component/FullScreenLoading.kt

@@ -63,20 +63,14 @@ fun FullScreenLoading(
                         .border(4.dp, white08, shape = CircleShape)
                         .background(transparent, shape = CircleShape)
                 )
-                Box(
+                CircularProgressIndicator(
                     modifier = Modifier
                         .fillMaxSize()
-                        .blur(1.dp)
                         .padding(8.dp)
-                ) {
-                    CircularProgressIndicator(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .align(Alignment.Center),
-                        color = colorAccentDark,
-                        strokeWidth = 4.dp
-                    )
-                }
+                        .align(Alignment.Center),
+                    color = colorAccentDark,
+                    strokeWidth = 4.dp
+                )
                 Image(
                     res = R.drawable.ic_fearless_logo,
                     tint = colorAccentDark,

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

@@ -57,6 +57,7 @@ import jp.co.soramitsu.coredb.migrations.Migration_50_51
 import jp.co.soramitsu.coredb.migrations.Migration_51_52
 import jp.co.soramitsu.coredb.migrations.Migration_52_53
 import jp.co.soramitsu.coredb.migrations.Migration_53_54
+import jp.co.soramitsu.coredb.migrations.Migration_54_55
 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
@@ -81,7 +82,7 @@ import jp.co.soramitsu.coredb.model.chain.ChainTypesLocal
 import jp.co.soramitsu.coredb.model.chain.MetaAccountLocal
 
 @Database(
-    version = 54,
+    version = 55,
     entities = [
         AccountLocal::class,
         AddressBookContact::class,
@@ -155,6 +156,7 @@ abstract class AppDatabase : RoomDatabase() {
                     .addMigrations(Migration_51_52)
                     .addMigrations(Migration_52_53)
                     .addMigrations(Migration_53_54)
+                    .addMigrations(Migration_54_55)
                     .build()
             }
             return instance!!

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

@@ -3,6 +3,16 @@ package jp.co.soramitsu.coredb.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
+val Migration_54_55 = object : Migration(54, 55) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+            """
+            CREATE UNIQUE INDEX IF NOT EXISTS `index_address_book_address_chainId` ON `address_book` (`address`, `chainId`)
+            """.trimIndent()
+        )
+    }
+}
+
 val Migration_53_54 = object : Migration(53, 54) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("DROP TABLE IF EXISTS _chains")

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

@@ -1,9 +1,13 @@
 package jp.co.soramitsu.coredb.model
 
 import androidx.room.Entity
+import androidx.room.Index
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "address_book")
+@Entity(
+    tableName = "address_book",
+    indices = [Index(value = ["address", "chainId"], unique = true)]
+)
 data class AddressBookContact(
     val address: String,
     val name: String?,