From 9736fa301caaa1637ba17a1d2651e1afdd801e0a Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 21 Apr 2026 12:23:19 +0100 Subject: [PATCH] Updated on 2026-08-14 --- .../CreateWalletStartModel.kt | 2 +- .../DefaultAddressSyncComponent.kt | 39 +++++++++---------- .../v2/addresssync/model/AddressSyncIntent.kt | 2 +- .../v2/addresssync/model/AddressSyncModel.kt | 12 +++--- .../v2/addresssync/ui/AddressSyncContent.kt | 7 +--- .../addresssync/model/AddressSyncModelTest.kt | 10 ++--- 6 files changed, 33 insertions(+), 39 deletions(-) diff --git a/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt b/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt index b438774c00..8c15de536f 100644 --- a/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt +++ b/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt @@ -239,7 +239,7 @@ internal class CreateWalletStartModel @Inject constructor( val route = if (onboardingV2FeatureToggles.isAddressSyncEnabled) { AppRoute.Onboarding( scanResponse = scanResponse, - mode = AppRoute.Onboarding.Mode.AddressSync + mode = AppRoute.Onboarding.Mode.AddressSync, ) } else { AppRoute.Wallet diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/DefaultAddressSyncComponent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/DefaultAddressSyncComponent.kt index 8357eb37d4..255027abc8 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/DefaultAddressSyncComponent.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/DefaultAddressSyncComponent.kt @@ -52,11 +52,11 @@ internal class DefaultAddressSyncComponent( modifier = modifier, childContent = { Children( - stack = childStack - ) { - it.instance.Content(modifier = modifier) + stack = childStack, + ) { child -> + child.instance.Content(Modifier) } - } + }, ) BackHandler { @@ -64,10 +64,7 @@ internal class DefaultAddressSyncComponent( } } - private fun createChild( - step: AddressSyncStep, - childContext: AppComponentContext, - ): ComposableContentComponent { + private fun createChild(step: AddressSyncStep, childContext: AppComponentContext): ComposableContentComponent { return when (step) { AddressSyncStep.ASK_BIOMETRY -> createAskBiometryComponent(childContext) AddressSyncStep.ASK_NOTIFICATIONS -> createPushNotificationComponent(childContext) @@ -85,8 +82,8 @@ internal class DefaultAddressSyncComponent( model.onIntent( AddressSyncIntent.Next( step = AddressSyncStep.ASK_NOTIFICATIONS, - replace = true - ) + shouldReplace = true, + ), ) } @@ -94,12 +91,12 @@ internal class DefaultAddressSyncComponent( model.onIntent( AddressSyncIntent.Next( step = AddressSyncStep.ASK_NOTIFICATIONS, - replace = false - ) + shouldReplace = false, + ), ) } - } - ) + }, + ), ) } @@ -112,8 +109,8 @@ internal class DefaultAddressSyncComponent( model.onIntent( AddressSyncIntent.Next( step = AddressSyncStep.ADDRESS_SYNC, - replace = true - ) + shouldReplace = true, + ), ) } @@ -121,8 +118,8 @@ internal class DefaultAddressSyncComponent( model.onIntent( AddressSyncIntent.Next( step = AddressSyncStep.ADDRESS_SYNC, - replace = false - ) + shouldReplace = false, + ), ) } @@ -130,13 +127,13 @@ internal class DefaultAddressSyncComponent( model.onIntent( AddressSyncIntent.Next( step = AddressSyncStep.ADDRESS_SYNC, - replace = false - ) + shouldReplace = false, + ), ) } }, source = AppRoute.PushNotification.Source.Onboarding, - ) + ), ) } } \ No newline at end of file diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncIntent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncIntent.kt index 47ecbbb69d..1293c244d5 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncIntent.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncIntent.kt @@ -3,6 +3,6 @@ package com.tangem.features.onboarding.v2.addresssync.model import com.tangem.features.onboarding.v2.addresssync.navigation.AddressSyncStep sealed interface AddressSyncIntent { - data class Next(val step: AddressSyncStep, val replace: Boolean) : AddressSyncIntent + data class Next(val step: AddressSyncStep, val shouldReplace: Boolean) : AddressSyncIntent data object Back : AddressSyncIntent } \ No newline at end of file diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModel.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModel.kt index 773be2996e..b06e54736c 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModel.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModel.kt @@ -47,15 +47,15 @@ internal class AddressSyncModel @Inject constructor( private suspend fun trySkippingScreen(next: AddressSyncIntent.Next) { when (next.step) { AddressSyncStep.ASK_BIOMETRY -> { - val showBiometry = canUseBiometryUseCase.strict() && shouldShowAskBiometryUseCase() - if (showBiometry.not()) { - nextScreen(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, replace = true)) + val shouldShowAskBiometry = canUseBiometryUseCase.strict() && shouldShowAskBiometryUseCase() + if (shouldShowAskBiometry.not()) { + nextScreen(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, shouldReplace = true)) } } AddressSyncStep.ASK_NOTIFICATIONS -> { - val showNotification = shouldAskPermissionUseCase(PUSH_PERMISSION) - if (showNotification.not()) { - nextScreen(AddressSyncIntent.Next(step = AddressSyncStep.ADDRESS_SYNC, replace = true)) + val shouldShowAskNotification = shouldAskPermissionUseCase(PUSH_PERMISSION) + if (shouldShowAskNotification.not()) { + nextScreen(AddressSyncIntent.Next(step = AddressSyncStep.ADDRESS_SYNC, shouldReplace = true)) } } AddressSyncStep.ADDRESS_SYNC -> Unit diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/ui/AddressSyncContent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/ui/AddressSyncContent.kt index 3da4b6d12e..9c0c693d4e 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/ui/AddressSyncContent.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/addresssync/ui/AddressSyncContent.kt @@ -14,10 +14,7 @@ import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview @Composable -internal fun AddressSyncContent( - modifier: Modifier = Modifier, - childContent: @Composable (Modifier) -> Unit = {}, -) { +internal fun AddressSyncContent(modifier: Modifier = Modifier, childContent: @Composable (Modifier) -> Unit = {}) { Column( modifier = modifier .background(color = TangemTheme.colors.background.secondary) @@ -26,7 +23,7 @@ internal fun AddressSyncContent( .systemBarsPadding(), horizontalAlignment = Alignment.CenterHorizontally, ) { - childContent(modifier) + childContent(Modifier) } } diff --git a/features/onboarding-v2/impl/src/test/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModelTest.kt b/features/onboarding-v2/impl/src/test/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModelTest.kt index 5f5797cc29..0e4a8acc7d 100644 --- a/features/onboarding-v2/impl/src/test/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModelTest.kt +++ b/features/onboarding-v2/impl/src/test/kotlin/com/tangem/features/onboarding/v2/addresssync/model/AddressSyncModelTest.kt @@ -39,7 +39,7 @@ internal class AddressSyncModelTest { val model = createModel(this) val stack = model.stackNavigation.trackStack() - model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, replace = false)) + model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, shouldReplace = false)) advanceUntilIdle() assert(stack == listOf(AddressSyncStep.ASK_BIOMETRY)) @@ -55,7 +55,7 @@ internal class AddressSyncModelTest { val model = createModel(this) val stack = model.stackNavigation.trackStack() - model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, replace = false)) + model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, shouldReplace = false)) advanceUntilIdle() assert(stack == listOf(AddressSyncStep.ASK_NOTIFICATIONS)) @@ -70,7 +70,7 @@ internal class AddressSyncModelTest { val model = createModel(this) val stack = model.stackNavigation.trackStack() - model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, replace = false)) + model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_BIOMETRY, shouldReplace = false)) advanceUntilIdle() assert(stack == listOf(AddressSyncStep.ADDRESS_SYNC)) @@ -83,7 +83,7 @@ internal class AddressSyncModelTest { val model = createModel(this) val stack = model.stackNavigation.trackStack() - model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, replace = false)) + model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, shouldReplace = false)) advanceUntilIdle() assert(stack == listOf(AddressSyncStep.ASK_NOTIFICATIONS)) @@ -96,7 +96,7 @@ internal class AddressSyncModelTest { val model = createModel(this) val stack = model.stackNavigation.trackStack() - model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, replace = false)) + model.onIntent(AddressSyncIntent.Next(step = AddressSyncStep.ASK_NOTIFICATIONS, shouldReplace = false)) advanceUntilIdle() assert(stack == listOf(AddressSyncStep.ADDRESS_SYNC))