diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingFeature.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingFeature.kt
index aed7e95547..a9aeae9a74 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingFeature.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingFeature.kt
@@ -9,7 +9,13 @@ object FirstProblemOnboardingFeature {
     internal data class State(
         val profileState: ProfileState,
         val nextLearningActivityState: NextLearningActivityState,
+        /**
+         * Field to differ new and existing users to change screen texts/icons
+         */
         val isNewUserMode: Boolean,
+        /**
+         * Flag for displaying loading animation (after click on CTA button)
+         */
         val isLearningActivityLoading: Boolean = false
     )
 
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingReducer.kt
index ae1124f7d8..0d5bcb1b65 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingReducer.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/first_problem_onboarding/presentation/FirstProblemOnboardingReducer.kt
@@ -33,10 +33,13 @@ internal class FirstProblemOnboardingReducer : StateReducer<State, Message, Acti
         if (state.profileState is ProfileState.Idle &&
             state.nextLearningActivityState is NextLearningActivityState.Idle
         ) {
-            state.updateProfileState(ProfileState.Loading) to setOf(
-                InternalAction.FetchProfile,
-                InternalAction.FetchNextLearningActivity
-            )
+            state
+                .updateProfileState(ProfileState.Loading)
+                .updateNextLearningActivityState(NextLearningActivityState.Loading) to
+                setOf(
+                    InternalAction.FetchProfile,
+                    InternalAction.FetchNextLearningActivity
+                )
         } else {
             null
         }
@@ -71,11 +74,12 @@ internal class FirstProblemOnboardingReducer : StateReducer<State, Message, Acti
             FirstProblemOnboardingFeature.FetchNextLearningActivityResult.Error ->
                 state
                     .copy(isLearningActivityLoading = false)
-                    .updateNextLearningActivityState(NextLearningActivityState.Error) to buildSet {
-                    if (state.isLearningActivityLoading) {
-                        add(Action.ViewAction.ShowNetworkError)
+                    .updateNextLearningActivityState(NextLearningActivityState.Error) to
+                    buildSet {
+                        if (state.isLearningActivityLoading) {
+                            add(Action.ViewAction.ShowNetworkError)
+                        }
                     }
-                }
             is FirstProblemOnboardingFeature.FetchNextLearningActivityResult.Success ->
                 if (state.isLearningActivityLoading) {
                     state.copy(isLearningActivityLoading = false) to setOf(