From 91fee8d2d0cfbd6676f267bdee11085449f0d0a6 Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Tue, 17 Aug 2021 14:41:23 +0530
Subject: [PATCH] refactor: remove legacy global env preRequest reference

---
 helpers/preRequest.ts    | 6 +++---
 newstore/environments.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helpers/preRequest.ts b/helpers/preRequest.ts
index b0ce2a1f4..48ce28636 100644
--- a/helpers/preRequest.ts
+++ b/helpers/preRequest.ts
@@ -1,6 +1,6 @@
 import {
   getCurrentEnvironment,
-  getLegacyGlobalEnvironment,
+  getGlobalVariables,
 } from "~/newstore/environments"
 
 export default function getEnvironmentVariablesFromScript(script: string) {
@@ -12,10 +12,10 @@ export default function getEnvironmentVariablesFromScript(script: string) {
     _variables[variable.key] = variable.value
   }
 
-  const globalEnv = getLegacyGlobalEnvironment()
+  const globalEnv = getGlobalVariables()
 
   if (globalEnv) {
-    for (const variable of globalEnv.variables) {
+    for (const variable of globalEnv) {
       _variables[variable.key] = variable.value
     }
   }
diff --git a/newstore/environments.ts b/newstore/environments.ts
index ebb26f50a..1d21b6b9f 100644
--- a/newstore/environments.ts
+++ b/newstore/environments.ts
@@ -278,7 +278,7 @@ export const aggregateEnvs$ = combineLatest([
       results.push({ key, value, sourceEnv: "global" })
     )
 
-    return results 
+    return results
   })
 )