Updated on 2026-08-14

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/DefaultNFTSendComponent.kt

@@ -85,11 +85,13 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
         ) { stack ->
             componentScope.launch {
                 when (val activeComponent = stack.active.instance) {
-                    is NFTSendConfirmComponent -> if (currentRouteFlow.value.isEditMode) {
+                    is NFTSendConfirmComponent -> {
                         analyticsEventHandler.send(
                             CommonSendAnalyticEvents.ConfirmationScreenOpened(categoryName = analyticsCategoryName),
                         )
-                        activeComponent.updateState(model.uiState.value)
+                        if (currentRouteFlow.value.isEditMode) {
+                            activeComponent.updateState(model.uiState.value)
+                        }
                     }
                     is SendDestinationComponent -> {
                         analyticsEventHandler.send(

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/analytics/EnterAddressSource.kt

@@ -5,6 +5,7 @@ internal enum class EnterAddressSource {
     PasteButton,
     RecentAddress,
     InputField,
+    MyWallets,
     ;
 
     val isPasted: Boolean

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/SendDestinationContent.kt

@@ -72,9 +72,14 @@ internal fun SendDestinationContent(
         )
         listItem(
             list = wallets,
-            clickIntents = clickIntents,
             isLast = recipients.any { !it.isVisible },
             isBalanceHidden = isBalanceHidden,
+            onClick = { title ->
+                clickIntents.onRecipientAddressValueChange(
+                    title,
+                    EnterAddressSource.MyWallets,
+                )
+            },
         )
         listHeaderItem(
             titleRes = R.string.send_recent_transactions,
@@ -83,9 +88,14 @@ internal fun SendDestinationContent(
         )
         listItem(
             list = recipients,
-            clickIntents = clickIntents,
             isLast = true,
             isBalanceHidden = isBalanceHidden,
+            onClick = { title ->
+                clickIntents.onRecipientAddressValueChange(
+                    title,
+                    EnterAddressSource.RecentAddress,
+                )
+            },
         )
     }
 }
@@ -182,9 +192,9 @@ private fun LazyListScope.listHeaderItem(@StringRes titleRes: Int, isVisible: Bo
 
 private fun LazyListScope.listItem(
     list: ImmutableList<DestinationRecipientListUM>,
-    clickIntents: SendDestinationClickIntents,
     isLast: Boolean,
     isBalanceHidden: Boolean,
+    onClick: (String) -> Unit,
 ) {
     items(
         count = list.size,
@@ -201,12 +211,7 @@ private fun LazyListScope.listItem(
                 info = item.timestamp?.resolveReference(),
                 subtitleEndOffset = item.subtitleEndOffset,
                 subtitleIconRes = item.subtitleIconRes,
-                onClick = {
+                onClick = { onClick(title) },
-                    clickIntents.onRecipientAddressValueChange(
-                        title,
-                        EnterAddressSource.RecentAddress,
-                    )
-                },
                 isLoading = item.isLoading,
                 modifier = Modifier
                     .animateItem()