Updated on 2026-08-14

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

@@ -341,16 +341,18 @@ private class AppCurrencySelectorStateProvider : CollectionPreviewParameterProvi
             .mapIndexed { index, s -> Currency(index.toString(), s) }
             .toPersistentList()
 
-        add(AppCurrencySelectorState.Loading(onBackClick = {}))
-        add(AppCurrencySelectorState.Default(
+        this + AppCurrencySelectorState.Loading(onBackClick = {})
+
+        this + AppCurrencySelectorState.Default(
             selectedId = "0",
             items = items,
             scrollToSelected = consumedEvent(),
             onCurrencyClick = {},
             onBackClick = {},
             onTopBarActionClick = {},
-        ))
-        add(AppCurrencySelectorState.Search(
+        )
+
+        this + AppCurrencySelectorState.Search(
             selectedId = "0",
             items = items,
             scrollToSelected = consumedEvent(),
@@ -358,7 +360,7 @@ private class AppCurrencySelectorStateProvider : CollectionPreviewParameterProvi
             onBackClick = {},
             onSearchInputChange = {},
             onTopBarActionClick = {},
-        ))
+        )
     },
 )
 // endregion Preview

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

@@ -15,8 +15,8 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 import com.tangem.tap.features.details.ui.appsettings.components.*
@@ -103,10 +103,10 @@ private class AppSettingsScreenStateProvider : CollectionPreviewParameterProvide
             itemsFactory.createSelectThemeModeButton(AppThemeMode.DEFAULT, {}),
         )
 
-        add(AppSettingsScreenState.Content(
+        this + AppSettingsScreenState.Content(
             items = items,
             dialog = null,
-        ))
+        )
     },
 )
 // endregion Preview

app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -64,10 +64,10 @@ private class ButtonItemProvider : CollectionPreviewParameterProvider<Item.Butto
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        add(itemsFactory.createSelectAppCurrencyButton(
+        this + itemsFactory.createSelectAppCurrencyButton(
             currentAppCurrencyName = "US Dollar",
             onClick = { /* no-op */ },
-        ))
+        )
     },
 )
 // endregion Preview

app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt

@@ -16,8 +16,8 @@ import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.components.SpacerW16
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -71,9 +71,7 @@ private class CardItemProvider : CollectionPreviewParameterProvider<Item.Card>(
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        add(itemsFactory.createEnrollBiometricsCard(
-            onClick = { /* no-op */ },
-        ))
+        this + itemsFactory.createEnrollBiometricsCard(onClick = { /* no-op */ })
     },
 )
 // endregion Preview

app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt

@@ -17,8 +17,8 @@ import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.components.SpacerW32
 import com.tangem.core.ui.components.TangemSwitch
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -85,26 +85,29 @@ private class SwitchItemProvider : CollectionPreviewParameterProvider<Item.Switc
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        add(itemsFactory.createSaveAccessCodeSwitch(
+        this + itemsFactory.createSaveAccessCodeSwitch(
             isChecked = true,
             isEnabled = true,
             onCheckedChange = { /* no-op */ },
-        ))
-        add(itemsFactory.createSaveAccessCodeSwitch(
+        )
+
+        this + itemsFactory.createSaveAccessCodeSwitch(
             isChecked = false,
             isEnabled = true,
             onCheckedChange = { /* no-op */ },
-        ))
-        add(itemsFactory.createSaveAccessCodeSwitch(
+        )
+
+        this + itemsFactory.createSaveAccessCodeSwitch(
             isChecked = true,
             isEnabled = false,
             onCheckedChange = { /* no-op */ },
-        ))
-        add(itemsFactory.createSaveAccessCodeSwitch(
+        )
+
+        this + itemsFactory.createSaveAccessCodeSwitch(
             isChecked = false,
             isEnabled = false,
             onCheckedChange = { /* no-op */ },
-        ))
+        )
     },
 )
 // endregion Preview

app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt

@@ -32,6 +32,7 @@ import com.tangem.tap.store
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
+import com.tangem.utils.extensions.addIf
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.*
@@ -100,74 +101,57 @@ internal class AppSettingsModel @Inject constructor(
 
     private fun buildItems(state: AppSettingsState): ImmutableList<AppSettingsScreenState.Item> {
         val items = buildList<AppSettingsScreenState.Item> {
-            if (state.needEnrollBiometrics) {
-                add(
-                    itemsFactory.createEnrollBiometricsCard(
-                        onClick = ::enrollBiometrics,
-                    ),
-                )
-            }
+            addIf(
+                condition = state.needEnrollBiometrics,
+                element = itemsFactory.createEnrollBiometricsCard(onClick = ::enrollBiometrics),
+            )
 
-            add(
-                itemsFactory.createSelectAppCurrencyButton(
-                    currentAppCurrencyName = state.selectedAppCurrency.name,
-                    onClick = ::showAppCurrencySelector,
-                ),
+            this + itemsFactory.createSelectAppCurrencyButton(
+                currentAppCurrencyName = state.selectedAppCurrency.name,
+                onClick = ::showAppCurrencySelector,
             )
 
             if (hotWalletFeatureToggles.isHotWalletEnabled) {
                 val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                add(
-                    itemsFactory.createUseBiometricsSwitch(
-                        isChecked = state.useBiometricAuthentication,
-                        isEnabled = canUseBiometrics,
-                        onCheckedChange = ::onBiometricAuthenticationToggled,
-                    ),
+                this + itemsFactory.createUseBiometricsSwitch(
+                    isChecked = state.useBiometricAuthentication,
+                    isEnabled = canUseBiometrics,
+                    onCheckedChange = ::onBiometricAuthenticationToggled,
                 )
 
-                add(
-                    itemsFactory.createRequireAccessCodeSwitch(
-                        isChecked = state.requireAccessCode,
-                        isEnabled = canUseBiometrics && state.useBiometricAuthentication,
-                        onCheckedChange = ::onRequireAccessCodeToggled,
-                    ),
+                this + itemsFactory.createRequireAccessCodeSwitch(
+                    isChecked = state.requireAccessCode,
+                    isEnabled = canUseBiometrics && state.useBiometricAuthentication,
+                    onCheckedChange = ::onRequireAccessCodeToggled,
                 )
             } else {
                 if (state.isBiometricsAvailable) {
                     val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                    add(
-                        itemsFactory.createSaveWalletsSwitch(
-                            isChecked = state.saveWallets,
-                            isEnabled = canUseBiometrics,
-                            onCheckedChange = ::onSaveWalletsToggled,
-                        ),
+                    this + itemsFactory.createSaveWalletsSwitch(
+                        isChecked = state.saveWallets,
+                        isEnabled = canUseBiometrics,
+                        onCheckedChange = ::onSaveWalletsToggled,
                     )
 
-                    add(
-                        itemsFactory.createSaveAccessCodeSwitch(
-                            isChecked = state.saveAccessCodes,
-                            isEnabled = canUseBiometrics,
-                            onCheckedChange = ::onSaveAccessCodesToggled,
-                        ),
+                    this + itemsFactory.createSaveAccessCodeSwitch(
+                        isChecked = state.saveAccessCodes,
+                        isEnabled = canUseBiometrics,
+                        onCheckedChange = ::onSaveAccessCodesToggled,
                     )
                 }
             }
 
-            add(
-                itemsFactory.createFlipToHideBalanceSwitch(
-                    isChecked = state.isHidingEnabled,
-                    isEnabled = true,
-                    onCheckedChange = ::onFlipToHideBalanceToggled,
-                ),
+            this + itemsFactory.createFlipToHideBalanceSwitch(
+                isChecked = state.isHidingEnabled,
+                isEnabled = true,
+                onCheckedChange = ::onFlipToHideBalanceToggled,
             )
 
-            add(
-                itemsFactory.createSelectThemeModeButton(
-                    currentThemeMode = state.selectedThemeMode,
-                    onClick = { showThemeModeSelector(state.selectedThemeMode) },
-                ),
+            this + itemsFactory.createSelectThemeModeButton(
+                currentThemeMode = state.selectedThemeMode,
+                onClick = { showThemeModeSelector(state.selectedThemeMode) },
             )
         }
 

app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt

@@ -12,9 +12,9 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.domain.card.CardTypesResolver
 import com.tangem.domain.card.ScanCardProcessor
-import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.common.util.getBackupCardsCount
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.requireColdWallet
@@ -34,6 +34,7 @@ import com.tangem.tap.features.details.ui.cardsettings.domain.CardSettingsIntera
 import com.tangem.tap.features.details.ui.common.utils.*
 import com.tangem.tap.store
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.addIf
 import com.tangem.wallet.R
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -89,8 +90,7 @@ internal class CardSettingsModel @Inject constructor(
                 .getOrElse { error("User wallet $userWalletId not found") }
                 .requireColdWallet()
 
-            cardSdkConfigRepository.isBiometricsRequestPolicy =
-                userWallet.scanResponse.card.isAccessCodeSet &&
+            cardSdkConfigRepository.isBiometricsRequestPolicy = userWallet.scanResponse.card.isAccessCodeSet &&
                 settingsRepository.shouldSaveAccessCodes()
         }
     }
@@ -135,36 +135,37 @@ internal class CardSettingsModel @Inject constructor(
         )
         val isResetCardAllowed = isResetToFactoryAllowedByCard(card, cardTypesResolver)
 
-        val cardDetails = buildList<CardInfo> {
+        val cardDetails: List<CardInfo> = buildList {
             add(CardInfo.CardId(cardId))
             add(CardInfo.Issuer(card.issuer.name))
 
-            if (!cardTypesResolver.isTangemTwins()) {
-                add(CardInfo.SignedHashes(card.signedHashesCount().toString()))
-            }
+            addIf(
+                condition = !cardTypesResolver.isTangemTwins(),
+                element = CardInfo.SignedHashes(card.signedHashesCount().toString()),
+            )
 
             add(
                 CardInfo.SecurityMode(
-                    currentSecurityOption,
+                    securityOption = currentSecurityOption,
                     clickable = allowedSecurityOptions.size > 1,
                 ),
             )
 
-            if (card.backupStatus?.isActive == true && card.isAccessCodeSet) {
-                add(CardInfo.ChangeAccessCode)
-            }
+            addIf(
+                condition = card.backupStatus?.isActive == true && card.isAccessCodeSet,
+                element = CardInfo.ChangeAccessCode,
+            )
 
-            if (isAccessCodeRecoveryAllowed(cardTypesResolver)) {
-                add(CardInfo.AccessCodeRecovery(isAccessCodeRecoveryEnabled(cardTypesResolver, card)))
-            }
+            addIf(
+                condition = isAccessCodeRecoveryAllowed(cardTypesResolver),
+                element = CardInfo.AccessCodeRecovery(isAccessCodeRecoveryEnabled(cardTypesResolver, card)),
+            )
 
-            if (isResetCardAllowed) {
-                add(
-                    CardInfo.ResetToFactorySettings(
-                        description = getResetToFactoryDescription(
-                            isActiveBackupStatus = card.backupStatus?.isActive == true,
-                            typesResolver = cardTypesResolver,
-                        ),
+            addIf(isResetCardAllowed) {
+                CardInfo.ResetToFactorySettings(
+                    description = getResetToFactoryDescription(
+                        isActiveBackupStatus = card.backupStatus?.isActive == true,
+                        typesResolver = cardTypesResolver,
                     ),
                 )
             }