From 0ea37ce7e3075c352a9b600a16f4f99f2bf391ce Mon Sep 17 00:00:00 2001
From: Matt Bemis <mbemis@broadinstitute.org>
Date: Wed, 26 Feb 2025 14:23:05 -0500
Subject: [PATCH] cleaner

---
 ui-core/src/components/forms/PagedSurveyView.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui-core/src/components/forms/PagedSurveyView.tsx b/ui-core/src/components/forms/PagedSurveyView.tsx
index 331ed6bd6..844baf3e0 100644
--- a/ui-core/src/components/forms/PagedSurveyView.tsx
+++ b/ui-core/src/components/forms/PagedSurveyView.tsx
@@ -127,12 +127,12 @@ export function PagedSurveyView({
     })
   }
 
-  const updateTaskId = (response: HubResponse) => {
-    //TODO: can we trust that the first task returned is the newest? hmmm
-    const newestTask = response.tasks[0]
+  const updateTaskId = (hubResponse: HubResponse) => {
+    const surveyResponseId = hubResponse.response.id
+    const taskForResponse = hubResponse.tasks.find(task => task.surveyResponseId === surveyResponseId)
     //set url params to the newest task id
-    if (newestTask && taskId !== newestTask.id) {
-      setTaskId(newestTask.id)
+    if (taskForResponse && taskId !== taskForResponse.id) {
+      setTaskId(taskForResponse.id)
     }
   }