feat: prettify XML response

2023-05-29 20:18:02 -04:00
71 changed files with 482 additions and 1163 deletions
--- a/.env.example
+++ b/.env.example
@@ -51,7 +51,7 @@ VITE_ADMIN_URL=http://localhost:3100

 # Backend URLs
 VITE_BACKEND_GQL_URL=http://localhost:3170/graphql
-VITE_BACKEND_WS_URL=ws://localhost:3170/graphql
+VITE_BACKEND_WS_URL=wss://localhost:3170/graphql
 VITE_BACKEND_API_URL=http://localhost:3170/v1

 # Terms Of Service And Privacy Policy Links (Optional)
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -1,42 +0,0 @@
-name: Deploy to Netlify (ui)
-
-on:
-  push:
-    branches: [main]
-    # run this workflow only if an update is made to the ui package
-    paths:
-      - "packages/hoppscotch-ui/**"
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup environment
-        run: mv .env.example .env
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8
-          run_install: true
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-          cache: pnpm
-
-      - name: Build site
-        run: pnpm run generate-ui
-
-      # Deploy the ui site with netlify-cli
-      - name: Deploy to Netlify (ui)
-        run: npx netlify-cli deploy --dir=packages/hoppscotch-ui/.histoire/dist --prod
-        env:
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_UI_SITE_ID }}
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
    "dev": "pnpm -r do-dev",
    "gen-gql": "cross-env GQL_SCHEMA_EMIT_LOCATION='../../../gql-gen/backend-schema.gql' pnpm -r generate-gql-sdl",
    "generate": "pnpm -r do-build-prod",
-    "start": "http-server packages/hoppscotch-selfhost-web/dist -p 3000",
+    "start": "http-server packages/hoppscotch-web/dist -p 3000",
    "lint": "pnpm -r do-lint",
    "typecheck": "pnpm -r do-typecheck",
    "lintfix": "pnpm -r do-lintfix",
--- a/packages/hoppscotch-backend/package.json
+++ b/packages/hoppscotch-backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hoppscotch-backend",
-  "version": "2023.4.6",
+  "version": "2023.4.3",
  "description": "",
  "author": "",
  "private": true,
--- a/packages/hoppscotch-backend/src/admin/admin.service.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.service.ts
@@ -236,11 +236,11 @@ export class AdminService {
    const user = await this.userService.findUserByEmail(userEmail);
    if (O.isNone(user)) return E.left(USER_NOT_FOUND);

-    const teamMember = await this.teamService.getTeamMemberTE(
+    const isUserAlreadyMember = await this.teamService.getTeamMemberTE(
      teamID,
      user.value.uid,
    )();
-    if (E.isLeft(teamMember)) {
+    if (E.left(isUserAlreadyMember)) {
      const addedUser = await this.teamService.addMemberToTeamWithEmail(
        teamID,
        userEmail,
@@ -248,18 +248,6 @@ export class AdminService {
      );
      if (E.isLeft(addedUser)) return E.left(addedUser.left);

-      const userInvitation =
-        await this.teamInvitationService.getTeamInviteByEmailAndTeamID(
-          userEmail,
-          teamID,
-        );
-
-      if (E.isRight(userInvitation)) {
-        await this.teamInvitationService.revokeInvitation(
-          userInvitation.right.id,
-        )();
-      }
-
      return E.right(addedUser.right);
    }

--- a/packages/hoppscotch-backend/src/errors.ts
+++ b/packages/hoppscotch-backend/src/errors.ts
@@ -23,7 +23,7 @@ export const AUTH_FAIL = 'auth/fail';
 export const JSON_INVALID = 'json_invalid';

 /**
- * Tried to delete a user data document from fb firestore but failed.
+ * Tried to delete an user data document from fb firestore but failed.
 * (FirebaseService)
 */
 export const USER_FB_DOCUMENT_DELETION_FAILED =
@@ -231,7 +231,7 @@ export const TEAM_COLL_INVALID_JSON = 'team_coll/invalid_json';
 export const TEAM_NOT_OWNER = 'team_coll/team_not_owner' as const;

 /**
- * Tried to perform an action on a request that doesn't accept their member role level
+ * Tried to perform action on a request that doesn't accept their member role level
 * (GqlRequestTeamMemberGuard)
 */
 export const TEAM_REQ_NOT_REQUIRED_ROLE = 'team_req/not_required_role';
@@ -262,7 +262,7 @@ export const TEAM_REQ_REORDERING_FAILED = 'team_req/reordering_failed' as const;
 export const SENDER_EMAIL_INVALID = 'mailer/sender_email_invalid' as const;

 /**
- * Tried to perform an action on a request when the user is not even a member of the team
+ * Tried to perform action on a request when the user is not even member of the team
 * (GqlRequestTeamMemberGuard, GqlCollectionTeamMemberGuard)
 */
 export const TEAM_REQ_NOT_MEMBER = 'team_req/not_member';
@@ -307,7 +307,7 @@ export const SHORTCODE_INVALID_JSON = 'shortcode/invalid_json' as const;
 export const SHORTCODE_ALREADY_EXISTS = 'shortcode/already_exists' as const;

 /**
- * Invalid or non-existent TEAM ENVIRONMENT ID
+ * Invalid or non-existent TEAM ENVIRONMMENT ID
 * (TeamEnvironmentsService)
 */
 export const TEAM_ENVIRONMENT_NOT_FOUND = 'team_environment/not_found' as const;
@@ -340,7 +340,7 @@ export const USER_SETTINGS_NULL_SETTINGS =
  'user_settings/null_settings' as const;

 /*
- * Global environment doesn't exist for the user
+ * Global environment doesnt exists for the user
 * (UserEnvironmentsService)
 */
 export const USER_ENVIRONMENT_GLOBAL_ENV_DOES_NOT_EXISTS =
--- a/packages/hoppscotch-backend/src/main.ts
+++ b/packages/hoppscotch-backend/src/main.ts
@@ -9,6 +9,7 @@ import { emitGQLSchemaFile } from './gql-schema';
 async function bootstrap() {
  console.log(`Running in production: ${process.env.PRODUCTION}`);
  console.log(`Port: ${process.env.PORT}`);
+  console.log(`Database: ${process.env.DATABASE_URL}`);

  const app = await NestFactory.create(AppModule);

--- a/packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts
@@ -3,7 +3,6 @@ import * as T from 'fp-ts/Task';
 import * as O from 'fp-ts/Option';
 import * as TO from 'fp-ts/TaskOption';
 import * as TE from 'fp-ts/TaskEither';
-import * as E from 'fp-ts/Either';
 import { pipe, flow, constVoid } from 'fp-ts/function';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { Team, TeamMemberRole } from 'src/team/team.model';
@@ -11,7 +10,6 @@ import { Email } from 'src/types/Email';
 import { User } from 'src/user/user.model';
 import { TeamService } from 'src/team/team.service';
 import {
-  INVALID_EMAIL,
  TEAM_INVITE_ALREADY_MEMBER,
  TEAM_INVITE_EMAIL_DO_NOT_MATCH,
  TEAM_INVITE_MEMBER_HAS_INVITE,
@@ -21,7 +19,6 @@ import { TeamInvitation } from './team-invitation.model';
 import { MailerService } from 'src/mailer/mailer.service';
 import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
-import { validateEmail } from '../utils';

@Injectable()
 export class TeamInvitationService {
@@ -66,32 +63,6 @@ export class TeamInvitationService {
    );
  }

-  /**
-   * Get the team invite for an invitee with email and teamID.
-   * @param inviteeEmail invitee email
-   * @param teamID team id
-   * @returns an Either of team invitation for the invitee or error
-   */
-  async getTeamInviteByEmailAndTeamID(inviteeEmail: string, teamID: string) {
-    const isEmailValid = validateEmail(inviteeEmail);
-    if (!isEmailValid) return E.left(INVALID_EMAIL);
-
-    try {
-      const teamInvite = await this.prisma.teamInvitation.findUniqueOrThrow({
-        where: {
-          teamID_inviteeEmail: {
-            inviteeEmail: inviteeEmail,
-            teamID: teamID,
-          },
-        },
-      });
-
-      return E.right(teamInvite);
-    } catch (e) {
-      return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-    }
-  }
-
  createInvitation(
    creator: User,
    team: Team,
@@ -155,7 +126,7 @@ export class TeamInvitationService {
            template: 'team-invitation',
            variables: {
              invitee: creator.displayName ?? 'A Hoppscotch User',
-              action_url: `${process.env.VITE_BASE_URL}/join-team?id=${invitation.id}`,
+              action_url: `https://hoppscotch.io/join-team?id=${invitation.id}`,
              invite_team_name: team.name,
            },
          }),
--- a/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts
@@ -32,7 +32,7 @@ export class TeamInviteViewerGuard implements CanActivate {
      // Get user
      TE.bindW('user', ({ gqlCtx }) =>
        pipe(
-          O.fromNullable(gqlCtx.getContext().req.user),
+          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
        ),
      ),
--- a/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts
@@ -33,7 +33,7 @@ export class TeamInviteeGuard implements CanActivate {
      // Get user
      TE.bindW('user', ({ gqlCtx }) =>
        pipe(
-          O.fromNullable(gqlCtx.getContext().req.user),
+          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
        ),
      ),
--- a/packages/hoppscotch-backend/src/types/AuthError.ts
+++ b/packages/hoppscotch-backend/src/types/AuthError.ts
@@ -2,7 +2,7 @@ import { HttpStatus } from '@nestjs/common';

 /**
 ** Custom interface to handle errors specific to Auth module
- ** Since its REST we need to return the HTTP status code along with the error message
+ ** Since its REST we need to return HTTP status code along with error message
 */
 export type AuthError = {
  message: string;
--- a/packages/hoppscotch-common/locales/af.json
+++ b/packages/hoppscotch-common/locales/af.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Reaksie liggaam",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Opskrifte",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tyd",
    "title": "Reaksie",
-    "video": "Video",
    "waiting_for_connection": "wag vir verbinding",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ar.json
+++ b/packages/hoppscotch-common/locales/ar.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "هيئة الاستجابة",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "الرؤوس",
@@ -446,7 +445,6 @@
    "status": "حالة",
    "time": "وقت",
    "title": "إجابة",
-    "video": "Video",
    "waiting_for_connection": "في انتظار الاتصال",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ca.json
+++ b/packages/hoppscotch-common/locales/ca.json
@@ -432,7 +432,6 @@
    "view_my_links": "Visualitzar els meus enllaços"
  },
  "response": {
-    "audio": "Audio",
    "body": "Cos de resposta",
    "filter_response_body": "Filtrar el cos de la resposta JSON (utilitza la sintaxi JSONPath)",
    "headers": "Capçaleres",
@@ -446,7 +445,6 @@
    "status": "Estat",
    "time": "Temps",
    "title": "Resposta",
-    "video": "Video",
    "waiting_for_connection": "esperant la connexió",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/cn.json
+++ b/packages/hoppscotch-common/locales/cn.json
@@ -19,7 +19,7 @@
    "edit": "编辑",
    "filter": "过滤",
    "go_back": "返回",
-    "go_forward": "前进",
+    "go_forward": "Go forward",
    "group_by": "分组方式",
    "label": "标签",
    "learn_more": "了解更多",
@@ -40,9 +40,9 @@
    "start": "开始",
    "starting": "正在开始",
    "stop": "停止",
-    "to_close": "关闭",
-    "to_navigate": "定位",
-    "to_select": "选择",
+    "to_close": "以关闭",
+    "to_navigate": "以定位",
+    "to_select": "以选择",
    "turn_off": "关闭",
    "turn_on": "开启",
    "undo": "撤消",
@@ -118,16 +118,16 @@
  },
  "collection": {
    "created": "集合已创建",
-    "different_parent": "不能用不同的父类来重新排序集合",
+    "different_parent": "Cannot reorder collection with different parent",
    "edit": "编辑集合",
    "invalid_name": "请提供有效的集合名称",
-    "invalid_root_move": "该集合已经在根级了",
-    "moved": "移动完成",
+    "invalid_root_move": "Collection already in the root",
+    "moved": "Moved Successfully",
    "my_collections": "我的集合",
    "name": "我的新集合",
    "name_length_insufficient": "集合名字至少需要 3 个字符",
    "new": "新建集合",
-    "order_changed": "集合顺序已更新",
+    "order_changed": "Collection Order Updated",
    "renamed": "集合已更名",
    "request_in_use": "请求正在使用中",
    "save_as": "另存为",
@@ -147,7 +147,7 @@
    "remove_team": "你确定要删除该团队吗？",
    "remove_telemetry": "你确定要退出遥测服务吗？",
    "request_change": "你确定你要放弃当前的请求，未保存的修改将被丢失。",
-    "save_unsaved_tab": "你想保存在此标签页中所作的修改吗？",
+    "save_unsaved_tab": "Do you want to save changes made in this tab?",
    "sync": "您确定要同步该工作区吗？"
  },
  "count": {
@@ -177,7 +177,7 @@
    "members": "团队为空",
    "parameters": "该请求没有任何参数",
    "pending_invites": "此团队无待办邀请",
-    "profile": "登录以查看你的个人资料",
+    "profile": "登录以查看你的个人档案",
    "protocols": "协议为空",
    "schema": "连接至 GraphQL 端点",
    "shortcodes": "Shortcodes 为空",
@@ -209,7 +209,7 @@
    "browser_support_sse": "该浏览器似乎不支持 SSE。",
    "check_console_details": "检查控制台日志以获悉详情",
    "curl_invalid_format": "cURL 格式不正确",
-    "danger_zone": "危险区域",
+    "danger_zone": "Danger zone",
    "delete_account": "您的帐号目前为这些团队的拥有者：",
    "delete_account_description": "您在删除帐号前必须先将您自己从团队中移除、转移拥有权，或是删除团队。",
    "empty_req_name": "空请求名称",
@@ -219,7 +219,7 @@
    "incorrect_email": "电子邮箱错误",
    "invalid_link": "无效链接",
    "invalid_link_description": "你点击的链接无效或已过期。",
-    "json_parsing_failed": "不合法的 JSON",
+    "json_parsing_failed": "Invalid JSON",
    "json_prettify_invalid_body": "无法美化无效的请求头，处理 JSON 语法错误并重试",
    "network_error": "好像发生了网络错误，请重试。",
    "network_fail": "无法发送请求",
@@ -316,14 +316,14 @@
    "zen_mode": "ZEN 模式"
  },
  "modal": {
-    "close_unsaved_tab": "有未保存的变更",
+    "close_unsaved_tab": "You have unsaved changes",
    "collections": "集合",
    "confirm": "确认",
    "edit_request": "编辑请求",
    "import_export": "导入/导出"
  },
  "mqtt": {
-    "already_subscribed": "您已经订阅了此主题。",
+    "already_subscribed": "您已经订阅了此主題。",
    "clean_session": "清除会话",
    "clear_input": "清除输入",
    "clear_input_on_send": "发送后清除输入",
@@ -355,7 +355,7 @@
  "navigation": {
    "doc": "文档",
    "graphql": "GraphQL",
-    "profile": "个人资料",
+    "profile": "个人档案",
    "realtime": "实时",
    "rest": "REST",
    "settings": "设置"
@@ -377,7 +377,7 @@
    "owner_description": "所有者可以添加、编辑和删除请求、集合及团队成员。",
    "roles": "角色",
    "roles_description": "角色用以控制共享集合的访问权限。",
-    "updated": "已更新",
+    "updated": "档案已更新",
    "viewer": "查看者",
    "viewer_description": "查看者只可查看与使用请求。"
  },
@@ -396,8 +396,8 @@
      "text": "文字"
    },
    "copy_link": "复制链接",
-    "different_collection": "不能对来自不同集合的请求进行重新排序",
-    "duplicated": "重复的请求",
+    "different_collection": "Cannot reorder requests from different collections",
+    "duplicated": "Request duplicated",
    "duration": "持续时间",
    "enter_curl": "输入 cURL",
    "generate_code": "生成代码",
@@ -405,10 +405,10 @@
    "header_list": "请求头列表",
    "invalid_name": "请提供请求名称",
    "method": "方法",
-    "moved": "请求移动完成",
+    "moved": "Request moved",
    "name": "请求名称",
    "new": "新请求",
-    "order_changed": "请求顺序更新完成",
+    "order_changed": "Request Order Updated",
    "override": "覆盖",
    "override_help": "设置 <kbd>Content-Type</kbd> 头",
    "overriden": "覆盖",
@@ -432,7 +432,6 @@
    "view_my_links": "查看我的链接"
  },
  "response": {
-    "audio": "Audio",
    "body": "响应体",
    "filter_response_body": "筛选JSON响应本体（使用JSONPath语法）",
    "headers": "响应头",
@@ -446,7 +445,6 @@
    "status": "状态",
    "time": "时间",
    "title": "响应",
-    "video": "Video",
    "waiting_for_connection": "等待连接",
    "xml": "XML"
  },
@@ -481,10 +479,10 @@
    "language": "语言",
    "light_mode": "亮色",
    "official_proxy_hosting": "官方代理由 Hoppscotch 托管。",
-    "profile": "个人资料",
-    "profile_description": "更新你的资料",
+    "profile": "个人档案",
+    "profile_description": "更新你的档案详情",
    "profile_email": "电子邮箱地址",
-    "profile_name": "名称",
+    "profile_name": "档案名称",
    "proxy": "网络代理",
    "proxy_url": "代理网址",
    "proxy_use_toggle": "使用代理中间件发送请求",
@@ -534,7 +532,7 @@
      "documentation": "前往文档页面",
      "forward": "前往下一页面",
      "graphql": "前往 GraphQL 页面",
-      "profile": "前往个人资料页面",
+      "profile": "前往个人档案页面",
      "realtime": "前往实时页面",
      "rest": "前往 REST 页面",
      "settings": "前往设置页面",
@@ -576,7 +574,7 @@
  },
  "socketio": {
    "communication": "通讯",
-    "connection_not_authorized": "此 SocketIO 连接未使用任何验证。",
+    "connection_not_authorized": "此SocketIO连接未使用任何验证。",
    "event_name": "事件名称",
    "events": "事件",
    "log": "日志",
@@ -616,12 +614,12 @@
    "none": "无",
    "nothing_found": "没有找到",
    "published_error": "将信息：{topic}发布至主题：{message}时发生错误",
-    "published_message": "已将此信息：{message} 发布至主题：{topic}",
+    "published_message": "已将此信息：{message}发布至主题：{topic}",
    "reconnection_error": "重连失败",
-    "subscribed_failed": "无法订阅此主题：{topic}",
-    "subscribed_success": "成功订阅此主题：{topic}",
-    "unsubscribed_failed": "无法取消订阅此主题：{topic}",
-    "unsubscribed_success": "成功取消订阅此主题：{topic}",
+    "subscribed_failed": "无法订阅此主題：{topic}",
+    "subscribed_success": "成功订阅此主題：{topic}",
+    "unsubscribed_failed": "无法取消订阅此主題：{topic}",
+    "unsubscribed_success": "成功取消订阅此主題：{topic}",
    "waiting_send_request": "等待发送请求"
  },
  "support": {
@@ -641,7 +639,7 @@
    "body": "请求体",
    "collections": "集合",
    "documentation": "帮助文档",
-    "environments": "环境",
+    "environments": "Environments",
    "headers": "请求头",
    "history": "历史记录",
    "mqtt": "MQTT",
@@ -666,7 +664,7 @@
    "email_do_not_match": "邮箱无法与你的帐户信息匹配。请联系你的团队者。",
    "exit": "退出团队",
    "exit_disabled": "团队所有者无法退出团队",
-    "invalid_coll_id": "无效的集合 ID",
+    "invalid_coll_id": "Invalid collection ID",
    "invalid_email_format": "电子邮箱格式无效",
    "invalid_id": "无效的团队 ID，请联系你的团队者。",
    "invalid_invite_link": "无效的邀请链接",
@@ -690,7 +688,7 @@
    "member_removed": "用户已移除",
    "member_role_updated": "用户角色已更新",
    "members": "成员",
-    "more_members": "+{count} 更多",
+    "more_members": "+{count} more",
    "name_length_insufficient": "团队名称至少为 6 个字符",
    "name_updated": "团队名称已更新",
    "new": "新团队",
@@ -698,13 +696,13 @@
    "new_name": "我的新团队",
    "no_access": "你没有编辑集合的权限",
    "no_invite_found": "未找到邀请。请联系你的团队者。",
-    "no_request_found": "请求不存在",
+    "no_request_found": "Request not found.",
    "not_found": "没有找到团队，请联系您的团队所有者。",
    "not_valid_viewer": "你不是有效的查看者。请联系你的团队者。",
-    "parent_coll_move": "不能将集合移动到一个子集合",
+    "parent_coll_move": "Cannot move collection to a child collection",
    "pending_invites": "待办邀请",
    "permissions": "权限",
-    "same_target_destination": "目标相同",
+    "same_target_destination": "Same target and destination",
    "saved": "团队已保存",
    "select_a_team": "选择团队",
    "title": "团队",
@@ -734,9 +732,9 @@
    "url": "URL"
  },
  "workspace": {
-    "change": "切换工作空间",
-    "personal": "我的工作空间",
-    "team": "团队工作空间",
-    "title": "工作空间"
+    "change": "Change workspace",
+    "personal": "My Workspace",
+    "team": "Team Workspace",
+    "title": "Workspaces"
  }
 }
--- a/packages/hoppscotch-common/locales/cs.json
+++ b/packages/hoppscotch-common/locales/cs.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Odpovědní orgán",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Záhlaví",
@@ -446,7 +445,6 @@
    "status": "Postavení",
    "time": "Čas",
    "title": "Odezva",
-    "video": "Video",
    "waiting_for_connection": "čekání na připojení",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/da.json
+++ b/packages/hoppscotch-common/locales/da.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Svarorgan",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Overskrifter",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tid",
    "title": "Respons",
-    "video": "Video",
    "waiting_for_connection": "venter på forbindelse",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/de.json
+++ b/packages/hoppscotch-common/locales/de.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Antworttext",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Header",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Zeit",
    "title": "Antwort",
-    "video": "Video",
    "waiting_for_connection": "auf Verbindung warten",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/el.json
+++ b/packages/hoppscotch-common/locales/el.json
@@ -432,7 +432,6 @@
    "view_my_links": "Προβολή των links μου"
  },
  "response": {
-    "audio": "Audio",
    "body": "Σώμα απόκρισης",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Κεφαλίδες",
@@ -446,7 +445,6 @@
    "status": "Κατάσταση",
    "time": "χρόνος",
    "title": "Απάντηση",
-    "video": "Video",
    "waiting_for_connection": "περιμένοντας τη σύνδεση",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/es.json
+++ b/packages/hoppscotch-common/locales/es.json
@@ -432,7 +432,6 @@
    "view_my_links": "Ver mis enlaces"
  },
  "response": {
-    "audio": "Audio",
    "body": "Cuerpo de respuesta",
    "filter_response_body": "Filtrar el cuerpo de la respuesta JSON (utiliza la sintaxis JSONPath)",
    "headers": "Encabezados",
@@ -446,7 +445,6 @@
    "status": "Estado",
    "time": "Tiempo",
    "title": "Respuesta",
-    "video": "Video",
    "waiting_for_connection": "esperando la conexión",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/fi.json
+++ b/packages/hoppscotch-common/locales/fi.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Vastauselin",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Otsikot",
@@ -446,7 +445,6 @@
    "status": "Tila",
    "time": "Aika",
    "title": "Vastaus",
-    "video": "Video",
    "waiting_for_connection": "yhteyttä odotellessa",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/fr.json
+++ b/packages/hoppscotch-common/locales/fr.json
@@ -432,7 +432,6 @@
    "view_my_links": "Voir mes liens"
  },
  "response": {
-    "audio": "Audio",
    "body": "Corps de réponse",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "En-têtes",
@@ -446,7 +445,6 @@
    "status": "Statut",
    "time": "Temps",
    "title": "Réponse",
-    "video": "Video",
    "waiting_for_connection": "En attente de connexion",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/he.json
+++ b/packages/hoppscotch-common/locales/he.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "גוף תגובה",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "כותרות",
@@ -446,7 +445,6 @@
    "status": "סטָטוּס",
    "time": "זְמַן",
    "title": "תְגוּבָה",
-    "video": "Video",
    "waiting_for_connection": "מחכה לחיבור",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/hi.json
+++ b/packages/hoppscotch-common/locales/hi.json
@@ -433,7 +433,6 @@
    "view_my_links": "मेरे लिंक देखें"
  },
  "response": {
-    "audio": "Audio",
    "body": "प्रतिक्रिया निकाय",
    "filter_response_body": "फ़िल्टर JSON रिस्पांस बॉडी (JSONPATH सिंटैक्स का उपयोग करता है)",
    "headers": "हेडर",
@@ -447,7 +446,6 @@
    "status": "दर्जा",
    "time": "समय",
    "title": "जवाब",
-    "video": "Video",
    "waiting_for_connection": "जुडने के लिए इंतजार",
    "xml": "एक्सएमएल"
  },
--- a/packages/hoppscotch-common/locales/hu.json
+++ b/packages/hoppscotch-common/locales/hu.json
@@ -5,29 +5,29 @@
    "choose_file": "Válasszon egy fájlt",
    "clear": "Törlés",
    "clear_all": "Összes törlése",
-    "close": "Bezárás",
+    "close": "Close",
    "connect": "Kapcsolódás",
-    "connecting": "Kapcsolódás",
+    "connecting": "Connecting",
    "copy": "Másolás",
    "delete": "Törlés",
    "disconnect": "Leválasztás",
    "dismiss": "Eltüntetés",
    "dont_save": "Ne mentse",
    "download_file": "Fájl letöltése",
-    "drag_to_reorder": "Húzza az átrendezéshez",
+    "drag_to_reorder": "Drag to reorder",
    "duplicate": "Kettőzés",
    "edit": "Szerkesztés",
-    "filter": "Szűrő",
+    "filter": "Filter",
    "go_back": "Vissza",
-    "go_forward": "Előre",
-    "group_by": "Csoportosítás",
+    "go_forward": "Go forward",
+    "group_by": "Group by",
    "label": "Címke",
    "learn_more": "Tudjon meg többet",
    "less": "Kevesebb",
    "more": "Több",
    "new": "Új",
    "no": "Nem",
-    "open_workspace": "Munkaterület megnyitása",
+    "open_workspace": "Open workspace",
    "paste": "Beillesztés",
    "prettify": "Csinosítás",
    "remove": "Eltávolítás",
@@ -38,7 +38,7 @@
    "search": "Keresés",
    "send": "Küldés",
    "start": "Indítás",
-    "starting": "Indítás",
+    "starting": "Starting",
    "stop": "Leállítás",
    "to_close": "a bezáráshoz",
    "to_navigate": "a navigáláshoz",
@@ -118,16 +118,16 @@
  },
  "collection": {
    "created": "Gyűjtemény létrehozva",
-    "different_parent": "Nem lehet átrendezni a különböző szülővel rendelkező gyűjteményt",
+    "different_parent": "Cannot reorder collection with different parent",
    "edit": "Gyűjtemény szerkesztése",
    "invalid_name": "Adjon nevet a gyűjteménynek",
-    "invalid_root_move": "A gyűjtemény már a gyökérben van",
-    "moved": "Sikeresen áthelyezve",
+    "invalid_root_move": "Collection already in the root",
+    "moved": "Moved Successfully",
    "my_collections": "Saját gyűjtemények",
    "name": "Saját új gyűjtemény",
    "name_length_insufficient": "A gyűjtemény nevének legalább 3 karakter hosszúságúnak kell lennie",
    "new": "Új gyűjtemény",
-    "order_changed": "Gyűjtemény sorrendje frissítve",
+    "order_changed": "Collection Order Updated",
    "renamed": "Gyűjtemény átnevezve",
    "request_in_use": "A kérés használatban",
    "save_as": "Mentés másként",
@@ -147,7 +147,7 @@
    "remove_team": "Biztosan törölni szeretné ezt a csapatot?",
    "remove_telemetry": "Biztosan ki szeretné kapcsolni a telemetriát?",
    "request_change": "Biztosan el szeretné vetni a jelenlegi kérést? Minden mentetlen változtatás el fog veszni.",
-    "save_unsaved_tab": "Szeretné menteni az ezen a lapon elvégzett változtatásokat?",
+    "save_unsaved_tab": "Do you want to save changes made in this tab?",
    "sync": "Szeretné visszaállítani a munkaterületét a felhőből? Ez el fogja vetni a helyi folyamatát."
  },
  "count": {
@@ -180,8 +180,8 @@
    "profile": "Jelentkezzen be a profilja megtekintéséhez",
    "protocols": "A protokollok üresek",
    "schema": "Kapcsolódjon egy GraphQL-végponthoz a séma megtekintéséhez",
-    "shortcodes": "A rövid kódok üresek",
-    "subscription": "A feliratkozások üresek",
+    "shortcodes": "Shortcodes are empty",
+    "subscription": "Subscriptions are empty",
    "team_name": "A csapat neve üres",
    "teams": "Ön nem tartozik semmilyen csapathoz",
    "tests": "Nincsenek tesztek ehhez a kéréshez"
@@ -194,13 +194,13 @@
    "deleted": "Környezet törlése",
    "edit": "Környezet szerkesztése",
    "invalid_name": "Adjon nevet a környezetnek",
-    "my_environments": "Saját környezetek",
+    "my_environments": "My Environments",
    "nested_overflow": "az egymásba ágyazott környezeti változók 10 szintre vannak korlátozva",
    "new": "Új környezet",
    "no_environment": "Nincs környezet",
    "no_environment_description": "Nem lettek környezetek kiválasztva. Válassza ki, hogy mit kell tenni a következő változókkal.",
    "select": "Környezet kiválasztása",
-    "team_environments": "Csapatkörnyezetek",
+    "team_environments": "Team Environments",
    "title": "Környezetek",
    "updated": "Környezet frissítve",
    "variable_list": "Változólista"
@@ -209,9 +209,9 @@
    "browser_support_sse": "Úgy tűnik, hogy ez a böngésző nem támogatja a kiszolgáló által küldött eseményeket.",
    "check_console_details": "Nézze meg a konzolnaplót a részletekért.",
    "curl_invalid_format": "A cURL nincs megfelelően formázva",
-    "danger_zone": "Veszélyes zóna",
-    "delete_account": "Az Ön fiókja jelenleg tulajdonos ezekben a csapatokban:",
-    "delete_account_description": "El kell távolítani magát, át kell adnia a tulajdonjogot vagy törölnie kell ezeket a csapatokat, mielőtt törölhetné a fiókját.",
+    "danger_zone": "Danger zone",
+    "delete_account": "Your account is currently an owner in these teams:",
+    "delete_account_description": "You must either remove yourself, transfer ownership, or delete these teams before you can delete your account.",
    "empty_req_name": "Üres kérésnév",
    "f12_details": "(F12 a részletekért)",
    "gql_prettify_invalid_query": "Nem sikerült csinosítani egy érvénytelen lekérdezést, oldja meg a lekérdezés szintaktikai hibáit, és próbálja újra",
@@ -219,13 +219,13 @@
    "incorrect_email": "Hibás e-mail",
    "invalid_link": "Érvénytelen hivatkozás",
    "invalid_link_description": "A kattintott hivatkozás érvénytelen vagy lejárt.",
-    "json_parsing_failed": "Érvénytelen JSON",
+    "json_parsing_failed": "Invalid JSON",
    "json_prettify_invalid_body": "Nem sikerült csinosítani egy érvénytelen törzset, oldja meg a JSON szintaktikai hibáit, és próbálja újra",
    "network_error": "Úgy tűnik, hogy hálózati hiba van. Próbálja újra.",
    "network_fail": "Nem sikerült elküldeni a kérést",
    "no_duration": "Nincs időtartam",
-    "no_results_found": "Nincs találat",
-    "page_not_found": "Ez az oldal nem található",
+    "no_results_found": "No matches found",
+    "page_not_found": "This page could not be found",
    "script_fail": "Nem sikerült végrehajtani a kérés előtti parancsfájlt",
    "something_went_wrong": "Valami elromlott",
    "test_script_fail": "Nem sikerült végrehajtani a kérés utáni parancsfájlt"
@@ -238,9 +238,9 @@
    "title": "Exportálás"
  },
  "filter": {
-    "all": "Összes",
-    "none": "Nincs",
-    "starred": "Csillagozott"
+    "all": "All",
+    "none": "None",
+    "starred": "Starred"
  },
  "folder": {
    "created": "Mappa létrehozva",
@@ -256,7 +256,7 @@
    "subscriptions": "Feliratkozások"
  },
  "group": {
-    "time": "Idő",
+    "time": "Time",
    "url": "URL"
  },
  "header": {
@@ -316,32 +316,32 @@
    "zen_mode": "Zen mód"
  },
  "modal": {
-    "close_unsaved_tab": "Elmentetlen változtatásai vannak",
+    "close_unsaved_tab": "You have unsaved changes",
    "collections": "Gyűjtemények",
    "confirm": "Megerősítés",
    "edit_request": "Kérés szerkesztése",
    "import_export": "Importálás és exportálás"
  },
  "mqtt": {
-    "already_subscribed": "Ön már feliratkozott erre a témára.",
-    "clean_session": "Munkamenet törlése",
-    "clear_input": "Bevitel törlése",
-    "clear_input_on_send": "Bevitel törlése küldéskor",
-    "client_id": "Ügyfél-azonosító",
-    "color": "Válasszon színt",
+    "already_subscribed": "You are already subscribed to this topic.",
+    "clean_session": "Clean Session",
+    "clear_input": "Clear input",
+    "clear_input_on_send": "Clear input on send",
+    "client_id": "Client ID",
+    "color": "Pick a color",
    "communication": "Kommunikáció",
-    "connection_config": "Kapcsolat beállításai",
-    "connection_not_authorized": "Ez az MQTT-kapcsolat nem használ semmilyen hitelesítést.",
-    "invalid_topic": "Adjon témát a feliratkozáshoz",
-    "keep_alive": "Életben tartás",
+    "connection_config": "Connection Config",
+    "connection_not_authorized": "This MQTT connection does not use any authentication.",
+    "invalid_topic": "Please provide a topic for the subscription",
+    "keep_alive": "Keep Alive",
    "log": "Napló",
-    "lw_message": "Utolsó kívánság üzenet",
-    "lw_qos": "Utolsó kívánság QoS",
-    "lw_retain": "Utolsó kívánság megtartás",
-    "lw_topic": "Utolsó kívánság téma",
+    "lw_message": "Last-Will Message",
+    "lw_qos": "Last-Will QoS",
+    "lw_retain": "Last-Will Retain",
+    "lw_topic": "Last-Will Topic",
    "message": "Üzenet",
-    "new": "Új feliratkozás",
-    "not_connected": "Először indítson egy MQTT-kapcsolatot.",
+    "new": "New Subscription",
+    "not_connected": "Please start a MQTT connection first.",
    "publish": "Közzététel",
    "qos": "QoS",
    "ssl": "SSL",
@@ -368,7 +368,7 @@
  },
  "profile": {
    "app_settings": "Alkalmazás beállításai",
-    "default_hopp_displayname": "Névtelen felhasználó",
+    "default_hopp_displayname": "Unnamed User",
    "editor": "Szerkesztő",
    "editor_description": "A szerkesztők hozzáadhatnak, szerkeszthetnek és törölhetnek kéréseket.",
    "email_verification_mail": "Egy ellenőrző e-mail el lett küldve az e-mail-címére. Kattintson a hivatkozásra az e-mail-címe ellenőrzéséhez.",
@@ -391,26 +391,26 @@
    "choose_language": "Nyelv kiválasztása",
    "content_type": "Tartalom típusa",
    "content_type_titles": {
-      "others": "Egyebek",
-      "structured": "Szerkesztett",
-      "text": "Szöveg"
+      "others": "Others",
+      "structured": "Structured",
+      "text": "Text"
    },
    "copy_link": "Hivatkozás másolása",
-    "different_collection": "Nem lehet átrendezni a különböző gyűjteményekből érkező kéréseket",
-    "duplicated": "Kérés megkettőzve",
+    "different_collection": "Cannot reorder requests from different collections",
+    "duplicated": "Request duplicated",
    "duration": "Időtartam",
-    "enter_curl": "cURL-parancs megadása",
+    "enter_curl": "cURL megadása",
    "generate_code": "Kód előállítása",
    "generated_code": "Előállított kód",
    "header_list": "Fejléclista",
    "invalid_name": "Adjon nevet a kérésnek",
    "method": "Módszer",
-    "moved": "Kérés áthelyezve",
+    "moved": "Request moved",
    "name": "Kérés neve",
    "new": "Új kérés",
-    "order_changed": "Kérés sorrendje frissítve",
+    "order_changed": "Request Order Updated",
    "override": "Felülbírálás",
-    "override_help": "<kbd>Content-Type</kbd> beállítása a fejlécekben",
+    "override_help": "A <kbd>Content-Type</kbd> beállítása a fejlécekben",
    "overriden": "Felülbírálva",
    "parameter_list": "Lekérdezési paraméterek",
    "parameters": "Paraméterek",
@@ -429,12 +429,11 @@
    "type": "Kérés típusa",
    "url": "URL",
    "variables": "Változók",
-    "view_my_links": "Saját hivatkozások megtekintése"
+    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Hang",
    "body": "Válasz törzse",
-    "filter_response_body": "JSON-válasz törzsének szűrése (JSONPath szintaxist használ)",
+    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Fejlécek",
    "html": "HTML",
    "image": "Kép",
@@ -446,14 +445,13 @@
    "status": "Állapot",
    "time": "Idő",
    "title": "Válasz",
-    "video": "Videó",
    "waiting_for_connection": "várakozás kapcsolódásra",
    "xml": "XML"
  },
  "settings": {
    "accent_color": "Kiemelőszín",
    "account": "Fiók",
-    "account_deleted": "A fiókja törölve lett",
+    "account_deleted": "Your account has been deleted",
    "account_description": "A fiókbeállítások személyre szabása.",
    "account_email_description": "Az Ön elsődleges e-mail-címe.",
    "account_name_description": "Ez a megjelenített neve.",
@@ -462,8 +460,8 @@
    "change_font_size": "Betűméret megváltoztatása",
    "choose_language": "Nyelv kiválasztása",
    "dark_mode": "Sötét",
-    "delete_account": "Fiók törlése",
-    "delete_account_description": "Ha törli a fiókját, akkor az összes adata véglegesen törlésre kerül. Ezt a műveletet nem lehet visszavonni.",
+    "delete_account": "Delete account",
+    "delete_account_description": "Once you delete your account, all your data will be permanently deleted. This action cannot be undone.",
    "expand_navigation": "Navigáció kinyitása",
    "experiments": "Kísérletek",
    "experiments_notice": "Ez olyan kísérletek gyűjteménye, amelyeken dolgozunk, és amelyek hasznosak, szórakoztatóak lehetnek, mindkettő, vagy egyik sem. Ezek nem véglegesek és nem stabilak, ezért ha valami túl furcsa dolog történik, ne essen pánikba. Egyszerűen kapcsolja ki a hibás dolgot. Viccet félretéve, ",
@@ -490,8 +488,8 @@
    "proxy_use_toggle": "A proxy középprogram használata a kérések küldéséhez",
    "read_the": "Olvassa el:",
    "reset_default": "Visszaállítás az alapértelmezettre",
-    "short_codes": "Rövid kódok",
-    "short_codes_description": "Az Ön által létrehozott rövid kódok.",
+    "short_codes": "Short codes",
+    "short_codes_description": "Short codes which were created by you.",
    "sidebar_on_left": "Oldalsáv a bal oldalon",
    "sync": "Szinkronizálás",
    "sync_collections": "Gyűjtemények",
@@ -505,16 +503,16 @@
    "theme_description": "Az alkalmazás témájának személyre szabása.",
    "use_experimental_url_bar": "Kísérleti URL-sáv használata a környezet kiemelésével",
    "user": "Felhasználó",
-    "verified_email": "Ellenőrzött e-mail-cím",
+    "verified_email": "Verified email",
    "verify_email": "E-mail-cím ellenőrzése"
  },
  "shortcodes": {
-    "actions": "Műveletek",
-    "created_on": "Létrehozva",
-    "deleted": "Rövid kód törölve",
-    "method": "Módszer",
-    "not_found": "A rövid kód nem található",
-    "short_code": "Rövid kód",
+    "actions": "Actions",
+    "created_on": "Created on",
+    "deleted": "Shortcode deleted",
+    "method": "Method",
+    "not_found": "Shortcode not found",
+    "short_code": "Short code",
    "url": "URL"
  },
  "shortcut": {
@@ -556,9 +554,9 @@
      "title": "Kérés"
    },
    "response": {
-      "copy": "Válasz másolása a vágólapra",
-      "download": "Válasz letöltés fájlként",
-      "title": "Válasz"
+      "copy": "Copy response to clipboard",
+      "download": "Download response as file",
+      "title": "Response"
    },
    "theme": {
      "black": "Téma átváltása fekete módra",
@@ -576,8 +574,8 @@
  },
  "socketio": {
    "communication": "Kommunikáció",
-    "connection_not_authorized": "Ez a SocketIO-kapcsolat nem használ semmilyen hitelesítést.",
-    "event_name": "Esemény vagy téma neve",
+    "connection_not_authorized": "This SocketIO connection does not use any authentication.",
+    "event_name": "Esemény neve",
    "events": "Események",
    "log": "Napló",
    "url": "URL"
@@ -594,9 +592,9 @@
    "connected": "Kapcsolódva",
    "connected_to": "Kapcsolódva ehhez: {name}",
    "connecting_to": "Kapcsolódás ehhez: {name}…",
-    "connection_error": "Nem sikerült kapcsolódni",
-    "connection_failed": "A kapcsolódás sikertelen",
-    "connection_lost": "A kapcsolat elveszett",
+    "connection_error": "Failed to connect",
+    "connection_failed": "Connection failed",
+    "connection_lost": "Connection lost",
    "copied_to_clipboard": "Vágólapra másolva",
    "deleted": "Törölve",
    "deprecated": "ELAVULT",
@@ -611,17 +609,17 @@
    "history_deleted": "Előzmények törölve",
    "linewrap": "Sorok tördelése",
    "loading": "Betöltés…",
-    "message_received": "Üzenet: {message} érkezett ehhez a témához: {topic}",
-    "mqtt_subscription_failed": "Valami elromlott a következő témára való feliratkozás során: {topic}",
+    "message_received": "Message: {message} arrived on topic: {topic}",
+    "mqtt_subscription_failed": "Something went wrong while subscribing to topic: {topic}",
    "none": "Nincs",
    "nothing_found": "Semmi sem található ehhez:",
-    "published_error": "Valami elromlott a következő üzenet közzététele során: {topic}, ehhez a témához: {message}",
-    "published_message": "Közzétett üzenet: {message}, ehhez a témához: {topic}",
-    "reconnection_error": "Nem sikerült újrakapcsolódni",
-    "subscribed_failed": "Nem sikerült feliratkozni erre a témára: {topic}",
-    "subscribed_success": "Sikeresen feliratkozott erre a témára: {topic}",
-    "unsubscribed_failed": "Nem sikerült leiratkozni erről a témáról: {topic}",
-    "unsubscribed_success": "Sikeresen leiratkozott erről a témáról: {topic}",
+    "published_error": "Something went wrong while publishing msg: {topic} to topic: {message}",
+    "published_message": "Published message: {message} to topic: {topic}",
+    "reconnection_error": "Failed to reconnect",
+    "subscribed_failed": "Failed to subscribe to topic: {topic}",
+    "subscribed_success": "Successfully subscribed to topic: {topic}",
+    "unsubscribed_failed": "Failed to unsubscribe from topic: {topic}",
+    "unsubscribed_success": "Successfully unsubscribed from topic: {topic}",
    "waiting_send_request": "Várakozás a kérés elküldésére"
  },
  "support": {
@@ -641,7 +639,7 @@
    "body": "Törzs",
    "collections": "Gyűjtemények",
    "documentation": "Dokumentáció",
-    "environments": "Környezetek",
+    "environments": "Environments",
    "headers": "Fejlécek",
    "history": "Előzmények",
    "mqtt": "MQTT",
@@ -666,7 +664,7 @@
    "email_do_not_match": "Az e-mail-cím nem egyezik a fiókja részleteivel. Vegye fel a kapcsolatot a csapat tulajdonosával.",
    "exit": "Kilépés a csapatból",
    "exit_disabled": "Csak a tulajdonos nem léphet ki a csapatból",
-    "invalid_coll_id": "Érvénytelen gyűjteményazonosító",
+    "invalid_coll_id": "Invalid collection ID",
    "invalid_email_format": "Az e-mail formátuma érvénytelen",
    "invalid_id": "Érvénytelen csapatazonosító. Vegye fel a kapcsolatot a csapat tulajdonosával.",
    "invalid_invite_link": "Érvénytelen meghívási hivatkozás",
@@ -690,7 +688,7 @@
    "member_removed": "Felhasználó eltávolítva",
    "member_role_updated": "Felhasználói szerepek frissítve",
    "members": "Tagok",
-    "more_members": "+{count} további",
+    "more_members": "+{count} more",
    "name_length_insufficient": "A csapat nevének legalább 6 karakter hosszúságúnak kell lennie",
    "name_updated": "Csapatnév frissítve",
    "new": "Új csapat",
@@ -698,13 +696,13 @@
    "new_name": "Saját új csapat",
    "no_access": "Nincs szerkesztési jogosultsága ezekhez a gyűjteményekhez",
    "no_invite_found": "A meghívás nem található. Vegye fel a kapcsolatot a csapat tulajdonosával.",
-    "no_request_found": "A kérés nem található.",
+    "no_request_found": "Request not found.",
    "not_found": "A csapat nem található. Vegye fel a kapcsolatot a csapat tulajdonosával.",
    "not_valid_viewer": "Ön nem érvényes megtekintő. Vegye fel a kapcsolatot a csapat tulajdonosával.",
-    "parent_coll_move": "Nem lehet áthelyezni a gyűjteményt egy gyermekgyűjteménybe",
+    "parent_coll_move": "Cannot move collection to a child collection",
    "pending_invites": "Függőben lévő meghívások",
    "permissions": "Jogosultságok",
-    "same_target_destination": "Ugyanaz a cél és célhely",
+    "same_target_destination": "Same target and destination",
    "saved": "Csapat elmentve",
    "select_a_team": "Csapat kiválasztása",
    "title": "Csapatok",
@@ -712,9 +710,9 @@
    "we_sent_invite_link_description": "Kérje meg az összes meghívottat, hogy nézzék meg a beérkező leveleiket. Kattintsanak a hivatkozásra a csapathoz való csatlakozáshoz."
  },
  "team_environment": {
-    "deleted": "Környezet törölve",
-    "duplicate": "Környezet megkettőzve",
-    "not_found": "A környezet nem található."
+    "deleted": "Environment Deleted",
+    "duplicate": "Environment Duplicated",
+    "not_found": "Environment not found."
  },
  "test": {
    "failed": "teszt sikertelen",
@@ -734,9 +732,9 @@
    "url": "URL"
  },
  "workspace": {
-    "change": "Munkaterület váltása",
-    "personal": "Saját munkaterület",
-    "team": "Csapat-munkaterület",
-    "title": "Munkaterületek"
+    "change": "Change workspace",
+    "personal": "My Workspace",
+    "team": "Team Workspace",
+    "title": "Workspaces"
  }
 }
--- a/packages/hoppscotch-common/locales/id.json
+++ b/packages/hoppscotch-common/locales/id.json
@@ -432,7 +432,6 @@
    "view_my_links": "Lihat tautan saya"
  },
  "response": {
-    "audio": "Audio",
    "body": "Response Body",
    "filter_response_body": "Filter body respons JSON (menggunakan sintaks JSONPath)",
    "headers": "Headers",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Waktu",
    "title": "Response",
-    "video": "Video",
    "waiting_for_connection": "Menunggu koneksi",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/it.json
+++ b/packages/hoppscotch-common/locales/it.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Corpo della risposta",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Intestazioni",
@@ -446,7 +445,6 @@
    "status": "Stato",
    "time": "Tempo impiegato",
    "title": "Risposta",
-    "video": "Video",
    "waiting_for_connection": "In attesa di connessione",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ja.json
+++ b/packages/hoppscotch-common/locales/ja.json
@@ -432,7 +432,6 @@
    "view_my_links": "自分のリンクを見る"
  },
  "response": {
-    "audio": "Audio",
    "body": "レスポンスボディ",
    "filter_response_body": "JSONレスポンスボディをフィルタ (JSONPathシンタックスを使用)",
    "headers": "ヘッダー",
@@ -446,7 +445,6 @@
    "status": "ステータス",
    "time": "時間",
    "title": "レスポンス",
-    "video": "Video",
    "waiting_for_connection": "接続を待っています",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ko.json
+++ b/packages/hoppscotch-common/locales/ko.json
@@ -432,7 +432,6 @@
    "view_my_links": "내 링크 보기"
  },
  "response": {
-    "audio": "Audio",
    "body": "응답 본문",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "헤더",
@@ -446,7 +445,6 @@
    "status": "상태",
    "time": "시간",
    "title": "제목",
-    "video": "Video",
    "waiting_for_connection": "연결 대기 중",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/nl.json
+++ b/packages/hoppscotch-common/locales/nl.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Reactie inhoud",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Headers",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tijd",
    "title": "Antwoord",
-    "video": "Video",
    "waiting_for_connection": "wachten op verbinding",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/no.json
+++ b/packages/hoppscotch-common/locales/no.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Svarkropp",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Overskrifter",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tid",
    "title": "Respons",
-    "video": "Video",
    "waiting_for_connection": "venter på tilkobling",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/pl.json
+++ b/packages/hoppscotch-common/locales/pl.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Ciało odpowiedzi",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Nagłówki",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Czas",
    "title": "Odpowiedź",
-    "video": "Video",
    "waiting_for_connection": "oczekiwanie na połączenie",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/pt-br.json
+++ b/packages/hoppscotch-common/locales/pt-br.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Corpo de Resposta",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Cabeçalhos",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tempo",
    "title": "Resposta",
-    "video": "Video",
    "waiting_for_connection": "aguardando conexão",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/pt.json
+++ b/packages/hoppscotch-common/locales/pt.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Corpo de Resposta",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Cabeçalhos",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tempo",
    "title": "Resposta",
-    "video": "Video",
    "waiting_for_connection": "aguardando conexão",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ro.json
+++ b/packages/hoppscotch-common/locales/ro.json
@@ -432,7 +432,6 @@
    "view_my_links": "Vizualizare link-uri"
  },
  "response": {
-    "audio": "Audio",
    "body": "Corpul de răspuns",
    "filter_response_body": "Filtrează corpul răspunsului JSON (folosește sintaxa JSONPath)",
    "headers": "Anteturi",
@@ -446,7 +445,6 @@
    "status": "Stare",
    "time": "Timp",
    "title": "Raspuns",
-    "video": "Video",
    "waiting_for_connection": "Așteptând conexiunea",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/ru.json
+++ b/packages/hoppscotch-common/locales/ru.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Тело ответа",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Заголовки",
@@ -446,7 +445,6 @@
    "status": "Статус",
    "time": "Время",
    "title": "Ответ",
-    "video": "Video",
    "waiting_for_connection": "Ожидание соединения",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/sr.json
+++ b/packages/hoppscotch-common/locales/sr.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Тело за одговор",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Заглавља",
@@ -446,7 +445,6 @@
    "status": "Статус",
    "time": "време",
    "title": "Одговор",
-    "video": "Video",
    "waiting_for_connection": "чека везу",
    "xml": "КСМЛ"
  },
--- a/packages/hoppscotch-common/locales/sv.json
+++ b/packages/hoppscotch-common/locales/sv.json
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Svarskommitté",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Rubriker",
@@ -446,7 +445,6 @@
    "status": "Status",
    "time": "Tid",
    "title": "Svar",
-    "video": "Video",
    "waiting_for_connection": "väntar på anslutning",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/tr.json
+++ b/packages/hoppscotch-common/locales/tr.json
@@ -122,7 +122,7 @@
    "edit": "Koleksiyonu düzenle",
    "invalid_name": "Lütfen koleksiyon için geçerli bir ad girin",
    "invalid_root_move": "Collection already in the root",
-    "moved": "Başarıyla taşındı",
+    "moved": "Moved Successfully",
    "my_collections": "Koleksiyonlarım",
    "name": "Yeni Koleksiyonum",
    "name_length_insufficient": "Koleksiyon adı en az 3 karakter uzunluğunda olmalıdır",
@@ -147,7 +147,7 @@
    "remove_team": "Bu takımı silmek istediğinizden emin misiniz?",
    "remove_telemetry": "Telemetriden çıkmak istediğinizden emin misiniz?",
    "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
-    "save_unsaved_tab": "Bu sekmede yapılan değişiklikleri kaydetmek istiyor musunuz?",
+    "save_unsaved_tab": "Do you want to save changes made in this tab?",
    "sync": "Bu çalışma alanını senkronize etmek istediğinizden emin misiniz?"
  },
  "count": {
@@ -368,9 +368,9 @@
  },
  "profile": {
    "app_settings": "Uygulama ayarları",
-    "default_hopp_displayname": "Adsız Kullanıcı",
-    "editor": "Editör",
-    "editor_description": "Editörler istekleri ekleyebilir, düzenleyebilir ve silebilir.",
+    "default_hopp_displayname": "Unnamed User",
+    "editor": "Düzenleyici",
+    "editor_description": "Editors can add, edit, and delete requests.",
    "email_verification_mail": "Doğrulama bağlantısı e-postanıza gönderildi. E-postanızı doğrulamak için gelen bağlantıya tıklayınız.",
    "no_permission": "Bu eylemi gerçekleştirmek için gerekli yetkiniz yok.",
    "owner": "Kurucu",
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Yanıt gövdesi",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Başlıklar",
@@ -446,7 +445,6 @@
    "status": "Durum",
    "time": "Zaman",
    "title": "Cevap",
-    "video": "Video",
    "waiting_for_connection": "Bağlantı için bekleniyor",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/tw.json
+++ b/packages/hoppscotch-common/locales/tw.json
@@ -432,7 +432,6 @@
    "view_my_links": "檢視我的連結"
  },
  "response": {
-    "audio": "Audio",
    "body": "回應本體",
    "filter_response_body": "篩選 JSON 回應本體 (使用 JSONPath 語法)",
    "headers": "回應標頭",
@@ -446,7 +445,6 @@
    "status": "狀態",
    "time": "時間",
    "title": "回應",
-    "video": "Video",
    "waiting_for_connection": "等待連線",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/uk.json
+++ b/packages/hoppscotch-common/locales/uk.json
@@ -432,7 +432,6 @@
    "view_my_links": "Переглянути мої посилання"
  },
  "response": {
-    "audio": "Audio",
    "body": "Орган реагування",
    "filter_response_body": "Фільтр тіла відповідей JSON (використовує синтаксис JSONPath)",
    "headers": "Заголовки",
@@ -446,7 +445,6 @@
    "status": "Статус",
    "time": "Час",
    "title": "Відповідь",
-    "video": "Video",
    "waiting_for_connection": "очікування підключення",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/locales/vi.json
+++ b/packages/hoppscotch-common/locales/vi.json
@@ -4,7 +4,7 @@
    "cancel": "Hủy bỏ",
    "choose_file": "Chọn một tệp",
    "clear": "Thông thoáng",
-    "clear_all": "Quet sạch tất cả",
+    "clear_all": "Quet sạch tât cả",
    "close": "Close",
    "connect": "Liên kết",
    "connecting": "Connecting",
@@ -432,7 +432,6 @@
    "view_my_links": "View my links"
  },
  "response": {
-    "audio": "Audio",
    "body": "Cơ quan phản hồi",
    "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
    "headers": "Tiêu đề",
@@ -446,7 +445,6 @@
    "status": "Tình trạng",
    "time": "Thời gian",
    "title": "Phản ứng",
-    "video": "Video",
    "waiting_for_connection": "Đang đợi kết nối",
    "xml": "XML"
  },
--- a/packages/hoppscotch-common/package.json
+++ b/packages/hoppscotch-common/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@hoppscotch/common",
  "private": true,
-  "version": "2023.4.6",
+  "version": "2023.4.3",
  "scripts": {
    "dev": "pnpm exec npm-run-all -p -l dev:*",
    "dev:vite": "vite",
--- a/packages/hoppscotch-common/public/icons/pwa-192x192.png
+++ b/packages/hoppscotch-common/public/icons/pwa-192x192.png
--- a/packages/hoppscotch-common/src/components.d.ts
+++ b/packages/hoppscotch-common/src/components.d.ts
@@ -86,7 +86,6 @@ declare module '@vue/runtime-core' {
    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
-    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder']
    HoppSmartProgressRing: typeof import('@hoppscotch/ui')['HoppSmartProgressRing']
    HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup']
    HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver']
@@ -135,13 +134,11 @@ declare module '@vue/runtime-core' {
    IconLucideUsers: typeof import('~icons/lucide/users')['default']
    LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']
    LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']
-    LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default']
    LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']
    LensesRenderersImageLensRenderer: typeof import('./components/lenses/renderers/ImageLensRenderer.vue')['default']
    LensesRenderersJSONLensRenderer: typeof import('./components/lenses/renderers/JSONLensRenderer.vue')['default']
    LensesRenderersPDFLensRenderer: typeof import('./components/lenses/renderers/PDFLensRenderer.vue')['default']
    LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default']
-    LensesRenderersVideoLensRenderer: typeof import('./components/lenses/renderers/VideoLensRenderer.vue')['default']
    LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default']
    LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default']
    ProfileShortcode: typeof import('./components/profile/Shortcode.vue')['default']
--- a/packages/hoppscotch-common/src/components/collections/MyCollections.vue
+++ b/packages/hoppscotch-common/src/components/collections/MyCollections.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col flex-1 bg-primaryContrast">
+  <div class="flex flex-col flex-1 bg-primary">
    <div
      class="sticky z-10 flex justify-between flex-1 border-b bg-primary border-dividerLight"
      :style="
--- a/packages/hoppscotch-common/src/components/collections/TeamCollections.vue
+++ b/packages/hoppscotch-common/src/components/collections/TeamCollections.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col flex-1 bg-primaryContrast">
+  <div class="flex flex-col flex-1 bg-primary">
    <div
      class="sticky z-10 flex justify-between flex-1 border-b bg-primary border-dividerLight"
      :style="
--- a/packages/hoppscotch-common/src/components/collections/index.vue
+++ b/packages/hoppscotch-common/src/components/collections/index.vue
@@ -125,8 +125,8 @@
      @hide-modal="displayModalEditFolder(false)"
    />
    <CollectionsEditRequest
-      v-model="editingRequestName"
      :show="showModalEditRequest"
+      v-bind:model-value="editingRequest ? editingRequest.name : ''"
      :loading-state="modalLoadingState"
      @submit="updateEditingRequest"
      @hide-modal="displayModalEditRequest(false)"
@@ -157,7 +157,7 @@
 </template>

 <script setup lang="ts">
-import { computed, nextTick, PropType, ref, watch } from "vue"
+import { computed, PropType, ref, watch } from "vue"
 import { useToast } from "@composables/toast"
 import { useI18n } from "@composables/i18n"
 import { Picked } from "~/helpers/types/HoppPicked"
@@ -288,7 +288,6 @@ const editingFolder = ref<
 const editingFolderName = ref<string | null>(null)
 const editingFolderPath = ref<string | null>(null)
 const editingRequest = ref<HoppRESTRequest | null>(null)
-const editingRequestName = ref("")
 const editingRequestIndex = ref<number | null>(null)
 const editingRequestID = ref<string | null>(null)

@@ -861,7 +860,6 @@ const editRequest = (payload: {
 }) => {
  const { folderPath, requestIndex, request } = payload
  editingRequest.value = request
-  editingRequestName.value = request.name ?? ""
  if (collectionsType.value.type === "my-collections" && folderPath) {
    editingFolderPath.value = folderPath
    editingRequestIndex.value = parseInt(requestIndex)
@@ -895,9 +893,6 @@ const updateEditingRequest = (newName: string) => {

    if (possibleActiveTab) {
      possibleActiveTab.value.document.request.name = requestUpdated.name
-      nextTick(() => {
-        possibleActiveTab.value.document.isDirty = false
-      })
    }

    displayModalEditRequest(false)
@@ -936,9 +931,6 @@ const updateEditingRequest = (newName: string) => {

    if (possibleTab) {
      possibleTab.value.document.request.name = requestName
-      nextTick(() => {
-        possibleTab.value.document.isDirty = false
-      })
    }
  }
 }
--- a/packages/hoppscotch-common/src/components/environments/Selector.vue
+++ b/packages/hoppscotch-common/src/components/environments/Selector.vue
@@ -11,14 +11,13 @@
      class="bg-transparent border-b border-dividerLight select-wrapper"
    >
      <HoppButtonSecondary
-        :icon="IconLayers"
-        :label="
-          mdAndLarger
-            ? selectedEnv.type !== 'NO_ENV_SELECTED'
-              ? selectedEnv.name
-              : `${t('environment.select')}`
-            : ''
-        "
+        v-if="selectedEnv.type !== 'NO_ENV_SELECTED'"
+        :label="selectedEnv.name"
+        class="flex-1 !justify-start pr-8 rounded-none"
+      />
+      <HoppButtonSecondary
+        v-else
+        :label="`${t('environment.select')}`"
        class="flex-1 !justify-start pr-8 rounded-none"
      />
    </span>
@@ -47,149 +46,93 @@
            }
          "
        />
-        <HoppSmartTabs
-          v-model="selectedEnvTab"
-          styles="sticky overflow-x-auto my-2 border border-divider rounded flex-shrink-0 z-10 top-0 bg-primary"
-          render-inactive-tabs
-        >
-          <HoppSmartTab
-            :id="'my-environments'"
-            :label="`${t('environment.my_environments')}`"
+        <div v-if="environmentType === 'my-environments'" class="flex flex-col">
+          <hr v-if="myEnvironments.length > 0" />
+          <HoppSmartItem
+            v-for="(gen, index) in myEnvironments"
+            :key="`gen-${index}`"
+            :label="gen.name"
+            :info-icon="index === selectedEnv.index ? IconCheck : undefined"
+            :active-info-icon="index === selectedEnv.index"
+            @click="
+              () => {
+                selectedEnvironmentIndex = { type: 'MY_ENV', index: index }
+                hide()
+              }
+            "
+          />
+        </div>
+        <div v-else class="flex flex-col">
+          <div
+            v-if="teamEnvLoading"
+            class="flex flex-col items-center justify-center p-4"
          >
+            <HoppSmartSpinner class="my-4" />
+            <span class="text-secondaryLight">{{ t("state.loading") }}</span>
+          </div>
+          <hr v-if="teamEnvironmentList.length > 0" />
+          <div v-if="isTeamSelected" class="flex flex-col">
            <HoppSmartItem
-              v-for="(gen, index) in myEnvironments"
-              :key="`gen-${index}`"
-              :icon="IconLayers"
-              :label="gen.name"
-              :info-icon="index === selectedEnv.index ? IconCheck : undefined"
-              :active-info-icon="index === selectedEnv.index"
+              v-for="(gen, index) in teamEnvironmentList"
+              :key="`gen-team-${index}`"
+              :label="gen.environment.name"
+              :info-icon="
+                gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
+              "
+              :active-info-icon="gen.id === selectedEnv.teamEnvID"
              @click="
                () => {
-                  selectedEnvironmentIndex = { type: 'MY_ENV', index: index }
+                  selectedEnvironmentIndex = {
+                    type: 'TEAM_ENV',
+                    teamEnvID: gen.id,
+                    teamID: gen.teamID,
+                    environment: gen.environment,
+                  }
                  hide()
                }
              "
            />
-            <div
-              v-if="myEnvironments.length === 0"
-              class="flex flex-col items-center justify-center text-secondaryLight"
-            >
-              <img
-                :src="`/images/states/${colorMode.value}/blockchain.svg`"
-                loading="lazy"
-                class="inline-flex flex-col object-contain object-center w-16 h-16 mb-2"
-                :alt="`${t('empty.environments')}`"
-              />
-              <span class="pb-2 text-center">
-                {{ t("empty.environments") }}
-              </span>
-            </div>
-          </HoppSmartTab>
-          <HoppSmartTab
-            :id="'team-environments'"
-            :label="`${t('environment.team_environments')}`"
-            :disabled="!isTeamSelected || workspace.type === 'personal'"
+          </div>
+          <div
+            v-if="!teamEnvLoading && isAdapterError"
+            class="flex flex-col items-center py-4"
          >
-            <div
-              v-if="teamListLoading"
-              class="flex flex-col items-center justify-center p-4"
-            >
-              <HoppSmartSpinner class="my-4" />
-              <span class="text-secondaryLight">{{ t("state.loading") }}</span>
-            </div>
-            <div v-else-if="isTeamSelected" class="flex flex-col">
-              <HoppSmartItem
-                v-for="(gen, index) in teamEnvironmentList"
-                :key="`gen-team-${index}`"
-                :icon="IconLayers"
-                :label="gen.environment.name"
-                :info-icon="
-                  gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
-                "
-                :active-info-icon="gen.id === selectedEnv.teamEnvID"
-                @click="
-                  () => {
-                    selectedEnvironmentIndex = {
-                      type: 'TEAM_ENV',
-                      teamEnvID: gen.id,
-                      teamID: gen.teamID,
-                      environment: gen.environment,
-                    }
-                    hide()
-                  }
-                "
-              />
-              <div
-                v-if="teamEnvironmentList.length === 0"
-                class="flex flex-col items-center justify-center text-secondaryLight"
-              >
-                <img
-                  :src="`/images/states/${colorMode.value}/blockchain.svg`"
-                  loading="lazy"
-                  class="inline-flex flex-col object-contain object-center w-16 h-16 mb-2"
-                  :alt="`${t('empty.environments')}`"
-                />
-                <span class="pb-2 text-center">
-                  {{ t("empty.environments") }}
-                </span>
-              </div>
-            </div>
-            <div
-              v-if="!teamListLoading && teamAdapterError"
-              class="flex flex-col items-center py-4"
-            >
-              <icon-lucide-help-circle class="mb-4 svg-icons" />
-              {{ getErrorMessage(teamAdapterError) }}
-            </div>
-          </HoppSmartTab>
-        </HoppSmartTabs>
+            <icon-lucide-help-circle class="mb-4 svg-icons" />
+            {{ errorMessage }}
+          </div>
+        </div>
      </div>
    </template>
  </tippy>
 </template>

 <script lang="ts" setup>
-import { computed, ref, watch } from "vue"
+import { computed, ref } from "vue"
 import IconCheck from "~icons/lucide/check"
-import IconLayers from "~icons/lucide/layers"
 import { TippyComponent } from "vue-tippy"
 import { useI18n } from "~/composables/i18n"
 import { GQLError } from "~/helpers/backend/GQLClient"
-import { useReadonlyStream, useStream } from "~/composables/stream"
+import { Environment } from "@hoppscotch/data"
+import { TeamEnvironment } from "~/helpers/teams/TeamEnvironment"
+import { useStream } from "~/composables/stream"
 import {
-  environments$,
  selectedEnvironmentIndex$,
  setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
-import { changeWorkspace, workspaceStatus$ } from "~/newstore/workspace"
-import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
-import { useColorMode } from "@composables/theming"
-import { breakpointsTailwind, useBreakpoints } from "@vueuse/core"
-import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
-import { useLocalState } from "~/newstore/localstate"
-import { onLoggedIn } from "~/composables/auth"
-import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
-
-const breakpoints = useBreakpoints(breakpointsTailwind)
-const mdAndLarger = breakpoints.greater("md")

 const t = useI18n()

-const colorMode = useColorMode()
-
 type EnvironmentType = "my-environments" | "team-environments"

-const myEnvironments = useReadonlyStream(environments$, [])
-
-const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
-
-const teamEnvListAdapter = new TeamEnvironmentAdapter(undefined)
-const teamListLoading = useReadonlyStream(teamEnvListAdapter.loading$, false)
-const teamAdapterError = useReadonlyStream(teamEnvListAdapter.error$, null)
-const teamEnvironmentList = useReadonlyStream(
-  teamEnvListAdapter.teamEnvironmentList$,
-  []
-)
+const props = defineProps<{
+  environmentType: EnvironmentType
+  myEnvironments: Environment[]
+  teamEnvironmentList: TeamEnvironment[]
+  teamEnvLoading: boolean
+  isAdapterError: boolean
+  errorMessage: GQLError<string>
+  isTeamSelected: boolean
+}>()

 const selectedEnvironmentIndex = useStream(
  selectedEnvironmentIndex$,
@@ -197,67 +140,15 @@ const selectedEnvironmentIndex = useStream(
  setSelectedEnvironmentIndex
 )

-const isTeamSelected = computed(
-  () => workspace.value.type === "team" && workspace.value.teamID !== undefined
-)
-
-const selectedEnvTab = ref<EnvironmentType>("my-environments")
-
-watch(
-  () => workspace.value,
-  (newVal) => {
-    if (newVal.type === "personal") {
-      selectedEnvTab.value = "my-environments"
-    } else {
-      selectedEnvTab.value = "team-environments"
-      if (newVal.teamID) {
-        teamEnvListAdapter.changeTeamID(newVal.teamID)
-      }
-    }
-  }
-)
-
-// TeamList-Adapter
-const teamListAdapter = new TeamListAdapter(true)
-const myTeams = useReadonlyStream(teamListAdapter.teamList$, null)
-const teamListFetched = ref(false)
-const REMEMBERED_TEAM_ID = useLocalState("REMEMBERED_TEAM_ID")
-
-onLoggedIn(() => {
-  !teamListAdapter.isInitialized && teamListAdapter.initialize()
-})
-
-const switchToTeamWorkspace = (team: GetMyTeamsQuery["myTeams"][number]) => {
-  REMEMBERED_TEAM_ID.value = team.id
-  changeWorkspace({
-    teamID: team.id,
-    teamName: team.name,
-    type: "team",
-  })
-}
-
-watch(
-  () => myTeams.value,
-  (newTeams) => {
-    if (newTeams && !teamListFetched.value) {
-      teamListFetched.value = true
-      if (REMEMBERED_TEAM_ID.value) {
-        const team = newTeams.find((t) => t.id === REMEMBERED_TEAM_ID.value)
-        if (team) switchToTeamWorkspace(team)
-      }
-    }
-  }
-)
-
 const selectedEnv = computed(() => {
  if (selectedEnvironmentIndex.value.type === "MY_ENV") {
    return {
      type: "MY_ENV",
      index: selectedEnvironmentIndex.value.index,
-      name: myEnvironments.value[selectedEnvironmentIndex.value.index].name,
+      name: props.myEnvironments[selectedEnvironmentIndex.value.index].name,
    }
  } else if (selectedEnvironmentIndex.value.type === "TEAM_ENV") {
-    const teamEnv = teamEnvironmentList.value.find(
+    const teamEnv = props.teamEnvironmentList.find(
      (env) =>
        env.id ===
        (selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
@@ -279,17 +170,4 @@ const selectedEnv = computed(() => {

 // Template refs
 const tippyActions = ref<TippyComponent | null>(null)
-
-const getErrorMessage = (err: GQLError<string>) => {
-  if (err.type === "network_error") {
-    return t("error.network_error")
-  } else {
-    switch (err.error) {
-      case "team_environment/not_found":
-        return t("team_environment.not_found")
-      default:
-        return t("error.something_went_wrong")
-    }
-  }
-}
 </script>
--- a/packages/hoppscotch-common/src/components/environments/index.vue
+++ b/packages/hoppscotch-common/src/components/environments/index.vue
@@ -4,6 +4,15 @@
      class="sticky top-0 z-10 flex flex-col flex-shrink-0 overflow-x-auto bg-primary"
    >
      <WorkspaceCurrent :section="t('tab.environments')" />
+      <EnvironmentsSelector
+        :environment-type="environmentType.type"
+        :my-environments="myEnvironments"
+        :team-env-loading="loading"
+        :team-environment-list="teamEnvironmentList"
+        :is-adapter-error="adapterError !== null"
+        :error-message="adapterError ? getErrorMessage(adapterError) : ''"
+        :is-team-selected="environmentType.selectedTeam !== undefined"
+      />
      <EnvironmentsMyEnvironment
        environment-index="Global"
        :environment="globalEnvironment"
@@ -37,11 +46,13 @@ import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
 import { useReadonlyStream, useStream } from "@composables/stream"
 import { useI18n } from "~/composables/i18n"
 import {
+  environments$,
  globalEnv$,
  selectedEnvironmentIndex$,
  setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
 import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
+import { GQLError } from "~/helpers/backend/GQLClient"
 import { defineActionHandler } from "~/helpers/actions"
 import { workspaceStatus$ } from "~/newstore/workspace"
 import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
@@ -136,19 +147,24 @@ onLoggedIn(() => {

 const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })

-// Switch to my environments if workspace is personal and to team environments if workspace is team
-// also resets selected environment if workspace is personal and the previous selected environment was a team environment
+// Used to switch environment type and team when user switch workspace in the global workspace switcher
+// Check if there is a teamID in the workspace, if yes, switch to team environment and select the team
+// If there is no teamID, switch to my environment
 watch(workspace, (newWorkspace) => {
  if (newWorkspace.type === "personal") {
    switchToMyEnvironments()
+    setSelectedEnvironmentIndex({
+      type: "NO_ENV_SELECTED",
+    })
+  } else if (newWorkspace.type === "team") {
+    const team = myTeams.value?.find((t) => t.id === newWorkspace.teamID)
+    updateSelectedTeam(team)
+
    if (selectedEnvironmentIndex.value.type !== "MY_ENV") {
      setSelectedEnvironmentIndex({
        type: "NO_ENV_SELECTED",
      })
    }
-  } else if (newWorkspace.type === "team") {
-    const team = myTeams.value?.find((t) => t.id === newWorkspace.teamID)
-    updateSelectedTeam(team)
  }
 })

@@ -191,6 +207,8 @@ defineActionHandler(
  }
 )

+const myEnvironments = useReadonlyStream(environments$, [])
+
 const selectedEnvironmentIndex = useStream(
  selectedEnvironmentIndex$,
  { type: "NO_ENV_SELECTED" },
@@ -233,4 +251,17 @@ watch(
  },
  { deep: true }
 )
+
+const getErrorMessage = (err: GQLError<string>) => {
+  if (err.type === "network_error") {
+    return t("error.network_error")
+  } else {
+    switch (err.error) {
+      case "team_environment/not_found":
+        return t("team_environment.not_found")
+      default:
+        return t("error.something_went_wrong")
+    }
+  }
+}
 </script>
--- a/packages/hoppscotch-common/src/components/environments/my/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/my/Details.vue
@@ -165,8 +165,8 @@ const props = withDefaults(
  defineProps<{
    show: boolean
    action: "edit" | "new"
-    editingEnvironmentIndex?: number | "Global" | null
-    editingVariableName?: string | null
+    editingEnvironmentIndex: number | "Global" | null
+    editingVariableName: string | null
    envVars?: () => Environment["variables"]
  }>(),
  {
--- a/packages/hoppscotch-common/src/components/environments/teams/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
@@ -140,7 +140,7 @@ import * as A from "fp-ts/Array"
 import * as O from "fp-ts/Option"
 import * as TE from "fp-ts/TaskEither"
 import { flow, pipe } from "fp-ts/function"
-import { Environment, parseTemplateStringE } from "@hoppscotch/data"
+import { parseTemplateStringE } from "@hoppscotch/data"
 import { refAutoReset } from "@vueuse/core"
 import { clone } from "lodash-es"
 import { useToast } from "@composables/toast"
@@ -173,20 +173,16 @@ const props = withDefaults(
  defineProps<{
    show: boolean
    action: "edit" | "new"
-    editingEnvironment?: TeamEnvironment | null
+    editingEnvironment: TeamEnvironment | null
    editingTeamId: string | undefined
-    editingVariableName?: string | null
-    isViewer?: boolean
-    envVars?: () => Environment["variables"]
+    editingVariableName: string | null
+    isViewer: boolean
  }>(),
  {
    show: false,
    action: "edit",
    editingEnvironment: null,
    editingTeamId: "",
-    editingVariableName: null,
-    isViewer: false,
-    envVars: () => [],
  }
 )

@@ -230,16 +226,10 @@ watch(
  () => props.show,
  (show) => {
    if (show) {
-      if (props.action === "new") {
+      if (props.editingEnvironment === null) {
        name.value = null
-        vars.value = pipe(
-          props.envVars() ?? [],
-          A.map((e: { key: string; value: string }) => ({
-            id: idTicker.value++,
-            env: clone(e),
-          }))
-        )
-      } else if (props.editingEnvironment !== null) {
+        vars.value = []
+      } else {
        name.value = props.editingEnvironment.environment.name ?? null
        vars.value = pipe(
          props.editingEnvironment.environment.variables ?? [],
--- a/packages/hoppscotch-common/src/components/environments/teams/index.vue
+++ b/packages/hoppscotch-common/src/components/environments/teams/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <div
-      class="sticky z-10 flex justify-between flex-1 flex-shrink-0 overflow-x-auto border-b top-upperPrimaryStickyFold border-dividerLight bg-primary"
+      class="sticky z-10 flex justify-between flex-1 flex-shrink-0 overflow-x-auto border-b top-upperSecondaryStickyFold border-dividerLight bg-primary"
    >
      <HoppButtonSecondary
        v-if="team === undefined || team.myRole === 'VIEWER'"
--- a/packages/hoppscotch-common/src/components/graphql/Authorization.vue
+++ b/packages/hoppscotch-common/src/components/graphql/Authorization.vue
@@ -142,14 +142,12 @@
        <div v-if="authType === 'basic'">
          <div class="flex flex-1 border-b border-dividerLight">
            <SmartEnvInput
-              :environmentHighlights="false"
              v-model="basicUsername"
              :placeholder="t('authorization.username')"
            />
          </div>
          <div class="flex flex-1 border-b border-dividerLight">
            <SmartEnvInput
-              :environmentHighlights="false"
              v-model="basicPassword"
              :placeholder="t('authorization.password')"
            />
@@ -157,37 +155,21 @@
        </div>
        <div v-if="authType === 'bearer'">
          <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput
-              :environmentHighlights="false"
-              v-model="bearerToken"
-              placeholder="Token"
-            />
+            <SmartEnvInput v-model="bearerToken" placeholder="Token" />
          </div>
        </div>
        <div v-if="authType === 'oauth-2'">
          <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput
-              :environmentHighlights="false"
-              v-model="oauth2Token"
-              placeholder="Token"
-            />
+            <SmartEnvInput v-model="oauth2Token" placeholder="Token" />
          </div>
          <HttpOAuth2Authorization />
        </div>
        <div v-if="authType === 'api-key'">
          <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput
-              :environmentHighlights="false"
-              v-model="apiKey"
-              placeholder="Key"
-            />
+            <SmartEnvInput v-model="apiKey" placeholder="Key" />
          </div>
          <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput
-              :environmentHighlights="false"
-              v-model="apiValue"
-              placeholder="Value"
-            />
+            <SmartEnvInput v-model="apiValue" placeholder="Value" />
          </div>
          <div class="flex items-center border-b border-dividerLight">
            <span class="flex items-center">
--- a/packages/hoppscotch-common/src/components/graphql/Request.vue
+++ b/packages/hoppscotch-common/src/components/graphql/Request.vue
@@ -17,7 +17,6 @@
      <HoppButtonPrimary
        id="get"
        name="get"
-        :loading="isLoading"
        :label="!connected ? t('action.connect') : t('action.disconnect')"
        class="w-32"
        @click="onConnectClick"
@@ -32,12 +31,7 @@ import { GQLConnection } from "~/helpers/GQLConnection"
 import { getCurrentStrategyID } from "~/helpers/network"
 import { useReadonlyStream, useStream } from "@composables/stream"
 import { useI18n } from "@composables/i18n"
-import {
-  gqlAuth$,
-  gqlHeaders$,
-  gqlURL$,
-  setGQLURL,
-} from "~/newstore/GQLSession"
+import { gqlHeaders$, gqlURL$, setGQLURL } from "~/newstore/GQLSession"

 const t = useI18n()

@@ -46,18 +40,13 @@ const props = defineProps<{
 }>()

 const connected = useReadonlyStream(props.conn.connected$, false)
-const isLoading = useReadonlyStream(props.conn.isLoading$, false)
 const headers = useReadonlyStream(gqlHeaders$, [])
-const auth = useReadonlyStream(gqlAuth$, {
-  authType: "none",
-  authActive: true,
-})

 const url = useStream(gqlURL$, "", setGQLURL)

 const onConnectClick = () => {
  if (!connected.value) {
-    props.conn.connect(url.value, headers.value as any, auth.value)
+    props.conn.connect(url.value, headers.value as any)

    platform.analytics?.logHoppRequestRunToAnalytics({
      platform: "graphql-schema",
--- a/packages/hoppscotch-common/src/components/http/Request.vue
+++ b/packages/hoppscotch-common/src/components/http/Request.vue
@@ -217,7 +217,6 @@
      @hide-modal="showCodegenModal = false"
    />
    <CollectionsSaveRequest
-      v-if="showSaveRequestModal"
      mode="rest"
      :show="showSaveRequestModal"
      @hide-modal="showSaveRequestModal = false"
--- a/packages/hoppscotch-common/src/components/http/TestResult.vue
+++ b/packages/hoppscotch-common/src/components/http/TestResult.vue
@@ -197,20 +197,11 @@
      />
    </div>
    <EnvironmentsMyDetails
-      :show="showMyEnvironmentDetailsModal"
+      :show="showModalDetails"
      action="new"
      :env-vars="getAdditionVars"
      @hide-modal="displayModalAdd(false)"
    />
-    <EnvironmentsTeamsDetails
-      :show="showTeamEnvironmentDetailsModal"
-      action="new"
-      :env-vars="getAdditionVars"
-      :editing-team-id="
-        workspace.type === 'team' ? workspace.teamID : undefined
-      "
-      @hide-modal="displayModalAdd(false)"
-    />
  </div>
 </template>

@@ -234,7 +225,6 @@ import IconClose from "~icons/lucide/x"

 import { useColorMode } from "~/composables/theming"
 import { useVModel } from "@vueuse/core"
-import { workspaceStatus$ } from "~/newstore/workspace"

 const props = defineProps<{
  modelValue: HoppTestResult | null | undefined
@@ -249,15 +239,10 @@ const testResults = useVModel(props, "modelValue", emit)
 const t = useI18n()
 const colorMode = useColorMode()

-const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
-
-const showMyEnvironmentDetailsModal = ref(false)
-const showTeamEnvironmentDetailsModal = ref(false)
+const showModalDetails = ref(false)

 const displayModalAdd = (shouldDisplay: boolean) => {
-  if (workspace.value.type === "personal")
-    showMyEnvironmentDetailsModal.value = shouldDisplay
-  else showTeamEnvironmentDetailsModal.value = shouldDisplay
+  showModalDetails.value = shouldDisplay
 }

 /**
--- a/packages/hoppscotch-common/src/components/smart/EnvInput.vue
+++ b/packages/hoppscotch-common/src/components/smart/EnvInput.vue
@@ -44,7 +44,6 @@ const props = withDefaults(
    envs?: { key: string; value: string; source: string }[] | null
    focus?: boolean
    selectTextOnMount?: boolean
-    environmentHighlights?: boolean
    readonly?: boolean
  }>(),
  {
@@ -54,7 +53,6 @@ const props = withDefaults(
    envs: null,
    focus: false,
    readonly: false,
-    environmentHighlights: true,
  }
 )

@@ -144,7 +142,7 @@ const initView = (el: any) => {
    tooltips({
      position: "absolute",
    }),
-    props.environmentHighlights ? envTooltipPlugin : [],
+    envTooltipPlugin,
    placeholderExt(props.placeholder),
    EditorView.domEventHandlers({
      paste(ev) {
--- a/packages/hoppscotch-common/src/helpers/GQLConnection.ts
+++ b/packages/hoppscotch-common/src/helpers/GQLConnection.ts
@@ -99,7 +99,7 @@ export class GQLConnection {

  private timeoutSubscription: any

-  public connect(url: string, headers: GQLHeader[], auth: HoppGQLAuth) {
+  public connect(url: string, headers: GQLHeader[]) {
    if (this.connected$.value) {
      throw new Error(
        "A connection is already running. Close it before starting another."
@@ -110,7 +110,7 @@ export class GQLConnection {
    this.connected$.next(true)

    const poll = async () => {
-      await this.getSchema(url, headers, auth)
+      await this.getSchema(url, headers)
      this.timeoutSubscription = setTimeout(() => {
        poll()
      }, GQL_SCHEMA_POLL_INTERVAL)
@@ -135,11 +135,7 @@ export class GQLConnection {
    this.schema$.next(null)
  }

-  private async getSchema(
-    url: string,
-    reqHeaders: GQLHeader[],
-    auth: HoppGQLAuth
-  ) {
+  private async getSchema(url: string, headers: GQLHeader[]) {
    try {
      this.isLoading$.next(true)

@@ -147,38 +143,10 @@ export class GQLConnection {
        query: getIntrospectionQuery(),
      })

-      const headers = reqHeaders.filter((x) => x.active && x.key !== "")
-
-      // TODO: Support a better b64 implementation than btoa ?
-      if (auth.authType === "basic") {
-        const username = auth.username
-        const password = auth.password
-
-        headers.push({
-          active: true,
-          key: "Authorization",
-          value: `Basic ${btoa(`${username}:${password}`)}`,
-        })
-      } else if (auth.authType === "bearer" || auth.authType === "oauth-2") {
-        headers.push({
-          active: true,
-          key: "Authorization",
-          value: `Bearer ${auth.token}`,
-        })
-      } else if (auth.authType === "api-key") {
-        const { key, value, addTo } = auth
-
-        if (addTo === "Headers") {
-          headers.push({
-            active: true,
-            key,
-            value,
-          })
-        }
-      }
-
      const finalHeaders: Record<string, string> = {}
-      headers.forEach((x) => (finalHeaders[x.key] = x.value))
+      headers
+        .filter((x) => x.active && x.key !== "")
+        .forEach((x) => (finalHeaders[x.key] = x.value))

      const reqOptions = {
        method: "POST",
--- a/packages/hoppscotch-common/src/helpers/RESTExtURLParams.ts
+++ b/packages/hoppscotch-common/src/helpers/RESTExtURLParams.ts
@@ -6,18 +6,14 @@ import { isJSONContentType } from "./utils/contenttypes"
 * Handles translations for all the hopp.io REST Shareable URL params
 */
 export function translateExtURLParams(
-  urlParams: Record<string, any>,
-  initialReq?: HoppRESTRequest
+  urlParams: Record<string, any>
 ): HoppRESTRequest {
-  if (urlParams.v) return parseV1ExtURL(urlParams, initialReq)
-  else return parseV0ExtURL(urlParams, initialReq)
+  if (urlParams.v) return parseV1ExtURL(urlParams)
+  else return parseV0ExtURL(urlParams)
 }

-function parseV0ExtURL(
-  urlParams: Record<string, any>,
-  initialReq?: HoppRESTRequest
-): HoppRESTRequest {
-  const resolvedReq = initialReq ?? getDefaultRESTRequest()
+function parseV0ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
+  const resolvedReq = getDefaultRESTRequest()

  if (urlParams.method && typeof urlParams.method === "string") {
    resolvedReq.method = urlParams.method
@@ -93,11 +89,8 @@ function parseV0ExtURL(
  return resolvedReq
 }

-function parseV1ExtURL(
-  urlParams: Record<string, any>,
-  initialReq?: HoppRESTRequest
-): HoppRESTRequest {
-  const resolvedReq = initialReq ?? getDefaultRESTRequest()
+function parseV1ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
+  const resolvedReq = getDefaultRESTRequest()

  if (urlParams.headers && typeof urlParams.headers === "string") {
    resolvedReq.headers = JSON.parse(urlParams.headers)
--- a/packages/hoppscotch-common/src/newstore/GQLSession.ts
+++ b/packages/hoppscotch-common/src/newstore/GQLSession.ts
@@ -275,4 +275,7 @@ export const gqlResponse$ = gqlSessionStore.subject$.pipe(
  distinctUntilChanged()
 )

-export const gqlAuth$ = gqlSessionStore.subject$.pipe(pluck("request", "auth"))
+export const gqlAuth$ = gqlSessionStore.subject$.pipe(
+  pluck("request", "auth"),
+  distinctUntilChanged()
+)
--- a/packages/hoppscotch-common/src/newstore/localpersistence.ts
+++ b/packages/hoppscotch-common/src/newstore/localpersistence.ts
@@ -47,8 +47,6 @@ import {
  loadTabsFromPersistedState,
  persistableTabState,
 } from "~/helpers/rest/tab"
-import { debounceTime } from "rxjs"
-import { gqlSessionStore, setGQLSession } from "./GQLSession"

 function checkAndMigrateOldSettings() {
  if (window.localStorage.getItem("selectedEnvIndex")) {
@@ -335,35 +333,12 @@ export function setupRESTTabsPersistence() {
  )
 }

-// temporary persistence for GQL session
-export function setupGQLPersistence() {
-  try {
-    const state = window.localStorage.getItem("gqlState")
-    if (state) {
-      const data = JSON.parse(state)
-      data["schema"] = ""
-      data["response"] = ""
-      setGQLSession(data)
-    }
-  } catch (e) {
-    console.error(
-      `Failed parsing persisted GraphQL state, state:`,
-      window.localStorage.getItem("gqlState")
-    )
-  }
-
-  gqlSessionStore.subject$.pipe(debounceTime(500)).subscribe((state) => {
-    window.localStorage.setItem("gqlState", JSON.stringify(state))
-  })
-}
-
 export function setupLocalPersistence() {
  checkAndMigrateOldSettings()

  setupLocalStatePersistence()
  setupSettingsPersistence()
  setupRESTTabsPersistence()
-  setupGQLPersistence()
  setupHistoryPersistence()
  setupCollectionsPersistence()
  setupGlobalEnvsPersistence()
--- a/packages/hoppscotch-common/src/newstore/syncing.ts
+++ b/packages/hoppscotch-common/src/newstore/syncing.ts
@@ -1,40 +0,0 @@
-import { distinctUntilChanged, pluck } from "rxjs"
-import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
-
-type SyncState = {
-  isInitialSync: boolean
-  shouldSync: boolean
-}
-
-type CurrentSyncingState = {
-  currentSyncingItem: SyncState
-}
-
-const initialState: CurrentSyncingState = {
-  currentSyncingItem: {
-    isInitialSync: false,
-    shouldSync: false,
-  },
-}
-
-const dispatchers = defineDispatchers({
-  changeCurrentSyncStatus(_, { syncItem }: { syncItem: SyncState }) {
-    return {
-      currentSyncingItem: syncItem,
-    }
-  },
-})
-
-export const currentSyncStore = new DispatchingStore(initialState, dispatchers)
-
-export const currentSyncingStatus$ = currentSyncStore.subject$.pipe(
-  pluck("currentSyncingItem"),
-  distinctUntilChanged()
-)
-
-export function changeCurrentSyncStatus(syncItem: SyncState) {
-  currentSyncStore.dispatch({
-    dispatcher: "changeCurrentSyncStatus",
-    payload: { syncItem },
-  })
-}
--- a/packages/hoppscotch-common/src/pages/graphql.vue
+++ b/packages/hoppscotch-common/src/pages/graphql.vue
@@ -14,10 +14,12 @@
 </template>

 <script setup lang="ts">
-import { usePageHead } from "@composables/head"
+import { computed, onBeforeUnmount, watch } from "vue"
+import { useReadonlyStream } from "@composables/stream"
 import { useI18n } from "@composables/i18n"
+import { usePageHead } from "@composables/head"
+import { startPageProgress, completePageProgress } from "@modules/loadingbar"
 import { GQLConnection } from "@helpers/GQLConnection"
-import { computed, onBeforeUnmount } from "vue"

 const t = useI18n()

@@ -26,10 +28,16 @@ usePageHead({
 })

 const gqlConn = new GQLConnection()
+const isLoading = useReadonlyStream(gqlConn.isLoading$, false)

 onBeforeUnmount(() => {
  if (gqlConn.connected$.value) {
    gqlConn.disconnect()
  }
 })
+
+watch(isLoading, () => {
+  if (isLoading.value) startPageProgress()
+  else completePageProgress()
+})
 </script>
--- a/packages/hoppscotch-common/src/pages/index.vue
+++ b/packages/hoppscotch-common/src/pages/index.vue
@@ -56,9 +56,6 @@
              @update:model-value="onTabUpdate"
            />
          </HoppSmartWindow>
-          <template #actions>
-            <EnvironmentsSelector class="h-full" />
-          </template>
        </HoppSmartWindows>
      </template>
      <template #sidebar>
@@ -66,8 +63,8 @@
      </template>
    </AppPaneLayout>
    <CollectionsEditRequest
-      v-model="reqName"
      :show="showRenamingReqNameModal"
+      v-model="reqName"
      @submit="renameReqName"
      @hide-modal="showRenamingReqNameModal = false"
    />
@@ -79,16 +76,15 @@
      @resolve="onResolveConfirmSaveTab"
    />
    <CollectionsSaveRequest
-      v-if="savingRequest"
-      mode="rest"
      :show="savingRequest"
+      :mode="'rest'"
      @hide-modal="onSaveModalClose"
    />
  </div>
 </template>

 <script lang="ts" setup>
-import { ref, onMounted, onBeforeUnmount, onBeforeMount } from "vue"
+import { ref, onMounted, onBeforeUnmount, watch, onBeforeMount } from "vue"
 import { safelyExtractRESTRequest } from "@hoppscotch/data"
 import { translateExtURLParams } from "~/helpers/RESTExtURLParams"
 import { useRoute } from "vue-router"
@@ -124,11 +120,6 @@ import { useToast } from "~/composables/toast"
 import { PersistableRESTTabState } from "~/helpers/rest/tab"
 import { watchDebounced } from "@vueuse/core"
 import { oauthRedirect } from "~/helpers/oauth"
-import { useReadonlyStream } from "~/composables/stream"
-import {
-  changeCurrentSyncStatus,
-  currentSyncingStatus$,
-} from "~/newstore/syncing"

 const savingRequest = ref(false)
 const confirmingCloseForTabID = ref<string | null>(null)
@@ -140,10 +131,7 @@ const toast = useToast()

 const tabs = getActiveTabs()

-const confirmSync = useReadonlyStream(currentSyncingStatus$, {
-  isInitialSync: false,
-  shouldSync: true,
-})
+const confirmSync = ref(false)
 const tabStateForSync = ref<PersistableRESTTabState | null>(null)

 function bindRequestToURLParams() {
@@ -154,11 +142,8 @@ function bindRequestToURLParams() {
    // If query params are empty, or contains code or error param (these are from Oauth Redirect)
    // We skip URL params parsing
    if (Object.keys(query).length === 0 || query.code || query.error) return
-
-    const request = currentActiveTab.value.document.request
-
    currentActiveTab.value.document.request = safelyExtractRESTRequest(
-      translateExtURLParams(query, request),
+      translateExtURLParams(query),
      getDefaultRESTRequest()
    )
  })
@@ -241,6 +226,29 @@ const onSaveModalClose = () => {
  }
 }

+watch(confirmSync, (newValue) => {
+  if (newValue) {
+    toast.show(t("confirm.sync"), {
+      duration: 0,
+      action: [
+        {
+          text: `${t("action.yes")}`,
+          onClick: (_, toastObject) => {
+            syncTabState()
+            toastObject.goAway(0)
+          },
+        },
+        {
+          text: `${t("action.no")}`,
+          onClick: (_, toastObject) => {
+            toastObject.goAway(0)
+          },
+        },
+      ],
+    })
+  }
+})
+
 const syncTabState = () => {
  if (tabStateForSync.value) loadTabsFromPersistedState(tabStateForSync.value)
 }
@@ -279,35 +287,6 @@ function startTabStateSync(): Subscription {
  return sub
 }

-const showSyncToast = () => {
-  toast.show(t("confirm.sync"), {
-    duration: 0,
-    action: [
-      {
-        text: `${t("action.yes")}`,
-        onClick: (_, toastObject) => {
-          syncTabState()
-          changeCurrentSyncStatus({
-            isInitialSync: true,
-            shouldSync: true,
-          })
-          toastObject.goAway(0)
-        },
-      },
-      {
-        text: `${t("action.no")}`,
-        onClick: (_, toastObject) => {
-          changeCurrentSyncStatus({
-            isInitialSync: true,
-            shouldSync: false,
-          })
-          toastObject.goAway(0)
-        },
-      },
-    ],
-  })
-}
-
 function setupTabStateSync() {
  const route = useRoute()

@@ -323,15 +302,9 @@ function setupTabStateSync() {
      const tabStateFromSync =
        await platform.sync.tabState.loadTabStateFromSync()

-      if (tabStateFromSync && !confirmSync.value.isInitialSync) {
+      if (tabStateFromSync) {
        tabStateForSync.value = tabStateFromSync
-        showSyncToast()
-        // Have to set isInitialSync to true here because the toast is shown
-        // and the user does not click on any of the actions
-        changeCurrentSyncStatus({
-          isInitialSync: true,
-          shouldSync: false,
-        })
+        confirmSync.value = true
      }
    }

--- a/packages/hoppscotch-common/src/pages/r/_id.vue
+++ b/packages/hoppscotch-common/src/pages/r/_id.vue
@@ -11,14 +11,6 @@
      <p class="mt-2 text-center">
        {{ t("error.invalid_link_description") }}
      </p>
-      <p class="mt-4">
-        <HoppButtonSecondary
-          to="/"
-          :icon="IconHome"
-          filled
-          :label="t('app.home')"
-        />
-      </p>
    </div>
    <div v-else class="flex flex-col items-center justify-center flex-1 p-4">
      <div
@@ -115,11 +107,6 @@ const addRequestToTab = () => {
  const data = shortcodeDetails.data

  if (E.isRight(data)) {
-    if (!data.right.shortcode?.request) {
-      invalidLink.value = true
-      return
-    }
-
    const request: unknown = JSON.parse(data.right.shortcode?.request as string)

    createNewTab({
--- a/packages/hoppscotch-selfhost-web/package.json
+++ b/packages/hoppscotch-selfhost-web/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@hoppscotch/selfhost-web",
  "private": true,
-  "version": "2023.4.6",
+  "version": "2023.4.3",
  "type": "module",
  "scripts": {
    "dev:vite": "vite",
--- a/packages/hoppscotch-sh-admin/package.json
+++ b/packages/hoppscotch-sh-admin/package.json
@@ -1,7 +1,7 @@
 {
  "name": "hoppscotch-sh-admin",
  "private": true,
-  "version": "2023.4.6",
+  "version": "2023.4.3",
  "type": "module",
  "scripts": {
    "dev": "pnpm exec npm-run-all -p -l dev:*",
--- a/packages/hoppscotch-sh-admin/src/helpers/auth.ts
+++ b/packages/hoppscotch-sh-admin/src/helpers/auth.ts
@@ -383,7 +383,7 @@ export const auth = {
      await this.signInWithEmailLink(deviceIdentifier, window.location.href);

      removeLocalConfig('deviceIdentifier');
-      window.location.href = import.meta.env.VITE_ADMIN_URL;
+      window.location.href = '/';
    }
  },
 };
--- a/packages/hoppscotch-ui/src/components/smart/Windows.vue
+++ b/packages/hoppscotch-ui/src/components/smart/Windows.vue
@@ -100,9 +100,7 @@
        </div>
      </div>

-      <div v-if="hasActions" :class="mdAndLarger ? 'w-64' : 'w-16'">
-        <slot name="actions" />
-      </div>
+      <slot name="actions" />

      <input
        type="range"
@@ -113,12 +111,10 @@
        :class="{
          '!block': scrollThumb.show,
        }"
-        :style="[
-          `--thumb-width: ${scrollThumb.width}px`,
-          `width: calc(100% - ${
-            hasActions ? (mdAndLarger ? '19rem' : '7rem') : '3rem'
-          })`,
-        ]"
+        :style="{
+          '--thumb-width': scrollThumb.width + 'px',
+        }"
+        style="width: calc(100% - 3rem)"
        id="myRange"
      />
    </div>
@@ -144,13 +140,8 @@ import {
  inject,
  watch,
  nextTick,
-  useSlots,
 } from "vue"
-import {
-  breakpointsTailwind,
-  useBreakpoints,
-  useElementSize,
-} from "@vueuse/core"
+import { useElementSize } from "@vueuse/core"
 import type { Slot } from "vue"
 import draggable from "vuedraggable-es"
 import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index"
@@ -173,9 +164,6 @@ export type TabProvider = {
  removeTabEntry: (tabID: string) => void
 }

-const breakpoints = useBreakpoints(breakpointsTailwind)
-const mdAndLarger = breakpoints.greater("md")
-
 const { t } = inject<HoppUIPluginOptions>(HOPP_UI_OPTIONS) ?? {}

 const props = withDefaults(
@@ -203,12 +191,6 @@ const emit = defineEmits<{
  (e: "addTab"): void
 }>()

-const slots = useSlots()
-
-const hasActions = computed(() => {
-  return !!slots.actions
-})
-
 const throwError = (message: string): never => {
  throw new Error(message)
 }
@@ -356,8 +338,8 @@ watch(
        rootMargin: "0px",
        threshold: 1.0,
      })
+      observer.observe(element!)

-      if (element) observer.observe(element)
      element?.scrollIntoView({ behavior: "smooth", inline: "center" })
    })
  },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml