From 983511e08434a5d0773344ecf3d027163bd08707 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 5 Sep 2025 16:23:03 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../v2/note/impl/DefaultOnboardingNoteComponent.kt | 12 ++---------- .../v2/note/impl/model/OnboardingNoteModel.kt | 13 +------------ .../v2/note/impl/route/OnboardingNoteRoute.kt | 5 +---- .../features/onboarding/v2/note/impl/route/Step.kt | 1 - 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/DefaultOnboardingNoteComponent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/DefaultOnboardingNoteComponent.kt index 092e847893..313506dfb3 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/DefaultOnboardingNoteComponent.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/DefaultOnboardingNoteComponent.kt @@ -9,7 +9,6 @@ import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation import com.arkivanov.decompose.extensions.compose.subscribeAsState import com.arkivanov.decompose.router.stack.ChildStack import com.arkivanov.decompose.router.stack.childStack -import com.arkivanov.decompose.router.stack.push import com.arkivanov.decompose.value.Value import com.arkivanov.decompose.value.subscribe import com.arkivanov.essenty.instancekeeper.getOrCreateSimple @@ -59,7 +58,7 @@ internal class DefaultOnboardingNoteComponent @AssistedInject constructor( key = "innerStack", source = model.stackNavigation, serializer = null, - initialConfiguration = model.initialRoute, + initialConfiguration = OnboardingNoteRoute.CreateWallet, handleBackButton = true, childFactory = { configuration, factoryContext -> createChild( @@ -99,17 +98,10 @@ internal class DefaultOnboardingNoteComponent @AssistedInject constructor( childParams = childParams, onWalletCreated = { userWallet -> model.onWalletCreated(userWallet) - model.stackNavigation.push(OnboardingNoteRoute.Done) + params.onDone() }, ), ) - OnboardingNoteRoute.Done -> onboardingDoneComponentFactory.create( - context = factoryContext, - params = OnboardingDoneComponent.Params( - mode = OnboardingDoneComponent.Mode.WalletCreated, - onDone = { params.onDone() }, - ), - ) } } diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/model/OnboardingNoteModel.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/model/OnboardingNoteModel.kt index ae47a8ab9d..ddfd182953 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/model/OnboardingNoteModel.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/model/OnboardingNoteModel.kt @@ -35,10 +35,8 @@ internal class OnboardingNoteModel @Inject constructor( @Suppress("UnusedPrivateMember") private val params = paramsContainer.require() - val initialRoute = initializeRoute() - private val _innerNavigationState = - MutableStateFlow(OnboardingNoteInnerNavigationState(stackSize = initialRoute.stepNum())) + MutableStateFlow(OnboardingNoteInnerNavigationState(stackSize = OnboardingNoteRoute.CreateWallet.stepNum())) val innerNavigationState = _innerNavigationState.asStateFlow() @@ -79,15 +77,6 @@ internal class OnboardingNoteModel @Inject constructor( } } - private fun initializeRoute(): OnboardingNoteRoute { - val card = params.scanResponse.card - return if (card.wallets.isEmpty()) { - OnboardingNoteRoute.CreateWallet - } else { - OnboardingNoteRoute.Done - } - } - private fun loadArtwork() { modelScope.launch { val cardInfo = params.scanResponse.card diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/OnboardingNoteRoute.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/OnboardingNoteRoute.kt index cc8101af19..adfafad870 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/OnboardingNoteRoute.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/OnboardingNoteRoute.kt @@ -7,9 +7,6 @@ internal sealed class OnboardingNoteRoute { @Serializable data object CreateWallet : OnboardingNoteRoute() - - @Serializable - data object Done : OnboardingNoteRoute() } -internal const val ONBOARDING_NOTE_STEPS_COUNT = 2 \ No newline at end of file +internal const val ONBOARDING_NOTE_STEPS_COUNT = 1 \ No newline at end of file diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/Step.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/Step.kt index 83b41e6d8f..9d6c137388 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/Step.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/note/impl/route/Step.kt @@ -2,5 +2,4 @@ package com.tangem.features.onboarding.v2.note.impl.route internal fun OnboardingNoteRoute.stepNum() = when (this) { OnboardingNoteRoute.CreateWallet -> 1 - OnboardingNoteRoute.Done -> 2 } \ No newline at end of file