Updated on 2026-08-14

features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt

@@ -4,7 +4,8 @@ import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Scaffold
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -36,41 +37,47 @@ import com.tangem.features.send.common.ui.FeeBlockSuccess
 
 @Composable
 fun SwapSuccessScreen(state: SwapSuccessStateHolder, feeSelectorUM: FeeSelectorUM?, onBack: () -> Unit) {
-    Scaffold(
+    Column(
-        modifier = Modifier.systemBarsPadding(),
+        modifier = Modifier
-        containerColor = TangemTheme.colors.background.secondary,
+            .systemBarsPadding()
-        content = { padding ->
+            .background(TangemTheme.colors.background.secondary),
-            SwapSuccessScreenContent(padding = padding, feeSelectorUM = feeSelectorUM, state = state)
+    ) {
-        },
+        Box(
-        topBar = {
+            modifier = Modifier.weight(1f),
+        ) {
+            SwapSuccessScreenContent(
+                feeSelectorUM = feeSelectorUM,
+                state = state,
+                modifier = Modifier
+                    .padding(horizontal = 16.dp),
+            )
+            Fade(
+                modifier = Modifier.align(Alignment.BottomCenter),
+                backgroundColor = TangemTheme.colors.background.secondary,
+            )
             AppBarWithBackButton(
                 onBackClick = onBack,
                 iconRes = R.drawable.ic_close_24,
             )
-        },
+        }
-        bottomBar = {
         SwapSuccessScreenButtons(
             textRes = R.string.common_close,
             state = state,
             onDoneClick = onBack,
         )
-        },
+    }
-    )
 }
 
 @Composable
 private fun SwapSuccessScreenContent(
     state: SwapSuccessStateHolder,
     feeSelectorUM: FeeSelectorUM?,
-    padding: PaddingValues,
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = Modifier
+        modifier = modifier.verticalScroll(rememberScrollState()),
-            .fillMaxSize()
-            .padding(padding)
-            .background(TangemTheme.colors.background.secondary)
-            .padding(horizontal = TangemTheme.dimens.spacing16),
     ) {
+        SpacerH(56.dp)
         TransactionDoneTitle(
             title = if (state.isTransferMode) {
                 resourceReference(R.string.transfer_in_progress_title)
@@ -124,6 +131,7 @@ private fun SwapSuccessScreenContent(
                     .background(TangemTheme.colors.background.action),
             )
         }
+        SpacerH(16.dp)
     }
 }
 
@@ -170,12 +178,19 @@ private fun SwapAmountBlock(
 }
 
 @Composable
-private fun SwapSuccessScreenButtons(@StringRes textRes: Int, state: SwapSuccessStateHolder, onDoneClick: () -> Unit) {
+private fun SwapSuccessScreenButtons(
+    @StringRes textRes: Int,
+    state: SwapSuccessStateHolder,
+    onDoneClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     val content = state.navigationUM as? NavigationUM.Content
     Column(
-        modifier = Modifier
+        modifier = modifier.padding(
-            .background(TangemTheme.colors.background.secondary)
+            start = 16.dp,
-            .padding(TangemTheme.dimens.spacing16),
+            end = 16.dp,
+            bottom = 16.dp,
+        ),
     ) {
         val pairButtons = content?.secondaryPairButtonsUM
         when {