From e35a99dbb018fe52a08cefa477019cbde1c711bb Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 17 Nov 2023 14:13:47 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../com/tangem/tap/features/home/compose/views/HomeButtons.kt | 4 ++-- app/src/main/res/values-night/colors.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt index 1bd1a192c6..aebf48b161 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt @@ -73,9 +73,9 @@ private fun OrderCardButton(onClick: () -> Unit, modifier: Modifier = Modifier) } private val LightBgScanCardButtonColors: ButtonColors = TangemButtonColors( - backgroundColor = TangemColorPalette.Light2, + backgroundColor = TangemColorPalette.Light4, contentColor = TangemColorPalette.Dark6, - disabledBackgroundColor = TangemColorPalette.Light2, + disabledBackgroundColor = TangemColorPalette.Dark5, disabledContentColor = TangemColorPalette.Dark6, ) diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 29535c674f..7b2c91dd38 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -10,7 +10,7 @@ #303030 - #F5F5F5 + #FFC9C9C9 #303030 #1ACE80 From dd4cb6eb52bd11743acb02daa27c203adb6868f4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 17 Nov 2023 14:35:14 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../presentation/viewmodels/AddCustomTokenViewModel.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt index d29e81ad9e..b1f939c0f6 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt @@ -602,10 +602,13 @@ internal class AddCustomTokenViewModel @Inject constructor( val networkSelectorValue = uiState.form.networkSelectorField.selectedItem.blockchain val networkId = Blockchain.fromNetworkId(networkSelectorValue.toNetworkId())?.id - // todo after move foundToken to CryptoCurrency model, use only id - val savedTokenId = if (token.isCustom) null else token.id.rawCurrencyId + val sameId = if (!token.isCustom) { + // todo after move foundToken to CryptoCurrency model, use only id + foundToken?.id == token.id.rawCurrencyId + } else { + true + } - val sameId = foundToken?.id == savedTokenId val sameAddress = contractAddress.equals(token.contractAddress, ignoreCase = true) val sameBlockchain = networkId == token.network.id.value val isSameDerivationPath = getDerivationPath()?.rawPath == token.network.derivationPath.value From 397d643fa0204c9358dcbeb432934a3c1185d925 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 17 Nov 2023 14:34:26 +0300 Subject: [PATCH 3/3] Updated on 2026-08-14 --- .../com/tangem/tap/features/send/ui/SendViewModel.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt index 4d9bdb266a..de5e810b88 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt @@ -2,7 +2,6 @@ package com.tangem.tap.features.send.ui import androidx.lifecycle.* import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase -import com.tangem.domain.balancehiding.ListenToFlipsUseCase import com.tangem.domain.tokens.FetchPendingTransactionsUseCase import com.tangem.domain.tokens.UpdateDelayedNetworkStatusUseCase import com.tangem.domain.tokens.model.CryptoCurrency @@ -16,7 +15,6 @@ import com.tangem.tap.proxy.AppStateHolder import com.tangem.utils.coroutines.CoroutineDispatcherProvider import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -30,7 +28,6 @@ internal class SendViewModel @Inject constructor( private val dispatchers: CoroutineDispatcherProvider, private val appStateHolder: AppStateHolder, private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase, - private val listenToFlipsUseCase: ListenToFlipsUseCase, private val updateDelayedCurrencyStatusUseCase: UpdateDelayedNetworkStatusUseCase, private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase, private val fetchPendingTransactionsUseCase: FetchPendingTransactionsUseCase, @@ -48,12 +45,6 @@ internal class SendViewModel @Inject constructor( } .flowOn(dispatchers.main) .launchIn(viewModelScope) - - viewModelScope.launch(dispatchers.main) { - listenToFlipsUseCase() - .flowWithLifecycle(owner.lifecycle) - .collect() - } } fun updateCurrencyDelayed() {