From ef30c91181a35c749639e8dcb342f2e0db454b5d Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 4 Dec 2023 14:48:04 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../core/ui/components/bottomsheets/TangemBottomSheet.kt | 2 +- data/analytics/.gitignore | 2 +- .../kotlin/com/tangem/data/tokens/di/TokensDataModule.kt | 1 + .../com/tangem/feature/swap/domain/SwapInteractorImpl.kt | 6 +++--- .../com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt | 2 +- .../ui/components/exchange/ExchangeStatusBottomSheet.kt | 2 +- .../tokendetails/viewmodels/TokenDetailsViewModel.kt | 1 - 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt index 9761a6b1dd..7627f60b0e 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt @@ -33,7 +33,7 @@ inline fun TangemBottomSheet( sheetState = sheetState, containerColor = contentColor, shape = TangemTheme.shapes.bottomSheetLarge, - dragHandle = { TangemBottomSheetDraggableHeader(color) }, + dragHandle = { TangemBottomSheetDraggableHeader(contentColor) }, ) { content(config.content) } diff --git a/data/analytics/.gitignore b/data/analytics/.gitignore index 3a48006eea..796b96d1c4 100644 --- a/data/analytics/.gitignore +++ b/data/analytics/.gitignore @@ -1 +1 @@ -/buld +/build diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt index 525a53a01e..db088b565c 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt +++ b/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 diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index 447edd8665..85be41f3bb 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/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() diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt index cf5fa35a88..2dd33c473f 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt +++ b/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) } diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/exchange/ExchangeStatusBottomSheet.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/exchange/ExchangeStatusBottomSheet.kt index f02ca3d0a7..1f047b8f60 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/exchange/ExchangeStatusBottomSheet.kt +++ b/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) } diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt index b4173d44bf..7d2d6a2019 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt +++ b/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,