Updated on 2026-08-14

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

@@ -24,6 +24,7 @@ import com.tangem.features.send.v2.common.PredefinedValues
 import com.tangem.features.send.v2.common.ui.SendContent
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.send.analytics.SendAnalyticEvents
+import com.tangem.features.send.v2.send.analytics.SendAnalyticEvents.SendScreenSource
 import com.tangem.features.send.v2.send.confirm.SendConfirmComponent
 import com.tangem.features.send.v2.send.model.SendModel
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponent
@@ -161,7 +162,20 @@ internal class DefaultSendComponent @AssistedInject constructor(
             cryptoCurrencyStatus = model.cryptoCurrencyStatus,
             callback = model,
             predefinedValues = model.predefinedValues,
-            onBackClick = ::onChildBack,
+            onBackClick = {
+                if (route.isEditMode) {
+                    onChildBack()
+                } else {
+                    analyticsEventHandler.send(
+                        SendAnalyticEvents.CloseButtonClicked(
+                            source = SendScreenSource.Amount,
+                            isFromSummary = false,
+                            isValid = model.uiState.value.amountUM.isPrimaryButtonEnabled,
+                        ),
+                    )
+                    router.pop()
+                }
+            },
             onNextClick = {
                 if (route.isEditMode) {
                     onChildBack()

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt

@@ -1,7 +1,6 @@
 package com.tangem.features.send.v2.subcomponents.amount.model
 
 import androidx.compose.runtime.Stable
-import com.tangem.common.routing.AppRouter
 import com.tangem.common.ui.amountScreen.AmountScreenClickIntents
 import com.tangem.common.ui.amountScreen.converters.*
 import com.tangem.common.ui.amountScreen.converters.field.AmountFieldChangeTransformer