Merge pull request #1334 from novasamatech/rc/7.7.1

Rc/7.7.1
novasamatech · Jan 18, 2024 · 209f545 · 209f545
2 parents f8bf93d + 9f1b33d
commit 209f545
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '7.7.0'
-        versionCode = 108
+        versionName = '7.7.1'
+        versionCode = 109
 
         applicationId = "io.novafoundation.nova"
         releaseApplicationSuffix = "market"

diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt
@@ -26,9 +26,9 @@ import java.math.BigInteger
  */
 @Language("RoomSql")
 private const val FIND_BY_ADDRESS_WHERE_CLAUSE = """
-    LEFT JOIN chain_accounts as c ON m.id = c.metaId
+    LEFT JOIN chain_accounts as c ON m.id = c.metaId AND c.chainId = :chainId
     WHERE
-    (c.chainId = :chainId  AND c.accountId IS NOT NULL AND c.accountId = :accountId)
+    (c.accountId IS NOT NULL AND c.accountId = :accountId)
     OR (c.accountId IS NULL AND (substrateAccountId = :accountId OR ethereumAddress = :accountId))
     ORDER BY (CASE WHEN isSelected THEN 0 ELSE 1 END)
     """