From 021908c8d1acc7b00f7adb51d35c9dacde6d5c23 Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Fri, 22 Apr 2022 11:58:29 +0530
Subject: [PATCH] fix: regressions in environment details modal

---
 .../components/environments/Details.vue       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/hoppscotch-app/components/environments/Details.vue b/packages/hoppscotch-app/components/environments/Details.vue
index b485bdea2..80560659f 100644
--- a/packages/hoppscotch-app/components/environments/Details.vue
+++ b/packages/hoppscotch-app/components/environments/Details.vue
@@ -245,25 +245,27 @@ const saveEnvironment = () => {
     return
   }
 
-  if (props.action === "new") {
-    createEnvironment(name.value)
-    setCurrentEnvironment(envList.value.length - 1)
-  }
-
   const environmentUpdated: Environment = {
     name: name.value,
     variables: vars.value,
   }
 
-  if (props.editingEnvironmentIndex === "Global")
-    setGlobalEnvVariables(environmentUpdated.variables)
-  else if (props.action === "new") {
+  if (props.action === "new") {
+    // Creating a new environment
+    createEnvironment(name.value)
     updateEnvironment(envList.value.length - 1, environmentUpdated)
+    setCurrentEnvironment(envList.value.length - 1)
     toast.success(`${t("environment.created")}`)
-  } else {
-    updateEnvironment(props.editingEnvironmentIndex!, environmentUpdated)
+  } else if (props.editingEnvironmentIndex === "Global") {
+    // Editing the Global environment
+    setGlobalEnvVariables(environmentUpdated.variables)
+    toast.success(`${t("environment.updated")}`)
+  } else if (props.editingEnvironmentIndex) {
+    // Editing an environment
+    updateEnvironment(props.editingEnvironmentIndex, environmentUpdated)
     toast.success(`${t("environment.updated")}`)
   }
+
   hideModal()
 }