Updated on 2026-08-14

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

@@ -4,7 +4,7 @@ import androidx.activity.compose.BackHandler
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
-import androidx.compose.material.*
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -27,13 +27,12 @@ internal fun SettingsScreensScaffold(
     addBottomInsets: Boolean = true,
     fab: @Composable () -> Unit = {},
 ) {
-    val state = rememberScaffoldState(snackbarHostState = snackbarHostState)
     val backgroundColor = TangemTheme.colors.background.secondary
 
     BackHandler(onBack = onBackClick)
 
     Scaffold(
-        scaffoldState = state,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
             EmptyTopBarWithNavigation(
                 modifier = Modifier.statusBarsPadding(),
@@ -43,7 +42,7 @@ internal fun SettingsScreensScaffold(
         },
         modifier = modifier,
         contentWindowInsets = WindowInsetsZero,
-        backgroundColor = backgroundColor,
+        containerColor = backgroundColor,
         floatingActionButton = {
             Box(modifier = Modifier.navigationBarsPadding()) {
                 fab()
@@ -89,6 +88,7 @@ internal fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun EmptyTopBarWithNavigation(
     onBackClick: () -> Unit,
@@ -108,8 +108,9 @@ internal fun EmptyTopBarWithNavigation(
                 )
             }
         },
-        backgroundColor = backgroundColor,
-        elevation = 0.dp,
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = backgroundColor,
+        ),
     )
 }
 

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

@@ -5,7 +5,10 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -15,6 +18,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.tangem.core.analytics.Analytics
+import com.tangem.core.ui.components.progressbar.TangemLinearProgressIndicator
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.analytics.events.Settings
@@ -71,7 +75,7 @@ private fun AddSessionFab(onAddSession: () -> Unit, modifier: Modifier = Modifie
 @Composable
 private fun EmptyScreen(state: WalletConnectScreenState) {
     if (state.isLoading) {
-        LinearProgressIndicator(
+        TangemLinearProgressIndicator(
             modifier = Modifier.fillMaxWidth(),
             color = TangemTheme.colors.icon.accent,
         )
@@ -102,7 +106,7 @@ private fun EmptyScreen(state: WalletConnectScreenState) {
 @Composable
 private fun WalletConnectSessions(state: WalletConnectScreenState) {
     if (state.isLoading) {
-        LinearProgressIndicator(
+        TangemLinearProgressIndicator(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(2.dp),

app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt

@@ -13,6 +13,7 @@ import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ProductType
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.visa.model.VisaCardActivationStatus
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.builder.UserWalletIdBuilder
 import com.tangem.domain.wallets.models.UserWallet
@@ -42,6 +43,12 @@ object OnboardingHelper {
             store.state.globalState.onboardingState.onboardingManager ?: OnboardingManager(response)
         val cardId = response.card.cardId
         return when {
+            response.cardTypesResolver.isVisaWallet() -> {
+                if (response.visaCardActivationStatus == null) error("Visa card activation status is null")
+
+                response.visaCardActivationStatus !is VisaCardActivationStatus.Activated
+            }
+
             response.cardTypesResolver.isTangemTwins() -> {
                 if (!response.twinsIsTwinned()) {
                     true
@@ -66,7 +73,8 @@ object OnboardingHelper {
     fun whereToNavigate(scanResponse: ScanResponse): AppRoute {
         val newOnboardingSupportTypes = scanResponse.productType == ProductType.Wallet2 ||
             scanResponse.productType == ProductType.Ring ||
-            scanResponse.productType == ProductType.Wallet // AppRoute.OnboardingOther is also supported
+            scanResponse.productType == ProductType.Wallet ||
+            scanResponse.productType == ProductType.Visa // AppRoute.OnboardingOther is also supported
         if (store.inject(DaggerGraphState::onboardingV2FeatureToggles).isOnboardingV2Enabled &&
             newOnboardingSupportTypes
         ) {

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

@@ -4,8 +4,8 @@ import android.content.DialogInterface
 import androidx.compose.foundation.layout.Box
 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.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt

@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt

@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier