Merging my branch into codeday/main

2022-08-03 16:47:52 -07:00
parent 33ecea5d75 9cfba797f6
commit dd5c876e32
2 changed files with 23 additions and 8 deletions
--- a/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
+++ b/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
@@ -14,7 +14,6 @@ import {
  HoppRESTHeader,
  HoppRESTParam,
 } from "@hoppscotch/data"
-import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
 import { arrayFlatMap, arraySort } from "../functional/array"
 import { toFormData } from "../functional/formData"
 import { tupleToRecord } from "../functional/record"
@@ -306,7 +305,7 @@ export function getEffectiveRESTRequest(

  return {
    ...request,
-    effectiveFinalURL: parseTemplateStringV(
+    effectiveFinalURL: parseTemplateString(
      request.endpoint,
      envVariables,
      request.vars