From f14216de94784e9cba328beda42855454ad7ca57 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 6 Dec 2023 15:28:07 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../com/tangem/feature/swap/ui/TransactionCard.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt index 258e8f5ddf..18d89a4d06 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt @@ -262,14 +262,12 @@ private fun Content( } } is TransactionCardType.SendCard -> { - AnimatedContent(targetState = textFieldValue, label = "") { - AutoSizeTextField( - modifier = sumTextModifier, - textFieldValue = it ?: TextFieldValue(), - onAmountChange = { type.onAmountChanged(it) }, - onFocusChange = type.onFocusChanged, - ) - } + AutoSizeTextField( + modifier = sumTextModifier, + textFieldValue = textFieldValue ?: TextFieldValue(), + onAmountChange = { type.onAmountChanged(it) }, + onFocusChange = type.onFocusChanged, + ) } } From 8424eb2464721dcdbb2f0ed895e8c61b42f0c26e Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 6 Dec 2023 15:29:11 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../presentation/tokendetails/state/SwapTransactionsState.kt | 2 +- .../factory/TokenDetailsSwapTransactionsStateConverter.kt | 4 ++-- .../ui/components/exchange/ExchangeStatusBottomSheet.kt | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/SwapTransactionsState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/SwapTransactionsState.kt index 11d4b21719..5e42550ab6 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/SwapTransactionsState.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/SwapTransactionsState.kt @@ -29,7 +29,7 @@ internal data class SwapTransactionsState( val fromFiatAmount: String, val fromCurrencyIcon: TokenIconState, val onClick: () -> Unit, - val onGoToProviderClick: () -> Unit, + val onGoToProviderClick: (String) -> Unit, ) internal class ExchangeStatusState( diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt index 1c53790afa..0c6b75dfed 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt @@ -96,11 +96,11 @@ internal class TokenDetailsSwapTransactionsStateConverter( fromFiatAmount = getFiatAmount(fromFiatAmount), fromCurrencyIcon = iconStateConverter.convert(fromCurrency), onClick = { clickIntents.onSwapTransactionClick(transaction.txId, transaction.status?.status) }, - onGoToProviderClick = { + onGoToProviderClick = { url -> analyticsEventsHandlerProvider().send( TokenExchangeAnalyticsEvent.GoToProviderStatus(cryptoCurrency.symbol), ) - clickIntents.onGoToProviderClick(url = transaction.status?.txUrl.orEmpty()) + clickIntents.onGoToProviderClick(url = url) }, ), ) 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 743b214df8..f8850738e2 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 @@ -1,7 +1,6 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.exchange import androidx.compose.animation.AnimatedContent -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text @@ -78,8 +77,8 @@ private fun ExchangeStatusBottomSheetContent(content: ExchangeStatusBottomSheetC SpacerH12() ExchangeStatusBlock( statuses = config.statuses, - showLink = notification.value == null, - onClick = config.onGoToProviderClick, + showLink = notification.value == null && config.txUrl != null, + onClick = { config.onGoToProviderClick(config.txUrl.orEmpty()) }, ) AnimatedContent( targetState = notification.value, From f257b5758d5be063d679e42ca6ea33d11a291641 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 6 Dec 2023 15:29:40 +0300 Subject: [PATCH 3/3] Updated on 2026-08-14 --- .../state/factory/TokenDetailsSwapTransactionsStateConverter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt index 0c6b75dfed..b67c23da81 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt @@ -194,6 +194,7 @@ internal class TokenDetailsSwapTransactionsStateConverter( status = ExchangeStatus.New, text = when { isNew -> TextReference.Res(R.string.express_exchange_status_receiving_active) + isNewDone -> TextReference.Res(R.string.express_exchange_status_received) else -> TextReference.Res(R.string.express_exchange_status_receiving) }, isActive = isNew,