From b3dfe405633678d0f7b7ae79c4a3828da2f1cdf3 Mon Sep 17 00:00:00 2001
From: nflnkr <molohov.eugeny@yandex.ru>
Date: Sun, 2 Jun 2024 14:08:09 +0300
Subject: [PATCH] use showfc flag from quiz config

---
 .../ViewPublicationPage/ResultForm.tsx        | 28 ++++++++++---------
 lib/model/settingsData.ts                     |  8 +++---
 lib/utils/hooks/useQuestionFlowControl.ts     |  7 +++--
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx
index f6d8b4e..24ca994 100644
--- a/lib/components/ViewPublicationPage/ResultForm.tsx
+++ b/lib/components/ViewPublicationPage/ResultForm.tsx
@@ -229,19 +229,21 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
             bottom: 0,
           }}
         >
-          {settings.cfg.resultInfo.showResultForm === "before" && !settings.cfg.score && (
-            <Button
-              onClick={() => setCurrentQuizStep("contactform")}
-              variant="contained"
-              sx={{
-                p: "10px 20px",
-                width: "auto",
-                height: "50px",
-              }}
-            >
-              {resultQuestion.content.hint.text || "Узнать подробнее"}
-            </Button>
-          )}
+          {settings.cfg.resultInfo.showResultForm === "before" &&
+            settings.cfg.showfc !== false &&
+            !settings.cfg.score && (
+              <Button
+                onClick={() => setCurrentQuizStep("contactform")}
+                variant="contained"
+                sx={{
+                  p: "10px 20px",
+                  width: "auto",
+                  height: "50px",
+                }}
+              >
+                {resultQuestion.content.hint.text || "Узнать подробнее"}
+              </Button>
+            )}
           {settings.cfg.resultInfo.showResultForm === "after" && resultQuestion.content.redirect && (
             <Button
               onClick={() => {
diff --git a/lib/model/settingsData.ts b/lib/model/settingsData.ts
index bae533b..ca55e80 100644
--- a/lib/model/settingsData.ts
+++ b/lib/model/settingsData.ts
@@ -110,10 +110,10 @@ export interface QuizConfig {
     law?: string;
   };
   meta: string;
-  antifraud: boolean;
-  showfc: boolean;
-  yandexMetricsNumber: number | undefined;
-  vkMetricsNumber: number | undefined;
+  antifraud?: boolean;
+  showfc?: boolean;
+  yandexMetricsNumber?: number;
+  vkMetricsNumber?: number;
 }
 
 export type FormContactFieldName = "name" | "email" | "phone" | "text" | "address";
diff --git a/lib/utils/hooks/useQuestionFlowControl.ts b/lib/utils/hooks/useQuestionFlowControl.ts
index e538738..4c94381 100644
--- a/lib/utils/hooks/useQuestionFlowControl.ts
+++ b/lib/utils/hooks/useQuestionFlowControl.ts
@@ -130,9 +130,12 @@ export function useQuestionFlowControl() {
     if (nextQuestion?.type !== "result") throw new Error("Current question is not result");
 
     setCurrentQuestionId(nextQuestion.id);
-    if (settings.cfg.resultInfo.showResultForm === "after" || isResultQuestionEmpty(nextQuestion))
+    if (
+      settings.cfg.showfc !== false &&
+      (settings.cfg.resultInfo.showResultForm === "after" || isResultQuestionEmpty(nextQuestion))
+    )
       setCurrentQuizStep("contactform");
-  }, [nextQuestion, setCurrentQuizStep, settings.cfg.resultInfo.showResultForm]);
+  }, [nextQuestion, setCurrentQuizStep, settings.cfg.resultInfo.showResultForm, settings.cfg.showfc]);
 
   const showResultAfterContactForm = useCallback(() => {
     if (currentQuestion?.type !== "result") throw new Error("Current question is not result");