Updated on 2026-08-14

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt

@@ -33,7 +33,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> TangemBottomSheet(
             sheetState = sheetState,
             containerColor = contentColor,
             shape = TangemTheme.shapes.bottomSheetLarge,
-            dragHandle = { TangemBottomSheetDraggableHeader(color) },
+            dragHandle = { TangemBottomSheetDraggableHeader(contentColor) },
         ) {
             content(config.content)
         }

data/analytics/.gitignore

@@ -1 +1 @@
-/buld
+/build

data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt

@@ -2,6 +2,7 @@ package com.tangem.data.tokens.di
 
 import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.tokens.repository.*
+import com.tangem.datasource.api.express.TangemExpressApi
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.network.NetworksStatusesStore
 import com.tangem.datasource.local.preferences.AppPreferencesStore

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt

@@ -468,7 +468,7 @@ internal class SwapInteractorImpl @Inject constructor(
             toDecimals = currencyToGet.currency.decimals,
             providerId = swapProvider.providerId,
             rateType = RateType.FLOAT,
-            toAddress = currencyToGet.value.networkAddress?.defaultAddress ?: "",
+            toAddress = currencyToGet.value.networkAddress?.defaultAddress?.value ?: "",
         )
 
         val txData = walletManagersFacade.createTransaction(
@@ -804,7 +804,7 @@ internal class SwapInteractorImpl @Inject constructor(
             toDecimals = toToken.currency.decimals,
             providerId = provider.providerId,
             rateType = RateType.FLOAT,
-            toAddress = toToken.value.networkAddress?.defaultAddress ?: "",
+            toAddress = toToken.value.networkAddress?.defaultAddress?.value ?: "",
         ).let {
             val swapData = it.dataModel
             if (swapData != null) {
@@ -911,7 +911,7 @@ internal class SwapInteractorImpl @Inject constructor(
         getSelectedWalletSyncUseCase().getOrNull()?.walletId?.let { userWalletId ->
             val txFeeResult = getFeeUseCase(
                 amount = amount.value,
-                destination = fromToken.value.networkAddress?.defaultAddress ?: "",
+                destination = fromToken.value.networkAddress?.defaultAddress?.value ?: "",
                 userWalletId = userWalletId,
                 cryptoCurrency = fromToken.currency,
             ).firstOrNull()

features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt

@@ -25,7 +25,7 @@ import kotlinx.collections.immutable.toImmutableList
 fun ChooseProviderBottomSheet(config: TangemBottomSheetConfig) {
     TangemBottomSheet(
         config = config,
-        color = TangemTheme.colors.background.tertiary,
+        contentColor = TangemTheme.colors.background.tertiary,
     ) { content: ChooseProviderBottomSheetConfig ->
         ChooseProviderBottomSheetContent(content = content)
     }

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/exchange/ExchangeStatusBottomSheet.kt

@@ -27,7 +27,7 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.state.SwapTrans
 internal fun ExchangeStatusBottomSheet(config: TangemBottomSheetConfig) {
     TangemBottomSheet(
         config = config,
-        color = TangemTheme.colors.background.tertiary,
+        contentColor = TangemTheme.colors.background.tertiary,
     ) { content: ExchangeStatusBottomSheetConfig ->
         ExchangeStatusBottomSheetContent(content = content)
     }

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt

@@ -77,7 +77,6 @@ internal class TokenDetailsViewModel @Inject constructor(
     private val getMultiCryptoCurrencyStatusUseCase: GetCryptoCurrencyStatusesSyncUseCase,
     private val swapRepository: SwapRepository,
     private val swapTransactionRepository: SwapTransactionRepository,
-    private val walletManagersFacade: WalletManagersFacade,
     private val isDemoCardUseCase: IsDemoCardUseCase,
     private val reduxStateHolder: ReduxStateHolder,
     private val analyticsEventsHandler: AnalyticsEventHandler,