Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt

@@ -30,7 +30,7 @@ enum class SettingsElement(
     LinkMoreCards(R.drawable.ic_more_cards, R.string.details_row_title_create_backup),
     TermsOfService(R.drawable.ic_text, R.string.disclaimer_title), // General Terms of Service of the App
     TermsOfUse(R.drawable.ic_text, R.string.details_row_title_card_tou), // Terms of Use for S2C cards only
-    PrivacyPolicy(R.drawable.ic_lock, R.string.details_row_privacy_policy);
+    PrivacyPolicy(R.drawable.ic_lock_24, R.string.details_row_privacy_policy);
 }
 
 @Immutable

app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt

@@ -6,7 +6,13 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
@@ -18,7 +24,7 @@ import com.tangem.tap.features.details.ui.cardsettings.resolveReference
 import com.tangem.tap.features.saveWallet.ui.components.SaveWalletScreenContent
 
 internal class SaveWalletBottomSheetFragment : ComposeBottomSheetFragment<SaveWalletScreenState>() {
-    override val expandedHeightFraction: Float = .95f
+    override val expandedHeightFraction: Float = .98f
 
     private val viewModel by viewModels<SaveWalletViewModel>()
 

app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt

@@ -1,27 +1,34 @@
 package com.tangem.tap.features.saveWallet.ui.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.components.SpacerH12
 import com.tangem.core.ui.components.SpacerH16
-import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerH32
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.components.SpacerHHalf
+import com.tangem.core.ui.components.SpacerW24
+import com.tangem.core.ui.components.SpacerW8
 import com.tangem.core.ui.components.atoms.Hand
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.wallet.R
@@ -34,79 +41,141 @@ internal fun SaveWalletScreenContent(
     onCloseClick: () -> Unit,
 ) {
     Column(
-        modifier = modifier
-            .padding(horizontal = TangemTheme.dimens.spacing16),
+        modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Hand()
-        IconButton(
+        Header(
+            modifier = Modifier.fillMaxWidth(),
+            onCloseClick = onCloseClick,
+        )
+        SpacerHHalf()
+        Title(
             modifier = Modifier
-                .align(Alignment.End)
-                .padding(all = TangemTheme.dimens.spacing8)
-                .size(TangemTheme.dimens.size32),
-            onClick = onCloseClick,
+                .widthIn(max = TangemTheme.dimens.size200),
+        )
+        SpacerH32()
+        Description(
+            modifier = Modifier
+                .padding(
+                    start = TangemTheme.dimens.spacing34,
+                    end = TangemTheme.dimens.spacing56,
+                )
+                .fillMaxWidth(),
+        )
+        SpacerHHalf()
+        Footer(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .fillMaxWidth(),
+            showProgress = showProgress,
+            onSaveWalletClick = onSaveWalletClick,
+        )
+        SpacerH16()
+    }
+}
+
+@Composable
+private fun Header(
+    modifier: Modifier = Modifier,
+    onCloseClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
+    ) {
+        Hand()
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.End,
         ) {
-            Icon(
-                modifier = Modifier.size(TangemTheme.dimens.size24),
-                painter = painterResource(id = R.drawable.ic_close),
-                tint = TangemTheme.colors.icon.secondary,
-                contentDescription = stringResource(id = R.string.common_cancel),
-            )
+            IconButton(
+                modifier = Modifier.size(TangemTheme.dimens.size32),
+                onClick = onCloseClick,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = R.drawable.ic_close),
+                    tint = TangemTheme.colors.icon.secondary,
+                    contentDescription = stringResource(id = R.string.common_cancel),
+                )
+            }
+            SpacerW8()
         }
-        Spacer(modifier = Modifier.weight(.7f))
+    }
+}
+
+@Composable
+private fun Title(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing32),
+    ) {
         Icon(
             modifier = Modifier.size(TangemTheme.dimens.size56),
             painter = painterResource(id = R.drawable.ic_fingerprint_24),
-            tint = TangemTheme.colors.icon.informative,
+            tint = TangemTheme.colors.icon.primary1,
             contentDescription = null,
         )
-        SpacerH24()
-        Box(
-            modifier = Modifier
-                .background(
-                    color = TangemTheme.colors.text.accent.copy(alpha = .12f),
-                    shape = TangemTheme.shapes.roundedCornersMedium,
-                ),
-        ) {
-            Text(
-                modifier = Modifier
-                    .padding(
-                        vertical = TangemTheme.dimens.spacing4,
-                        horizontal = TangemTheme.dimens.spacing12,
-                    ),
-                text = stringResource(R.string.save_user_wallet_agreement_new_feature),
-                style = TangemTheme.typography.subtitle2,
-                color = TangemTheme.colors.text.accent,
-                textAlign = TextAlign.Center,
-            )
-        }
-        SpacerH24()
         Text(
-            modifier = Modifier.fillMaxWidth(),
-            text = stringResource(R.string.onboarding_navbar_save_wallet),
+            text = stringResource(
+                id = R.string.save_user_wallet_agreement_header,
+                stringResource(id = R.string.common_biometrics).capitalize(Locale.current),
+            ),
             style = TangemTheme.typography.h2,
             color = TangemTheme.colors.text.primary1,
             textAlign = TextAlign.Center,
         )
-        SpacerH12()
-        Text(
-            modifier = Modifier.fillMaxWidth(fraction = .87f),
-            text = stringResource(R.string.save_user_wallet_agreement_description),
-            style = TangemTheme.typography.body1,
-            color = TangemTheme.colors.text.secondary,
-            textAlign = TextAlign.Center,
+    }
+}
+
+@Composable
+private fun Description(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24),
+        horizontalAlignment = Alignment.Start,
+    ) {
+        DescriptionItem(
+            iconPainter = painterResource(id = R.drawable.ic_face_recognition_24),
+            title = stringResource(id = R.string.save_user_wallet_agreement_access_title),
+            description = stringResource(id = R.string.save_user_wallet_agreement_access_description),
         )
-        Spacer(modifier = Modifier.weight(1f))
+        DescriptionItem(
+            iconPainter = painterResource(id = R.drawable.ic_lock_24),
+            title = stringResource(id = R.string.save_user_wallet_agreement_code_title),
+            description = stringResource(
+                id = R.string.save_user_wallet_agreement_code_description,
+                stringResource(id = R.string.common_biometrics).capitalize(Locale.current),
+            ),
+        )
+    }
+}
+
+@Composable
+private fun Footer(
+    modifier: Modifier = Modifier,
+    showProgress: Boolean,
+    onSaveWalletClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+    ) {
         PrimaryButton(
             modifier = Modifier.fillMaxWidth(),
             showProgress = showProgress,
             text = stringResource(
                 id = R.string.save_user_wallet_agreement_allow,
-                stringResource(id = R.string.common_biometric_authentication),
+                stringResource(id = R.string.common_biometrics).capitalize(Locale.current),
             ),
             onClick = onSaveWalletClick,
         )
-        SpacerH16()
         Text(
             modifier = Modifier.fillMaxWidth(fraction = .7f),
             text = stringResource(R.string.save_user_wallet_agreement_notice),
@@ -114,7 +183,41 @@ internal fun SaveWalletScreenContent(
             color = TangemTheme.colors.text.tertiary,
             textAlign = TextAlign.Center,
         )
-        SpacerH16()
+    }
+}
+
+@Composable
+private fun DescriptionItem(
+    modifier: Modifier = Modifier,
+    iconPainter: Painter,
+    title: String,
+    description: String,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.Top,
+        horizontalArrangement = Arrangement.SpaceEvenly,
+    ) {
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size24),
+            painter = iconPainter,
+            tint = TangemTheme.colors.icon.primary1,
+            contentDescription = null,
+        )
+        SpacerW24()
+        Column {
+            Text(
+                text = title,
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH4()
+            Text(
+                text = description,
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.secondary,
+            )
+        }
     }
 }
 

app/src/main/res/drawable/ic_lock.xml

@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13C12.53,13 13.039,13.211 13.414,13.586C13.789,13.961 14,14.47 14,15C14,15.53 13.789,16.039 13.414,16.414C13.039,16.789 12.53,17 12,17ZM18,20V10H6V20H18ZM18,8C18.53,8 19.039,8.211 19.414,8.586C19.789,8.961 20,9.47 20,10V20C20,20.53 19.789,21.039 19.414,21.414C19.039,21.789 18.53,22 18,22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6C7,4.674 7.527,3.402 8.464,2.464C9.402,1.527 10.674,1 12,1C12.657,1 13.307,1.129 13.913,1.381C14.52,1.632 15.071,2 15.535,2.464C16,2.929 16.368,3.48 16.619,4.087C16.871,4.693 17,5.343 17,6V8H18ZM12,3C11.204,3 10.441,3.316 9.879,3.879C9.316,4.441 9,5.204 9,6V8H15V6C15,5.204 14.684,4.441 14.121,3.879C13.559,3.316 12.796,3 12,3Z"/>
-</vector>