Updated on 2026-08-14

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt

@@ -15,6 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -22,18 +24,17 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.tangem.common.ui.navigationButtons.preview.NavigationButtonsPreview
 import com.tangem.core.ui.components.Keyboard
+import com.tangem.core.ui.components.SecondaryButtonIconStart
 import com.tangem.core.ui.components.buttons.common.TangemButton
 import com.tangem.core.ui.components.buttons.common.TangemButtonIconPosition
 import com.tangem.core.ui.components.buttons.common.TangemButtonsDefaults
-import com.tangem.core.ui.components.buttons.common.contentColor
 import com.tangem.core.ui.components.keyboardAsState
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.isNullOrEmpty
-import com.tangem.core.ui.extensions.rememberHapticFeedback
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import kotlinx.collections.immutable.ImmutableList
+import com.tangem.core.ui.utils.singleEvent
 
 @Composable
 fun NavigationButtonsBlock(
@@ -47,7 +48,7 @@ fun NavigationButtonsBlock(
         modifier = modifier.fillMaxWidth(),
     ) {
         InfoText(footerText)
-        ExtraButtons(state?.extraButtons, state?.txUrl)
+        DoneButtons(state?.extraButtons)
         Row(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
@@ -58,9 +59,33 @@ fun NavigationButtonsBlock(
     }
 }
 
+@Composable
+fun NavigationButtonsBlockV2(
+    navigationUM: NavigationUM,
+    modifier: Modifier = Modifier,
+    footerText: TextReference? = null,
+) {
+    val navigationUM = navigationUM as? NavigationUM.Content
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        InfoText(footerText)
+        DoneButtons(navigationUM?.secondaryPairButtonsUM)
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
+        ) {
+            PreviousButton(navigationUM?.prevButton)
+            NavigationPrimaryButton(navigationUM?.primaryButton, modifier = Modifier.weight(1f))
+        }
+    }
+}
+
 @Composable
 fun NavigationPrimaryButton(primaryButton: NavigationButton?, modifier: Modifier = Modifier) {
     val wrappedButton by rememberNavigationButton(primaryButton)
+    val hapticFeedback = LocalHapticFeedback.current
     AnimatedContent(
         targetState = wrappedButton,
         transitionSpec = { navigationButtonsTransition() },
@@ -83,7 +108,12 @@ fun NavigationPrimaryButton(primaryButton: NavigationButton?, modifier: Modifier
             TangemButton(
                 text = button.textReference.resolveReference(),
                 enabled = button.isEnabled,
-                onClick = button.onClick,
+                onClick = {
+                    if (button.isHapticClick) {
+                        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    }
+                    button.onClick()
+                },
                 showProgress = button.showProgress,
                 colors = color,
                 textStyle = TangemTheme.typography.subtitle1,
@@ -123,33 +153,39 @@ private fun PreviousButton(prevButton: NavigationButton?) {
 }
 
 @Composable
-private fun ExtraButtons(extraButtons: ImmutableList<NavigationButton>?, txUrl: String?) {
+fun DoneButtons(pairButtons: Pair<NavigationButton, NavigationButton>?, modifier: Modifier = Modifier) {
     AnimatedVisibility(
-        visible = !txUrl.isNullOrBlank() && extraButtons != null,
+        visible = pairButtons != null,
         enter = slideInVertically(initialOffsetY = { it / 2 }).plus(fadeIn()),
         exit = slideOutVertically(targetOffsetY = { it / 2 }).plus(fadeOut()),
         label = "Animate show sent state buttons",
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
     ) {
-        val buttons = remember(this) { requireNotNull(extraButtons) }
+        val (leftButton, rightButton) = remember(this) { requireNotNull(pairButtons) }
         Row(
             horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
             modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing12),
         ) {
-            buttons.forEach { button ->
-                val icon = button.iconRes?.let { TangemButtonIconPosition.Start(iconResId = it) }
-                    ?: TangemButtonIconPosition.None
-                TangemButton(
-                    text = button.textReference.resolveReference(),
-                    icon = icon,
-                    textStyle = TangemTheme.typography.subtitle1,
-                    onClick = rememberHapticFeedback(state = button, onAction = button.onClick),
-                    modifier = Modifier.weight(1f),
-                    enabled = button.isEnabled,
-                    showProgress = false,
-                    colors = TangemButtonsDefaults.secondaryButtonColors,
-                )
-            }
+            SecondaryButtonIconStart(
+                text = leftButton.textReference.resolveReference(),
+                iconResId = requireNotNull(leftButton.iconRes),
+                onClick = {
+                    singleEvent {
+                        leftButton.onClick()
+                    }
+                },
+                modifier = Modifier.weight(1f),
+            )
+            SecondaryButtonIconStart(
+                text = rightButton.textReference.resolveReference(),
+                iconResId = requireNotNull(rightButton.iconRes),
+                onClick = {
+                    singleEvent {
+                        rightButton.onClick()
+                    }
+                },
+                modifier = Modifier.weight(1f),
+            )
         }
     }
 }

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt

@@ -2,7 +2,6 @@ package com.tangem.common.ui.navigationButtons
 
 import androidx.annotation.DrawableRes
 import com.tangem.core.ui.extensions.TextReference
-import kotlinx.collections.immutable.ImmutableList
 
 sealed class NavigationButtonsState {
     data object Empty : NavigationButtonsState()
@@ -10,7 +9,7 @@ sealed class NavigationButtonsState {
     data class Data(
         val primaryButton: NavigationButton?,
         val prevButton: NavigationButton?,
-        val extraButtons: ImmutableList<NavigationButton>,
+        val extraButtons: Pair<NavigationButton, NavigationButton>?,
         val txUrl: String? = null,
         val onTextClick: (String) -> Unit,
     ) : NavigationButtonsState()

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt

@@ -5,29 +5,25 @@ import com.tangem.common.ui.navigationButtons.NavigationButton
 import com.tangem.common.ui.navigationButtons.NavigationButtonsState
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
-import kotlinx.collections.immutable.persistentListOf
 
 internal object NavigationButtonsPreview {
 
-    private val extraButtons = persistentListOf(
-        NavigationButton(
-            textReference = resourceReference(R.string.common_explore),
-            iconRes = R.drawable.ic_tangem_24,
-            isSecondary = true,
-            isIconVisible = true,
-            showProgress = false,
-            isEnabled = true,
-            onClick = {},
-        ),
-        NavigationButton(
-            textReference = resourceReference(R.string.common_share),
-            iconRes = R.drawable.ic_tangem_24,
-            isSecondary = true,
-            isIconVisible = true,
-            showProgress = false,
-            isEnabled = true,
-            onClick = {},
-        ),
+    private val extraButtons = NavigationButton(
+        textReference = resourceReference(R.string.common_explore),
+        iconRes = R.drawable.ic_tangem_24,
+        isSecondary = true,
+        isIconVisible = true,
+        showProgress = false,
+        isEnabled = true,
+        onClick = {},
+    ) to NavigationButton(
+        textReference = resourceReference(R.string.common_share),
+        iconRes = R.drawable.ic_tangem_24,
+        isSecondary = true,
+        isIconVisible = true,
+        showProgress = false,
+        isEnabled = true,
+        onClick = {},
     )
 
     private val prev = NavigationButton(