Shared: Fix subscription management is not available for MobileConten…

…tTrial subscription (#1144) ^ALTAPPS-1317
hyperskill · Aug 5, 2024 · 5aadab9 · 5aadab9
1 parent 984fa60
commit 5aadab9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/...monMain/kotlin/org/hyperskill/app/profile_settings/presentation/ProfileSettingsReducer.kt b/...monMain/kotlin/org/hyperskill/app/profile_settings/presentation/ProfileSettingsReducer.kt
@@ -189,8 +189,8 @@ internal class ProfileSettingsReducer : StateReducer<State, Message, Action> {
         state: State
     ): ReducerResult =
         if (state is State.Content) {
-            state to when (state.subscription?.type) {
-                SubscriptionType.MOBILE_ONLY ->
+            state to when {
+                state.subscription?.type == SubscriptionType.MOBILE_ONLY ->
                     setOf(
                         Action.LogAnalyticEvent(
                             ProfileSettingsClickedHyperskillAnalyticEvent(
@@ -199,7 +199,7 @@ internal class ProfileSettingsReducer : StateReducer<State, Message, Action> {
                         ),
                         Action.ViewAction.NavigateTo.SubscriptionManagement
                     )
-                SubscriptionType.FREEMIUM ->
+                state.subscription?.type?.canUpgradeToMobileOnly == true ->
                     setOf(
                         Action.LogAnalyticEvent(
                             ProfileSettingsClickedHyperskillAnalyticEvent(

diff --git a/...monMain/kotlin/org/hyperskill/app/profile_settings/view/ProfileSettingsViewStateMapper.kt b/...monMain/kotlin/org/hyperskill/app/profile_settings/view/ProfileSettingsViewStateMapper.kt
@@ -20,35 +20,25 @@ internal class ProfileSettingsViewStateMapper(
         ViewState.Content(
             profileSettings = state.profileSettings,
             isLoadingMagicLink = state.isLoadingMagicLink,
-            subscriptionState = if (isSubscriptionVisible(state)) {
-                when (state.subscription?.type) {
-                    SubscriptionType.MOBILE_ONLY ->
+            subscriptionState = if (state.subscription != null && state.mobileOnlyFormattedPrice != null) {
+                when {
+                    state.subscription.type == SubscriptionType.MOBILE_ONLY -> {
                         ViewState.Content.SubscriptionState(
                             resourceProvider.getString(SharedResources.strings.settings_subscription_mobile_only)
                         )
-                    SubscriptionType.FREEMIUM -> {
-                        state.mobileOnlyFormattedPrice?.let {
-                            ViewState.Content.SubscriptionState(
-                                resourceProvider.getString(
-                                    SharedResources.strings.settings_subscription_mobile_only_suggestion,
-                                    state.mobileOnlyFormattedPrice
-                                )
+                    }
+                    state.subscription.type.canUpgradeToMobileOnly -> {
+                        ViewState.Content.SubscriptionState(
+                            resourceProvider.getString(
+                                SharedResources.strings.settings_subscription_mobile_only_suggestion,
+                                state.mobileOnlyFormattedPrice
                             )
-                        }
+                        )
                     }
                     else -> null
                 }
             } else {
                 null
             }
         )
-
-    private fun isSubscriptionVisible(state: ProfileSettingsFeature.State.Content): Boolean =
-        state.subscription != null &&
-            state.mobileOnlyFormattedPrice != null &&
-            when (state.subscription.type) {
-                SubscriptionType.FREEMIUM,
-                SubscriptionType.MOBILE_ONLY -> true
-                else -> false
-            }
 }
diff --git a/...d/src/commonMain/kotlin/org/hyperskill/app/subscriptions/domain/model/SubscriptionType.kt b/...d/src/commonMain/kotlin/org/hyperskill/app/subscriptions/domain/model/SubscriptionType.kt
@@ -9,6 +9,7 @@ enum class SubscriptionType(
     val isProjectInfoAvailable: Boolean = true,
     val isCertificateAvailable: Boolean = true,
     val areHintsLimited: Boolean = false,
+    val canUpgradeToMobileOnly: Boolean = false,
     val subscriptionLimitType: SubscriptionLimitType = SubscriptionLimitType.NONE
 ) {
     @SerialName("personal")
@@ -39,12 +40,14 @@ enum class SubscriptionType(
         isCertificateAvailable = false,
         isProjectInfoAvailable = false,
         areHintsLimited = true,
+        canUpgradeToMobileOnly = true,
         subscriptionLimitType = SubscriptionLimitType.PROBLEMS
     ),
     MOBILE_CONTENT_TRIAL(
         isCertificateAvailable = false,
         isProjectInfoAvailable = false,
         areHintsLimited = true,
+        canUpgradeToMobileOnly = true,
         subscriptionLimitType = SubscriptionLimitType.TOPICS
     ),