From 47f1ccb8545de2dd5bc42cfc20a8c8df072c4b2b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 2 Jul 2026 13:53:12 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 data/manage-tokens/build.gradle.kts           | 71 +++++++-------
 data/markets/build.gradle.kts                 | 62 ++++++------
 data/networks/build.gradle.kts                | 52 +++++-----
 data/news/build.gradle.kts                    | 33 +++----
 data/nft/build.gradle.kts                     | 75 ++++++++-------
 data/notifications/build.gradle.kts           | 32 +++----
 data/onboarding/build.gradle.kts              | 12 ++-
 data/payment/build.gradle.kts                 | 41 +-------
 .../build.gradle.kts                          | 38 ++++----
 data/qr-scanning/build.gradle.kts             | 36 ++++---
 data/quotes/build.gradle.kts                  | 42 ++++----
 data/search/build.gradle.kts                  | 35 +++----
 data/settings/build.gradle.kts                | 32 ++++---
 data/staking/build.gradle.kts                 | 96 ++++++++++---------
 data/stories/build.gradle.kts                 | 26 +++--
 15 files changed, 361 insertions(+), 322 deletions(-)

diff --git a/data/manage-tokens/build.gradle.kts b/data/manage-tokens/build.gradle.kts
index fa149015fa..d9a8abba65 100644
--- a/data/manage-tokens/build.gradle.kts
+++ b/data/manage-tokens/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -13,44 +12,52 @@ android {
 }
 
 dependencies {
-    /** Libs */
-    implementation(projects.libs.crypto)
 
-    /** Project - Domain */
-    implementation(projects.domain.account)
-    implementation(projects.domain.demo)
-    implementation(projects.domain.models)
-    implementation(projects.domain.manageTokens)
-    implementation(projects.domain.card)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.legacy)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Data */
-    implementation(projects.core.datasource)
-    implementation(projects.data.common)
-    implementation(projects.data.tokens)
+    // region Other libraries
+    implementation(deps.arrow.core)
+    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // endregion
 
-    /** Project - Utils */
-    implementation(projects.core.utils)
-    implementation(projects.core.pagination)
-    implementation(projects.domain.legacy)
-    implementation(projects.libs.blockchainSdk)
-
-    /** Tangem SDKs */
+    // region Tangem SDKs
     implementation(tangemDeps.blockchain)
     implementation(tangemDeps.card.core)
+    // endregion
 
-    /** AndroidX */
-    implementation(deps.androidx.datastore)
-
-    /** DI */
+    // region DI
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Other */
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.pagination)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    runtimeOnly(projects.data.tokens)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.common)
+    api(projects.domain.manageTokens)
+    implementation(projects.domain.card)
+    implementation(projects.domain.models)
+    implementation(projects.domain.wallets)
+    runtimeOnly(projects.domain.account)
+    // endregion
+
+    // region Project - Domain models
+    implementation(projects.domain.manageTokens.models)
+    // endregion
+
+    // region Project - Libs
+    api(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/markets/build.gradle.kts b/data/markets/build.gradle.kts
index bce4fe8a70..b7cace4d18 100644
--- a/data/markets/build.gradle.kts
+++ b/data/markets/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.hilt.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -14,39 +13,48 @@ android {
 }
 
 dependencies {
-    /** Libs */
-    implementation(projects.libs.crypto)
 
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-    implementation(projects.core.pagination)
-    implementation(projects.core.analytics)
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.configToggles)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.markets)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.tokens)
-
-    implementation(projects.data.common)
-
-    implementation(projects.libs.blockchainSdk)
+    // region Other libraries
+    implementation(deps.arrow.core)
+    implementation(deps.jodatime)
+    implementation(tangemDeps.blockchain)
+    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // endregion
 
     // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Others dependencies
-    implementation(deps.androidx.datastore)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.jodatime)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
-    implementation(tangemDeps.blockchain)
-    ksp(deps.moshi.kotlin.codegen)
-    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // region Core modules
+    api(projects.core.analytics)
+    api(projects.core.analytics.models)
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.pagination)
+    // endregion
+
+    // region Data
+    api(projects.data.common)
+    // endregion
+
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.markets)
+    implementation(projects.domain.models)
+    runtimeOnly(projects.domain.tokens)
+    // endregion
+
+    // region Domain models
+    implementation(projects.domain.markets.models)
+    // endregion
+
+    // region Libs
+    api(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
     // endregion
 }
diff --git a/data/networks/build.gradle.kts b/data/networks/build.gradle.kts
index 9d038aa71b..4adc467f72 100644
--- a/data/networks/build.gradle.kts
+++ b/data/networks/build.gradle.kts
@@ -9,27 +9,18 @@ android {
     namespace = "com.tangem.data.networks"
 }
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    implementation(projects.data.dynamicAddresses)
+    // region Other libraries
+    api(deps.moshi)
+    implementation(deps.androidx.datastore)
+    implementation(deps.arrow.core)
     // endregion
 
-    // region Project - Domain
-    implementation(projects.domain.card)
-    implementation(projects.domain.common)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.models)
-    implementation(projects.domain.networks)
-    implementation(projects.domain.walletManager)
-    // endregion
-
-    // region Project - Libs
-    implementation(projects.libs.blockchainSdk)
+    // region Project - Libs (SDK)
     implementation(tangemDeps.blockchain) { exclude(module = "joda-time") }
     // endregion
 
@@ -38,15 +29,32 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Other libraries
-    implementation(deps.androidx.datastore)
-    implementation(deps.moshi)
+    // region Project - Core
+    api(projects.core.utils)
+    implementation(projects.core.datasource)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    api(projects.data.dynamicAddresses)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.common)
+    api(projects.domain.core)
+    api(projects.domain.models)
+    api(projects.domain.networks)
+    api(projects.domain.walletManager)
+    runtimeOnly(projects.domain.card)
+    // endregion
+
+    // region Project - Libs
+    api(projects.libs.blockchainSdk)
     // endregion
 
     // region Tests
-    testImplementation(tangemDeps.blockchain)
-    testImplementation(tangemDeps.card.core)
     testImplementation(projects.common.test)
+    testImplementation(projects.domain.card)
     testImplementation(projects.test.core)
     // endregion
 }
\ No newline at end of file
diff --git a/data/news/build.gradle.kts b/data/news/build.gradle.kts
index 801dc276a5..7c929344da 100644
--- a/data/news/build.gradle.kts
+++ b/data/news/build.gradle.kts
@@ -9,21 +9,13 @@ android {
     namespace = "com.tangem.data.news"
 }
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    api(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Domain
-    implementation(projects.domain.news)
-    // endregion
-
-    // region Project - Libs
-    implementation(projects.libs.blockchainSdk)
+    // region Other libraries
+    implementation(deps.arrow.core)
     // endregion
 
     // region DI
@@ -31,16 +23,19 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Other libraries
-    implementation(deps.androidx.datastore)
-    implementation(deps.moshi.kotlin)
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.pagination)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.news)
+    implementation(projects.domain.models)
     // endregion
 
     // region Tests
     testImplementation(deps.test.coroutine)
-    testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.truth)
-    testImplementation(projects.common.test)
     // endregion
 }
\ No newline at end of file
diff --git a/data/nft/build.gradle.kts b/data/nft/build.gradle.kts
index 980501de77..4f9f268fb9 100644
--- a/data/nft/build.gradle.kts
+++ b/data/nft/build.gradle.kts
@@ -4,55 +4,60 @@ plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 android {
     namespace = "com.tangem.data.nft"
 }
+
 dependencies {
 
-    /** Project - Data */
-    implementation(projects.core.datasource)
-    implementation(projects.data.common)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Domain */
+    // region Other libraries
+    implementation(deps.arrow.core)
+    implementation(deps.arrow.fx)
+    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // endregion
+
+    // region Libs - Tangem
+    implementation(tangemDeps.blockchain)
+    // endregion
+
+    // region DI
+    implementation(deps.hilt.android)
+    kapt(deps.hilt.kapt)
+    // endregion
+
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.common)
+    api(projects.domain.walletManager)
     implementation(projects.domain.card)
-    implementation(projects.domain.common)
     implementation(projects.domain.models)
     implementation(projects.domain.nft)
     implementation(projects.domain.nft.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.wallets.models)
+    // endregion
 
-    /** Project - Utils */
-    implementation(projects.core.utils)
-    implementation(projects.domain.legacy)
-    implementation(projects.libs.blockchainSdk)
+    // region Project - Libs
+    api(projects.libs.blockchainSdk)
+    // endregion
 
-    /** Feature Api modules */
-    implementation(projects.features.nft.api)
-
-    /** Libs - Other */
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.arrow.core)
-    implementation(deps.arrow.fx)
-    implementation(deps.jodatime)
-    implementation(deps.androidx.paging.runtime)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
-
-    /** Libs - Tangem */
-    implementation(tangemDeps.blockchain)
-    implementation(tangemDeps.card.core)
-
-    /** DI */
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
-
-    testImplementation(projects.test.core)
+    // region Tests
+    testImplementation(deps.test.coroutine)
+    testImplementation(deps.test.junit5)
+    testImplementation(deps.test.mockk)
     testImplementation(projects.common.test)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts
index a0aeddb8c9..c9de88f354 100644
--- a/data/notifications/build.gradle.kts
+++ b/data/notifications/build.gradle.kts
@@ -10,13 +10,19 @@ android {
 }
 
 dependencies {
-    // region sdk
-    implementation(tangemDeps.blockchain)
+
+    // region Kotlin
+    api(deps.kotlin.coroutines)
     // endregion
 
-    // region AndroidX libraries
+    // region Other libraries
     implementation(deps.androidx.datastore)
-    implementation(deps.kotlin.coroutines)
+    implementation(deps.arrow.core)
+    implementation(deps.moshi)
+    // endregion
+
+    // region SDK
+    implementation(tangemDeps.blockchain)
     // endregion
 
     // region DI
@@ -24,29 +30,23 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Arrow
-    implementation(deps.arrow.core)
-    // endregion
-
     // region Core modules
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-    implementation(projects.core.ui)
+    api(projects.core.datasource)
+    api(projects.core.utils)
     implementation(projects.common.ui)
     implementation(projects.libs.blockchainSdk)
     // endregion
 
     // region Domain modules
+    api(projects.domain.notifications)
+    implementation(projects.domain.models)
     implementation(projects.domain.notifications.models)
-    implementation(projects.domain.notifications)
     // endregion
 
     // region tests
-    testImplementation(deps.test.junit5)
     testImplementation(deps.test.coroutine)
-    testImplementation(deps.test.truth)
+    testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.moshi)
-    testImplementation(deps.moshi.kotlin)
+    testImplementation(deps.test.truth)
     // endregion
 }
\ No newline at end of file
diff --git a/data/onboarding/build.gradle.kts b/data/onboarding/build.gradle.kts
index 2f080f54bd..08c4e2685a 100644
--- a/data/onboarding/build.gradle.kts
+++ b/data/onboarding/build.gradle.kts
@@ -11,8 +11,13 @@ android {
 
 dependencies {
 
-    // region AndroidX libraries
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
     implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
     // endregion
 
     // region DI
@@ -21,11 +26,12 @@ dependencies {
     // endregion
 
     // region Core modules
-    implementation(projects.core.datasource)
+    api(projects.core.datasource)
+    implementation(projects.core.utils)
     // endregion
 
     // region Domain modules
-    implementation(projects.domain.onboarding)
+    api(projects.domain.onboarding)
     implementation(projects.domain.models)
     // endregion
 }
\ No newline at end of file
diff --git a/data/payment/build.gradle.kts b/data/payment/build.gradle.kts
index f6ecd6bd5d..0e80ddee1f 100644
--- a/data/payment/build.gradle.kts
+++ b/data/payment/build.gradle.kts
@@ -1,48 +1,9 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
-    alias(deps.plugins.kotlin.kapt)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 android {
     namespace = "com.tangem.data.payment"
-}
-
-dependencies {
-    /** Project - Data */
-    implementation(projects.core.error)
-    implementation(projects.core.error.ext)
-    implementation(projects.data.common)
-    implementation(projects.data.wallets)
-
-    /** Project - Domain */
-    implementation(projects.domain.payment)
-    implementation(projects.domain.payment.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.models)
-    implementation(projects.domain.common)
-
-    /** Project - Utils */
-    implementation(projects.core.utils)
-    implementation(projects.domain.legacy)
-    implementation(projects.libs.blockchainSdk)
-
-    /** Libs - Tangem */
-    implementation(tangemDeps.blockchain)
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.card.android)
-    implementation(tangemDeps.hot.core)
-    implementation(projects.libs.tangemSdkApi)
-
-    /** Libs - Other */
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.arrow.core)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-
-    /** DI */
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
-}
+}
\ No newline at end of file
diff --git a/data/push-notification-preferences/build.gradle.kts b/data/push-notification-preferences/build.gradle.kts
index 5911dc2475..324ee965fe 100644
--- a/data/push-notification-preferences/build.gradle.kts
+++ b/data/push-notification-preferences/build.gradle.kts
@@ -11,29 +11,35 @@ android {
 }
 
 dependencies {
-    /** Domain */
-    implementation(projects.domain.pushNotificationPreferences)
-    implementation(projects.domain.models)
 
-    /** Core */
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-
-    /** Other */
-    implementation(deps.androidx.datastore)
-    implementation(deps.arrow.core)
+    // region Kotlin
     implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** DI */
+    // region Other libraries
+    implementation(deps.arrow.core)
+    // endregion
+
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Tests */
-    testImplementation(deps.test.junit5)
+    // region Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.pushNotificationPreferences)
+    implementation(projects.domain.models)
+    // endregion
+
+    // region Tests
     testImplementation(deps.test.coroutine)
-    testImplementation(deps.test.truth)
+    testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
+    testImplementation(deps.test.truth)
     testImplementation(deps.test.turbine)
-    testImplementation(deps.moshi)
-    testImplementation(deps.moshi.kotlin)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/qr-scanning/build.gradle.kts b/data/qr-scanning/build.gradle.kts
index b8627af56e..b342c2bc81 100644
--- a/data/qr-scanning/build.gradle.kts
+++ b/data/qr-scanning/build.gradle.kts
@@ -12,25 +12,37 @@ android {
 
 dependencies {
 
-    /** Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.qrScanning)
-    implementation(projects.domain.qrScanning.models)
-    implementation(projects.domain.tokens.models)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    implementation(projects.core.ui)
-    implementation(projects.libs.blockchainSdk)
-
-    /** SdK */
+    // region SDK
     implementation(tangemDeps.blockchain)
+    // endregion
 
-    /** DI */
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Tests */
-    testImplementation(deps.test.junit5)
+    // region Core modules
+    implementation(projects.core.ui)
+    // endregion
+
+    // region Domain
+    api(projects.domain.qrScanning)
+    implementation(projects.domain.models)
+    implementation(projects.domain.qrScanning.models)
+    // endregion
+
+    // region Libs
+    implementation(projects.libs.blockchainSdk)
+    // endregion
+
+    // region Tests
     testImplementation(deps.test.coroutine)
+    testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
     testImplementation(deps.test.truth)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/quotes/build.gradle.kts b/data/quotes/build.gradle.kts
index 8b02a3dfae..8dcfda655e 100644
--- a/data/quotes/build.gradle.kts
+++ b/data/quotes/build.gradle.kts
@@ -9,22 +9,20 @@ android {
     namespace = "com.tangem.data.quotes"
 }
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    api(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
+    // region Other libraries
+    api(deps.moshi)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.datastore)
+    implementation(deps.arrow.core)
     // endregion
 
-    // region Project - Domain
-    api(projects.domain.models)
-    api(projects.domain.quotes)
-    // endregion
-
-    // region Project - Libs
-    implementation(projects.libs.blockchainSdk)
+    // region Tangem SDKs
+    implementation(tangemDeps.blockchain)
     // endregion
 
     // region DI
@@ -32,13 +30,23 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Tangem SDKs
-    implementation(tangemDeps.blockchain)
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
     // endregion
 
-    // region Other libraries
-    implementation(deps.androidx.datastore)
-    implementation(deps.moshi.kotlin)
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.core)
+    api(projects.domain.quotes)
+    implementation(projects.domain.models)
+    // endregion
+
+    // region Project - Libs
+    implementation(projects.libs.blockchainSdk)
     // endregion
 
     // region Tests
diff --git a/data/search/build.gradle.kts b/data/search/build.gradle.kts
index 96eb497c11..fcda33e6c6 100644
--- a/data/search/build.gradle.kts
+++ b/data/search/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -10,22 +11,15 @@ android {
 }
 
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    api(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Domain
-    implementation(projects.domain.search)
-    implementation(projects.domain.common)
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.markets.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.appCurrency)
+    // region Other libraries
+    api(deps.androidx.datastore)
+    api(deps.moshi)
+    ksp(deps.moshi.kotlin.codegen)
     // endregion
 
     // region DI
@@ -33,8 +27,15 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Other libraries
-    implementation(deps.androidx.datastore)
-    implementation(deps.moshi.kotlin)
+    // region Project - Core
+    api(projects.core.utils)
+    implementation(projects.core.datasource)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.account.status)
+    api(projects.domain.common)
+    api(projects.domain.search)
+    implementation(projects.domain.models)
     // endregion
 }
\ No newline at end of file
diff --git a/data/settings/build.gradle.kts b/data/settings/build.gradle.kts
index 7e15b66fe2..eb43f9113e 100644
--- a/data/settings/build.gradle.kts
+++ b/data/settings/build.gradle.kts
@@ -5,38 +5,40 @@ plugins {
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.hilt.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 android {
     namespace = "com.tangem.data.settings"
 }
+
 dependencies {
 
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-
-    implementation(projects.domain.balanceHiding.models)
-    implementation(projects.domain.settings)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
+    // region Others dependencies
+    implementation(deps.androidx.core)
     implementation(deps.androidx.datastore)
+    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // endregion
 
     // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
     // endregion
 
+    // region Core modules
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.settings)
+    // endregion
+
     // region Test
     testImplementation(projects.test.core)
     // endregion
-
-    // region Others dependencies
-    implementation(deps.jodatime)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
-    ksp(deps.moshi.kotlin.codegen)
-    kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
-    // endregion
 }
diff --git a/data/staking/build.gradle.kts b/data/staking/build.gradle.kts
index 54aedfa1ae..59b9aff0d7 100644
--- a/data/staking/build.gradle.kts
+++ b/data/staking/build.gradle.kts
@@ -5,66 +5,76 @@ plugins {
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.hilt.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
 android {
     namespace = "com.tangem.data.staking"
 }
+
 dependencies {
-    /** Core modules */
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-
-    /** Common modules */
-    implementation(projects.data.common)
-
-    /** Domain modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.staking)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.card)
-    implementation(projects.domain.models)
-
-    /** Feature Api modules */
-    implementation(projects.features.staking.api)
-
-    // region DI
-
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
 
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    implementation(deps.kotlin.datetime)
     // endregion
 
-    // region Others dependencies
-
-    implementation(deps.androidx.datastore)
-    implementation(deps.jodatime)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.kotlin.datetime)
-    implementation(deps.kotlin.immutable.collections)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
+    // region Other libraries
+    api(deps.androidx.datastore)
+    api(deps.moshi)
+    implementation(deps.arrow.core)
     implementation(deps.firebase.crashlytics)
-    ksp(deps.moshi.kotlin.codegen)
+    implementation(deps.jodatime)
+    implementation(deps.kotlin.immutable.collections)
     kaptForObfuscatingVariants(deps.retrofit.response.type.keeper)
+    // endregion
 
-    implementation(projects.libs.blockchainSdk)
-    implementation(projects.libs.crypto)
-
-    implementation(tangemDeps.card.core)
+    // region Tangem SDK
     implementation(tangemDeps.blockchain) {
         exclude(module = "joda-time")
     }
-
+    implementation(tangemDeps.card.core)
     // endregion
 
-    testImplementation(tangemDeps.card.core)
+    // region DI
+    implementation(deps.hilt.android)
+    kapt(deps.hilt.kapt)
+    // endregion
+
+    // region Core modules
+    api(projects.core.analytics)
+    api(projects.core.configToggles)
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.analytics.models)
+    // endregion
+
+    // region Data
+    implementation(projects.data.common)
+    // endregion
+
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.core)
+    api(projects.domain.models)
+    api(projects.domain.staking)
+    api(projects.domain.walletManager)
+    api(projects.domain.wallets)
+    implementation(projects.domain.card)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.staking.models)
+    implementation(projects.domain.wallets.models)
+    // endregion
+
+    // region Libs
+    implementation(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
+    // endregion
+
+    // region Tests
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
-}
+    // endregion
+}
\ No newline at end of file
diff --git a/data/stories/build.gradle.kts b/data/stories/build.gradle.kts
index 95fa9bc8ff..22e136681e 100644
--- a/data/stories/build.gradle.kts
+++ b/data/stories/build.gradle.kts
@@ -11,17 +11,27 @@ android {
 }
 
 dependencies {
-    implementation(deps.androidx.datastore)
 
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    implementation(deps.androidx.datastore)
+    // endregion
+
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    implementation(projects.domain.stories)
+    // region Core modules
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.stories)
     implementation(projects.domain.stories.models)
-    api(projects.domain.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.features.referral.domain)
-
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
+    // endregion
 }
\ No newline at end of file