From 580e51dcea6922f93aabec54e28c5bbc307c57a5 Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Wed, 9 Aug 2023 15:40:07 +0530
Subject: [PATCH] Fix Logic Jumps issues in in-product survey (#667)

---
 .../settings/members/DeleteTeam.tsx           |  2 +-
 packages/js/src/components/SurveyView.tsx     | 33 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/DeleteTeam.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/DeleteTeam.tsx
index 31ae560a53..48271ea936 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/DeleteTeam.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/DeleteTeam.tsx
@@ -54,7 +54,7 @@ export default function DeleteTeam({ environmentId }) {
       {!isDeleteDisabled && (
         <div>
           <p className="text-sm text-slate-900">
-           This action cannot be undone. If it&apos;s gone, it&apos;s gone.
+            This action cannot be undone. If it&apos;s gone, it&apos;s gone.
           </p>
           <Button
             disabled={isDeleteDisabled}
diff --git a/packages/js/src/components/SurveyView.tsx b/packages/js/src/components/SurveyView.tsx
index d0bb02ce61..5b96cca45b 100644
--- a/packages/js/src/components/SurveyView.tsx
+++ b/packages/js/src/components/SurveyView.tsx
@@ -162,18 +162,31 @@ export default function SurveyView({ config, survey, close, errorHandler }: Surv
     }
   }
 
-  function getNextQuestionId() {
+  function getNextQuestionId(data: TResponseData): string {
     const questions = survey.questions;
     const currentQuestionIndex = questions.findIndex((q) => q.id === activeQuestionId);
+    const currentQuestion = questions[currentQuestionIndex];
+    const responseValue = data[activeQuestionId];
+
     if (currentQuestionIndex === -1) throw new Error("Question not found");
 
+    if (currentQuestion?.logic && currentQuestion?.logic.length > 0) {
+      for (let logic of currentQuestion.logic) {
+        if (!logic.destination) continue;
+
+        if (evaluateCondition(logic, responseValue)) {
+          return logic.destination;
+        }
+      }
+    }
+
     return questions[currentQuestionIndex + 1]?.id || "end";
   }
 
   function goToNextQuestion(answer: TResponseData): string {
     setLoadingElement(true);
     const questions = survey.questions;
-    const nextQuestionId = getNextQuestionId();
+    const nextQuestionId = getNextQuestionId(answer);
 
     if (nextQuestionId === "end") {
       submitResponse(answer);
@@ -212,21 +225,7 @@ export default function SurveyView({ config, survey, close, errorHandler }: Surv
 
   const submitResponse = async (data: TResponseData) => {
     setLoadingElement(true);
-    const questions = survey.questions;
-    const nextQuestionId = getNextQuestionId();
-    const currentQuestion = questions[activeQuestionId];
-    const responseValue = data[activeQuestionId];
-
-    if (currentQuestion?.logic && currentQuestion?.logic.length > 0) {
-      for (let logic of currentQuestion.logic) {
-        if (!logic.destination) continue;
-
-        if (evaluateCondition(logic, responseValue)) {
-          return logic.destination;
-        }
-      }
-    }
-
+    const nextQuestionId = getNextQuestionId(data);
     const finished = nextQuestionId === "end";
     // build response
     const responseRequest: TResponseInput = {