From 82b7c5afc6b67359224e7f8f3dabae3adb63d1e9 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 1 Jul 2026 17:01:46 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 domain/swap/models/build.gradle.kts           | 20 ++--
 domain/tokens/build.gradle.kts                | 97 ++++++++++---------
 domain/transaction/build.gradle.kts           | 67 +++++++------
 domain/txhistory/build.gradle.kts             | 29 +++---
 domain/virtual-account/build.gradle.kts       | 37 ++++---
 .../virtual-account/models/build.gradle.kts   |  1 -
 domain/visa/build.gradle.kts                  | 58 ++++++-----
 domain/visa/models/build.gradle.kts           | 28 ++++--
 domain/wallet-connect/build.gradle.kts        | 41 +++++---
 domain/wallet-connect/models/build.gradle.kts | 22 +++--
 domain/wallet-manager/build.gradle.kts        | 49 +++++-----
 domain/wallet-manager/models/build.gradle.kts | 13 +--
 domain/wallets/build.gradle.kts               | 84 ++++++++--------
 domain/wallets/models/build.gradle.kts        | 17 +---
 domain/yield-supply/build.gradle.kts          | 60 +++++++-----
 domain/yield-supply/models/build.gradle.kts   | 12 ++-
 16 files changed, 347 insertions(+), 288 deletions(-)

diff --git a/domain/swap/models/build.gradle.kts b/domain/swap/models/build.gradle.kts
index 0b8ed0f521..bfd35e461a 100644
--- a/domain/swap/models/build.gradle.kts
+++ b/domain/swap/models/build.gradle.kts
@@ -10,15 +10,17 @@ android {
 }
 
 dependencies {
-    /** Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.express.models)
-    implementation(projects.domain.tokens.models)
 
-    /** Core */
-    implementation(projects.core.datasource)
+    // region Other libraries
+    api(deps.jodatime)
+    // endregion
 
-    /** Other */
-    implementation(deps.jodatime)
-    implementation(deps.moshi)
+    // region Core modules
+    api(projects.core.datasource)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.express.models)
+    api(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/tokens/build.gradle.kts b/domain/tokens/build.gradle.kts
index c13e8ebf7b..ad3fb6c9cc 100644
--- a/domain/tokens/build.gradle.kts
+++ b/domain/tokens/build.gradle.kts
@@ -9,55 +9,62 @@ android {
 }
 dependencies {
 
-    /** Project - Domain */
-    api(projects.domain.core)
-    implementation(projects.domain.common)
-    implementation(projects.domain.card)
-    implementation(projects.domain.express)
-    implementation(projects.domain.models)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.staking)
-    implementation(projects.domain.visa)
-    implementation(projects.libs.blockchainSdk)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.txhistory.models)
-    implementation(projects.domain.transaction.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.onramp.models)
-    implementation(projects.domain.settings)
-    implementation(projects.features.swap.domain.api)
-    implementation(projects.features.swap.domain.models)
-    implementation(projects.domain.stories.models)
-    implementation(projects.domain.stories)
-    implementation(projects.domain.networks)
-    implementation(projects.domain.quotes)
-    implementation(projects.domain.yieldSupply.models)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Api */
-    implementation(projects.features.staking.api)
-    implementation(projects.features.markets.api)
-    implementation(projects.features.swap.api)
-    implementation(projects.features.virtualAccounts.details.api) //VIRTUAL_ACCOUNTS_ENABLED
-
-    /** Project - Other */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.utils)
-    implementation(projects.libs.crypto)
-    implementation(projects.common)
-
-    /** Android - Other */
-    implementation(deps.androidx.paging.runtime)
-
-    /** Utils */
-    implementation(deps.jodatime)
-
-    implementation(tangemDeps.blockchain) {
+    // region Other libraries
+    api(deps.arrow.core)
+    api(tangemDeps.blockchain) {
         exclude(module = "joda-time")
     }
+    // endregion
 
-    /** Tests */
+    // region Core modules
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.core)
+    api(projects.domain.express)
+    api(projects.domain.legacy)
+    api(projects.domain.networks)
+    api(projects.domain.quotes)
+    api(projects.domain.staking)
+    api(projects.domain.stories)
+    api(projects.domain.visa)
+    api(projects.domain.walletManager)
+    implementation(projects.domain.card)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.models)
+    api(projects.domain.tokens.models)
+    api(projects.domain.transaction.models)
+    api(projects.domain.yieldSupply.models)
+    implementation(projects.domain.express.models)
+    implementation(projects.domain.stories.models)
+    // endregion
+
+    // region Features
+    api(projects.features.virtualAccounts.details.api) // VIRTUAL_ACCOUNTS_ENABLED
+    // endregion
+
+    // region Libs
+    implementation(projects.libs.crypto)
+    // endregion
+
+    // region Common
+    implementation(projects.common)
+    // endregion
+
+    // region Runtime
+    runtimeOnly(projects.domain.settings)
+    // endregion
+
+    // region Tests
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/transaction/build.gradle.kts b/domain/transaction/build.gradle.kts
index 02aa7efb9e..f75682630c 100644
--- a/domain/transaction/build.gradle.kts
+++ b/domain/transaction/build.gradle.kts
@@ -8,47 +8,58 @@ android {
     namespace = "com.tangem.domain.transaction"
 }
 
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-}
-
 dependencies {
+
+    // region Kotlin
+    api(deps.arrow.core)
     implementation(deps.kotlin.coroutines)
-    implementation(deps.arrow.core)
+    // endregion
 
-    implementation(projects.core.utils)
-    implementation(projects.core.ui)
-    implementation(projects.core.datasource)
-
-    /** Tangem SDKs */
-    implementation(tangemDeps.card.core)
+    // region Tangem SDK
+    api(tangemDeps.blockchain)
+    api(tangemDeps.card.core)
     implementation(tangemDeps.card.android) {
         exclude(module = "joda-time")
     }
-    implementation(tangemDeps.blockchain)
+    // endregion
 
+    // region Core modules
+    api(projects.core.utils)
+    implementation(projects.core.ui)
+    // endregion
+
+    // region Libs
     implementation(projects.libs.blockchainSdk)
     implementation(projects.libs.crypto)
+    // endregion
 
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.common)
-    implementation(projects.domain.dynamicAddresses)
-    implementation(projects.domain.dynamicAddresses.models)
-    implementation(projects.domain.models)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.transaction.models)
-    implementation(projects.domain.demo)
-    implementation(projects.domain.card)
-    implementation(projects.domain.notifications)
+    // region Domain
+    api(projects.domain.account)
+    api(projects.domain.account.status)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.demo)
+    api(projects.domain.dynamicAddresses)
     api(projects.domain.networks)
+    api(projects.domain.notifications)
+    api(projects.domain.tokens)
+    api(projects.domain.walletManager)
+    implementation(projects.domain.core)
+    implementation(projects.domain.dynamicAddresses.models)
+    implementation(projects.domain.legacy)
+    // endregion
 
-    testRuntimeOnly(deps.test.junit5.engine)
+    // region Domain models
+    api(projects.domain.demo.models)
+    api(projects.domain.models)
+    api(projects.domain.transaction.models)
+    api(projects.domain.wallets.models)
+    // endregion
+
+    // region Tests
     testRuntimeOnly(deps.test.junit5.vintage.engine)
+    testImplementation(deps.test.junit)
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
-    testImplementation(projects.test.mock)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/txhistory/build.gradle.kts b/domain/txhistory/build.gradle.kts
index ff40ff4913..19711a8331 100644
--- a/domain/txhistory/build.gradle.kts
+++ b/domain/txhistory/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.kotlin.kapt)
-    alias(deps.plugins.hilt.android)
     id("configuration")
 }
 
@@ -11,24 +9,23 @@ android {
 }
 
 dependencies {
-    /** Project - Domain */
-    implementation(projects.domain.core)
-    api(projects.domain.express.models)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.txhistory.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.visa.models)
 
-    /** Project - Other */
-    implementation(projects.core.utils)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
 
-    /** Android - Other */
+    // region Other libraries
+    api(deps.arrow.core)
     implementation(deps.androidx.paging.runtime)
+    // endregion
 
+    // region Core modules
     api(projects.core.pagination)
+    // endregion
 
-    /** DI */
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
+    // region Domain models
+    api(projects.domain.express.models)
+    api(projects.domain.models)
+    api(projects.domain.txhistory.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/virtual-account/build.gradle.kts b/domain/virtual-account/build.gradle.kts
index 618b957012..a3098a841f 100644
--- a/domain/virtual-account/build.gradle.kts
+++ b/domain/virtual-account/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -10,24 +9,36 @@ android {
 }
 
 dependencies {
-    /** Project - Domain */
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    implementation(deps.arrow.core)
+    // endregion
+
+    // region Core modules
+    api(projects.core.security)
+    // endregion
+
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.visa)
+    // endregion
+
+    // region Domain models
     api(projects.domain.models)
     api(projects.domain.virtualAccount.models)
-    implementation(projects.domain.common)
-    implementation(projects.domain.visa)
+    // endregion
 
-    /** Project - Core */
-    implementation(projects.core.security)
-
-    /** Coroutines */
-    implementation(deps.kotlin.coroutines)
-
-    /** Tests */
+    // region Tests
+    testImplementation(deps.test.coroutine)
     testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.coroutine)
     testImplementation(deps.test.truth)
-    testImplementation(projects.test.core)
     testImplementation(projects.common.test)
     testImplementation(projects.domain.card)
+    testImplementation(projects.domain.visa.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/virtual-account/models/build.gradle.kts b/domain/virtual-account/models/build.gradle.kts
index 0604c48d68..b055934966 100644
--- a/domain/virtual-account/models/build.gradle.kts
+++ b/domain/virtual-account/models/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
diff --git a/domain/visa/build.gradle.kts b/domain/visa/build.gradle.kts
index 8ed679097d..c03fac0f35 100644
--- a/domain/visa/build.gradle.kts
+++ b/domain/visa/build.gradle.kts
@@ -1,44 +1,52 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 android {
     namespace = "com.tangem.domain.visa"
 }
-dependencies {
-    /** Project - Core */
-    api(projects.core.pagination)
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.error)
-    implementation(projects.core.security)
-    implementation(projects.core.utils)
 
-    /** Project - Domain */
+dependencies {
+
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.arrow.core)
+    api(deps.jodatime)
+    implementation(deps.androidx.paging.runtime)
+    runtimeOnly(deps.spongecastle.core)
+    // endregion
+
+    // region Core modules
+    api(projects.core.analytics.models)
+    api(projects.core.error)
+    api(projects.core.pagination)
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.core)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.appCurrency.models)
     api(projects.domain.models)
     api(projects.domain.visa.models)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.core)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.core.datasource)
+    // endregion
 
-    /** Security */
-    implementation(deps.spongecastle.core)
+    // region Runtime
+    runtimeOnly(deps.room.runtime)
+    // endregion
 
-    /** Libs - Other */
-    implementation(deps.jodatime)
-    implementation(deps.androidx.paging.runtime)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-
-    /** Tests */
+    // region Tests
+    testImplementation(deps.test.coroutine)
     testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.coroutine)
     testImplementation(deps.test.truth)
     testImplementation(projects.test.core)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/visa/models/build.gradle.kts b/domain/visa/models/build.gradle.kts
index 9d9560e9a9..a78ad55341 100644
--- a/domain/visa/models/build.gradle.kts
+++ b/domain/visa/models/build.gradle.kts
@@ -6,16 +6,26 @@ plugins {
 }
 
 dependencies {
-    implementation(deps.moshi.kotlin)
+
+    // region Kotlin
+    api(deps.kotlin.serialization)
+    // endregion
+
+    // region Other libraries
+    api(deps.jodatime)
+    api(deps.moshi)
     ksp(deps.moshi.kotlin.codegen)
-    implementation(deps.moshi.adapters)
-    implementation(deps.kotlin.serialization)
-    implementation(deps.jodatime)
-    implementation(projects.core.error)
+    // endregion
 
-    /** Domain models */
+    // region Core modules
+    api(projects.core.error)
+    // endregion
+
+    // region Tangem SDK (derived public keys types for VA activation)
+    api(tangemDeps.card.core)
+    // endregion
+
+    // region Domain models
     implementation(projects.domain.models)
-
-    /** Tangem libraries (derived public keys types for VA activation) */
-    implementation(tangemDeps.card.core)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallet-connect/build.gradle.kts b/domain/wallet-connect/build.gradle.kts
index 6150ebfe15..aaa51802d5 100644
--- a/domain/wallet-connect/build.gradle.kts
+++ b/domain/wallet-connect/build.gradle.kts
@@ -9,23 +9,32 @@ android {
 }
 
 dependencies {
-    /* Project - Domain */
-    implementation(projects.domain.blockaid.models)
+
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.arrow.core)
+    api(tangemDeps.blockchain)
+    api(tangemDeps.card.core)
+    // endregion
+
+    // region Core modules
+    api(projects.core.analytics)
+    api(projects.core.analytics.models)
+    implementation(projects.core.utils)
+    // endregion
+
+    // region Domain
     implementation(projects.domain.core)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.walletConnect.models)
     implementation(projects.domain.transaction)
-    implementation(projects.domain.transaction.models)
+    // endregion
 
-    /* Project - Core */
-    implementation(projects.core.analytics)
-
-    /* Other */
-    implementation(deps.moshi.adapters)
-
-    /* Tangem libraries */
-    implementation(tangemDeps.blockchain)
-    implementation(tangemDeps.card.core)
+    // region Domain models
+    api(projects.domain.blockaid.models)
+    api(projects.domain.models)
+    api(projects.domain.transaction.models)
+    api(projects.domain.walletConnect.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallet-connect/models/build.gradle.kts b/domain/wallet-connect/models/build.gradle.kts
index 0e4052be5f..06fb4ab9ee 100644
--- a/domain/wallet-connect/models/build.gradle.kts
+++ b/domain/wallet-connect/models/build.gradle.kts
@@ -6,17 +6,19 @@ plugins {
 }
 dependencies {
 
-    /* Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.blockaid.models)
-    implementation(projects.domain.transaction.models)
+    // region Kotlin
+    api(deps.kotlin.serialization)
+    // endregion
 
-    /* Other */
-    implementation(deps.moshi)
+    // region Other libraries
+    api(deps.moshi)
     ksp(deps.moshi.kotlin.codegen)
+    // endregion
 
-    /* Utils */
-    implementation(deps.kotlin.serialization)
+    // region Domain models
+    api(projects.domain.blockaid.models)
+    api(projects.domain.models)
+    api(projects.domain.tokens.models)
+    api(projects.domain.transaction.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallet-manager/build.gradle.kts b/domain/wallet-manager/build.gradle.kts
index 162d0c7060..5a73409714 100644
--- a/domain/wallet-manager/build.gradle.kts
+++ b/domain/wallet-manager/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -10,34 +9,32 @@ android {
 }
 
 dependencies {
-    /** Domain models */
-    api(projects.domain.walletManager.models)
 
-    /** Project - Domain */
-    implementation(projects.core.utils)
-    implementation(projects.core.error)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.arrow.core)
+    api(tangemDeps.blockchain)
+    // endregion
+
+    // region Core modules
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain models
     api(projects.domain.models)
-    implementation(projects.domain.core)
-    implementation(projects.domain.demo.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.transaction.models)
-    implementation(projects.domain.txhistory.models)
+    api(projects.domain.transaction.models)
+    api(projects.domain.txhistory.models)
+    api(projects.domain.walletManager.models)
+    // endregion
 
-    /** Tangem libs */
-    implementation(tangemDeps.card.core)
+    // region Libs
+    api(projects.libs.blockchainSdk)
+    // endregion
 
-    /** Libs - Other */
-    implementation(projects.libs.blockchainSdk)
-    implementation(tangemDeps.blockchain)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-
-    /** Testing libraries */
-    testImplementation(deps.test.junit5)
+    // region Tests
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.truth)
-    testImplementation(projects.common.test)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallet-manager/models/build.gradle.kts b/domain/wallet-manager/models/build.gradle.kts
index b02c2d05dc..a1d22984dd 100644
--- a/domain/wallet-manager/models/build.gradle.kts
+++ b/domain/wallet-manager/models/build.gradle.kts
@@ -6,12 +6,13 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.domain.models)
 
-    implementation(deps.moshi.kotlin)
+    // region Other libraries
+    api(deps.moshi)
     ksp(deps.moshi.kotlin.codegen)
-    implementation(deps.moshi.adapters)
-    implementation(deps.kotlin.serialization)
-    implementation(deps.jodatime)
-    implementation(projects.core.error)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallets/build.gradle.kts b/domain/wallets/build.gradle.kts
index 4663162f38..839fe3ad59 100644
--- a/domain/wallets/build.gradle.kts
+++ b/domain/wallets/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.kotlin.kapt)
-    alias(deps.plugins.hilt.android)
     id("configuration")
 }
 
@@ -12,54 +10,56 @@ android {
 
 dependencies {
 
-    // region Core modules
-    implementation(projects.core.res)
-    implementation(projects.core.utils)
-    implementation(projects.core.analytics)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
     // endregion
 
-    // region Domain modules
-    api(projects.domain.core)
-    api(projects.domain.common)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.walletManager)
-    implementation(projects.libs.blockchainSdk)
-    implementation(projects.libs.tangemSdkApi)
-    implementation(projects.domain.account)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.card)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.notifications.models)
-    implementation(projects.domain.demo.models)
-    implementation(projects.domain.hotWallet)
-    implementation(projects.domain.qrScanning)
+    // region Other libraries
+    api(deps.arrow.core)
+    api(tangemDeps.blockchain) // android-library
+    api(tangemDeps.card.core)
+    api(tangemDeps.hot.core)
+    implementation(deps.hilt.android)
     // endregion
 
-    // region Domain modules
-    implementation(projects.domain.qrScanning.models)
-    // endregion
-
-    implementation(projects.common)
-
-    // region Tangem libraries
-    implementation(tangemDeps.blockchain) // android-library
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.hot.core)
-    // endregion
-
-    /** Other libraries */
+    // region Firebase
     implementation(platform(deps.firebase.bom))
     implementation(deps.firebase.analytics)
+    // endregion
 
-    // region DI
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
-    // end
+    // region Core modules
+    api(projects.core.analytics)
+    api(projects.core.analytics.models)
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.account)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.hotWallet)
+    api(projects.domain.walletManager)
+    api(projects.domain.core)
+    implementation(projects.domain.legacy)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.models)
+    api(projects.domain.wallets.models)
+    implementation(projects.domain.demo.models)
+    implementation(projects.domain.notifications.models)
+    // endregion
+
+    // region Libs
+    implementation(projects.libs.blockchainSdk)
+    // endregion
+
+    // region Common
+    implementation(projects.common)
+    // endregion
 
     // region Tests
-    testImplementation(projects.test.core)
     testImplementation(projects.common.test)
-    // end
+    testImplementation(projects.test.core)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/wallets/models/build.gradle.kts b/domain/wallets/models/build.gradle.kts
index 83c2d1f222..057169ab33 100644
--- a/domain/wallets/models/build.gradle.kts
+++ b/domain/wallets/models/build.gradle.kts
@@ -1,25 +1,12 @@
 plugins {
     alias(deps.plugins.kotlin.jvm)
     alias(deps.plugins.kotlin.serialization)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 dependencies {
-    // region Tangem libraries
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.hot.core)
-    // endregion
 
-    // region Domain modules
-    implementation(projects.domain.models)
-    // endregion
-
-    implementation(projects.core.utils)
-
-    // region Other libraries
-    implementation(deps.kotlin.serialization)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
+    // region Domain models
+    api(projects.domain.models)
     // endregion
 }
\ No newline at end of file
diff --git a/domain/yield-supply/build.gradle.kts b/domain/yield-supply/build.gradle.kts
index ed3e4090d9..c231127d3e 100644
--- a/domain/yield-supply/build.gradle.kts
+++ b/domain/yield-supply/build.gradle.kts
@@ -8,35 +8,51 @@ android {
     namespace = "com.tangem.domain.yield.supply"
 }
 dependencies {
-    /** Core */
+
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.arrow.core)
+    api(tangemDeps.blockchain)
+    // endregion
+
+    // region Core modules
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.utils)
+    // endregion
+
+    // region Libs
     implementation(projects.libs.blockchainSdk)
     implementation(projects.libs.crypto)
+    // endregion
 
-    /** Domain */
+    // region Domain
+    api(projects.domain.account)
+    api(projects.domain.blockaid)
+    api(projects.domain.networks)
+    api(projects.domain.quotes)
+    api(projects.domain.transaction)
     implementation(projects.domain.account.status)
-    implementation(projects.domain.models)
-    implementation(projects.domain.yieldSupply.models)
-    implementation(projects.domain.transaction.models)
-    implementation(projects.domain.transaction)
-    implementation(projects.domain.legacy)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.appCurrency.models)
+    api(projects.domain.models)
+    api(projects.domain.transaction.models)
+    api(projects.domain.yieldSupply.models)
     implementation(projects.domain.blockaid.models)
-    implementation(projects.domain.blockaid)
-    implementation(projects.domain.quotes)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.appCurrency.models)
+    // endregion
 
-    /** Tandem SDK */
-    implementation(tangemDeps.blockchain)
-
-    /** Other */
-    implementation(deps.arrow.core)
-
-    /** tests */
-    testImplementation(projects.test.core)
-    testImplementation(deps.test.junit5)
+    // region Tests
+    testRuntimeOnly(projects.domain.tokens)
+    testImplementation(deps.kotlin.datetime)
     testImplementation(deps.test.coroutine)
-    testImplementation(deps.test.truth)
+    testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
+    testImplementation(deps.test.truth)
+    testImplementation(projects.domain.legacy)
+    testImplementation(projects.test.core)
+    // endregion
 }
\ No newline at end of file
diff --git a/domain/yield-supply/models/build.gradle.kts b/domain/yield-supply/models/build.gradle.kts
index faf3c29745..e13d433f40 100644
--- a/domain/yield-supply/models/build.gradle.kts
+++ b/domain/yield-supply/models/build.gradle.kts
@@ -5,12 +5,14 @@ plugins {
 }
 
 dependencies {
-    // region Domain modules
-    api(projects.domain.models)
+
+    // region Kotlin
+    api(deps.kotlin.datetime)
+    api(deps.kotlin.serialization)
     // endregion
 
-    // region Other libraries
-    implementation(deps.kotlin.serialization)
-    api(deps.kotlin.datetime)
+    // region Domain models
+    api(projects.domain.models)
+    // endregion
 }