diff --git a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt index 3290c8dbc9..89edce5203 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt +++ b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt @@ -1,7 +1,10 @@ package com.tangem.features.account.createedit.ui import android.content.res.Configuration -import androidx.compose.foundation.* +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid @@ -59,7 +62,6 @@ internal fun AccountCreateEditContent( modifier = modifier .background(color = TangemTheme.colors.background.secondary) .fillMaxSize() - .verticalScroll(rememberScrollState()) .imePadding() .systemBarsPadding(), horizontalAlignment = Alignment.CenterHorizontally, @@ -184,7 +186,6 @@ private fun AccountColor(colorsState: AccountCreateEditUM.Colors) { columns = columns, contentPadding = contentPadding, horizontalArrangement = Arrangement.spacedBy(4.dp), - userScrollEnabled = false, ) { items(colorsState.list) { color -> val isSelected = color == colorsState.selected diff --git a/features/account/impl/src/main/java/com/tangem/features/account/details/ui/AccountDetailsContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/details/ui/AccountDetailsContent.kt index 1d0afaa6d2..1ff4d5400f 100644 --- a/features/account/impl/src/main/java/com/tangem/features/account/details/ui/AccountDetailsContent.kt +++ b/features/account/impl/src/main/java/com/tangem/features/account/details/ui/AccountDetailsContent.kt @@ -103,7 +103,7 @@ private fun ArchiveAccountRow(state: AccountDetailsUM.ArchiveMode.Available) { modifier = Modifier.size(TangemTheme.dimens.size24), ) Text( - text = stringResourceSafe(R.string.account_details_archive), + text = stringResourceSafe(R.string.account_details_archiving), color = TangemTheme.colors.text.disabled, style = TangemTheme.typography.subtitle1, )