From 01f7a64b0b81df8a92b2f8941cd19e0f47621c26 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Nov 2023 12:27:10 +0300 Subject: [PATCH 1/5] Updated on 2026-08-14 --- .../impl/presentation/viewmodels/AddCustomTokenViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a38a59439..d29e81ad9e 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 @@ -606,7 +606,7 @@ internal class AddCustomTokenViewModel @Inject constructor( val savedTokenId = if (token.isCustom) null else token.id.rawCurrencyId val sameId = foundToken?.id == savedTokenId - val sameAddress = contractAddress == token.contractAddress + val sameAddress = contractAddress.equals(token.contractAddress, ignoreCase = true) val sameBlockchain = networkId == token.network.id.value val isSameDerivationPath = getDerivationPath()?.rawPath == token.network.derivationPath.value From 01800949ab8ac57a31ea22e9bd4386475a8b12f8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Nov 2023 12:27:31 +0300 Subject: [PATCH 2/5] Updated on 2026-08-14 --- core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt index db286e6d51..93dae822ba 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt @@ -156,7 +156,7 @@ private fun darkThemeColors(): TangemColors { attention = TangemColorPalette.Mustard, ), button = TangemColors.Button( - primary = TangemColorPalette.Light1, + primary = TangemColorPalette.Light4, secondary = TangemColorPalette.Dark5, disabled = TangemColorPalette.Dark5, positiveDisabled = TangemColorPalette.DarkGreen, From ff1da9629ff357ac34dad95d267da244afeca8e2 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Nov 2023 16:02:10 +0800 Subject: [PATCH 3/5] Updated on 2026-08-14 --- .../bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt index b9dc31d04f..704418b5ec 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt @@ -2,9 +2,7 @@ package com.tangem.core.ui.components.bottomsheets.tokenreceive import android.widget.Toast import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.Image -import androidx.compose.foundation.background +import androidx.compose.foundation.* import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.rememberLazyListState @@ -43,6 +41,7 @@ private fun TokenReceiveBottomSheetContent(content: TokenReceiveBottomSheetConfi var selectedAddress by remember { mutableStateOf(content.addresses.first()) } Column( modifier = Modifier + .verticalScroll(state = rememberScrollState()) .padding( start = TangemTheme.dimens.spacing24, top = TangemTheme.dimens.spacing24, From af5e1b0eb1d48cd3749e6b8f388e4d5e296bd805 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Nov 2023 18:14:08 +0500 Subject: [PATCH 4/5] Updated on 2026-08-14 --- gradle/dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index ee032b368e..6b1a2ec671 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.2-388" +tangemBlockchainSdk = "release-app_5.2-389" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.2-311" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds From 4aeca2c72ea97495032fa1b8872aea312a186481 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Nov 2023 21:37:36 +0800 Subject: [PATCH 5/5] Updated on 2026-08-14 --- .../presentation/common/component/TokenItem.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt index ac0fac75db..9a3d17502f 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt @@ -45,13 +45,18 @@ internal fun TokenItem( .tokenClickable(state = state) .background(color = TangemTheme.colors.background.primary), ) { - TokenIcon(state = state.iconState, modifier = Modifier.layoutId(layoutId = LayoutId.ICON)) + TokenIcon( + state = state.iconState, + modifier = Modifier + .layoutId(layoutId = LayoutId.ICON) + .padding(end = TangemTheme.dimens.spacing8), + ) TokenTitle( state = state.titleState, modifier = Modifier .layoutId(layoutId = LayoutId.TITLE) - .padding(horizontal = TangemTheme.dimens.spacing8) + .padding(end = TangemTheme.dimens.spacing8) .padding(bottom = betweenRowsMargin), ) @@ -67,7 +72,7 @@ internal fun TokenItem( state = state.cryptoPriceState, modifier = Modifier .layoutId(layoutId = LayoutId.CRYPTO_PRICE) - .padding(horizontal = TangemTheme.dimens.spacing8), + .padding(end = TangemTheme.dimens.spacing8), ) TokenCryptoAmount( @@ -233,7 +238,10 @@ private fun CustomContainer(state: TokenItemState, modifier: Modifier = Modifier ) cryptoAmount?.placeRelative( - x = layoutWidth - cryptoAmount.width - layoutPadding, + x = when (state) { + is TokenItemState.Draggable -> layoutPadding + icon.width + else -> layoutWidth - cryptoAmount.width - layoutPadding + }, y = layoutHeight - cryptoAmount.height - layoutPadding, )