From b3f05c42e8b9d926aa5c804b740976de10db805b Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Sat, 19 Feb 2022 15:07:38 +0530
Subject: [PATCH] fix: crash on getUpdatedEnvVariables on certain cases

---
 .../hoppscotch-app/helpers/RequestRunner.ts   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/hoppscotch-app/helpers/RequestRunner.ts b/packages/hoppscotch-app/helpers/RequestRunner.ts
index b171b072..4c41f16d 100644
--- a/packages/hoppscotch-app/helpers/RequestRunner.ts
+++ b/packages/hoppscotch-app/helpers/RequestRunner.ts
@@ -91,9 +91,12 @@ export const runRESTRequest$ = (): TaskEither<
             })()
 
             if (isRight(runResult)) {
+              debugger
+
               setRESTTestResults(translateToSandboxTestResults(runResult.right))
 
               setGlobalEnvVariables(runResult.right.envs.global)
+
               if (environmentsStore.value.currentEnvironmentIndex !== -1) {
                 const env = getEnviroment(
                   environmentsStore.value.currentEnvironmentIndex
@@ -154,14 +157,21 @@ const getUpdatedEnvVariables = (
     A.filterMap(
       flow(
         O.fromPredicate(
-          (x) =>
-            current.findIndex((y) => x.key === y.key && x.value !== y.value) ===
-            -1
+          (x) => current.findIndex((y) => x.key === y.key) === -1
         ),
-        O.map((x) => ({
-          ...x,
-          previousValue: current.find((y) => x.key === y.key)!.value,
-        }))
+        O.chain(
+          O.fromPredicate(
+            (x) => current.findIndex((y) => x.value !== y.value) === -1
+          )
+        ),
+        O.map((x) => {
+          const match = current.find((y) => x.key === y.key)!.value
+
+          return {
+            ...x,
+            previousValue: match,
+          }
+        })
       )
     )
   )