Shared: Navigate user back to step after the subscription purchase (#933)

^ALTAPPS-1148

Author: XanderZhu

androidHyperskillApp/src/main/java/org/hyperskill/app/android/paywall/fragment/PaywallFragment.kt

@@ -77,8 +77,8 @@ class PaywallFragment : Fragment() {
             ViewAction.CompletePaywall -> {
                 requireAppRouter().sendResult(PAYWALL_COMPLETED, Any())
             }
-            ViewAction.StudyPlan -> {
-                requireRouter().backTo(MainScreen(initialTab = Tabs.STUDY_PLAN))
+            ViewAction.NavigateTo.Back -> {
+                requireRouter().exit()
             }
             is ViewAction.ShowMessage -> {
                 Toast.makeText(

androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt

@@ -23,6 +23,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.hyperskill.app.android.HyperskillApp
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.core.extensions.argument
+import org.hyperskill.app.android.core.view.ui.dialog.dismissDialogFragmentIfExists
 import org.hyperskill.app.android.core.view.ui.fragment.parentOfType
 import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
 import org.hyperskill.app.android.databinding.FragmentStepQuizBinding
@@ -290,6 +291,9 @@ abstract class DefaultStepQuizFragment :
                     .newInstance(action.modalData)
                     .showIfNotExists(childFragmentManager, ProblemsLimitReachedBottomSheet.TAG)
             }
+            StepQuizFeature.Action.ViewAction.HideProblemsLimitReachedModal -> {
+                childFragmentManager.dismissDialogFragmentIfExists(ProblemsLimitReachedBottomSheet.TAG)
+            }
             is StepQuizFeature.Action.ViewAction.ShowProblemOnboardingModal -> {
                 ProblemOnboardingBottomSheetDialogFragment.newInstance(action.modalType)
                     .showIfNotExists(

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/Views/StepQuizView.swift

@@ -342,6 +342,8 @@ struct StepQuizView: View {
             }
         case .openUrl(let data):
             WebControllerManager.shared.presentWebControllerWithURLString(data.url, controllerType: .inAppSafari)
+        case .hideProblemsLimitReachedModal:
+            #warning("TODO: ALTAPPS-1148")
         }
     }
 }

shared/src/commonMain/kotlin/org/hyperskill/app/paywall/presentation/PaywallFeature.kt

@@ -71,15 +71,15 @@ object PaywallFeature {
 
             object ClosePaywall : ViewAction
 
-            object StudyPlan : ViewAction
-
             data class ShowMessage(
                 val messageKind: MessageKind
             ) : ViewAction
 
             data class OpenUrl(val url: String) : ViewAction
 
             sealed interface NavigateTo : ViewAction {
+                object Back : NavigateTo
+
                 object BackToProfileSettings : NavigateTo
             }
         }

shared/src/commonMain/kotlin/org/hyperskill/app/paywall/presentation/PaywallReducer.kt

@@ -175,7 +175,7 @@ internal class PaywallReducer(
             PaywallTransitionSource.PROFILE_SETTINGS ->
                 Action.ViewAction.NavigateTo.BackToProfileSettings
             PaywallTransitionSource.PROBLEMS_LIMIT_MODAL ->
-                Action.ViewAction.StudyPlan
+                Action.ViewAction.NavigateTo.Back
         }
 
     private fun handleClickedTermsOfServiceAndPrivacyPolicy(state: State): ReducerResult =

shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponentImpl.kt

@@ -61,6 +61,7 @@ internal class StepQuizComponentImpl(
             resourceProvider = appGraph.commonComponent.resourceProvider,
             logger = appGraph.loggerComponent.logger,
             buildVariant = appGraph.commonComponent.buildKonfig.buildVariant,
-            platform = appGraph.commonComponent.platform
+            platform = appGraph.commonComponent.platform,
+            currentSubscriptionStateRepository = appGraph.stateRepositoriesComponent.currentSubscriptionStateRepository
         )
 }

shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizFeatureBuilder.kt

@@ -21,6 +21,7 @@ import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsActionDispat
 import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature
 import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsReducer
 import org.hyperskill.app.subscriptions.domain.interactor.SubscriptionsInteractor
+import org.hyperskill.app.subscriptions.domain.repository.CurrentSubscriptionStateRepository
 import ru.nobird.app.core.model.safeCast
 import ru.nobird.app.presentation.redux.dispatcher.transform
 import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher
@@ -45,7 +46,8 @@ internal object StepQuizFeatureBuilder {
         resourceProvider: ResourceProvider,
         logger: Logger,
         buildVariant: BuildVariant,
-        platform: Platform
+        platform: Platform,
+        currentSubscriptionStateRepository: CurrentSubscriptionStateRepository
     ): Feature<StepQuizFeature.State, StepQuizFeature.Message, StepQuizFeature.Action> {
         val stepQuizReducer = StepQuizReducer(
             stepRoute = stepRoute,
@@ -57,6 +59,7 @@ internal object StepQuizFeatureBuilder {
             stepQuizReplyValidator = stepQuizReplyValidator,
             subscriptionsInteractor = subscriptionsInteractor,
             currentProfileStateRepository = currentProfileStateRepository,
+            currentSubscriptionStateRepository = currentSubscriptionStateRepository,
             urlPathProcessor = urlPathProcessor,
             analyticInteractor = analyticInteractor,
             sentryInteractor = sentryInteractor,

shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizActionDispatcher.kt

@@ -1,5 +1,9 @@
 package org.hyperskill.app.step_quiz.presentation
 
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import org.hyperskill.app.SharedResources
 import org.hyperskill.app.analytic.domain.interactor.AnalyticInteractor
 import org.hyperskill.app.core.domain.platform.Platform
@@ -30,6 +34,7 @@ import org.hyperskill.app.subscriptions.domain.interactor.SubscriptionsInteracto
 import org.hyperskill.app.subscriptions.domain.model.Subscription
 import org.hyperskill.app.subscriptions.domain.model.isFreemium
 import org.hyperskill.app.subscriptions.domain.model.isProblemsLimitReached
+import org.hyperskill.app.subscriptions.domain.repository.CurrentSubscriptionStateRepository
 import ru.nobird.app.presentation.redux.dispatcher.CoroutineActionDispatcher
 
 internal class StepQuizActionDispatcher(
@@ -43,8 +48,23 @@ internal class StepQuizActionDispatcher(
     private val sentryInteractor: SentryInteractor,
     private val onboardingInteractor: OnboardingInteractor,
     private val resourceProvider: ResourceProvider,
-    private val platform: Platform
+    private val platform: Platform,
+    currentSubscriptionStateRepository: CurrentSubscriptionStateRepository
 ) : CoroutineActionDispatcher<Action, Message>(config.createConfig()) {
+
+    init {
+        currentSubscriptionStateRepository
+            .changes
+            .map { it.isProblemsLimitReached }
+            .distinctUntilChanged()
+            .onEach { isProblemsLimitReached ->
+                onNewMessage(
+                    InternalMessage.ProblemsLimitChanged(isProblemsLimitReached)
+                )
+            }
+            .launchIn(actionScope)
+    }
+
     override suspend fun doSuspendableAction(action: Action) {
         when (action) {
             is Action.FetchAttempt ->
@@ -200,21 +220,13 @@ internal class StepQuizActionDispatcher(
                 getSubmissionState(attempt.id, action.step.id, currentProfile.id)
                     .getOrThrow()
 
-            val isProblemsLimitReached = currentSubscription.isProblemsLimitReached
-            val problemsLimitReachedModalData = if (isProblemsLimitReached) {
-                getProblemsLimitReachedModalData(
-                    currentSubscription,
-                    isSubscriptionPurchaseEnabled(currentProfile, currentSubscription)
-                )
-            } else {
-                null
-            }
+            val problemsLimitReachedModalData = getProblemsLimitReachedModalData(currentProfile, currentSubscription)
 
             Message.FetchAttemptSuccess(
                 step = action.step,
                 attempt = attempt,
                 submissionState = submissionState,
-                isProblemsLimitReached = isProblemsLimitReached,
+                isProblemsLimitReached = currentSubscription.isProblemsLimitReached,
                 problemsLimitReachedModalData = problemsLimitReachedModalData,
                 problemsOnboardingFlags = onboardingInteractor.getProblemsOnboardingFlags()
             )
@@ -236,20 +248,25 @@ internal class StepQuizActionDispatcher(
                 }
             }
 
-    internal fun isSubscriptionPurchaseEnabled(
-        currentProfile: Profile,
-        currentSubscription: Subscription
+    private fun isSubscriptionPurchaseEnabled(
+        profile: Profile,
+        subscription: Subscription
     ): Boolean =
         platform.isSubscriptionPurchaseEnabled &&
-            currentProfile.features.isMobileOnlySubscriptionEnabled &&
-            currentSubscription.isFreemium
+            profile.features.isMobileOnlySubscriptionEnabled &&
+            subscription.isFreemium
 
+    // TODO: ALTAPPS-1171: Extract ProblemsLimitReachedModal into a separate feature
     private suspend fun getProblemsLimitReachedModalData(
-        subscription: Subscription,
-        isSubscriptionPurchaseEnabled: Boolean
+        profile: Profile,
+        subscription: Subscription
     ): StepQuizFeature.ProblemsLimitReachedModalData? {
+        if (!subscription.isProblemsLimitReached) return null
+
         val stepsLimitTotal = subscription.stepsLimitTotal ?: return null
 
+        val isSubscriptionPurchaseEnabled = isSubscriptionPurchaseEnabled(profile, subscription)
+
         return if (currentProfileStateRepository.isFreemiumWrongSubmissionChargeLimitsEnabled()) {
             StepQuizFeature.ProblemsLimitReachedModalData(
                 title = resourceProvider.getString(
@@ -303,15 +320,7 @@ internal class StepQuizActionDispatcher(
         subscriptionsInteractor.chargeProblemsLimits(action.chargeStrategy)
 
         val subscription = subscriptionsInteractor.getCurrentSubscription().getOrElse { return }
-        val problemsLimitReachedModalData =
-            if (subscription.isProblemsLimitReached) {
-                getProblemsLimitReachedModalData(
-                    subscription = subscription,
-                    isSubscriptionPurchaseEnabled = isSubscriptionPurchaseEnabled(currentProfile, subscription)
-                )
-            } else {
-                null
-            }
+        val problemsLimitReachedModalData = getProblemsLimitReachedModalData(currentProfile, subscription)
 
         onNewMessage(
             InternalMessage.UpdateProblemsLimitResult(

shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizFeature.kt

@@ -156,6 +156,8 @@ object StepQuizFeature {
             val problemsLimitReachedModalData: ProblemsLimitReachedModalData?
         ) : InternalMessage
 
+        data class ProblemsLimitChanged(val isProblemsLimitReached: Boolean) : InternalMessage
+
         object CreateMagicLinkForUnsupportedQuizError : InternalMessage
         data class CreateMagicLinkForUnsupportedQuizSuccess(val url: String) : InternalMessage
     }
@@ -198,6 +200,8 @@ object StepQuizFeature {
 
             data class ShowProblemsLimitReachedModal(val modalData: ProblemsLimitReachedModalData) : ViewAction
 
+            object HideProblemsLimitReachedModal : ViewAction
+
             data class ShowProblemOnboardingModal(val modalType: ProblemOnboardingModal) : ViewAction
 
             data class StepQuizHintsViewAction(

shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizReducer.kt

@@ -220,6 +220,8 @@ internal class StepQuizReducer(
             }
             is InternalMessage.UpdateProblemsLimitResult ->
                 handleUpdateProblemsLimitResult(state, message)
+            is InternalMessage.ProblemsLimitChanged ->
+                handleProblemsLimitChanged(state, message)
             is Message.ProblemsLimitReachedModalGoToHomeScreenClicked ->
                 state to setOf(
                     Action.ViewAction.NavigateTo.Home,
@@ -442,6 +444,28 @@ internal class StepQuizReducer(
             null
         }
 
+    private fun handleProblemsLimitChanged(
+        state: State,
+        message: InternalMessage.ProblemsLimitChanged
+    ): StepQuizReducerResult? =
+        if (state.stepQuizState is StepQuizState.AttemptLoaded) {
+            val isProblemsLimitReached =
+                StepQuizResolver.isStepHasLimitedAttempts(stepRoute) && message.isProblemsLimitReached
+            val shouldHideProblemsLimitModal =
+                state.stepQuizState.isProblemsLimitReached && !isProblemsLimitReached
+            state.copy(
+                stepQuizState = state.stepQuizState.copy(
+                    isProblemsLimitReached = isProblemsLimitReached
+                )
+            ) to if (shouldHideProblemsLimitModal) {
+                setOf(Action.ViewAction.HideProblemsLimitReachedModal)
+            } else {
+                emptySet()
+            }
+        } else {
+            null
+        }
+
     private fun handleTheoryToolbarItemClicked(state: State): StepQuizReducerResult =
         if (state.stepQuizState is StepQuizState.AttemptLoaded &&
             state.stepQuizState.isTheoryAvailable

shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizTest.kt

@@ -304,7 +304,11 @@ class StepQuizTest {
         )
 
         assertEquals(expectedState, actualState)
-        assertTrue(actualActions.isEmpty())
+        assertTrue {
+            actualActions.none {
+                it is StepQuizFeature.Action.ViewAction.ShowProblemsLimitReachedModal
+            }
+        }
     }
 
     @Test