diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
index 2ccdbdd1f0..06eda3e12c 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
@@ -341,25 +341,29 @@ private class AppCurrencySelectorStateProvider : CollectionPreviewParameterProvi
             .mapIndexed { index, s -> Currency(index.toString(), s) }
             .toPersistentList()
 
-        this + AppCurrencySelectorState.Loading(onBackClick = {})
+        add(AppCurrencySelectorState.Loading(onBackClick = {}))
 
-        this + AppCurrencySelectorState.Default(
-            selectedId = "0",
-            items = items,
-            scrollToSelected = consumedEvent(),
-            onCurrencyClick = {},
-            onBackClick = {},
-            onTopBarActionClick = {},
+        add(
+            AppCurrencySelectorState.Default(
+                selectedId = "0",
+                items = items,
+                scrollToSelected = consumedEvent(),
+                onCurrencyClick = {},
+                onBackClick = {},
+                onTopBarActionClick = {},
+            ),
         )
 
-        this + AppCurrencySelectorState.Search(
-            selectedId = "0",
-            items = items,
-            scrollToSelected = consumedEvent(),
-            onCurrencyClick = {},
-            onBackClick = {},
-            onSearchInputChange = {},
-            onTopBarActionClick = {},
+        add(
+            AppCurrencySelectorState.Search(
+                selectedId = "0",
+                items = items,
+                scrollToSelected = consumedEvent(),
+                onCurrencyClick = {},
+                onBackClick = {},
+                onSearchInputChange = {},
+                onTopBarActionClick = {},
+            ),
         )
     },
 )
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
index b721c113d5..438819ed0a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
@@ -103,9 +103,11 @@ private class AppSettingsScreenStateProvider : CollectionPreviewParameterProvide
             itemsFactory.createSelectThemeModeButton(AppThemeMode.DEFAULT, {}),
         )
 
-        this + AppSettingsScreenState.Content(
-            items = items,
-            dialog = null,
+        add(
+            AppSettingsScreenState.Content(
+                items = items,
+                dialog = null,
+            ),
         )
     },
 )
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
index 801c708484..6c74614ff1 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
@@ -64,9 +64,11 @@ private class ButtonItemProvider : CollectionPreviewParameterProvider<Item.Butto
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        this + itemsFactory.createSelectAppCurrencyButton(
-            currentAppCurrencyName = "US Dollar",
-            onClick = { /* no-op */ },
+        add(
+            itemsFactory.createSelectAppCurrencyButton(
+                currentAppCurrencyName = "US Dollar",
+                onClick = { /* no-op */ },
+            ),
         )
     },
 )
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
index ff2109d124..5a954d604e 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
@@ -71,7 +71,7 @@ private class CardItemProvider : CollectionPreviewParameterProvider<Item.Card>(
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        this + itemsFactory.createEnrollBiometricsCard(onClick = { /* no-op */ })
+        add(itemsFactory.createEnrollBiometricsCard(onClick = { /* no-op */ }))
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
index a31eb1484d..153b026e85 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
@@ -85,28 +85,36 @@ private class SwitchItemProvider : CollectionPreviewParameterProvider<Item.Switc
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        this + itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = true,
-            isEnabled = true,
-            onCheckedChange = { /* no-op */ },
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = true,
+                isEnabled = true,
+                onCheckedChange = { /* no-op */ },
+            ),
         )
 
-        this + itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = false,
-            isEnabled = true,
-            onCheckedChange = { /* no-op */ },
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = false,
+                isEnabled = true,
+                onCheckedChange = { /* no-op */ },
+            ),
         )
 
-        this + itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = true,
-            isEnabled = false,
-            onCheckedChange = { /* no-op */ },
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = true,
+                isEnabled = false,
+                onCheckedChange = { /* no-op */ },
+            ),
         )
 
-        this + itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = false,
-            isEnabled = false,
-            onCheckedChange = { /* no-op */ },
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = false,
+                isEnabled = false,
+                onCheckedChange = { /* no-op */ },
+            ),
         )
     },
 )
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
index 46ccbc0485..d9d1ad29f8 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
@@ -100,58 +100,72 @@ internal class AppSettingsModel @Inject constructor(
     }
 
     private fun buildItems(state: AppSettingsState): ImmutableList<AppSettingsScreenState.Item> {
-        val items = buildList<AppSettingsScreenState.Item> {
+        val items = buildList {
             addIf(
                 condition = state.needEnrollBiometrics,
                 element = itemsFactory.createEnrollBiometricsCard(onClick = ::enrollBiometrics),
             )
 
-            this + itemsFactory.createSelectAppCurrencyButton(
-                currentAppCurrencyName = state.selectedAppCurrency.name,
-                onClick = ::showAppCurrencySelector,
+            add(
+                itemsFactory.createSelectAppCurrencyButton(
+                    currentAppCurrencyName = state.selectedAppCurrency.name,
+                    onClick = ::showAppCurrencySelector,
+                ),
             )
 
             if (hotWalletFeatureToggles.isHotWalletEnabled) {
                 val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                this + itemsFactory.createUseBiometricsSwitch(
-                    isChecked = state.useBiometricAuthentication,
-                    isEnabled = canUseBiometrics,
-                    onCheckedChange = ::onBiometricAuthenticationToggled,
+                add(
+                    itemsFactory.createUseBiometricsSwitch(
+                        isChecked = state.useBiometricAuthentication,
+                        isEnabled = canUseBiometrics,
+                        onCheckedChange = ::onBiometricAuthenticationToggled,
+                    ),
                 )
 
-                this + itemsFactory.createRequireAccessCodeSwitch(
-                    isChecked = state.requireAccessCode,
-                    isEnabled = canUseBiometrics && state.useBiometricAuthentication,
-                    onCheckedChange = ::onRequireAccessCodeToggled,
+                add(
+                    itemsFactory.createRequireAccessCodeSwitch(
+                        isChecked = state.requireAccessCode,
+                        isEnabled = canUseBiometrics && state.useBiometricAuthentication,
+                        onCheckedChange = ::onRequireAccessCodeToggled,
+                    ),
                 )
             } else {
                 if (state.isBiometricsAvailable) {
                     val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                    this + itemsFactory.createSaveWalletsSwitch(
-                        isChecked = state.saveWallets,
-                        isEnabled = canUseBiometrics,
-                        onCheckedChange = ::onSaveWalletsToggled,
+                    add(
+                        itemsFactory.createSaveWalletsSwitch(
+                            isChecked = state.saveWallets,
+                            isEnabled = canUseBiometrics,
+                            onCheckedChange = ::onSaveWalletsToggled,
+                        ),
                     )
 
-                    this + itemsFactory.createSaveAccessCodeSwitch(
-                        isChecked = state.saveAccessCodes,
-                        isEnabled = canUseBiometrics,
-                        onCheckedChange = ::onSaveAccessCodesToggled,
+                    add(
+                        itemsFactory.createSaveAccessCodeSwitch(
+                            isChecked = state.saveAccessCodes,
+                            isEnabled = canUseBiometrics,
+                            onCheckedChange = ::onSaveAccessCodesToggled,
+                        ),
                     )
                 }
             }
 
-            this + itemsFactory.createFlipToHideBalanceSwitch(
-                isChecked = state.isHidingEnabled,
-                isEnabled = true,
-                onCheckedChange = ::onFlipToHideBalanceToggled,
+            add(
+                itemsFactory.createFlipToHideBalanceSwitch(
+                    isChecked = state.isHidingEnabled,
+                    isEnabled = true,
+                    onCheckedChange = ::onFlipToHideBalanceToggled,
+                ),
             )
 
-            this + itemsFactory.createSelectThemeModeButton(
-                currentThemeMode = state.selectedThemeMode,
-                onClick = { showThemeModeSelector(state.selectedThemeMode) },
+            add(
+                itemsFactory.createSelectThemeModeButton(
+                    currentThemeMode = state.selectedThemeMode,
+                    onClick = { showThemeModeSelector(state.selectedThemeMode) },
+                ),
             )
         }