From 702ad41e70d26810d8e45fe2758aa273d7c8d91a Mon Sep 17 00:00:00 2001
From: Aleksandr Zhukov <alexandr.zhukov@hyperskill.org>
Date: Tue, 30 Jul 2024 17:09:13 +0200
Subject: [PATCH] Shared, Android skip suggestion (#1126)

---
 .../extensions/NestedScollViewExtention.kt    |   7 +
 .../fragment/StageStepWrapperFragment.kt      |   7 +
 .../step/view/delegate/StepMenuDelegate.kt    |  12 +-
 .../step/view/fragment/StepWrapperFragment.kt |  19 +-
 .../step/view/model/StepMenuPrimaryAction.kt  |   3 +-
 .../step/view/model/StepToolbarCallback.kt    |   2 +
 .../step_practice/model/StepPracticeHost.kt   |   3 +
 .../view/fragment/StepPracticeFragment.kt     |   7 +
 .../StepQuizFeedbackBlocksDelegate.kt         |  64 +++-
 .../view/fragment/DefaultStepQuizFragment.kt  |  45 +--
 .../view/mapper/StepQuizFeedbackMapper.kt     |  55 ----
 .../view/model/StepQuizFeedbackState.kt       |  13 -
 .../drawable/bg_step_quiz_feedback_wrong.xml  |   7 +
 .../drawable/ic_step_quiz_feedback_wrong.xml  |  13 +
 .../layout_step_quiz_feedback_block.xml       |  51 ++-
 .../src/main/res/menu/step_menu.xml           |  14 +-
 .../src/main/res/values/styles.xml            |  10 +-
 config/detekt/baseline.xml                    |   3 +-
 .../Views/Toolbar/StepToolbarContent.swift    |  36 +--
 .../Modules/StepQuiz/Views/StepQuizView.swift |   6 +
 .../app/step/presentation/StepViewModel.kt    |   9 +-
 .../hyperskill/HyperskillAnalyticPart.kt      |   3 +-
 ...enuActionClickedHyperskillAnalyticEvent.kt |   1 +
 .../hyperskill/app/step/domain/model/Step.kt  |   9 +-
 .../domain/model/StepMenuSecondaryAction.kt   |   1 +
 .../app/step/presentation/StepFeature.kt      |   6 +-
 .../app/step/presentation/StepReducer.kt      |  51 ++-
 .../step/view/mapper/StepViewStateMapper.kt   |  13 +-
 ...dCommentsClickedHyperskillAnalyticEvent.kt |  31 ++
 ...ckSeeHintClickedHyperskillAnalyticEvent.kt |  31 ++
 ...dbackSkipClickedHyperskillAnalyticEvent.kt |  31 ++
 .../step_quiz/injection/StepQuizComponent.kt  |   2 +
 .../injection/StepQuizComponentImpl.kt        |  14 +-
 .../step_quiz/presentation/StepQuizFeature.kt |  67 ++--
 .../step_quiz/presentation/StepQuizReducer.kt |  68 +++-
 .../view/mapper/StepQuizFeedbackMapper.kt     | 121 ++++++++
 .../view/model/StepQuizFeedbackState.kt       |  33 ++
 .../presentation/StepQuizHintsFeature.kt      |   7 +
 .../presentation/StepQuizHintsReducer.kt      |  89 +++---
 .../moko-resources/base/strings.xml           |   8 +
 .../step/StepViewStateMapperTest.kt           |  12 +-
 .../step_quiz/StepQuizFeedbackMapperTest.kt   | 291 ++++++++++++++++++
 .../org/hyperskill/step_quiz/StepQuizTest.kt  | 206 ++++++++++++-
 43 files changed, 1214 insertions(+), 267 deletions(-)
 delete mode 100644 androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
 delete mode 100644 androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/model/StepQuizFeedbackState.kt
 create mode 100644 androidHyperskillApp/src/main/res/drawable/bg_step_quiz_feedback_wrong.xml
 create mode 100644 androidHyperskillApp/src/main/res/drawable/ic_step_quiz_feedback_wrong.xml
 create mode 100644 shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent.kt
 create mode 100644 shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent.kt
 create mode 100644 shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSkipClickedHyperskillAnalyticEvent.kt
 create mode 100644 shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
 create mode 100644 shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/model/StepQuizFeedbackState.kt
 create mode 100644 shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizFeedbackMapperTest.kt

diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/extensions/NestedScollViewExtention.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/extensions/NestedScollViewExtention.kt
index 1b8da2ab95..55f757a8d8 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/extensions/NestedScollViewExtention.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/extensions/NestedScollViewExtention.kt
@@ -15,4 +15,11 @@ fun NestedScrollView.smoothScrollToBottom(durationMilliseconds: Int = DEFAULT_SM
         val y = view.bottom + lp.bottomMargin + scrollView.paddingBottom
         scrollView.smoothScrollTo(0, y, durationMilliseconds)
     }
+}
+
+fun NestedScrollView.smoothScrollTo(view: View, durationMilliseconds: Int = DEFAULT_SMOOTH_SCROLL_DURATION) {
+    val scrollView = this
+    val lp = view.layoutParams as ViewGroup.MarginLayoutParams
+    val y = view.bottom + lp.bottomMargin
+    scrollView.smoothScrollTo(0, y, durationMilliseconds)
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/stage_implementation/fragment/StageStepWrapperFragment.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/stage_implementation/fragment/StageStepWrapperFragment.kt
index 1606a542f2..7768b592db 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/stage_implementation/fragment/StageStepWrapperFragment.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/stage_implementation/fragment/StageStepWrapperFragment.kt
@@ -12,6 +12,7 @@ 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.extensions.logger
+import org.hyperskill.app.android.core.extensions.smoothScrollTo
 import org.hyperskill.app.android.core.extensions.smoothScrollToBottom
 import org.hyperskill.app.android.core.view.ui.fragment.setChildFragment
 import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
@@ -228,4 +229,10 @@ class StageStepWrapperFragment :
             .stagePracticeContainer
             .smoothScrollToBottom(SMOOTH_SCROLL_DURATION_MILLISECONDS)
     }
+
+    override fun scrollTo(view: View) {
+        viewBinding
+            .stagePracticeContainer
+            .smoothScrollTo(view, SMOOTH_SCROLL_DURATION_MILLISECONDS)
+    }
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepMenuDelegate.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepMenuDelegate.kt
index d22ddc4b20..a1599a1919 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepMenuDelegate.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/delegate/StepMenuDelegate.kt
@@ -24,7 +24,7 @@ import org.hyperskill.app.step.domain.model.StepMenuSecondaryAction
 @OptIn(FlowPreview::class)
 class StepMenuDelegate(
     menuHost: MenuHost,
-    private val viewLifecycleOwner: LifecycleOwner,
+    viewLifecycleOwner: LifecycleOwner,
     private val onPrimaryActionClick: (StepMenuPrimaryAction) -> Unit,
     private val onSecondaryActionClick: (StepMenuSecondaryAction) -> Unit,
     private val onBackClick: () -> Unit
@@ -89,7 +89,6 @@ class StepMenuDelegate(
             val menuItem: MenuItem? = menu.findItem(
                 when (action) {
                     StepMenuPrimaryAction.THEORY -> R.id.theory
-                    StepMenuPrimaryAction.COMMENTS -> R.id.comments
                 }
             )
             val isVisible = params?.isVisible == true
@@ -108,6 +107,7 @@ class StepMenuDelegate(
                 StepMenuSecondaryAction.REPORT -> R.id.practiceFeedback
                 StepMenuSecondaryAction.SKIP -> R.id.skip
                 StepMenuSecondaryAction.OPEN_IN_WEB -> R.id.open_in_web
+                StepMenuSecondaryAction.COMMENTS -> R.id.comments
             }
             menu.findItem(menuItemId)?.isVisible = actions.contains(action)
         }
@@ -115,14 +115,14 @@ class StepMenuDelegate(
 
     override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
         when (menuItem.itemId) {
-            R.id.comments -> {
-                onPrimaryActionClick.invoke(StepMenuPrimaryAction.COMMENTS)
-                true
-            }
             R.id.theory -> {
                 onPrimaryActionClick.invoke(StepMenuPrimaryAction.THEORY)
                 true
             }
+            R.id.comments -> {
+                onSecondaryActionClick.invoke(StepMenuSecondaryAction.COMMENTS)
+                true
+            }
             R.id.practiceFeedback -> {
                 onSecondaryActionClick.invoke(StepMenuSecondaryAction.REPORT)
                 true
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/fragment/StepWrapperFragment.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/fragment/StepWrapperFragment.kt
index e3f6807a45..04ec55f43d 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/fragment/StepWrapperFragment.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/fragment/StepWrapperFragment.kt
@@ -22,7 +22,6 @@ import org.hyperskill.app.android.step.view.model.LimitsWidgetCallback
 import org.hyperskill.app.android.step.view.model.StepCompletionHost
 import org.hyperskill.app.android.step.view.model.StepCompletionView
 import org.hyperskill.app.android.step.view.model.StepMenuPrimaryAction
-import org.hyperskill.app.android.step.view.model.StepMenuPrimaryActionParams
 import org.hyperskill.app.android.step.view.model.StepPracticeCallback
 import org.hyperskill.app.android.step.view.model.StepToolbarCallback
 import org.hyperskill.app.android.step.view.model.StepToolbarHost
@@ -136,13 +135,6 @@ class StepWrapperFragment :
             initStepContainer(stepState)
             parentOfType(StepToolbarHost::class.java)?.apply {
                 renderTopicProgress(state.stepToolbarViewState)
-                renderPrimaryAction(
-                    StepMenuPrimaryAction.COMMENTS,
-                    StepMenuPrimaryActionParams(
-                        isVisible = state.isCommentsToolbarItemAvailable,
-                        isEnabled = true
-                    )
-                )
                 renderSecondaryMenuActions(state.stepMenuSecondaryActions)
             }
             (childFragmentManager.findFragmentByTag(STEP_CONTENT_TAG) as? StepCompletionView)
@@ -223,13 +215,18 @@ class StepWrapperFragment :
                 (childFragmentManager.findFragmentByTag(STEP_CONTENT_TAG) as? StepPracticeCallback)
                     ?.onTheoryClick()
             }
-            StepMenuPrimaryAction.COMMENTS -> {
-                stepViewModel.onCommentsClick()
-            }
         }
     }
 
     override fun onSecondaryActionClicked(action: StepMenuSecondaryAction) {
         stepViewModel.onActionClick(action)
     }
+
+    override fun requestShowComments() {
+        stepViewModel.requestShowComments()
+    }
+
+    override fun requestSkip() {
+        stepViewModel.requestSkip()
+    }
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepMenuPrimaryAction.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepMenuPrimaryAction.kt
index 6f848df6c9..a6673e89a7 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepMenuPrimaryAction.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepMenuPrimaryAction.kt
@@ -1,6 +1,5 @@
 package org.hyperskill.app.android.step.view.model
 
 enum class StepMenuPrimaryAction {
-    THEORY,
-    COMMENTS
+    THEORY
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepToolbarCallback.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepToolbarCallback.kt
index 9366748a8f..2dae115c0f 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepToolbarCallback.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step/view/model/StepToolbarCallback.kt
@@ -5,4 +5,6 @@ import org.hyperskill.app.step.domain.model.StepMenuSecondaryAction
 interface StepToolbarCallback {
     fun onPrimaryActionClicked(action: StepMenuPrimaryAction)
     fun onSecondaryActionClicked(action: StepMenuSecondaryAction)
+    fun requestShowComments()
+    fun requestSkip()
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/model/StepPracticeHost.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/model/StepPracticeHost.kt
index 072d32c094..fa3b191d23 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/model/StepPracticeHost.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/model/StepPracticeHost.kt
@@ -1,5 +1,8 @@
 package org.hyperskill.app.android.step_practice.model
 
+import android.view.View
+
 interface StepPracticeHost {
     fun fullScrollDown()
+    fun scrollTo(view: View)
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/view/fragment/StepPracticeFragment.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/view/fragment/StepPracticeFragment.kt
index 5ac864bfe9..d34e0e64a0 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/view/fragment/StepPracticeFragment.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_practice/view/fragment/StepPracticeFragment.kt
@@ -7,6 +7,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 import dev.chrisbanes.insetter.applyInsetter
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.core.extensions.argument
+import org.hyperskill.app.android.core.extensions.smoothScrollTo
 import org.hyperskill.app.android.core.extensions.smoothScrollToBottom
 import org.hyperskill.app.android.core.view.ui.fragment.setChildFragment
 import org.hyperskill.app.android.databinding.FragmentStepPracticeBinding
@@ -90,4 +91,10 @@ class StepPracticeFragment :
             .stepPracticeContainer
             .smoothScrollToBottom(SMOOTH_SCROLL_DURATION_MILLISECONDS)
     }
+
+    override fun scrollTo(view: View) {
+        stepPracticeViewBinding
+            .stepPracticeContainer
+            .smoothScrollTo(view, SMOOTH_SCROLL_DURATION_MILLISECONDS)
+    }
 }
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/delegate/StepQuizFeedbackBlocksDelegate.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/delegate/StepQuizFeedbackBlocksDelegate.kt
index 79e8a4ad13..fc5fd2e607 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/delegate/StepQuizFeedbackBlocksDelegate.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/delegate/StepQuizFeedbackBlocksDelegate.kt
@@ -1,22 +1,27 @@
 package org.hyperskill.app.android.step_quiz.view.delegate
 
 import android.content.Context
+import android.graphics.Paint
 import android.graphics.drawable.AnimationDrawable
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.core.view.ui.widget.ProgressableWebViewClient
 import org.hyperskill.app.android.databinding.LayoutStepQuizFeedbackBlockBinding
-import org.hyperskill.app.android.step_quiz.view.model.StepQuizFeedbackState
+import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
+import org.hyperskill.app.step_quiz.view.model.StepQuizFeedbackState
+import org.hyperskill.app.step_quiz.view.model.StepQuizFeedbackState.Wrong.Action
 import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate
 import ru.nobird.android.view.base.ui.extension.getDrawableCompat
 
 class StepQuizFeedbackBlocksDelegate(
     context: Context,
-    private val layoutStepQuizFeedbackBlockBinding: LayoutStepQuizFeedbackBlockBinding
+    private val layoutStepQuizFeedbackBlockBinding: LayoutStepQuizFeedbackBlockBinding,
+    private val onNewMessage: (StepQuizFeature.Message) -> Unit
 ) {
     companion object {
         private const val EVALUATION_FRAME_DURATION_MS = 250
+        private const val NON_LATEX_HINT_TEMPLATE = """<pre><span style="font-family: 'Roboto';">%s</span></pre>"""
     }
 
     private val viewStateDelegate = ViewStateDelegate<StepQuizFeedbackState>()
@@ -24,7 +29,7 @@ class StepQuizFeedbackBlocksDelegate(
     init {
         with(viewStateDelegate) {
             addState<StepQuizFeedbackState.Idle>()
-            addState<StepQuizFeedbackState.Unsupported>(
+            addState<StepQuizFeedbackState.UnsupportedStep>(
                 layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackUnsupported
             )
             addState<StepQuizFeedbackState.Evaluation>(
@@ -38,7 +43,7 @@ class StepQuizFeedbackBlocksDelegate(
                 layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackWrong,
                 layoutStepQuizFeedbackBlockBinding.stepQuizFeedback
             )
-            addState<StepQuizFeedbackState.Validation>(
+            addState<StepQuizFeedbackState.ValidationFailed>(
                 layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackValidation
             )
             addState<StepQuizFeedbackState.RejectedSubmission>(
@@ -58,6 +63,10 @@ class StepQuizFeedbackBlocksDelegate(
             textView?.typeface =
                 ResourcesCompat.getFont(context, R.font.pt_mono)
         }
+
+        with(layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackWrongAction) {
+            paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
+        }
     }
 
     fun setState(state: StepQuizFeedbackState) {
@@ -65,12 +74,39 @@ class StepQuizFeedbackBlocksDelegate(
         layoutStepQuizFeedbackBlockBinding.root.isVisible = state !is StepQuizFeedbackState.Idle
         when (state) {
             is StepQuizFeedbackState.Correct -> {
-                setHint(layoutStepQuizFeedbackBlockBinding, state.hint)
+                setHint(layoutStepQuizFeedbackBlockBinding, state.hint, state.useLatex)
             }
             is StepQuizFeedbackState.Wrong -> {
-                setHint(layoutStepQuizFeedbackBlockBinding, state.hint)
+                with(layoutStepQuizFeedbackBlockBinding) {
+                    stepQuizFeedbackWrongTitle.text = state.title
+                    stepQuizFeedbackWrongDescription.isVisible = state.description != null
+                    if (state.description != null) {
+                        stepQuizFeedbackWrongDescription.text = state.description
+                    }
+
+                    stepQuizFeedbackWrongAction.isVisible = state.actionText != null
+                    if (state.actionText != null) {
+                        stepQuizFeedbackWrongAction.text = state.actionText
+                    }
+                    val action = state.actionType
+                    stepQuizFeedbackWrongAction.setOnClickListener(
+                        if (action != null) {
+                            {
+                                onNewMessage(
+                                    when (action) {
+                                        Action.SEE_HINT -> StepQuizFeature.Message.SeeHintClicked
+                                        Action.READ_COMMENTS -> StepQuizFeature.Message.ReadCommentsClicked
+                                        Action.SKIP_PROBLEM -> StepQuizFeature.Message.SkipClicked
+                                    }
+                                )
+                            }
+                        } else null
+                    )
+
+                    setHint(layoutStepQuizFeedbackBlockBinding, state.feedbackHint, state.useFeedbackHintLatex)
+                }
             }
-            is StepQuizFeedbackState.Validation -> {
+            is StepQuizFeedbackState.ValidationFailed -> {
                 layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackValidation.text = state.message
             }
             is StepQuizFeedbackState.RejectedSubmission -> {
@@ -84,10 +120,18 @@ class StepQuizFeedbackBlocksDelegate(
 
     private fun setHint(
         layoutStepQuizFeedbackBlockBinding: LayoutStepQuizFeedbackBlockBinding,
-        hint: String?
+        hint: String?,
+        useLatex: Boolean
     ) {
-        layoutStepQuizFeedbackBlockBinding.stepQuizFeedback.isVisible = hint != null
-        layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackBody.setText(hint)
+        val resultHint = hint?.let {
+            if (useLatex) {
+                hint
+            } else {
+                String.format(NON_LATEX_HINT_TEMPLATE, hint)
+            }
+        }
+        layoutStepQuizFeedbackBlockBinding.stepQuizFeedback.isVisible = resultHint != null
+        layoutStepQuizFeedbackBlockBinding.stepQuizFeedbackBody.setText(resultHint)
     }
 
     private fun getEvaluationDrawable(context: Context): AnimationDrawable =
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt
index 8a08d476df..d5d464ab63 100644
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt
+++ b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt
@@ -33,6 +33,7 @@ import org.hyperskill.app.android.step.view.model.StepHost
 import org.hyperskill.app.android.step.view.model.StepMenuPrimaryAction
 import org.hyperskill.app.android.step.view.model.StepMenuPrimaryActionParams
 import org.hyperskill.app.android.step.view.model.StepPracticeCallback
+import org.hyperskill.app.android.step.view.model.StepToolbarCallback
 import org.hyperskill.app.android.step.view.model.StepToolbarContentViewState
 import org.hyperskill.app.android.step.view.model.StepToolbarHost
 import org.hyperskill.app.android.step_practice.model.StepPracticeHost
@@ -41,9 +42,7 @@ import org.hyperskill.app.android.step_quiz.view.delegate.StepQuizFormDelegate
 import org.hyperskill.app.android.step_quiz.view.dialog.ProblemOnboardingBottomSheetCallback
 import org.hyperskill.app.android.step_quiz.view.dialog.ProblemsOnboardingBottomSheetFactory
 import org.hyperskill.app.android.step_quiz.view.factory.StepQuizViewStateDelegateFactory
-import org.hyperskill.app.android.step_quiz.view.mapper.StepQuizFeedbackMapper
 import org.hyperskill.app.android.step_quiz.view.model.StepQuizButtonsState
-import org.hyperskill.app.android.step_quiz.view.model.StepQuizFeedbackState
 import org.hyperskill.app.android.step_quiz_hints.delegate.StepQuizHintsDelegate
 import org.hyperskill.app.android.view.base.ui.extension.snackbar
 import org.hyperskill.app.problems_limit_info.domain.model.ProblemsLimitInfoModalFeatureParams
@@ -51,7 +50,6 @@ import org.hyperskill.app.step.domain.model.BlockName
 import org.hyperskill.app.step.domain.model.Step
 import org.hyperskill.app.step.domain.model.StepRoute
 import org.hyperskill.app.step_completion.presentation.StepCompletionFeature
-import org.hyperskill.app.step_quiz.domain.validation.ReplyValidationResult
 import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
 import org.hyperskill.app.step_quiz.presentation.StepQuizResolver
 import org.hyperskill.app.step_quiz.presentation.StepQuizViewModel
@@ -91,9 +89,7 @@ abstract class DefaultStepQuizFragment :
 
     private var stepQuizStatsTextMapper: StepQuizStatsTextMapper? = null
     private var stepQuizTitleMapper: StepQuizTitleMapper? = null
-    private val stepQuizFeedbackMapper by lazy(LazyThreadSafetyMode.NONE) {
-        StepQuizFeedbackMapper()
-    }
+    private var stepQuizFeedbackMapper: org.hyperskill.app.step_quiz.view.mapper.StepQuizFeedbackMapper? = null
 
     protected abstract val quizViews: Array<View>
     protected abstract val skeletonView: View
@@ -118,6 +114,7 @@ abstract class DefaultStepQuizFragment :
         val platformStepQuizComponent = HyperskillApp.graph().buildPlatformStepQuizComponent(stepQuizComponent)
         stepQuizStatsTextMapper = stepQuizComponent.stepQuizStatsTextMapper
         stepQuizTitleMapper = stepQuizComponent.stepQuizTitleMapper
+        stepQuizFeedbackMapper = stepQuizComponent.stepQuizFeedbackMapper
         viewModelFactory = platformStepQuizComponent.reduxViewModelFactory
     }
 
@@ -137,7 +134,11 @@ abstract class DefaultStepQuizFragment :
         )
         viewBinding.stepQuizFeedbackBlocks.stepQuizFeedbackWrong.isHapticFeedbackEnabled = true
         stepQuizFeedbackBlocksDelegate =
-            StepQuizFeedbackBlocksDelegate(requireContext(), viewBinding.stepQuizFeedbackBlocks)
+            StepQuizFeedbackBlocksDelegate(
+                context = requireContext(),
+                layoutStepQuizFeedbackBlockBinding = viewBinding.stepQuizFeedbackBlocks,
+                onNewMessage = stepQuizViewModel::onNewMessage
+            )
         stepQuizFormDelegate = createStepQuizFormDelegate().also { delegate ->
             delegate.customizeSubmissionButton(viewBinding.stepQuizButtons.stepQuizSubmitButton)
         }
@@ -320,6 +321,18 @@ abstract class DefaultStepQuizFragment :
             StepQuizFeature.Action.ViewAction.ScrollToCallToActionButton -> {
                 handleScrollToCallToActionButton()
             }
+            StepQuizFeature.Action.ViewAction.ScrollToHints -> {
+                parentOfType(StepPracticeHost::class.java)
+                    ?.scrollTo(viewBinding.stepQuizHints.root)
+            }
+            is StepQuizFeature.Action.ViewAction.RequestShowComments -> {
+                parentOfType(StepToolbarCallback::class.java)
+                    ?.requestShowComments()
+            }
+            is StepQuizFeature.Action.ViewAction.RequestSkipStep -> {
+                parentOfType(StepToolbarCallback::class.java)
+                    ?.requestSkip()
+            }
             is StepQuizFeature.Action.ViewAction.StepQuizCodeBlanksViewAction -> {
                 // no op
             }
@@ -379,10 +392,12 @@ abstract class DefaultStepQuizFragment :
             }
         }
 
+        val feedbackState = stepQuizFeedbackMapper?.map(state)
+        if (feedbackState != null) {
+            stepQuizFeedbackBlocksDelegate?.setState(feedbackState)
+        }
+
         when (val stepQuizState = state.stepQuizState) {
-            StepQuizFeature.StepQuizState.Unsupported -> {
-                stepQuizFeedbackBlocksDelegate?.setState(StepQuizFeedbackState.Unsupported)
-            }
             is StepQuizFeature.StepQuizState.AttemptLoaded -> {
                 renderAttemptLoaded(stepQuizState)
             }
@@ -412,21 +427,11 @@ abstract class DefaultStepQuizFragment :
                 isCheckbox = state.attempt.dataset?.isCheckbox
             )
         stepQuizFormDelegate?.setState(state)
-        stepQuizFeedbackBlocksDelegate?.setState(
-            stepQuizFeedbackMapper.mapToStepQuizFeedbackState(step.block.name, state)
-        )
         viewBinding.stepQuizButtons.stepQuizSubmitButton.isEnabled = StepQuizResolver.isQuizEnabled(state)
 
         when (val submissionState = state.submissionState) {
             is StepQuizFeature.SubmissionState.Loaded -> {
                 switchStepQuizButtonsState(getLoadedSubmissionButtonsState(submissionState.submission.status, step))
-
-                val replyValidation = submissionState.replyValidation
-                if (replyValidation is ReplyValidationResult.Error) {
-                    stepQuizFeedbackBlocksDelegate?.setState(
-                        StepQuizFeedbackState.Validation(replyValidation.message)
-                    )
-                }
             }
             is StepQuizFeature.SubmissionState.Empty -> {
                 switchStepQuizButtonsState(StepQuizButtonsState.Submit)
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/mapper/StepQuizFeedbackMapper.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
deleted file mode 100644
index 1b8495830c..0000000000
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.hyperskill.app.android.step_quiz.view.mapper
-
-import org.hyperskill.app.android.step_quiz.view.model.StepQuizFeedbackState
-import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
-import org.hyperskill.app.submissions.domain.model.Submission
-import org.hyperskill.app.submissions.domain.model.SubmissionStatus
-import org.hyperskill.app.submissions.domain.model.formattedText
-
-class StepQuizFeedbackMapper {
-    fun mapToStepQuizFeedbackState(
-        stepBlockName: String?,
-        state: StepQuizFeature.StepQuizState
-    ): StepQuizFeedbackState {
-        val submissionState = (state as? StepQuizFeature.StepQuizState.AttemptLoaded)?.submissionState
-        return if (submissionState is StepQuizFeature.SubmissionState.Loaded) {
-            when (submissionState.submission.status) {
-                SubmissionStatus.CORRECT ->
-                    StepQuizFeedbackState.Correct(formatHint(stepBlockName, submissionState.submission))
-
-                SubmissionStatus.WRONG ->
-                    StepQuizFeedbackState.Wrong(formatHint(stepBlockName, submissionState.submission))
-
-                SubmissionStatus.EVALUATION ->
-                    StepQuizFeedbackState.Evaluation
-
-                SubmissionStatus.REJECTED -> {
-                    val feedback = submissionState.submission.feedback
-                    if (feedback != null) {
-                        StepQuizFeedbackState.RejectedSubmission(feedback.formattedText())
-                    } else {
-                        StepQuizFeedbackState.Idle
-                    }
-                }
-
-                else -> StepQuizFeedbackState.Idle
-            }
-        } else {
-            StepQuizFeedbackState.Idle
-        }
-    }
-
-    private fun formatHint(stepBlockName: String?, submission: Submission): String? =
-        submission
-            .hint
-            ?.takeIf(String::isNotEmpty)
-            ?.replace("\n", "<br />")
-            ?.let {
-                val showLaTeX = stepBlockName == "math"
-                if (showLaTeX) {
-                    it
-                } else {
-                    """<pre><span style="font-family: 'Roboto';">$it</span></pre>"""
-                }
-            }
-}
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/model/StepQuizFeedbackState.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/model/StepQuizFeedbackState.kt
deleted file mode 100644
index 524e000441..0000000000
--- a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/step_quiz/view/model/StepQuizFeedbackState.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.hyperskill.app.android.step_quiz.view.model
-
-sealed class StepQuizFeedbackState {
-    object Idle : StepQuizFeedbackState()
-    data class Correct(val hint: String?) : StepQuizFeedbackState()
-    data class Wrong(val hint: String?) : StepQuizFeedbackState()
-    object Evaluation : StepQuizFeedbackState()
-    data class Validation(val message: String) : StepQuizFeedbackState()
-
-    object Unsupported : StepQuizFeedbackState()
-
-    data class RejectedSubmission(val message: String) : StepQuizFeedbackState()
-}
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/res/drawable/bg_step_quiz_feedback_wrong.xml b/androidHyperskillApp/src/main/res/drawable/bg_step_quiz_feedback_wrong.xml
new file mode 100644
index 0000000000..4a2e7e115c
--- /dev/null
+++ b/androidHyperskillApp/src/main/res/drawable/bg_step_quiz_feedback_wrong.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_overlay_orange_alpha_12" />
+    <corners android:radius="@dimen/corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/res/drawable/ic_step_quiz_feedback_wrong.xml b/androidHyperskillApp/src/main/res/drawable/ic_step_quiz_feedback_wrong.xml
new file mode 100644
index 0000000000..fafc24005c
--- /dev/null
+++ b/androidHyperskillApp/src/main/res/drawable/ic_step_quiz_feedback_wrong.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <group>
+    <clip-path
+        android:pathData="M0,0h20v20h-20z"/>
+    <path
+        android:pathData="M5.333,15.833L4.167,14.667L8.833,10L4.167,5.333L5.333,4.167L10,8.833L14.667,4.167L15.833,5.333L11.167,10L15.833,14.667L14.667,15.833L10,11.167L5.333,15.833Z"
+        android:fillColor="#F97A12"/>
+  </group>
+</vector>
diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_feedback_block.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_feedback_block.xml
index b6a5286a62..6b52c206d5 100644
--- a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_feedback_block.xml
+++ b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_feedback_block.xml
@@ -6,29 +6,64 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <LinearLayout
         android:id="@+id/stepQuizFeedbackWrong"
-        style="@style/StepQuizFeedback.Wrong"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="@dimen/auth_button_max_width"
-        app:drawableStartCompat="@drawable/ic_info_outline_24px"
-        android:text="@string/step_quiz_status_wrong_text"/>
+        style="@style/StepQuizFeedback.Wrong"
+        android:orientation="vertical"
+        android:maxWidth="@dimen/auth_button_max_width">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/stepQuizFeedbackWrongTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:drawableStartCompat="@drawable/ic_step_quiz_feedback_wrong"
+            android:drawablePadding="8dp"
+            android:textAppearance="?textAppearanceBody1"
+            android:textColor="@color/color_overlay_orange"
+            tools:text="@string/step_quiz_status_wrong_title"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/stepQuizFeedbackWrongDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?textAppearanceBody1"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="4dp"
+            tools:text="@string/step_quiz_status_see_comments_suggestion"
+            />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/stepQuizFeedbackWrongAction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?textAppearanceBody1"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/selectable_item_rounded_background"
+            android:paddingHorizontal="8dp"
+            android:paddingVertical="@dimen/gamification_toolbar_subtitle_padding_vertical"
+            tools:text="@string/step_quiz_status_comments_action"
+            />
+
+    </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/stepQuizFeedbackEvaluation"
-        style="@style/StepQuizFeedback.Wrong"
+        style="@style/StepQuizFeedback.Neutral"
         android:text="@string/step_quiz_status_evaluation_text" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/stepQuizFeedbackValidation"
-        style="@style/StepQuizFeedback.Wrong"
+        style="@style/StepQuizFeedback.Neutral"
         app:drawableStartCompat="@drawable/ic_info_outline_24px"
         tools:text="Evaluation"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/stepQuizFeedbackUnsupported"
-        style="@style/StepQuizFeedback.Wrong"
+        style="@style/StepQuizFeedback.Neutral"
         app:drawableStartCompat="@drawable/ic_info_outline_24px"
         android:text="@string/step_quiz_unsupported_quiz_text" />
 
diff --git a/androidHyperskillApp/src/main/res/menu/step_menu.xml b/androidHyperskillApp/src/main/res/menu/step_menu.xml
index 595dc4ad00..6cb8ee0e7b 100644
--- a/androidHyperskillApp/src/main/res/menu/step_menu.xml
+++ b/androidHyperskillApp/src/main/res/menu/step_menu.xml
@@ -3,19 +3,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/comments"
-        android:title="@string/step_menu_comments_item"
-        android:icon="@drawable/ic_step_menu_comments"
-        app:showAsAction="ifRoom"
-        android:visible="false" />
-
     <item
         android:id="@+id/theory"
         android:title="@string/step_menu_theory_item"
         android:icon="@drawable/ic_theory"
         app:showAsAction="ifRoom"
         android:visible="false" />
+    
+    <item
+        android:id="@+id/comments"
+        android:title="@string/step_menu_comments_item"
+        android:icon="@drawable/ic_step_menu_comments"
+        app:showAsAction="never"
+        android:visible="false" />
 
     <item
         android:id="@+id/share"
diff --git a/androidHyperskillApp/src/main/res/values/styles.xml b/androidHyperskillApp/src/main/res/values/styles.xml
index 94d59ffe8a..dd73b60baf 100644
--- a/androidHyperskillApp/src/main/res/values/styles.xml
+++ b/androidHyperskillApp/src/main/res/values/styles.xml
@@ -77,8 +77,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">48dp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:gravity">center_vertical</item>
@@ -94,6 +94,12 @@
     </style>
 
     <style name="StepQuizFeedback.Wrong">
+        <item name="android:background">@drawable/bg_step_quiz_feedback_wrong</item>
+        <item name="android:textColor">@color/color_overlay_orange</item>
+        <item name="drawableTint">@color/color_overlay_orange</item>
+    </style>
+
+    <style name="StepQuizFeedback.Neutral">
         <item name="backgroundTint">@color/color_overlay_blue_alpha_12</item>
         <item name="android:textColor">@color/color_primary</item>
         <item name="drawableTint">@color/color_primary</item>
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 8b8f6f0fca..b6d2393895 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -26,7 +26,7 @@
     <ID>CyclomaticComplexMethod:LoadingView.kt$LoadingView$override fun onDraw(canvas: Canvas)</ID>
     <ID>CyclomaticComplexMethod:ProfileReducer.kt$ProfileReducer$override fun reduce(state: State, message: Message): ReducerResult</ID>
     <ID>CyclomaticComplexMethod:StepQuizActionDispatcher.kt$StepQuizActionDispatcher$override suspend fun doSuspendableAction(action: Action)</ID>
-    <ID>CyclomaticComplexMethod:StepQuizHintsReducer.kt$StepQuizHintsReducer$override fun reduce(state: State, message: Message): Pair&lt;State, Set&lt;Action&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:StepQuizHintsReducer.kt$StepQuizHintsReducer$override fun reduce(state: State, message: Message): StepQuizHintsReducerResult</ID>
     <ID>CyclomaticComplexMethod:StepQuizReducer.kt$StepQuizReducer$override fun reduce(state: State, message: Message): StepQuizReducerResult</ID>
     <ID>CyclomaticComplexMethod:StepQuizReplyValidator.kt$StepQuizReplyValidator$fun validate(dataset: Dataset?, reply: Reply, stepBlockName: String): ReplyValidationResult</ID>
     <ID>CyclomaticComplexMethod:TopicsRepetitionsReducer.kt$TopicsRepetitionsReducer$override fun reduce(state: State, message: Message): Pair&lt;State, Set&lt;Action&gt;&gt;</ID>
@@ -52,6 +52,7 @@
     <ID>ImplicitDefaultLocale:TimeIntervalUtil.kt$TimeIntervalUtil$String.format("%02d:00 \u2014 %02d:00", i, i + 1)</ID>
     <ID>InvalidPackageDeclaration:HandleActions.kt$package org.hyperskill.app.core.view</ID>
     <ID>LambdaParameterInRestartableEffect:OnComposableShownFirstTime.kt$block</ID>
+    <ID>LargeClass:StepQuizReducer.kt$StepQuizReducer : StateReducer</ID>
     <ID>LongMethod:AppReducer.kt$AppReducer$private fun handleFetchAppStartupConfigSuccess( state: State, message: Message.FetchAppStartupConfigSuccess ): ReducerResult</ID>
     <ID>LongMethod:ChallengeCard.kt$@Composable fun ChallengeCard( viewState: ChallengeWidgetViewState, onNewMessage: (Message) -&gt; Unit )</ID>
     <ID>LongMethod:DefaultStepQuizFragment.kt$DefaultStepQuizFragment$override fun onAction(action: StepQuizFeature.Action.ViewAction)</ID>
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/Toolbar/StepToolbarContent.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/Toolbar/StepToolbarContent.swift
index cd0a3190c4..cf0ef73c6d 100644
--- a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/Toolbar/StepToolbarContent.swift
+++ b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Step/Views/Toolbar/StepToolbarContent.swift
@@ -18,7 +18,7 @@ extension View {
         if #available(iOS 16.0, *) {
             toolbar {
                 StepToolbarContent(
-                    isCommentsToolbarItemAvailable: state.isCommentsToolbarItemAvailable,
+                    isCommentsToolbarItemAvailable: false,
                     menuActions: state.stepMenuSecondaryActions,
                     isMenuActionsDisabled: isMenuActionsDisabled,
                     onCommentButtonTap: onCommentButtonTap,
@@ -29,30 +29,15 @@ extension View {
                 )
             }
         } else {
-            if state.isCommentsToolbarItemAvailable {
-                toolbar {
-                    CommentsToolbarItem(action: onCommentButtonTap)
-
-                    StepMenuActionsToolbarItem(
-                        actions: state.stepMenuSecondaryActions,
-                        disabled: isMenuActionsDisabled,
-                        onShareButtonTap: onShareButtonTap,
-                        onReportButtonTap: onReportButtonTap,
-                        onSkipButtonTap: onSkipButtonTap,
-                        onOpenInWebButtonTap: onOpenInWebButtonTap
-                    )
-                }
-            } else {
-                toolbar {
-                    StepMenuActionsToolbarItem(
-                        actions: state.stepMenuSecondaryActions,
-                        disabled: isMenuActionsDisabled,
-                        onShareButtonTap: onShareButtonTap,
-                        onReportButtonTap: onReportButtonTap,
-                        onSkipButtonTap: onSkipButtonTap,
-                        onOpenInWebButtonTap: onOpenInWebButtonTap
-                    )
-                }
+            toolbar {
+                StepMenuActionsToolbarItem(
+                    actions: state.stepMenuSecondaryActions,
+                    disabled: isMenuActionsDisabled,
+                    onShareButtonTap: onShareButtonTap,
+                    onReportButtonTap: onReportButtonTap,
+                    onSkipButtonTap: onSkipButtonTap,
+                    onOpenInWebButtonTap: onOpenInWebButtonTap
+                )
             }
         }
     }
@@ -61,6 +46,7 @@ extension View {
 
 @available(iOS 16.0, *)
 private struct StepToolbarContent: ToolbarContent {
+    #warning("TOOD: Replace with stepMenuSecondaryActions in ALTAPPS-1314")
     let isCommentsToolbarItemAvailable: Bool
 
     let menuActions: Set<StepMenuSecondaryAction>
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/Views/StepQuizView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/Views/StepQuizView.swift
index 66ad91d223..06c983e840 100644
--- a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/Views/StepQuizView.swift
+++ b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/Views/StepQuizView.swift
@@ -311,6 +311,12 @@ private extension StepQuizView {
             assertionFailure(
                 "StepQuizView :: did receive unexpected StepQuizCodeBlanksViewAction: \(stepQuizCodeBlanksViewAction)"
             )
+        case .scrollToHints:
+            #warning("TODO: ALTAPPS-1314")
+        case .requestShowComments:
+            #warning("TODO: ALTAPPS-1314")
+        case .requestSkipStep:
+            #warning("TODO: ALTAPPS-1314")
         }
     }
 
diff --git a/shared/src/androidMain/kotlin/org/hyperskill/app/step/presentation/StepViewModel.kt b/shared/src/androidMain/kotlin/org/hyperskill/app/step/presentation/StepViewModel.kt
index bbedb8f67f..1ad5b8c07e 100644
--- a/shared/src/androidMain/kotlin/org/hyperskill/app/step/presentation/StepViewModel.kt
+++ b/shared/src/androidMain/kotlin/org/hyperskill/app/step/presentation/StepViewModel.kt
@@ -48,6 +48,7 @@ class StepViewModel(
     fun onActionClick(action: StepMenuSecondaryAction) {
         onNewMessage(
             when (action) {
+                StepMenuSecondaryAction.COMMENTS -> Message.CommentClicked
                 StepMenuSecondaryAction.SHARE -> Message.ShareClicked
                 StepMenuSecondaryAction.REPORT -> Message.ReportClicked
                 StepMenuSecondaryAction.SKIP -> Message.SkipClicked
@@ -56,7 +57,11 @@ class StepViewModel(
         )
     }
 
-    fun onCommentsClick() {
-        onNewMessage(Message.CommentClicked)
+    fun requestShowComments() {
+        onNewMessage(Message.RequestShowComment)
+    }
+
+    fun requestSkip() {
+        onNewMessage(Message.RequestSkip)
     }
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt
index 28ad7589cf..a7b0df89bc 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt
@@ -44,5 +44,6 @@ enum class HyperskillAnalyticPart(val partName: String) {
     REQUEST_REVIEW_MODAL("request_review_modal"),
     USERS_INTERVIEW_WIDGET("users_interview_widget"),
     UNSUPPORTED_QUIZ_PLACEHOLDER("unsupported_quiz_placeholder"),
-    CODE_BLANKS("code_blanks")
+    CODE_BLANKS("code_blanks"),
+    STEP_QUIZ_FEEDBACK("step_quiz_feedback")
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/analytic/StepToolbarMenuActionClickedHyperskillAnalyticEvent.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/analytic/StepToolbarMenuActionClickedHyperskillAnalyticEvent.kt
index 121721bfa4..088061e59d 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/analytic/StepToolbarMenuActionClickedHyperskillAnalyticEvent.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/analytic/StepToolbarMenuActionClickedHyperskillAnalyticEvent.kt
@@ -37,6 +37,7 @@ class StepToolbarMenuActionClickedHyperskillAnalyticEvent(
         StepMenuSecondaryAction.REPORT -> HyperskillAnalyticTarget.REPORT
         StepMenuSecondaryAction.SKIP -> HyperskillAnalyticTarget.SKIP
         StepMenuSecondaryAction.OPEN_IN_WEB -> HyperskillAnalyticTarget.OPEN_IN_WEB
+        StepMenuSecondaryAction.COMMENTS -> HyperskillAnalyticTarget.COMMENT
     },
     context = mapOf(StepAnalyticParams.PARAM_STEP_ID to stepRoute.stepId)
 )
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Step.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Step.kt
index 9b6d67c32e..d09e5c3a6e 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Step.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Step.kt
@@ -5,6 +5,7 @@ import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.hyperskill.app.comments.domain.model.CommentStatisticsEntry
+import org.hyperskill.app.comments.domain.model.CommentThread
 
 @Serializable
 data class Step(
@@ -75,4 +76,10 @@ fun Step.pycharmCode(): String? =
  * @see [BlockName.supportedBlocksNames]
  */
 fun Step.isSupported(): Boolean =
-    BlockName.supportedBlocksNames.contains(block.name)
\ No newline at end of file
+    BlockName.supportedBlocksNames.contains(block.name)
+
+val Step.areCommentsAvailable: Boolean
+    get() = commentsStatistics.any { it.thread == CommentThread.COMMENT && it.totalCount > 0 }
+
+val Step.commentThreadStatistic: CommentStatisticsEntry?
+    get() = commentsStatistics.firstOrNull { it.thread == CommentThread.COMMENT }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/StepMenuSecondaryAction.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/StepMenuSecondaryAction.kt
index f57d5c3db8..e83edbcbb5 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/StepMenuSecondaryAction.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/StepMenuSecondaryAction.kt
@@ -5,6 +5,7 @@ package org.hyperskill.app.step.domain.model
  * The order of the enum entries is used to display actions on the ui.
  */
 enum class StepMenuSecondaryAction {
+    COMMENTS,
     SHARE,
     REPORT,
     SKIP,
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepFeature.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepFeature.kt
index 2ad1a0478b..f1e475b206 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepFeature.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepFeature.kt
@@ -28,7 +28,6 @@ object StepFeature {
         val stepState: StepState,
         val stepToolbarViewState: StepToolbarFeature.ViewState,
         val stepMenuSecondaryActions: Set<StepMenuSecondaryAction>,
-        val isCommentsToolbarItemAvailable: Boolean,
         val isLoadingShowed: Boolean
     )
 
@@ -60,6 +59,11 @@ object StepFeature {
         object SkipClicked : Message
         object OpenInWebClicked : Message
 
+        // Represents a comment request without a click on the toolbar comment button
+        data object RequestShowComment : Message
+        // Represents a skip request without a click on the toolbar skip button
+        data object RequestSkip : Message
+
         /**
          * Message Wrappers
          */
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepReducer.kt
index 68a7ecf7e1..b4e2e65bc2 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepReducer.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/presentation/StepReducer.kt
@@ -1,13 +1,12 @@
 package org.hyperskill.app.step.presentation
 
-import org.hyperskill.app.comments.domain.model.CommentThread
 import org.hyperskill.app.comments.screen.domain.model.CommentsScreenFeatureParams
 import org.hyperskill.app.core.domain.url.HyperskillUrlPath
-import org.hyperskill.app.step.domain.analytic.StepToolbarCommentClickedHyperskillAnalyticEvent
 import org.hyperskill.app.step.domain.analytic.StepToolbarMenuActionClickedHyperskillAnalyticEvent
 import org.hyperskill.app.step.domain.analytic.StepViewedHyperskillAnalyticEvent
 import org.hyperskill.app.step.domain.model.StepMenuSecondaryAction
 import org.hyperskill.app.step.domain.model.StepRoute
+import org.hyperskill.app.step.domain.model.commentThreadStatistic
 import org.hyperskill.app.step.presentation.StepFeature.Action
 import org.hyperskill.app.step.presentation.StepFeature.InternalAction
 import org.hyperskill.app.step.presentation.StepFeature.InternalMessage
@@ -58,13 +57,16 @@ internal class StepReducer(
                     reduceStepToolbarMessage(state.stepToolbarState, message.message)
                 state.copy(stepToolbarState = stepToolbarState) to stepToolbarActions
             }
-            Message.CommentClicked -> handleCommentClicked(state)
+            Message.CommentClicked -> showComments(state, isClickMessage = true)
+            Message.RequestShowComment -> showComments(state, isClickMessage = false)
 
             Message.ShareClicked -> handleShareClicked(state)
             is InternalMessage.ShareLinkReady -> handleShareLinkReady(state, message)
 
             Message.ReportClicked -> handleReportClicked(state)
-            Message.SkipClicked -> handleSkipClicked(state)
+
+            Message.SkipClicked -> handleSkip(state, isClickMessage = true)
+            Message.RequestSkip -> handleSkip(state, isClickMessage = false)
 
             Message.OpenInWebClicked -> handleOpenInWebClicked(state)
             is InternalMessage.GetMagicLinkReceiveSuccess -> handleMagicLinkSuccess(state, message)
@@ -198,15 +200,23 @@ internal class StepReducer(
             state to emptySet()
         }
 
-    private fun handleCommentClicked(state: State): ReducerResult? {
-        val commentThreadStatistics = (state.stepState as? StepState.Data)
-            ?.step
-            ?.commentsStatistics
-            ?.firstOrNull { it.thread == CommentThread.COMMENT }
-
+    private fun showComments(
+        state: State,
+        isClickMessage: Boolean
+    ): ReducerResult? {
+        val commentThreadStatistics = (state.stepState as? StepState.Data)?.step?.commentThreadStatistic
         return commentThreadStatistics?.let {
-            state to setOf(
-                InternalAction.LogAnalyticEvent(StepToolbarCommentClickedHyperskillAnalyticEvent(stepRoute)),
+            state to setOfNotNull(
+                if (isClickMessage) {
+                    InternalAction.LogAnalyticEvent(
+                        StepToolbarMenuActionClickedHyperskillAnalyticEvent(
+                            StepMenuSecondaryAction.COMMENTS,
+                            stepRoute
+                        )
+                    )
+                } else {
+                    null
+                },
                 Action.ViewAction.NavigateTo.CommentsScreen(
                     CommentsScreenFeatureParams(
                         stepRoute = stepRoute,
@@ -241,12 +251,19 @@ internal class StepReducer(
             )
         )
 
-    private fun handleSkipClicked(state: State): ReducerResult =
+    private fun handleSkip(
+        state: State,
+        isClickMessage: Boolean
+    ): ReducerResult =
         if (!state.isLoadingShowed && state.stepState is StepState.Data) {
-            state.copy(isLoadingShowed = true) to setOf(
-                InternalAction.LogAnalyticEvent(
-                    StepToolbarMenuActionClickedHyperskillAnalyticEvent(StepMenuSecondaryAction.SKIP, stepRoute)
-                ),
+            state.copy(isLoadingShowed = true) to setOfNotNull(
+                if (isClickMessage) {
+                    InternalAction.LogAnalyticEvent(
+                        StepToolbarMenuActionClickedHyperskillAnalyticEvent(StepMenuSecondaryAction.SKIP, stepRoute)
+                    )
+                } else {
+                    null
+                },
                 InternalAction.SkipStep(stepRoute.stepId)
             )
         } else {
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/view/mapper/StepViewStateMapper.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/view/mapper/StepViewStateMapper.kt
index 6e8becde3f..5727894dcf 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/view/mapper/StepViewStateMapper.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/view/mapper/StepViewStateMapper.kt
@@ -1,8 +1,8 @@
 package org.hyperskill.app.step.view.mapper
 
-import org.hyperskill.app.comments.domain.model.CommentThread
 import org.hyperskill.app.step.domain.model.StepMenuSecondaryAction
 import org.hyperskill.app.step.domain.model.StepRoute
+import org.hyperskill.app.step.domain.model.areCommentsAvailable
 import org.hyperskill.app.step.presentation.StepFeature
 import org.hyperskill.app.step_toolbar.view.mapper.StepToolbarViewStateMapper
 
@@ -14,7 +14,6 @@ internal class StepViewStateMapper(
             stepState = state.stepState,
             stepToolbarViewState = StepToolbarViewStateMapper.map(state.stepToolbarState),
             stepMenuSecondaryActions = getStepToolbarActions(state.stepState, stepRoute),
-            isCommentsToolbarItemAvailable = isCommentsToolbarItemAvailable(state.stepState),
             isLoadingShowed = state.isLoadingShowed
         )
 
@@ -23,7 +22,13 @@ internal class StepViewStateMapper(
         stepRoute: StepRoute
     ): Set<StepMenuSecondaryAction> =
         StepMenuSecondaryAction.entries.filter { action ->
-            action != StepMenuSecondaryAction.SKIP || isSkipButtonAvailable(stepState, stepRoute)
+            when (action) {
+                StepMenuSecondaryAction.COMMENTS -> isCommentsToolbarItemAvailable(stepState)
+                StepMenuSecondaryAction.SKIP -> isSkipButtonAvailable(stepState, stepRoute)
+                StepMenuSecondaryAction.SHARE,
+                StepMenuSecondaryAction.REPORT,
+                StepMenuSecondaryAction.OPEN_IN_WEB -> true
+            }
         }.toSet()
 
     private fun isSkipButtonAvailable(
@@ -36,6 +41,6 @@ internal class StepViewStateMapper(
 
     private fun isCommentsToolbarItemAvailable(stepState: StepFeature.StepState): Boolean {
         val step = (stepState as? StepFeature.StepState.Data)?.step ?: return false
-        return step.commentsStatistics.any { it.thread == CommentThread.COMMENT && it.totalCount > 0 }
+        return step.areCommentsAvailable
     }
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent.kt
new file mode 100644
index 0000000000..ffa2a6c452
--- /dev/null
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent.kt
@@ -0,0 +1,31 @@
+package org.hyperskill.app.step_quiz.domain.analytic
+
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticAction
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticEvent
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticPart
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticRoute
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticTarget
+
+/**
+ * Represents click on the ReadComments button in the step quiz feedback block.
+ *
+ * JSON payload:
+ * ```
+ * {
+ *     "route": "/learn/step/1",
+ *     "action": "click",
+ *     "part": "step_quiz_feedback",
+ *     "target": "comment"
+ * }
+ * ```
+ *
+ * @see HyperskillAnalyticEvent
+ */
+class StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent(
+    route: HyperskillAnalyticRoute
+) : HyperskillAnalyticEvent(
+    route,
+    HyperskillAnalyticAction.CLICK,
+    HyperskillAnalyticPart.STEP_QUIZ_FEEDBACK,
+    HyperskillAnalyticTarget.COMMENT
+)
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent.kt
new file mode 100644
index 0000000000..a3cbb82531
--- /dev/null
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent.kt
@@ -0,0 +1,31 @@
+package org.hyperskill.app.step_quiz.domain.analytic
+
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticAction
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticEvent
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticPart
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticRoute
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticTarget
+
+/**
+ * Represents click on the SeeHint button in the step quiz feedback block.
+ *
+ * JSON payload:
+ * ```
+ * {
+ *     "route": "/learn/step/1",
+ *     "action": "click",
+ *     "part": "step_quiz_feedback",
+ *     "target": "see_hint"
+ * }
+ * ```
+ *
+ * @see HyperskillAnalyticEvent
+ */
+class StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent(
+    route: HyperskillAnalyticRoute
+) : HyperskillAnalyticEvent(
+    route,
+    HyperskillAnalyticAction.CLICK,
+    HyperskillAnalyticPart.STEP_QUIZ_FEEDBACK,
+    HyperskillAnalyticTarget.SEE_HINT
+)
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSkipClickedHyperskillAnalyticEvent.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSkipClickedHyperskillAnalyticEvent.kt
new file mode 100644
index 0000000000..fb9ee75741
--- /dev/null
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/analytic/StepQuizFeedbackSkipClickedHyperskillAnalyticEvent.kt
@@ -0,0 +1,31 @@
+package org.hyperskill.app.step_quiz.domain.analytic
+
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticAction
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticEvent
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticPart
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticRoute
+import org.hyperskill.app.analytic.domain.model.hyperskill.HyperskillAnalyticTarget
+
+/**
+ * Represents click on the Skip button in the step quiz feedback block.
+ *
+ * JSON payload:
+ * ```
+ * {
+ *     "route": "/learn/step/1",
+ *     "action": "click",
+ *     "part": "step_quiz_feedback",
+ *     "target": "skip"
+ * }
+ * ```
+ *
+ * @see HyperskillAnalyticEvent
+ */
+class StepQuizFeedbackSkipClickedHyperskillAnalyticEvent(
+    route: HyperskillAnalyticRoute
+) : HyperskillAnalyticEvent(
+    route,
+    HyperskillAnalyticAction.CLICK,
+    HyperskillAnalyticPart.STEP_QUIZ_FEEDBACK,
+    HyperskillAnalyticTarget.SKIP
+)
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponent.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponent.kt
index 11121dc1bc..8d8615061f 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponent.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponent.kt
@@ -2,6 +2,7 @@ package org.hyperskill.app.step_quiz.injection
 
 import org.hyperskill.app.step_quiz.domain.interactor.StepQuizInteractor
 import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
+import org.hyperskill.app.step_quiz.view.mapper.StepQuizFeedbackMapper
 import org.hyperskill.app.step_quiz.view.mapper.StepQuizStatsTextMapper
 import org.hyperskill.app.step_quiz.view.mapper.StepQuizTitleMapper
 import ru.nobird.app.presentation.redux.feature.Feature
@@ -9,6 +10,7 @@ import ru.nobird.app.presentation.redux.feature.Feature
 interface StepQuizComponent {
     val stepQuizStatsTextMapper: StepQuizStatsTextMapper
     val stepQuizTitleMapper: StepQuizTitleMapper
+    val stepQuizFeedbackMapper: StepQuizFeedbackMapper
     val stepQuizInteractor: StepQuizInteractor
     val stepQuizFeature: Feature<StepQuizFeature.State, StepQuizFeature.Message, StepQuizFeature.Action>
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponentImpl.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponentImpl.kt
index 2597202b0a..c2d226289e 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponentImpl.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/injection/StepQuizComponentImpl.kt
@@ -1,6 +1,7 @@
 package org.hyperskill.app.step_quiz.injection
 
 import org.hyperskill.app.core.injection.AppGraph
+import org.hyperskill.app.core.view.mapper.ResourceProvider
 import org.hyperskill.app.step.domain.model.StepRoute
 import org.hyperskill.app.step_quiz.data.repository.AttemptRepositoryImpl
 import org.hyperskill.app.step_quiz.data.source.AttemptRemoteDataSource
@@ -9,6 +10,7 @@ import org.hyperskill.app.step_quiz.domain.repository.AttemptRepository
 import org.hyperskill.app.step_quiz.domain.validation.StepQuizReplyValidator
 import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
 import org.hyperskill.app.step_quiz.remote.AttemptRemoteDataSourceImpl
+import org.hyperskill.app.step_quiz.view.mapper.StepQuizFeedbackMapper
 import org.hyperskill.app.step_quiz.view.mapper.StepQuizStatsTextMapper
 import org.hyperskill.app.step_quiz.view.mapper.StepQuizTitleMapper
 import org.hyperskill.app.step_quiz_code_blanks.injection.StepQuizCodeBlanksComponent
@@ -20,17 +22,23 @@ internal class StepQuizComponentImpl(
     private val appGraph: AppGraph,
     private val stepRoute: StepRoute
 ) : StepQuizComponent {
+
+    private val resourceProvider: ResourceProvider = appGraph.commonComponent.resourceProvider
+
     private val stepQuizReplyValidator: StepQuizReplyValidator =
-        StepQuizReplyValidator(appGraph.commonComponent.resourceProvider)
+        StepQuizReplyValidator(resourceProvider)
 
     override val stepQuizStatsTextMapper: StepQuizStatsTextMapper
         get() = StepQuizStatsTextMapper(
-            appGraph.commonComponent.resourceProvider,
+            resourceProvider,
             appGraph.commonComponent.dateFormatter
         )
 
     override val stepQuizTitleMapper: StepQuizTitleMapper
-        get() = StepQuizTitleMapper(appGraph.commonComponent.resourceProvider)
+        get() = StepQuizTitleMapper(resourceProvider)
+
+    override val stepQuizFeedbackMapper: StepQuizFeedbackMapper
+        get() = StepQuizFeedbackMapper(resourceProvider)
 
     private val attemptRemoteDataSource: AttemptRemoteDataSource =
         AttemptRemoteDataSourceImpl(appGraph.networkComponent.authorizedHttpClient)
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizFeature.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizFeature.kt
index fc4ccf3821..d9898bb13c 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizFeature.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizFeature.kt
@@ -27,19 +27,20 @@ object StepQuizFeature {
     )
 
     sealed interface StepQuizState {
-        object Idle : StepQuizState
-        object Loading : StepQuizState
-        object Unsupported : StepQuizState
+        data object Idle : StepQuizState
+        data object Loading : StepQuizState
+        data object Unsupported : StepQuizState
         data class AttemptLoading(val oldState: AttemptLoaded) : StepQuizState
         data class AttemptLoaded(
             val step: Step,
             val attempt: Attempt,
             val submissionState: SubmissionState,
             val isProblemsLimitReached: Boolean,
-            internal val isTheoryAvailable: Boolean
+            internal val isTheoryAvailable: Boolean,
+            internal val wrongSubmissionsCount: Int = 0
         ) : StepQuizState
 
-        object NetworkError : StepQuizState
+        data object NetworkError : StepQuizState
     }
     sealed interface SubmissionState {
         data class Empty(val reply: Reply? = null) : SubmissionState
@@ -70,14 +71,14 @@ object StepQuizFeature {
             val submissionState: SubmissionState,
             val isProblemsLimitReached: Boolean
         ) : Message
-        object CreateAttemptError : Message
+        data object CreateAttemptError : Message
 
         /**
          * Submit submission
          */
         data class CreateSubmissionClicked(val step: Step, val reply: Reply) : Message
         data class CreateSubmissionSuccess(val submission: Submission, val newAttempt: Attempt? = null) : Message
-        object CreateSubmissionNetworkError : Message
+        data object CreateSubmissionNetworkError : Message
         data class CreateSubmissionReplyValidationResult(
             val step: Step,
             val reply: Reply,
@@ -102,25 +103,29 @@ object StepQuizFeature {
          *
          * @see StepQuizFeature.Action.ViewAction.NavigateTo.TheoryStepScreen
          */
-        object TheoryToolbarItemClicked : Message
+        data object TheoryToolbarItemClicked : Message
 
-        object UnsupportedQuizSolveOnTheWebClicked : Message
-        object UnsupportedQuizGoToStudyPlanClicked : Message
+        data object SeeHintClicked : Message
+        data object ReadCommentsClicked : Message
+        data object SkipClicked : Message
+
+        data object UnsupportedQuizSolveOnTheWebClicked : Message
+        data object UnsupportedQuizGoToStudyPlanClicked : Message
 
         /**
          * Analytic
          */
-        object ClickedCodeDetailsEventMessage : Message
-        object FullScreenCodeEditorClickedCodeDetailsEventMessage : Message
+        data object ClickedCodeDetailsEventMessage : Message
+        data object FullScreenCodeEditorClickedCodeDetailsEventMessage : Message
 
-        object ClickedStepTextDetailsEventMessage : Message
-        object FullScreenCodeEditorClickedStepTextDetailsEventMessage : Message
+        data object ClickedStepTextDetailsEventMessage : Message
+        data object FullScreenCodeEditorClickedStepTextDetailsEventMessage : Message
 
-        object ClickedOpenFullScreenCodeEditorEventMessage : Message
+        data object ClickedOpenFullScreenCodeEditorEventMessage : Message
 
         data class CodeEditorClickedInputAccessoryButtonEventMessage(val symbol: String) : Message
 
-        object ClickedRetryEventMessage : Message
+        data object ClickedRetryEventMessage : Message
 
         /**
          * Message Wrappers
@@ -155,7 +160,7 @@ object StepQuizFeature {
             val isProblemsLimitReached: Boolean
         ) : InternalMessage
 
-        object CreateMagicLinkForUnsupportedQuizError : InternalMessage
+        data object CreateMagicLinkForUnsupportedQuizError : InternalMessage
         data class CreateMagicLinkForUnsupportedQuizSuccess(val url: String) : InternalMessage
     }
 
@@ -192,9 +197,9 @@ object StepQuizFeature {
         data class StepQuizCodeBlanksAction(val action: StepQuizCodeBlanksFeature.Action) : Action
 
         sealed interface ViewAction : Action {
-            object ShowNetworkError : ViewAction // error
+            data object ShowNetworkError : ViewAction // error
 
-            object RequestResetCode : ViewAction
+            data object RequestResetCode : ViewAction
 
             data class ShowProblemsLimitReachedModal(
                 val subscription: Subscription,
@@ -202,11 +207,13 @@ object StepQuizFeature {
                 val context: ProblemsLimitInfoModalContext
             ) : ViewAction
 
-            object HideProblemsLimitReachedModal : ViewAction
+            data object HideProblemsLimitReachedModal : ViewAction
 
             data class ShowProblemOnboardingModal(val modalType: ProblemOnboardingModal) : ViewAction
 
-            object ScrollToCallToActionButton : ViewAction
+            data object ScrollToCallToActionButton : ViewAction
+
+            data object ScrollToHints : ViewAction
 
             data class StepQuizHintsViewAction(
                 val viewAction: StepQuizHintsFeature.Action.ViewAction
@@ -221,22 +228,26 @@ object StepQuizFeature {
             ) : ViewAction
 
             sealed interface CreateMagicLinkState : ViewAction {
-                object Loading : CreateMagicLinkState
-                object Error : CreateMagicLinkState
-                object Success : CreateMagicLinkState
+                data object Loading : CreateMagicLinkState
+                data object Error : CreateMagicLinkState
+                data object Success : CreateMagicLinkState
             }
             data class OpenUrl(val url: String) : ViewAction
 
+            data object RequestShowComments : ViewAction
+
+            data object RequestSkipStep : ViewAction
+
             sealed interface NavigateTo : ViewAction {
-                object StudyPlan : NavigateTo
+                data object StudyPlan : NavigateTo
                 data class TheoryStepScreen(val stepRoute: StepRoute) : NavigateTo
             }
 
             sealed interface HapticFeedback : ViewAction {
-                object ReplyValidationError : HapticFeedback
+                data object ReplyValidationError : HapticFeedback
 
-                object WrongSubmission : HapticFeedback
-                object CorrectSubmission : HapticFeedback
+                data object WrongSubmission : HapticFeedback
+                data object CorrectSubmission : HapticFeedback
             }
         }
     }
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizReducer.kt
index f301a69a88..1346c821c5 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizReducer.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/presentation/StepQuizReducer.kt
@@ -17,6 +17,9 @@ import org.hyperskill.app.step_quiz.domain.analytic.StepQuizClickedSendHyperskil
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizClickedStepTextDetailsHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizClickedTheoryToolbarItemHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizCodeEditorClickedInputAccessoryButtonHyperskillAnalyticEvent
+import org.hyperskill.app.step_quiz.domain.analytic.StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent
+import org.hyperskill.app.step_quiz.domain.analytic.StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent
+import org.hyperskill.app.step_quiz.domain.analytic.StepQuizFeedbackSkipClickedHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizFullScreenCodeEditorClickedCodeDetailsHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizFullScreenCodeEditorClickedStepTextDetailsHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz.domain.analytic.StepQuizUnsupportedClickedGoToStudyPlanHyperskillAnalyticEvent
@@ -34,6 +37,7 @@ import org.hyperskill.app.step_quiz_toolbar.presentation.StepQuizToolbarFeature
 import org.hyperskill.app.submissions.domain.model.Reply
 import org.hyperskill.app.submissions.domain.model.Submission
 import org.hyperskill.app.submissions.domain.model.SubmissionStatus
+import org.hyperskill.app.submissions.domain.model.isWrongOrRejected
 import org.hyperskill.app.subscriptions.domain.model.FreemiumChargeLimitsStrategy
 import org.hyperskill.app.subscriptions.domain.model.Subscription
 import ru.nobird.app.presentation.redux.reducer.StateReducer
@@ -159,6 +163,12 @@ internal class StepQuizReducer(
                 handleUpdateProblemsLimitResult(state, message)
             is InternalMessage.ProblemsLimitChanged ->
                 handleProblemsLimitChanged(state, message)
+            is Message.SeeHintClicked ->
+                handleSeeHintsClicked(state)
+            is Message.ReadCommentsClicked ->
+                handleReadCommentsClicked(state)
+            is Message.SkipClicked ->
+                handleSkipClicked(state)
             is Message.ClickedCodeDetailsEventMessage ->
                 if (state.stepQuizState is StepQuizState.AttemptLoaded) {
                     val event = StepQuizClickedCodeDetailsHyperskillAnalyticEvent(stepRoute.analyticRoute)
@@ -347,7 +357,8 @@ internal class StepQuizReducer(
                     attempt = message.attempt,
                     submissionState = message.submissionState,
                     isProblemsLimitReached = message.isProblemsLimitReached,
-                    isTheoryAvailable = StepQuizResolver.isTheoryAvailable(stepRoute, message.step)
+                    isTheoryAvailable = StepQuizResolver.isTheoryAvailable(stepRoute, message.step),
+                    wrongSubmissionsCount = state.stepQuizState.oldState.wrongSubmissionsCount
                 ),
                 stepQuizCodeBlanksState = stepQuizCodeBlanksState
             ) to stepQuizCodeBlanksActions
@@ -439,14 +450,17 @@ internal class StepQuizReducer(
         message: Message.CreateSubmissionSuccess
     ): StepQuizReducerResult? =
         if (state.stepQuizState is StepQuizState.AttemptLoaded) {
+            val submissionStatus = message.submission.status
             state.copy(
                 stepQuizState = state.stepQuizState.copy(
                     attempt = message.newAttempt ?: state.stepQuizState.attempt,
-                    submissionState = StepQuizFeature.SubmissionState.Loaded(message.submission)
+                    submissionState = StepQuizFeature.SubmissionState.Loaded(message.submission),
+                    wrongSubmissionsCount = getWrongSubmissionCount(
+                        currentWrongSubmissionCount = state.stepQuizState.wrongSubmissionsCount,
+                        currentSubmissionStatus = submissionStatus
+                    )
                 )
             ) to buildSet {
-                val submissionStatus = message.submission.status
-
                 if (submissionStatus == SubmissionStatus.WRONG &&
                     StepQuizResolver.isStepHasLimitedAttempts(stepRoute)
                 ) {
@@ -465,6 +479,16 @@ internal class StepQuizReducer(
             null
         }
 
+    private fun getWrongSubmissionCount(
+        currentWrongSubmissionCount: Int,
+        currentSubmissionStatus: SubmissionStatus?
+    ): Int =
+        if (currentSubmissionStatus.isWrongOrRejected) {
+            currentWrongSubmissionCount + 1
+        } else {
+            currentWrongSubmissionCount
+        }
+
     private fun handleUpdateProblemsLimitResult(
         state: State,
         message: InternalMessage.UpdateProblemsLimitResult
@@ -619,4 +643,40 @@ internal class StepQuizReducer(
                 )
             )
         )
+
+    private fun handleSeeHintsClicked(state: State): StepQuizReducerResult {
+        val step = (state.stepQuizState as? StepQuizState.AttemptLoaded)?.step
+        return if (step != null && StepQuizHintsFeature.isHintsFeatureAvailable(step)) {
+            val (newState, actions) = stepQuizChildFeatureReducer.reduce(
+                state = state,
+                message = Message.StepQuizHintsMessage(
+                    StepQuizHintsFeature.InternalMessage.InitiateHintLoading
+                )
+            )
+            newState to actions + setOf(
+                InternalAction.LogAnalyticEvent(
+                    StepQuizFeedbackSeeHintClickedHyperskillAnalyticEvent(stepRoute.analyticRoute)
+                ),
+                Action.ViewAction.ScrollToHints
+            )
+        } else {
+            state to emptySet()
+        }
+    }
+
+    private fun handleReadCommentsClicked(state: State): StepQuizReducerResult =
+        state to setOf(
+            InternalAction.LogAnalyticEvent(
+                StepQuizFeedbackReadCommentsClickedHyperskillAnalyticEvent(stepRoute.analyticRoute)
+            ),
+            Action.ViewAction.RequestShowComments
+        )
+
+    private fun handleSkipClicked(state: State): StepQuizReducerResult =
+        state to setOf(
+            InternalAction.LogAnalyticEvent(
+                StepQuizFeedbackSkipClickedHyperskillAnalyticEvent(stepRoute.analyticRoute)
+            ),
+            Action.ViewAction.RequestSkipStep
+        )
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/mapper/StepQuizFeedbackMapper.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
new file mode 100644
index 0000000000..4dbfd1147c
--- /dev/null
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/mapper/StepQuizFeedbackMapper.kt
@@ -0,0 +1,121 @@
+package org.hyperskill.app.step_quiz.view.mapper
+
+import org.hyperskill.app.SharedResources
+import org.hyperskill.app.core.view.mapper.ResourceProvider
+import org.hyperskill.app.step.domain.model.BlockName
+import org.hyperskill.app.step.domain.model.Step
+import org.hyperskill.app.step.domain.model.areCommentsAvailable
+import org.hyperskill.app.step_quiz.domain.validation.ReplyValidationResult
+import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
+import org.hyperskill.app.step_quiz.view.model.StepQuizFeedbackState
+import org.hyperskill.app.step_quiz.view.model.StepQuizFeedbackState.Wrong.Action
+import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature
+import org.hyperskill.app.submissions.domain.model.Submission
+import org.hyperskill.app.submissions.domain.model.SubmissionStatus
+import org.hyperskill.app.submissions.domain.model.formattedText
+
+class StepQuizFeedbackMapper(private val resourcesProvider: ResourceProvider) {
+
+    companion object {
+        private const val SEE_HINT_SUGGESTION_THRESHOLD = 2
+        private const val SKIP_SUGGESTION_THRESHOLD = 4
+    }
+
+    fun map(state: StepQuizFeature.State): StepQuizFeedbackState =
+        when (val stepQuizState = state.stepQuizState) {
+            is StepQuizFeature.StepQuizState.AttemptLoaded -> {
+                val submissionState = stepQuizState.submissionState as? StepQuizFeature.SubmissionState.Loaded
+                when (val replyValidation = submissionState?.replyValidation) {
+                    is ReplyValidationResult.Error -> StepQuizFeedbackState.ValidationFailed(replyValidation.message)
+                    else -> mapSubmission(state, stepQuizState, submissionState)
+                }
+            }
+            is StepQuizFeature.StepQuizState.Unsupported -> StepQuizFeedbackState.UnsupportedStep
+            else -> StepQuizFeedbackState.Idle
+        }
+
+    private fun mapSubmission(
+        state: StepQuizFeature.State,
+        stepQuizState: StepQuizFeature.StepQuizState.AttemptLoaded,
+        submissionState: StepQuizFeature.SubmissionState.Loaded?
+    ): StepQuizFeedbackState {
+        val submission = submissionState?.submission
+        return when (submission?.status) {
+            SubmissionStatus.CORRECT ->
+                StepQuizFeedbackState.Correct(
+                    hint = getHint(submission),
+                    useLatex = shouldUseLatex(stepQuizState.step)
+                )
+            SubmissionStatus.EVALUATION -> StepQuizFeedbackState.Evaluation
+            SubmissionStatus.WRONG -> getWrongStatusFeedback(state, stepQuizState, submission)
+            SubmissionStatus.REJECTED -> {
+                val feedback = submission.feedback
+                if (feedback != null) {
+                    StepQuizFeedbackState.RejectedSubmission(feedback.formattedText())
+                } else {
+                    StepQuizFeedbackState.Idle
+                }
+            }
+            else -> StepQuizFeedbackState.Idle
+        }
+    }
+
+    private fun getWrongStatusFeedback(
+        state: StepQuizFeature.State,
+        stepQuizState: StepQuizFeature.StepQuizState.AttemptLoaded,
+        submission: Submission
+    ): StepQuizFeedbackState.Wrong {
+        val wrongSubmissionAction = getWrongSubmissionAction(state, stepQuizState)
+        return StepQuizFeedbackState.Wrong(
+            title = resourcesProvider.getString(SharedResources.strings.step_quiz_status_wrong_title),
+            description = when (wrongSubmissionAction) {
+                Action.SEE_HINT ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_see_hint_suggestion)
+                Action.READ_COMMENTS ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_see_comments_suggestion)
+                Action.SKIP_PROBLEM ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_skip_suggestion)
+                null -> null
+            },
+            actionText = when (wrongSubmissionAction) {
+                Action.SEE_HINT ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_hint_action)
+                Action.READ_COMMENTS ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_comments_action)
+                Action.SKIP_PROBLEM ->
+                    resourcesProvider.getString(SharedResources.strings.step_quiz_status_skip_action)
+                null -> null
+            },
+            actionType = wrongSubmissionAction,
+            feedbackHint = getHint(submission),
+            useFeedbackHintLatex = shouldUseLatex(stepQuizState.step)
+        )
+    }
+
+    private fun shouldUseLatex(step: Step): Boolean =
+        step.block.name == BlockName.MATH
+
+    private fun getWrongSubmissionAction(
+        state: StepQuizFeature.State,
+        stepQuizState: StepQuizFeature.StepQuizState.AttemptLoaded
+    ): Action? =
+        when (stepQuizState.wrongSubmissionsCount) {
+            in 0 until SEE_HINT_SUGGESTION_THRESHOLD -> null
+            in SEE_HINT_SUGGESTION_THRESHOLD until SKIP_SUGGESTION_THRESHOLD -> {
+                val hintState = state.stepQuizHintsState as? StepQuizHintsFeature.State.Content
+                val canSeeHint = hintState?.currentHint == null && hintState?.hintsIds?.isNotEmpty() == true
+                when {
+                    canSeeHint -> Action.SEE_HINT
+                    stepQuizState.step.areCommentsAvailable -> Action.READ_COMMENTS
+                    else -> null
+                }
+            }
+            else -> Action.SKIP_PROBLEM
+        }
+
+    private fun getHint(submission: Submission): String? =
+        submission
+            .hint
+            ?.takeIf(String::isNotEmpty)
+            ?.replace("\n", "<br />")
+}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/model/StepQuizFeedbackState.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/model/StepQuizFeedbackState.kt
new file mode 100644
index 0000000000..4a1e57886f
--- /dev/null
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz/view/model/StepQuizFeedbackState.kt
@@ -0,0 +1,33 @@
+package org.hyperskill.app.step_quiz.view.model
+
+sealed interface StepQuizFeedbackState {
+    data object Idle : StepQuizFeedbackState
+
+    data class Correct(
+        val hint: String?,
+        val useLatex: Boolean
+    ) : StepQuizFeedbackState
+
+    data class Wrong(
+        val title: String,
+        val description: String?,
+        val actionText: String?,
+        val actionType: Action?,
+        val feedbackHint: String?,
+        val useFeedbackHintLatex: Boolean,
+    ) : StepQuizFeedbackState {
+        enum class Action {
+            SEE_HINT,
+            READ_COMMENTS,
+            SKIP_PROBLEM
+        }
+    }
+
+    data class RejectedSubmission(val message: String) : StepQuizFeedbackState
+
+    data object Evaluation : StepQuizFeedbackState
+
+    data class ValidationFailed(val message: String) : StepQuizFeedbackState
+
+    data object UnsupportedStep : StepQuizFeedbackState
+}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsFeature.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsFeature.kt
index 44b7e5afcc..b268542bab 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsFeature.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsFeature.kt
@@ -175,6 +175,13 @@ object StepQuizHintsFeature {
         data class ReportHintNoticeHiddenEventMessage(val isReported: Boolean) : Message
     }
 
+    internal sealed interface InternalMessage : Message {
+        /**
+         * Initiate loading next hint without analytic event
+         */
+        data object InitiateHintLoading : InternalMessage
+    }
+
     sealed interface Action {
         /**
          * Reporting hint action
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsReducer.kt
index 75c02412ad..1519d84753 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsReducer.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_hints/presentation/StepQuizHintsReducer.kt
@@ -8,12 +8,15 @@ import org.hyperskill.app.step_quiz_hints.domain.analytic.StepQuizHintsClickedHy
 import org.hyperskill.app.step_quiz_hints.domain.analytic.StepQuizHintsHiddenReportHintNoticeHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz_hints.domain.analytic.StepQuizHintsShownReportHintNoticeHyperskillAnalyticEvent
 import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature.Action
+import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature.InternalMessage
 import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature.Message
 import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature.State
 import ru.nobird.app.presentation.redux.reducer.StateReducer
 
+private typealias StepQuizHintsReducerResult = Pair<State, Set<Action>>
+
 class StepQuizHintsReducer(private val stepRoute: StepRoute) : StateReducer<State, Message, Action> {
-    override fun reduce(state: State, message: Message): Pair<State, Set<Action>> =
+    override fun reduce(state: State, message: Message): StepQuizHintsReducerResult =
         when (message) {
             is Message.InitWithStepId ->
                 if (state is State.Idle) {
@@ -97,42 +100,9 @@ class StepQuizHintsReducer(private val stepRoute: StepRoute) : StateReducer<Stat
                     null
                 }
             is Message.LoadHintButtonClicked ->
-                when (state) {
-                    is State.Content -> {
-                        val hintsIds = state.hintsIds.toMutableList()
-                        val nextHintId = hintsIds.removeLast()
-                        State.Loading() to setOf(
-                            Action.FetchNextHint(
-                                nextHintId,
-                                hintsIds,
-                                state.areHintsLimited,
-                                state.stepId
-                            ),
-                            Action.LogAnalyticEvent(
-                                StepQuizHintsClickedHyperskillAnalyticEvent(
-                                    stepRoute.analyticRoute,
-                                    when (state.currentHint) {
-                                        null -> HyperskillAnalyticTarget.SEE_HINT
-                                        else -> HyperskillAnalyticTarget.SEE_NEXT_HINT
-                                    }
-                                )
-                            )
-                        )
-                    }
-                    is State.NetworkError -> {
-                        State.Loading() to setOf(
-                            Action.FetchNextHint(
-                                nextHintId = state.nextHintId,
-                                remainingHintsIds = state.hintsIds,
-                                areHintsLimited = state.areHintsLimited,
-                                stepId = state.stepId
-                            )
-                        )
-                    }
-                    else -> {
-                        null
-                    }
-                }
+                handleLoadHintButtonClicked(state, logAnalyticEvent = true)
+            is InternalMessage.InitiateHintLoading ->
+                handleLoadHintButtonClicked(state, logAnalyticEvent = false)
             is Message.NextHintLoaded ->
                 if (state is State.Loading) {
                     State.Content(
@@ -194,4 +164,49 @@ class StepQuizHintsReducer(private val stepRoute: StepRoute) : StateReducer<Stat
                     null
                 }
         } ?: (state to emptySet())
+
+    private fun handleLoadHintButtonClicked(
+        state: State,
+        logAnalyticEvent: Boolean
+    ): StepQuizHintsReducerResult =
+        when (state) {
+            is State.Content -> {
+                val hintsIds = state.hintsIds.toMutableList()
+                val nextHintId = hintsIds.removeLast()
+                State.Loading() to setOfNotNull(
+                    Action.FetchNextHint(
+                        nextHintId,
+                        hintsIds,
+                        state.areHintsLimited,
+                        state.stepId
+                    ),
+                    if (logAnalyticEvent) {
+                        Action.LogAnalyticEvent(
+                            StepQuizHintsClickedHyperskillAnalyticEvent(
+                                route = stepRoute.analyticRoute,
+                                target = when (state.currentHint) {
+                                    null -> HyperskillAnalyticTarget.SEE_HINT
+                                    else -> HyperskillAnalyticTarget.SEE_NEXT_HINT
+                                }
+                            )
+                        )
+                    } else {
+                        null
+                    }
+                )
+            }
+            is State.NetworkError -> {
+                State.Loading() to setOf(
+                    Action.FetchNextHint(
+                        nextHintId = state.nextHintId,
+                        remainingHintsIds = state.hintsIds,
+                        areHintsLimited = state.areHintsLimited,
+                        stepId = state.stepId
+                    )
+                )
+            }
+            else -> {
+                state to emptySet()
+            }
+        }
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/moko-resources/base/strings.xml b/shared/src/commonMain/moko-resources/base/strings.xml
index 45cce779c5..cf6b06e22d 100644
--- a/shared/src/commonMain/moko-resources/base/strings.xml
+++ b/shared/src/commonMain/moko-resources/base/strings.xml
@@ -74,9 +74,17 @@
 
     <!-- Step quiz -->
     <string name="step_quiz_status_correct_text">You\'re absolutely correct!</string>
+    <string name="step_quiz_status_wrong_title">Not correct</string>
     <string name="step_quiz_status_wrong_text">Not correct, but keep on trying\nand never give up!</string>
     <string name="step_quiz_status_evaluation_text">Evaluation...</string>
     <string name="step_quiz_status_loading_text">Loading...</string>
+    <string name="step_quiz_status_see_hint_suggestion">Take a look at what other users are suggesting to solve this problem.</string>
+    <string name="step_quiz_status_hint_action">See community hint</string>
+    <string name="step_quiz_status_see_comments_suggestion">Study the comments of other learners, it may help you to find the right solution.</string>
+    <string name="step_quiz_status_comments_action">Read the comments</string>
+    <string name="step_quiz_status_skip_suggestion">Go to the next problem if you're stuck on the current one.</string>
+    <string name="step_quiz_status_skip_action">Skip this problem</string>
+
     <string name="step_quiz_stats_text">%s solved this problem. Latest completion was %s ago.</string>
     <string name="step_quiz_feedback_title">FEEDBACK:</string>
     <string name="step_quiz_continue_button_text">Continue</string>
diff --git a/shared/src/commonTest/kotlin/org/hyperskill/step/StepViewStateMapperTest.kt b/shared/src/commonTest/kotlin/org/hyperskill/step/StepViewStateMapperTest.kt
index 52919b0e83..9a17029cbf 100644
--- a/shared/src/commonTest/kotlin/org/hyperskill/step/StepViewStateMapperTest.kt
+++ b/shared/src/commonTest/kotlin/org/hyperskill/step/StepViewStateMapperTest.kt
@@ -1,8 +1,8 @@
 package org.hyperskill.step
 
 import kotlin.test.Test
+import kotlin.test.assertContains
 import kotlin.test.assertFalse
-import kotlin.test.assertTrue
 import org.hyperskill.app.comments.domain.model.CommentStatisticsEntry
 import org.hyperskill.app.comments.domain.model.CommentThread
 import org.hyperskill.app.step.domain.model.Step
@@ -16,7 +16,7 @@ import org.hyperskill.step.domain.model.stub
 
 class StepViewStateMapperTest {
     @Test
-    fun `isCommentsToolbarItemAvailable returns true when comments are present`() {
+    fun `Comments secondary action should be presented when comments are present`() {
         val step = Step.stub(
             id = 1,
             commentsStatistics = listOf(
@@ -32,11 +32,11 @@ class StepViewStateMapperTest {
         val mapper = StepViewStateMapper(stepRoute)
         val viewState = mapper.map(state)
 
-        assertTrue(viewState.isCommentsToolbarItemAvailable)
+        assertContains(viewState.stepMenuSecondaryActions, StepMenuSecondaryAction.COMMENTS)
     }
 
     @Test
-    fun `isCommentsToolbarItemAvailable returns false when no comments are present`() {
+    fun `Comments secondary action should not be presented when no comments are present`() {
         val step = Step.stub(
             id = 1,
             commentsStatistics = listOf(
@@ -52,7 +52,7 @@ class StepViewStateMapperTest {
         val mapper = StepViewStateMapper(stepRoute)
         val viewState = mapper.map(state)
 
-        assertFalse(viewState.isCommentsToolbarItemAvailable)
+        assertFalse(viewState.stepMenuSecondaryActions.contains(StepMenuSecondaryAction.COMMENTS))
     }
 
     @Test
@@ -67,7 +67,7 @@ class StepViewStateMapperTest {
         val mapper = StepViewStateMapper(stepRoute)
         val viewState = mapper.map(state)
 
-        assertTrue(viewState.stepMenuSecondaryActions.contains(StepMenuSecondaryAction.SKIP))
+        assertContains(viewState.stepMenuSecondaryActions, StepMenuSecondaryAction.SKIP)
     }
 
     @Test
diff --git a/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizFeedbackMapperTest.kt b/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizFeedbackMapperTest.kt
new file mode 100644
index 0000000000..9f33ecf884
--- /dev/null
+++ b/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizFeedbackMapperTest.kt
@@ -0,0 +1,291 @@
+package org.hyperskill.step_quiz
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import org.hyperskill.ResourceProviderStub
+import org.hyperskill.app.comments.domain.model.Comment
+import org.hyperskill.app.comments.domain.model.CommentStatisticsEntry
+import org.hyperskill.app.comments.domain.model.CommentThread
+import org.hyperskill.app.step.domain.model.Step
+import org.hyperskill.app.step_quiz.domain.model.attempts.Attempt
+import org.hyperskill.app.step_quiz.domain.validation.ReplyValidationResult
+import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
+import org.hyperskill.app.step_quiz.view.mapper.StepQuizFeedbackMapper
+import org.hyperskill.app.step_quiz.view.model.StepQuizFeedbackState
+import org.hyperskill.app.step_quiz_code_blanks.presentation.StepQuizCodeBlanksFeature
+import org.hyperskill.app.step_quiz_hints.presentation.StepQuizHintsFeature
+import org.hyperskill.app.step_quiz_toolbar.presentation.StepQuizToolbarFeature
+import org.hyperskill.app.submissions.domain.model.Feedback
+import org.hyperskill.app.submissions.domain.model.Submission
+import org.hyperskill.app.submissions.domain.model.SubmissionStatus
+import org.hyperskill.commets.domain.model.stub
+import org.hyperskill.step.domain.model.stub
+import org.hyperskill.step_quiz.domain.model.stub
+
+class StepQuizFeedbackMapperTest {
+
+    private val mapper = StepQuizFeedbackMapper(ResourceProviderStub())
+
+    @Test
+    fun `StepQuizState_Unsupported should be mapped to Unsupported viewState`() {
+        val state = StepQuizFeature.State(
+            stepQuizState = StepQuizFeature.StepQuizState.Unsupported,
+            stepQuizHintsState = StepQuizHintsFeature.State.Idle,
+            stepQuizToolbarState = StepQuizToolbarFeature.State.Idle,
+            stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.State.Idle
+        )
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.UnsupportedStep>(viewState)
+    }
+
+    @Test
+    fun `All the StepQuizState except Unsupported and AttemptLoaded should be mapped to Idle viewState`() {
+        listOf(
+            StepQuizFeature.StepQuizState.Idle,
+            StepQuizFeature.StepQuizState.Loading,
+            StepQuizFeature.StepQuizState.NetworkError,
+            StepQuizFeature.StepQuizState.AttemptLoading(
+                StepQuizFeature.StepQuizState.AttemptLoaded(
+                    step = Step.stub(id = 1),
+                    attempt = Attempt.stub(),
+                    submissionState = StepQuizFeature.SubmissionState.Empty(),
+                    isProblemsLimitReached = false,
+                    isTheoryAvailable = false
+                )
+            )
+        ).forEach { stepQuizState ->
+            val state = StepQuizFeature.State(
+                stepQuizState = stepQuizState,
+                stepQuizHintsState = StepQuizHintsFeature.State.Idle,
+                stepQuizToolbarState = StepQuizToolbarFeature.State.Idle,
+                stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.State.Idle
+            )
+            val viewState = mapper.map(state)
+
+            assertIs<StepQuizFeedbackState.Idle>(viewState)
+        }
+    }
+
+    @Test
+    fun `ReplyValidationResult_Error should be mapped to ValidationFailed viewState`() {
+        val replyValidationResultError = ReplyValidationResult.Error("Test message")
+
+        val state = getAttemptLoadedSubmissionState(
+            submission = Submission.stub(),
+            replyValidation = replyValidationResultError
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.ValidationFailed>(viewState)
+        assertEquals(replyValidationResultError.message, viewState.message)
+    }
+
+    @Test
+    fun `SubmissionStatus_CORRECT should be mapped to Correct viewState`() {
+        val hint = "Test hint"
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(
+                status = SubmissionStatus.CORRECT,
+                hint = hint
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Correct>(viewState)
+        assertEquals(hint, viewState.hint)
+    }
+
+    @Test
+    fun `SubmissionStatus_Evaluation should be mapped to Evaluation viewState`() {
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(status = SubmissionStatus.EVALUATION)
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Evaluation>(viewState)
+    }
+
+    @Test
+    fun `SubmissionStatus_Local should be mapped to Idle viewState`() {
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(status = SubmissionStatus.LOCAL)
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Idle>(viewState)
+    }
+
+    @Test
+    fun `SubmissionStatus_Rejected with feedback should be mapped to RejectedSubmission viewState`() {
+        val feedback = Feedback.Text("Test feedback")
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(
+                status = SubmissionStatus.REJECTED,
+                feedback = feedback
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.RejectedSubmission>(viewState)
+        assertEquals(feedback.text, viewState.message)
+    }
+
+    @Test
+    fun `SubmissionStatus_Rejected without feedback should be mapped to Idle viewState`() {
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(
+                status = SubmissionStatus.REJECTED
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Idle>(viewState)
+    }
+
+    @Test
+    fun `SubmissionStatus_Wrong should be mapped to Wrong viewState`() {
+        val state = getAttemptLoadedSubmissionState(
+            Submission.stub(
+                status = SubmissionStatus.WRONG
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Wrong>(viewState)
+    }
+
+    @Test
+    fun `Second wrong submission should trigger Wrong viewState with SEE_HINT actionType when hint is not opened`() {
+        val stepId = 0L
+        val state = getAttemptLoadedSubmissionState(
+            step = Step.stub(id = stepId),
+            submission = Submission.stub(
+                status = SubmissionStatus.WRONG,
+            ),
+            wrongSubmissionCount = 2,
+            stepQuizHintsState = StepQuizHintsFeature.State.Content(
+                hintsIds = listOf(0, 1, 2),
+                currentHint = null,
+                hintHasReaction = false,
+                areHintsLimited = false,
+                stepId = stepId
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Wrong>(viewState)
+        assertEquals(StepQuizFeedbackState.Wrong.Action.SEE_HINT, viewState.actionType)
+    }
+
+    /*ktlint-disable*/
+    @Test
+    fun `Second wrong submission should trigger Wrong viewState with READ_COMMENTS actionType when hint is opened and there are comments`() {
+        val stepId = 0L
+        val state = getAttemptLoadedSubmissionState(
+            step = Step.stub(
+                id = stepId,
+                commentsStatistics = listOf(
+                    CommentStatisticsEntry(
+                        thread = CommentThread.COMMENT,
+                        totalCount = 1
+                    )
+                )
+            ),
+            submission = Submission.stub(
+                status = SubmissionStatus.WRONG,
+            ),
+            wrongSubmissionCount = 2,
+            stepQuizHintsState = StepQuizHintsFeature.State.Content(
+                hintsIds = listOf(0, 1, 2),
+                currentHint = Comment.stub(id = 0),
+                hintHasReaction = false,
+                areHintsLimited = false,
+                stepId = stepId
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Wrong>(viewState)
+        assertEquals(StepQuizFeedbackState.Wrong.Action.READ_COMMENTS, viewState.actionType)
+    }
+
+    /*ktlint-disable*/
+    @Test
+    fun `Second wrong submission should trigger Wrong viewState with null actionType when hint is opened and no comments available`() {
+        val stepId = 0L
+        val state = getAttemptLoadedSubmissionState(
+            step = Step.stub(
+                id = stepId,
+                commentsStatistics = emptyList()
+            ),
+            submission = Submission.stub(
+                status = SubmissionStatus.WRONG,
+            ),
+            wrongSubmissionCount = 2,
+            stepQuizHintsState = StepQuizHintsFeature.State.Content(
+                hintsIds = listOf(0, 1, 2),
+                currentHint = Comment.stub(id = 0),
+                hintHasReaction = false,
+                areHintsLimited = false,
+                stepId = stepId
+            )
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Wrong>(viewState)
+        assertEquals(null, viewState.actionType)
+    }
+
+    @Test
+    fun `4th wrong submission should trigger Wrong viewState with SKIP_PROBLEM action type`() {
+        val stepId = 0L
+        val state = getAttemptLoadedSubmissionState(
+            step = Step.stub(id = stepId),
+            submission = Submission.stub(
+                status = SubmissionStatus.WRONG,
+            ),
+            wrongSubmissionCount = 4
+        )
+
+        val viewState = mapper.map(state)
+
+        assertIs<StepQuizFeedbackState.Wrong>(viewState)
+        assertEquals(StepQuizFeedbackState.Wrong.Action.SKIP_PROBLEM, viewState.actionType)
+    }
+
+    private fun getAttemptLoadedSubmissionState(
+        submission: Submission,
+        replyValidation: ReplyValidationResult? = null,
+        wrongSubmissionCount: Int = 0,
+        step: Step = Step.stub(id = 0),
+        stepQuizHintsState: StepQuizHintsFeature.State = StepQuizHintsFeature.State.Idle
+    ): StepQuizFeature.State =
+        StepQuizFeature.State(
+            stepQuizState = StepQuizFeature.StepQuizState.AttemptLoaded(
+                step = step,
+                attempt = Attempt.stub(),
+                submissionState = StepQuizFeature.SubmissionState.Loaded(
+                    submission = submission,
+                    replyValidation = replyValidation
+                ),
+                isProblemsLimitReached = false,
+                isTheoryAvailable = false,
+                wrongSubmissionsCount = wrongSubmissionCount
+            ),
+            stepQuizHintsState = stepQuizHintsState,
+            stepQuizToolbarState = StepQuizToolbarFeature.State.Idle,
+            stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.State.Idle
+        )
+}
\ No newline at end of file
diff --git a/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizTest.kt b/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizTest.kt
index dd3c84b904..038e8ff55a 100644
--- a/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizTest.kt
+++ b/shared/src/commonTest/kotlin/org/hyperskill/step_quiz/StepQuizTest.kt
@@ -5,6 +5,8 @@ import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import org.hyperskill.app.comments.domain.model.CommentStatisticsEntry
+import org.hyperskill.app.comments.domain.model.CommentThread
 import org.hyperskill.app.onboarding.domain.model.ProblemsOnboardingFlags
 import org.hyperskill.app.problems_limit_info.domain.model.ProblemsLimitInfoModalContext
 import org.hyperskill.app.problems_limit_info.domain.model.ProblemsLimitInfoModalLaunchSource
@@ -173,7 +175,8 @@ class StepQuizTest {
                     Submission.stub(status = SubmissionStatus.WRONG)
                 ),
                 isProblemsLimitReached = false,
-                isTheoryAvailable = false
+                isTheoryAvailable = false,
+                wrongSubmissionsCount = 1
             ),
             stepQuizHintsState = StepQuizHintsFeature.State.Idle,
             stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
@@ -222,11 +225,12 @@ class StepQuizTest {
                     Submission.stub(status = SubmissionStatus.WRONG)
                 ),
                 isProblemsLimitReached = false,
-                isTheoryAvailable = false
+                isTheoryAvailable = false,
+                wrongSubmissionsCount = 1
             ),
             stepQuizHintsState = StepQuizHintsFeature.State.Idle,
             stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
-            stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState()
+            stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState(),
         )
 
         assertEquals(expectedState, actualState)
@@ -764,4 +768,200 @@ class StepQuizTest {
             }
         }
     }
+
+    @Test
+    fun `Wrong and rejected submissions should increment wrongSubmissionsCount on CreateSubmissionSuccess`() {
+        val step = Step.stub(id = 1)
+        val attempt = Attempt.stub()
+        val submissionState = StepQuizFeature.SubmissionState.Loaded(
+            Submission.stub(status = SubmissionStatus.EVALUATION)
+        )
+        val stepRoute = StepRoute.Learn.Step(step.id, null)
+
+        val expectedWrongSubmissionsCount = 1
+
+        val reducer = StepQuizReducer(
+            stepRoute = stepRoute,
+            stepQuizChildFeatureReducer = StepQuizChildFeatureReducer.stub(stepRoute)
+        )
+
+        listOf(
+            SubmissionStatus.WRONG,
+            SubmissionStatus.REJECTED
+        ).forEach { submissionStatus ->
+            val (state, _) = reducer.reduce(
+                StepQuizFeature.State(
+                    stepQuizState = StepQuizFeature.StepQuizState.AttemptLoaded(
+                        step = step,
+                        attempt = attempt,
+                        submissionState = submissionState,
+                        isProblemsLimitReached = false,
+                        isTheoryAvailable = false,
+                        wrongSubmissionsCount = 0
+                    ),
+                    stepQuizHintsState = StepQuizHintsFeature.State.Idle,
+                    stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
+                    stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState()
+                ),
+                StepQuizFeature.Message.CreateSubmissionSuccess(
+                    submission = Submission.stub(status = submissionStatus)
+                )
+            )
+
+            assertEquals(
+                expectedWrongSubmissionsCount,
+                (state.stepQuizState as? StepQuizFeature.StepQuizState.AttemptLoaded)?.wrongSubmissionsCount
+            )
+        }
+    }
+
+    @Test
+    fun `WrongSubmissionsCount submissions should be kept on CreateAttemptSuccess`() {
+        val step = Step.stub(id = 1)
+        val attempt = Attempt.stub()
+        val submissionState = StepQuizFeature.SubmissionState.Loaded(
+            Submission.stub(status = SubmissionStatus.EVALUATION)
+        )
+        val stepRoute = StepRoute.Learn.Step(step.id, null)
+
+        val expectedWrongSubmissionsCount = 1
+
+        val reducer = StepQuizReducer(
+            stepRoute = stepRoute,
+            stepQuizChildFeatureReducer = StepQuizChildFeatureReducer.stub(stepRoute)
+        )
+
+        val (state, _) = reducer.reduce(
+            StepQuizFeature.State(
+                stepQuizState = StepQuizFeature.StepQuizState.AttemptLoading(
+                    StepQuizFeature.StepQuizState.AttemptLoaded(
+                        step = step,
+                        attempt = attempt,
+                        submissionState = submissionState,
+                        isProblemsLimitReached = false,
+                        isTheoryAvailable = false,
+                        wrongSubmissionsCount = expectedWrongSubmissionsCount
+                    )
+                ),
+                stepQuizHintsState = StepQuizHintsFeature.State.Idle,
+                stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
+                stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState()
+            ),
+            StepQuizFeature.Message.CreateAttemptSuccess(
+                step = step,
+                attempt = attempt,
+                submissionState = submissionState,
+                isProblemsLimitReached = false
+            )
+        )
+
+        assertEquals(
+            expectedWrongSubmissionsCount,
+            (state.stepQuizState as? StepQuizFeature.StepQuizState.AttemptLoaded)?.wrongSubmissionsCount
+        )
+    }
+
+    @Test
+    fun `Non-error submissions should not increment wrongSubmissionsCount`() {
+        val step = Step.stub(id = 1)
+        val attempt = Attempt.stub()
+        val submissionState = StepQuizFeature.SubmissionState.Loaded(
+            Submission.stub(status = SubmissionStatus.EVALUATION)
+        )
+        val stepRoute = StepRoute.Learn.Step(step.id, null)
+
+        val expectedWrongSubmissionsCount = 0
+
+        val reducer = StepQuizReducer(
+            stepRoute = stepRoute,
+            stepQuizChildFeatureReducer = StepQuizChildFeatureReducer.stub(stepRoute)
+        )
+
+        listOf(
+            SubmissionStatus.LOCAL,
+            SubmissionStatus.EVALUATION,
+            SubmissionStatus.CORRECT
+        ).forEach { submissionStatus ->
+            val (state, _) = reducer.reduce(
+                StepQuizFeature.State(
+                    stepQuizState = StepQuizFeature.StepQuizState.AttemptLoaded(
+                        step = step,
+                        attempt = attempt,
+                        submissionState = submissionState,
+                        isProblemsLimitReached = false,
+                        isTheoryAvailable = false,
+                        wrongSubmissionsCount = 0
+                    ),
+                    stepQuizHintsState = StepQuizHintsFeature.State.Idle,
+                    stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
+                    stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState()
+                ),
+                StepQuizFeature.Message.CreateSubmissionSuccess(
+                    submission = Submission.stub(status = submissionStatus)
+                )
+            )
+
+            assertEquals(
+                expectedWrongSubmissionsCount,
+                (state.stepQuizState as? StepQuizFeature.StepQuizState.AttemptLoaded)?.wrongSubmissionsCount
+            )
+        }
+    }
+
+    @Test
+    fun `Clicking on the SeeHint button in the feedback should trigger hint loading`() {
+        val step = Step.stub(
+            id = 1,
+            commentsStatistics = listOf(
+                CommentStatisticsEntry(CommentThread.HINT, totalCount = 1)
+            )
+        )
+        val attempt = Attempt.stub()
+        val submissionState = StepQuizFeature.SubmissionState.Loaded(
+            Submission.stub(status = SubmissionStatus.EVALUATION)
+        )
+        val stepRoute = StepRoute.Learn.Step(step.id, null)
+
+        val reducer = StepQuizReducer(
+            stepRoute = stepRoute,
+            stepQuizChildFeatureReducer = StepQuizChildFeatureReducer.stub(stepRoute)
+        )
+
+        val expectedNextHintId = 2L
+
+        val (_, actions) = reducer.reduce(
+            StepQuizFeature.State(
+                stepQuizState = StepQuizFeature.StepQuizState.AttemptLoaded(
+                    step = step,
+                    attempt = attempt,
+                    submissionState = submissionState,
+                    isProblemsLimitReached = false,
+                    isTheoryAvailable = false,
+                    wrongSubmissionsCount = 0
+                ),
+                stepQuizHintsState = StepQuizHintsFeature.State.Content(
+                    hintsIds = listOf(0, 1, expectedNextHintId),
+                    currentHint = null,
+                    hintHasReaction = false,
+                    areHintsLimited = false,
+                    stepId = step.id
+                ),
+                stepQuizToolbarState = StepQuizToolbarFeature.initialState(stepRoute),
+                stepQuizCodeBlanksState = StepQuizCodeBlanksFeature.initialState()
+            ),
+            StepQuizFeature.Message.SeeHintClicked
+        )
+
+        assertContains(
+            actions,
+            StepQuizFeature.Action.StepQuizHintsAction(
+                StepQuizHintsFeature.Action.FetchNextHint(
+                    nextHintId = expectedNextHintId,
+                    remainingHintsIds = listOf(0, 1),
+                    areHintsLimited = false,
+                    stepId = step.id
+                )
+            )
+        )
+    }
 }
\ No newline at end of file