Merge branch 'fixes' into dev

src/pages/ViewPublicationPage/Footer.tsx

@@ -109,6 +109,7 @@ export const Footer = ({
   }, [question, answers]);
 
   const showResult = (nextQuestion) => {
+    console.log("Следующий результат будет вот такой" , nextQuestion)
     if (nextQuestion && quiz?.config.resultInfo.when === "email") {
       setShowContactForm(true);
       return;
@@ -241,6 +242,7 @@ export const Footer = ({
   };
 
   const followNextStep = () => {
+    console.log(" Я понимаю что нахожусь в линейном опроснике" + linear)
     if (linear) {
       setStepNumber((q) => q + 1);
       const questionIndex = questions.findIndex(({ id }) => id === question.id);

src/pages/ViewPublicationPage/ResultForm.tsx

@@ -33,15 +33,28 @@ export const ResultForm = ({
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down(650));
   const { questions } = useQuestionsStore();
-  const resultQuestion = (questions.find(
+
-    (question) =>
+  const searchResult = () => {
-      question.type === "result" &&
+    if (Boolean(quiz?.config.haveRoot)) {
-      question.content.rule.parentId === currentQuestion.content.id,
+      //ищём для ветвления
-  ) ||
+      return (questions.find(
-    questions.find(
+        (question) =>
-      (question) =>
+          question.type === "result" &&
-        question.type === "result" && question.content.rule.parentId === "line",
+          question.content.rule.parentId === currentQuestion.content.id,
-    )) as AnyTypedQuizQuestion;
+      ) ||
+        questions.find(
+          (question) =>
+            question.type === "result" && question.content.rule.parentId === "line",
+        )) as AnyTypedQuizQuestion;
+    } else {
+      return questions.find(
+        (question) =>
+          question.type === "result" && question.content.rule.parentId === "line",
+      ) as AnyTypedQuizQuestion;
+    }
+  }
+
+  const resultQuestion = searchResult()
 
   const followNextForm = () => {
     setShowResultForm(false);
@@ -49,6 +62,7 @@ export const ResultForm = ({
   };
   if (resultQuestion === undefined) return <></>;
 
+  console.log("Я форма показа резултата и он такой ", resultQuestion)
   return (
     <Box
       sx={{