From 0f38f3ebed134867af0f2dfa1b5d9956cde1103b Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 26 Mar 2025 18:41:26 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../impl/presentation/analytics/SendAnalyticEvents.kt | 1 + .../features/send/impl/presentation/model/SendModel.kt | 2 +- .../presentation/ui/recipient/SendRecipientContent.kt | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/analytics/SendAnalyticEvents.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/analytics/SendAnalyticEvents.kt index 03fb73beab..16070eefb1 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/analytics/SendAnalyticEvents.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/analytics/SendAnalyticEvents.kt @@ -151,6 +151,7 @@ internal enum class EnterAddressSource { QRCode, PasteButton, RecentAddress, + MyWallet, } internal enum class SelectedCurrencyType(val value: String) { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt index 55e0edc294..f2a909d245 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt @@ -725,7 +725,7 @@ internal class SendModel @Inject constructor( val memo = uiState.value.getRecipientState(stateRouter.isEditState)?.memoTextField?.value val isValidMemo = validateMemo(memo) - val isRecent = type == EnterAddressSource.RecentAddress + val isRecent = type == EnterAddressSource.RecentAddress || type == EnterAddressSource.MyWallet if (isRecent && isValidAddress && isValidMemo) onNextClick(stateRouter.isEditState) } // endregion diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt index 4838a3a3e3..d16ff2d06c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt @@ -28,11 +28,11 @@ import com.tangem.core.ui.res.TangemThemePreview import com.tangem.features.send.impl.R import com.tangem.features.send.impl.presentation.analytics.EnterAddressSource import com.tangem.features.send.impl.presentation.domain.SendRecipientListContent +import com.tangem.features.send.impl.presentation.model.SendClickIntents import com.tangem.features.send.impl.presentation.state.SendStates import com.tangem.features.send.impl.presentation.state.fields.SendTextField import com.tangem.features.send.impl.presentation.state.previewdata.RecipientStatePreviewData import com.tangem.features.send.impl.presentation.state.previewdata.SendClickIntentsStub -import com.tangem.features.send.impl.presentation.model.SendClickIntents import kotlinx.collections.immutable.ImmutableList private const val ADDRESS_FIELD_KEY = "ADDRESS_FIELD_KEY" @@ -81,6 +81,7 @@ internal fun SendRecipientContent( clickIntents = clickIntents, isLast = recipients.any { !it.isVisible }, isBalanceHidden = isBalanceHidden, + type = EnterAddressSource.MyWallet, ) listHeaderItem( titleRes = R.string.send_recent_transactions, @@ -92,6 +93,7 @@ internal fun SendRecipientContent( clickIntents = clickIntents, isLast = true, isBalanceHidden = isBalanceHidden, + type = EnterAddressSource.RecentAddress, ) } } @@ -192,6 +194,7 @@ private fun LazyListScope.listItem( clickIntents: SendClickIntents, isLast: Boolean, isBalanceHidden: Boolean, + type: EnterAddressSource, ) { items( count = list.size, @@ -208,10 +211,7 @@ private fun LazyListScope.listItem( subtitleEndOffset = item.subtitleEndOffset, subtitleIconRes = item.subtitleIconRes, onClick = { - clickIntents.onRecipientAddressValueChange( - title, - EnterAddressSource.RecentAddress, - ) + clickIntents.onRecipientAddressValueChange(title, type) }, isLoading = item.isLoading, modifier = Modifier