fix: stringify rawValue in brunoVarInfo (#6281)

* refactor: update DeprecationWarning component to accept children and enhance deprecation messages for Presets and Post Response Vars

* refactor: update DeprecationWarning component to use props for feature names and links, enhancing deprecation messages across various components

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,9 @@
-### Description
+# Description
 
 <!-- Explain here the changes your PR introduces and text to help us understand the context of this change. -->
 
-#### Contribution Checklist:
+### Contribution Checklist:
 
-- [ ] **I've used AI significantly to create this pull request**
 - [ ] **The pull request only addresses one issue or adds one feature.**
 - [ ] **The pull request does not introduce any breaking changes**
 - [ ] **I have added screenshots or gifs to help explain the change if applicable.**
@@ -13,6 +12,6 @@
 
 Note: Keeping the PR small and focused helps make it easier to review and merge. If you have multiple changes you want to make, please consider submitting them as separate pull requests.
 
-#### Publishing to New Package Managers
+### Publishing to New Package Managers
 
 Please see [here](../publishing.md) for more information.

.github/actions/common/setup-node-deps/action.yml

@@ -23,5 +23,4 @@ runs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
-        npm run build:schema-types
         npm run build:bruno-filestore

.github/workflows/npm-bru-cli.yml

@@ -25,7 +25,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -40,7 +40,7 @@ jobs:
         run: |
           cd packages/bruno-tests/collection
           npm install
-          bru run --env Prod --output junit.xml --format junit --sandbox developer
+          bru run --env Prod --output junit.xml --format junit
 
       - name: Publish Test Report
         uses: dorny/test-reporter@v2

.github/workflows/ssl-tests.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps
@@ -44,7 +44,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps
@@ -73,7 +73,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -30,7 +30,6 @@ jobs:
           npm run sandbox:bundle-libraries --workspace=packages/bruno-js
           npm run build --workspace=packages/bruno-converters
           npm run build --workspace=packages/bruno-requests
-          npm run build --workspace=packages/bruno-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Lint Check
@@ -67,7 +66,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -84,7 +83,6 @@ jobs:
           npm run sandbox:bundle-libraries --workspace=packages/bruno-js
           npm run build --workspace=packages/bruno-converters
           npm run build --workspace=packages/bruno-requests
-          npm run build --workspace=packages/bruno-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Run Local Testbench
@@ -96,7 +94,7 @@ jobs:
         run: |
           cd packages/bruno-tests/collection
           npm install
-          node ../../bruno-cli/bin/bru.js run --env Prod --output junit.xml --format junit --sandbox developer
+          node ../../bruno-cli/bin/bru.js run --env Prod --output junit.xml --format junit
 
       - name: Publish Test Report
         uses: EnricoMi/publish-unit-test-result-action@v2
@@ -110,7 +108,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v5
     - uses: actions/setup-node@v5
       with:
         node-version: v22.11.x
@@ -136,13 +134,12 @@ jobs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
-        npm run build:schema-types
         npm run build:bruno-filestore
 
     - name: Run Playwright tests
       run: |
         xvfb-run npm run test:e2e
-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:
         name: playwright-report

.gitignore

@@ -51,12 +51,3 @@ bruno.iml
 
 # Playwright
 /blob-report/
-
-# Development plan files
-*.plan.md
-
-# packages dist
-packages/bruno-filestore/dist
-packages/bruno-requests/dist
-packages/bruno-schema-types/dist
-packages/bruno-converters/dist

CODING_STANDARDS.md

@@ -6,7 +6,7 @@
 
 - Use 2 spaces for indentation. No tabs, just spaces – keeps everything neat and uniform.
 
-- Stick to single quotes for strings. For JSX/TSX attributes, use double quotes (e.g., <svg xmlns="..." viewBox="...">) to follow React conventions.
+- Stick to single quotes for strings. Double quotes are cool elsewhere, but here we go single.
 
 - Always add semicolons at the end of statements. It's like putting a period at the end of a sentence – clarity matters.
 
@@ -34,40 +34,6 @@
 
 Remember, these rules are here to make our codebase harmonious. If something doesn't fit perfectly, let's chat about it. Happy coding! 🚀
 
-
-## Tests 
-
-- Add tests for any new functionality or meaningful changes. If code is added, removed, or significantly modified, corresponding tests should be updated or created.
- 
-- Prioritise high-value tests over maximum coverage. Focus on testing behaviour that is critical, complex, or likely to break—don’t chase coverage numbers for their own sake.
-
-- Write behaviour-driven tests, not implementation-driven ones. Tests should validate real expected output and observable behaviour, not internal details or mocked-out logic unless absolutely necessary.
-
-- Minimise mocking unless it meaningfully increases clarity or isolates external dependencies. Prefer real flows where practical; only mock external services, slow systems, or non-deterministic behaviour.
-
-- Keep tests readable and maintainable. Optimise for clarity over cleverness. Name tests descriptively, keep setup minimal, and avoid unnecessary abstraction.
-
-- Aim for tests that fail usefully. When a test fails, it should clearly indicate what behaviour broke and why.
-
-- Cover both the “happy path” and the realistically problematic paths. Validate expected success behaviour, but also validate error handling, edge cases, and degraded-mode behaviour when appropriate.
-
-- Ensure tests are deterministic and reproducible. No randomness, timing dependencies, or environment-specific assumptions without explicit control.
-
-- Avoid overfitting tests to current behaviour if future flexibility matters. Only assert what needs to be true, not incidental details.
-
-- Use consistent patterns and helper utilities where they improve clarity. Prefer shared test utilities over copy-pasted setup code, but only when it actually reduces complexity.
-
-- Tests should be fast enough to run continuously. Avoid long-running operations unless absolutely necessary; prefer lightweight fixtures and isolated units.
-
-
-## UI Specific instructions 
-
-### React
-
-- Use styled component's theme prop to manage CSS colors and not CSS variables when in the context of a styled component or any react component using the styled component 
-- Styled Components are used as wrappers to define both self and children components style, tailwind classes are used specifically for layout based styles. 
-- Styled Component CSS might also change layout but tailwind classes shouldn't define colors. 
-
 ## Readability and Abstractions
 
 - Avoid abstractions unless the exact same code is being used in more than 3 places.

contributing.md

@@ -70,7 +70,6 @@ npm run build:bruno-query
 npm run build:bruno-common
 npm run build:bruno-converters
 npm run build:bruno-requests
-npm run build:schema-types
 npm run build:bruno-filestore
 
 # bundle js sandbox libraries

eslint.config.js

@@ -1,6 +1,6 @@
 // eslint.config.js
-const { defineConfig } = require('eslint/config');
-const globals = require('globals');
+const { defineConfig } = require("eslint/config");
+const globals = require("globals");
 const { fixupPluginRules } = require('@eslint/compat');
 const eslintPluginDiff = require('eslint-plugin-diff');
 
@@ -11,18 +11,6 @@ const runESMImports = async () => {
 };
 
 module.exports = runESMImports().then(() => defineConfig([
-  // Global ignores - must be a standalone object with ONLY ignores
-  {
-    ignores: [
-      '**/node_modules/**/*',
-      '**/dist/**/*',
-      '**/*.bru',
-      'packages/bruno-js/src/sandbox/bundle-browser-rollup.js',
-      'packages/bruno-app/public/static/**/*',
-      'packages/bruno-app/.next/**/*',
-      'packages/bruno-electron/web/**/*'
-    ]
-  },
   {
     plugins: {
       'diff': fixupPluginRules(eslintPluginDiff),
@@ -46,13 +34,13 @@ module.exports = runESMImports().then(() => defineConfig([
       'packages/bruno-converters/**/*.js',
       'packages/bruno-electron/**/*.js',
       'packages/bruno-filestore/**/*.ts',
-      'packages/bruno-schema-types/**/*.ts',
       'packages/bruno-js/**/*.js',
       'packages/bruno-lang/**/*.js',
       'packages/bruno-requests/**/*.ts',
       'packages/bruno-requests/**/*.js',
       'packages/bruno-tests/**/*.{js,ts}'
     ],
+    processor: 'diff/diff',
     rules: {
       ...stylistic.configs.customize({
         indent: 2,
@@ -68,7 +56,7 @@ module.exports = runESMImports().then(() => defineConfig([
         minElements: 2,
         consistent: true
       }],
-      '@stylistic/function-paren-newline': ['off'],
+      '@stylistic/function-paren-newline': ['error', 'never'],
       '@stylistic/array-bracket-spacing': ['error', 'never'],
       '@stylistic/arrow-spacing': ['error', { before: true, after: true }],
       '@stylistic/function-call-spacing': ['error', 'never'],
@@ -76,14 +64,12 @@ module.exports = runESMImports().then(() => defineConfig([
       '@stylistic/padding-line-between-statements': ['off'],
       '@stylistic/semi-style': ['error', 'last'],
       '@stylistic/max-len': ['off'],
-      '@stylistic/jsx-one-expression-per-line': ['off'],
-      '@stylistic/max-statements-per-line': ['off'],
-      '@stylistic/no-mixed-operators': ['off']
+      '@stylistic/jsx-one-expression-per-line': ['off']
     }
   },
   {
-    files: ['packages/bruno-app/**/*.{js,jsx,ts}'],
-    ignores: ['**/*.config.js', '**/public/**/*'],
+    files: ["packages/bruno-app/**/*.{js,jsx,ts}"],
+    ignores: ["**/*.config.js", "**/public/**/*"],
     languageOptions: {
       globals: {
         ...globals.browser,
@@ -96,114 +82,114 @@ module.exports = runESMImports().then(() => defineConfig([
       },
       parserOptions: {
         ecmaFeatures: {
-          jsx: true
-        }
-      }
+          jsx: true,
+        },
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
     // It prevents lint errors when using CommonJS exports (module.exports) in Jest mocks.
-    files: ['packages/bruno-app/src/test-utils/mocks/codemirror.js'],
+    files: ["packages/bruno-app/src/test-utils/mocks/codemirror.js"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
-      }
+        ...globals.jest,
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-cli/**/*.js'],
-    ignores: ['**/*.config.js'],
+    files: ["packages/bruno-cli/**/*.js"],
+    ignores: ["**/*.config.js"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
+        ...globals.jest,
       },
       parserOptions: {
-        ecmaVersion: 'latest'
-      }
-    },
-    rules: {
-      'no-undef': 'error'
-    }
-  },
-  {
-    files: ['packages/bruno-common/**/*.ts'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest
+        ecmaVersion: "latest"
       },
-      parser: require('@typescript-eslint/parser'),
-      parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        project: './packages/bruno-common/tsconfig.json'
-      }
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-converters/**/*.js'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
+    files: ["packages/bruno-common/**/*.ts"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
+        ...globals.jest,
+      },
+      parser: require("@typescript-eslint/parser"),
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: "./packages/bruno-common/tsconfig.json",
+      },
+    },
+    rules: {
+      "no-undef": "error",
+    },
+  },
+  {
+    files: ["packages/bruno-converters/**/*.js"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
       },
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module'
-      }
-    },
-    rules: {
-      'no-undef': 'error'
-    }
-  },
-  {
-    files: ['packages/bruno-electron/**/*.js'],
-    ignores: ['**/*.config.js', '**/web/**/*'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest
-      }
-    },
-    rules: {
-      'no-undef': 'error'
-    }
-  },
-  {
-    files: ['packages/bruno-filestore/**/*.ts'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest
+        ecmaVersion: "latest",
+        sourceType: "module",
       },
-      parser: require('@typescript-eslint/parser'),
-      parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        project: './packages/bruno-filestore/tsconfig.json'
-      }
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-js/**/*.js'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
+    files: ["packages/bruno-electron/**/*.js"],
+    ignores: ["**/*.config.js", "**/web/**/*"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+    },
+    rules: {
+      "no-undef": "error",
+    },
+  },
+  {
+    files: ["packages/bruno-filestore/**/*.ts"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+      parser: require("@typescript-eslint/parser"),
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: "./packages/bruno-filestore/tsconfig.json",
+      },
+    },
+    rules: {
+      "no-undef": "error",
+    },
+  },
+  {
+    files: ["packages/bruno-js/**/*.js"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
     languageOptions: {
       globals: {
         ...globals.node,
@@ -214,65 +200,65 @@ module.exports = runESMImports().then(() => defineConfig([
         typeDetectGlobalObject: false
       },
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module'
-      }
+        ecmaVersion: "latest",
+        sourceType: "module",
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-lang/**/*.js'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
+    files: ["packages/bruno-lang/**/*.js"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
+        ...globals.jest,
       },
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module'
-      }
+        ecmaVersion: "latest",
+        sourceType: "module",
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-requests/**/*.ts'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
+    files: ["packages/bruno-requests/**/*.ts"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
+        ...globals.jest,
       },
-      parser: require('@typescript-eslint/parser'),
+      parser: require("@typescript-eslint/parser"),
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        project: './packages/bruno-requests/tsconfig.json'
-      }
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: "./packages/bruno-requests/tsconfig.json",
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
+      "no-undef": "error",
+    },
   },
   {
-    files: ['packages/bruno-requests/**/*.js'],
-    ignores: ['**/*.config.js', '**/dist/**/*'],
+    files: ["packages/bruno-requests/**/*.js"],
+    ignores: ["**/*.config.js", "**/dist/**/*"],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest
+        ...globals.jest,
       },
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module'
-      }
+        ecmaVersion: "latest",
+        sourceType: "module",
+      },
     },
     rules: {
-      'no-undef': 'error'
-    }
-  }
+      "no-undef": "error",
+    },
+  },
 ]));

package.json

@@ -8,7 +8,6 @@
     "packages/bruno-common",
     "packages/bruno-converters",
     "packages/bruno-schema",
-    "packages/bruno-schema-types",
     "packages/bruno-query",
     "packages/bruno-js",
     "packages/bruno-lang",
@@ -62,7 +61,6 @@
     "build:bruno-converters": "npm run build --workspace=packages/bruno-converters",
     "build:bruno-query": "npm run build --workspace=packages/bruno-query",
     "build:graphql-docs": "npm run build --workspace=packages/bruno-graphql-docs",
-    "build:schema-types": "npm run build --workspace=packages/bruno-schema-types",
     "build:electron": "node ./scripts/build-electron.js",
     "build:electron:mac": "./scripts/build-electron.sh mac",
     "build:electron:win": "./scripts/build-electron.sh win",

packages/bruno-app/babel.config.js

@@ -6,4 +6,4 @@ module.exports = {
     }]
   ],
   plugins: ['babel-plugin-styled-components']
-};
+};

packages/bruno-app/jest.config.js

@@ -1,10 +1,10 @@
 module.exports = {
   rootDir: '.',
   transform: {
-    '^.+\\.[jt]sx?$': 'babel-jest'
+    '^.+\\.[jt]sx?$': 'babel-jest',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!strip-json-comments|nanoid|xml-formatter)/'
+    "/node_modules/(?!strip-json-comments|nanoid|xml-formatter)/",
   ],
   moduleNameMapper: {
     '^assets/(.*)$': '<rootDir>/src/assets/$1',
@@ -22,9 +22,9 @@ module.exports = {
   testEnvironment: 'jsdom',
   setupFilesAfterEnv: ['@testing-library/jest-dom'],
   setupFiles: [
-    '<rootDir>/jest.setup.js'
+    '<rootDir>/jest.setup.js',
   ],
   testMatch: [
     '<rootDir>/src/**/*.spec.[jt]s?(x)'
   ]
-};
+};

packages/bruno-app/package.json

@@ -21,8 +21,6 @@
     "@usebruno/common": "0.1.0",
     "@usebruno/graphql-docs": "0.1.0",
     "@usebruno/schema": "0.7.0",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/xterm": "^5.5.0",
     "classnames": "^2.3.1",
     "codemirror": "5.65.2",
     "codemirror-graphql": "2.1.1",
@@ -45,8 +43,6 @@
     "idb": "^7.0.0",
     "immer": "^9.0.15",
     "jsesc": "^3.0.2",
-    "js-yaml": "^4.1.0",
-    "xml2js": "^0.6.2",
     "jshint": "^2.13.6",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.2.1",
@@ -85,7 +81,6 @@
     "shell-quote": "^1.8.3",
     "strip-json-comments": "^5.0.1",
     "styled-components": "^5.3.3",
-    "swagger-ui-react": "5.17.12",
     "system": "^2.0.1",
     "url": "^0.11.3",
     "xml-formatter": "^3.5.0",

packages/bruno-app/public/theme/dark.js

@@ -1,6 +1,6 @@
 const darkTheme = {
-  'brand': '#546de5',
-  'text': 'rgb(52 52 52)',
+  brand: '#546de5',
+  text: 'rgb(52 52 52)',
   'primary-text': '#ffffff',
   'primary-theme': '#1e1e1e',
   'secondary-text': '#929292',

packages/bruno-app/public/theme/light.js

@@ -1,6 +1,6 @@
 const lightTheme = {
-  'brand': '#546de5',
-  'text': 'rgb(52 52 52)',
+  brand: '#546de5',
+  text: 'rgb(52 52 52)',
   'primary-text': 'rgb(52 52 52)',
   'primary-theme': '#ffffff',
   'secondary-text': '#929292',

packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/Plugins/Yaml/index.js

@@ -1,129 +0,0 @@
-const yamlPlugin = (cm) => {
-  cm.defineMode('yaml', function () {
-    var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
-    var keywordRegex = new RegExp('\\b((' + cons.join(')|(') + '))$', 'i');
-
-    return {
-      token: function (stream, state) {
-        var ch = stream.peek();
-        var esc = state.escaped;
-        state.escaped = false;
-        /* comments */
-        if (ch == '#' && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-          stream.skipToEnd();
-          return 'comment';
-        }
-
-        if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/)) return 'string';
-
-        if (state.literal && stream.indentation() > state.keyCol) {
-          stream.skipToEnd();
-          return 'string';
-        } else if (state.literal) {
-          state.literal = false;
-        }
-        if (stream.sol()) {
-          state.keyCol = 0;
-          state.pair = false;
-          state.pairStart = false;
-          /* document start */
-          if (stream.match('---')) {
-            return 'def';
-          }
-          /* document end */
-          if (stream.match('...')) {
-            return 'def';
-          }
-          /* array list item */
-          if (stream.match(/\s*-\s+/)) {
-            return 'meta';
-          }
-        }
-        /* inline pairs/lists */
-        if (stream.match(/^(\{|\}|\[|\])/)) {
-          if (ch == '{') state.inlinePairs++;
-          else if (ch == '}') state.inlinePairs--;
-          else if (ch == '[') state.inlineList++;
-          else state.inlineList--;
-          return 'meta';
-        }
-
-        /* list separator */
-        if (state.inlineList > 0 && !esc && ch == ',') {
-          stream.next();
-          return 'meta';
-        }
-        /* pairs separator */
-        if (state.inlinePairs > 0 && !esc && ch == ',') {
-          state.keyCol = 0;
-          state.pair = false;
-          state.pairStart = false;
-          stream.next();
-          return 'meta';
-        }
-
-        /* start of value of a pair */
-        if (state.pairStart) {
-          /* block literals */
-          if (stream.match(/^\s*(\||\>)\s*/)) {
-            state.literal = true;
-            return 'meta';
-          }
-          /* references */
-          if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) {
-            return 'variable-2';
-          }
-          /* numbers */
-          if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) {
-            return 'number';
-          }
-          if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) {
-            return 'number';
-          }
-          /* keywords */
-          if (stream.match(keywordRegex)) {
-            return 'keyword';
-          }
-        }
-
-        /* pairs (associative arrays) -> key */
-        if (
-          !state.pair
-          && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^\s,\[\]{}#&*!|>'"%@`])[^#:]*(?=:($|\s))/)
-        ) {
-          state.pair = true;
-          state.keyCol = stream.indentation();
-          return 'atom';
-        }
-        if (state.pair && stream.match(/^:\s*/)) {
-          state.pairStart = true;
-          return 'meta';
-        }
-
-        /* nothing found, continue */
-        state.pairStart = false;
-        state.escaped = ch == '\\';
-        stream.next();
-        return null;
-      },
-      startState: function () {
-        return {
-          pair: false,
-          pairStart: false,
-          keyCol: 0,
-          inlinePairs: 0,
-          inlineList: 0,
-          literal: false,
-          escaped: false
-        };
-      },
-      lineComment: '#',
-      fold: 'indent'
-    };
-  });
-
-  cm.defineMIME('text/x-yaml', 'yaml');
-  cm.defineMIME('text/yaml', 'yaml');
-};
-
-export default yamlPlugin;

packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/StyledWrapper.js

@@ -1,65 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  div.CodeMirror {
-    height: calc(100vh - 4rem);
-    background: ${(props) => props.theme.codemirror.bg};
-    border: solid 1px ${(props) => props.theme.codemirror.border};
-    font-family: ${(props) => (props.font ? props.font : 'default')};
-    line-break: anywhere;
-  }
-
-  .CodeMirror-dialog {
-    overflow: visible;
-    input {
-      background: transparent;
-      border: 1px solid #d3d6db;
-      outline: none;
-      border-radius: 0px;
-    }
-  }
-
-  .CodeMirror-overlayscroll-horizontal div,
-  .CodeMirror-overlayscroll-vertical div {
-    background: #d2d7db;
-  }
-
-  textarea.cm-editor {
-    position: relative;
-  }
-
-  // Todo: dark mode temporary fix
-  // Clean this
-  .CodeMirror.cm-s-monokai {
-    .CodeMirror-overlayscroll-horizontal div,
-    .CodeMirror-overlayscroll-vertical div {
-      background: #444444;
-    }
-  }
-
-  .cm-s-monokai span.cm-property,
-  .cm-s-monokai span.cm-attribute {
-    color: #9cdcfe !important;
-  }
-
-  .cm-s-monokai span.cm-string {
-    color: #ce9178 !important;
-  }
-
-  .cm-s-monokai span.cm-number {
-    color: #b5cea8 !important;
-  }
-
-  .cm-s-monokai span.cm-atom {
-    color: #569cd6 !important;
-  }
-
-  .cm-variable-valid {
-    color: green;
-  }
-  .cm-variable-invalid {
-    color: red;
-  }
-`;
-
-export default StyledWrapper;

packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/index.js

@@ -1,138 +0,0 @@
-/**
- *  Copyright (c) 2021 GraphQL Contributors.
- *
- *  This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
- */
-
-import React from 'react';
-import StyledWrapper from './StyledWrapper';
-import yamlPlugin from './Plugins/Yaml/index';
-
-let CodeMirror;
-const SERVER_RENDERED = typeof window === 'undefined' || global['PREVENT_CODEMIRROR_RENDER'] === true;
-
-if (!SERVER_RENDERED) {
-  CodeMirror = require('codemirror');
-}
-
-export default class CodeEditor extends React.Component {
-  constructor(props) {
-    super(props);
-    this.cachedValue = props.value || '';
-    this.variables = {};
-    this.lintOptions = {
-      esversion: 11,
-      expr: true,
-      asi: true
-    };
-  }
-
-  componentWillMount() {
-    switch (this.props.mode) {
-      case 'yaml':
-        // YAML linting and hightlighting plugin
-        yamlPlugin(CodeMirror);
-        break;
-      default:
-        break;
-    }
-  }
-
-  componentDidMount() {
-    const editor = (this.editor = CodeMirror(this._node, {
-      value: this.props.value || '',
-      lineNumbers: true,
-      lineWrapping: true,
-      tabSize: 2,
-      mode: this.props.mode || 'application/text',
-      keyMap: 'sublime',
-      autoCloseBrackets: true,
-      matchBrackets: true,
-      showCursorWhenSelecting: true,
-      foldGutter: true,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
-      lint: this.lintOptions,
-      readOnly: this.props.readOnly,
-      scrollbarStyle: 'overlay',
-      theme: this.props.theme === 'dark' ? 'monokai' : 'default',
-      extraKeys: {
-        'Cmd-S': () => {
-          if (this.props.onSave) {
-            this.props.onSave();
-          }
-        },
-        'Ctrl-S': () => {
-          if (this.props.onSave) {
-            this.props.onSave();
-          }
-        },
-        'Cmd-F': 'findPersistent',
-        'Ctrl-F': 'findPersistent',
-        'Cmd-H': 'replace',
-        'Ctrl-H': 'replace',
-        'Tab': function (cm) {
-          cm.getSelection().includes('\n') || editor.getLine(cm.getCursor().line) == cm.getSelection()
-            ? cm.execCommand('indentMore')
-            : cm.replaceSelection('  ', 'end');
-        },
-        'Shift-Tab': 'indentLess',
-        'Ctrl-Space': 'autocomplete',
-        'Cmd-Space': 'autocomplete',
-        'Ctrl-Y': 'foldAll',
-        'Cmd-Y': 'foldAll',
-        'Ctrl-I': 'unfoldAll',
-        'Cmd-I': 'unfoldAll'
-      }
-    }));
-    if (editor) {
-      editor.setOption('lint', this.props.mode && editor.getValue().trim().length > 0 ? this.lintOptions : false);
-      editor.on('change', this._onEdit);
-    }
-  }
-
-  componentDidUpdate(prevProps) {
-    this.ignoreChangeEvent = true;
-    if (this.props.value !== prevProps.value && this.props.value !== this.cachedValue && this.editor) {
-      this.cachedValue = this.props.value;
-      this.editor.setValue(this.props.value);
-    }
-    if (this.props.theme !== prevProps.theme && this.editor) {
-      this.editor.setOption('theme', this.props.theme === 'dark' ? 'monokai' : 'default');
-    }
-    this.ignoreChangeEvent = false;
-  }
-
-  componentWillUnmount() {
-    if (this.editor) {
-      this.editor.off('change', this._onEdit);
-      this.editor = null;
-    }
-  }
-
-  render() {
-    if (this.editor) {
-      this.editor.refresh();
-    }
-    return (
-      <StyledWrapper
-        className="h-full w-full graphiql-container"
-        aria-label="Code Editor"
-        font={this.props.font}
-        ref={(node) => {
-          this._node = node;
-        }}
-      />
-    );
-  }
-
-  _onEdit = () => {
-    if (!this.ignoreChangeEvent && this.editor) {
-      this.editor.setOption('lint', this.editor.getValue().trim().length > 0 ? this.lintOptions : false);
-      this.cachedValue = this.editor.getValue();
-      if (this.props.onEdit) {
-        this.props.onEdit(this.cachedValue);
-      }
-    }
-  };
-}

packages/bruno-app/src/components/ApiSpecPanel/FileEditor/index.js

@@ -1,51 +0,0 @@
-import get from 'lodash/get';
-import { useTheme } from 'providers/Theme';
-import { useDispatch, useSelector } from 'react-redux';
-import CodeEditor from './CodeEditor/index';
-import { IconDeviceFloppy } from '@tabler/icons';
-import { saveApiSpecToFile } from 'providers/ReduxStore/slices/apiSpec';
-import { useState } from 'react';
-
-const FileEditor = ({ apiSpec }) => {
-  const dispatch = useDispatch();
-  const { displayedTheme, theme } = useTheme();
-  const preferences = useSelector((state) => state.app.preferences);
-
-  const [content, setContent] = useState(apiSpec?.raw);
-
-  const onEdit = (value) => {
-    setContent(value);
-  };
-
-  const onSave = () => {
-    dispatch(saveApiSpecToFile({ uid: apiSpec?.uid, content }));
-  };
-
-  const hasChanges = Boolean(content != apiSpec?.raw);
-
-  const editorMode = 'yaml';
-
-  return (
-    <div className="flex flex-grow relative">
-      <CodeEditor
-        theme={displayedTheme}
-        value={content}
-        onEdit={onEdit}
-        onSave={onSave}
-        mode={editorMode}
-        font={get(preferences, 'font.codeFont', 'default')}
-      />
-      <IconDeviceFloppy
-        onClick={onSave}
-        color={hasChanges ? theme.colors.text.yellow : theme.requestTabs.icon.color}
-        strokeWidth={1.5}
-        size={22}
-        className={`absolute right-0 top-0 m-4 ${
-          hasChanges ? 'cursor-pointer oapcity-100' : 'cursor-default opacity-50'
-        }`}
-      />
-    </div>
-  );
-};
-
-export default FileEditor;

packages/bruno-app/src/components/ApiSpecPanel/Renderers/Swagger/StyledWrapper.js

@@ -1,19 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  .swagger-root {
-    height: calc(100vh - 4rem);
-    border: solid 1px ${(props) => props.theme.codemirror.border};
-
-    &.dark {
-      .swagger-ui {
-        filter: invert(88%) hue-rotate(180deg);
-      }
-      .swagger-ui .microlight {
-        filter: invert(100%) hue-rotate(180deg);
-      }
-    }
-  }
-`;
-
-export default StyledWrapper;

packages/bruno-app/src/components/ApiSpecPanel/Renderers/Swagger/index.js

@@ -1,19 +0,0 @@
-import SwaggerUI from 'swagger-ui-react';
-import StyledWrapper from './StyledWrapper';
-import { useTheme } from 'providers/Theme';
-
-const Swagger = ({ string }) => {
-  const { displayedTheme } = useTheme();
-
-  console.log('string', string);
-
-  return (
-    <StyledWrapper>
-      <div className={`swagger-root w-full overflow-y-scroll ${displayedTheme}`}>
-        <SwaggerUI spec={string} />
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default Swagger;

packages/bruno-app/src/components/ApiSpecPanel/StyledWrapper.js

@@ -1,22 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  .menu-icon {
-    cursor: pointer;
-    color: ${(props) => props.theme.sidebar.dropdownIcon.color};
-  }
-
-  div.dropdown-item.menu-item {
-    color: ${(props) => props.theme.colors.danger};
-    &:hover {
-      background-color: ${(props) => props.theme.colors.bg.danger};
-      color: white;
-    }
-  }
-
-  .react-tooltip {
-    z-index: 10;
-  }
-`;
-
-export default StyledWrapper;

packages/bruno-app/src/components/ApiSpecPanel/index.js

@@ -1,97 +0,0 @@
-import React, { forwardRef, useRef } from 'react';
-import find from 'lodash/find';
-import { useSelector, useDispatch } from 'react-redux';
-import { IconFileCode, IconDots } from '@tabler/icons';
-import StyledWrapper from './StyledWrapper';
-import FileEditor from './FileEditor';
-import Dropdown from 'components/Dropdown';
-import { openApiSpec } from 'providers/ReduxStore/slices/apiSpec';
-import { useState } from 'react';
-import CreateApiSpec from 'components/Sidebar/ApiSpecs/CreateApiSpec';
-import { Suspense } from 'react';
-import Swagger from './Renderers/Swagger';
-import toast from 'react-hot-toast';
-
-const ApiSpecPanel = () => {
-  const dispatch = useDispatch();
-
-  const [createApiSpecModalOpen, setCreateApiSpecModalOpen] = useState(false);
-
-  const { apiSpecs, activeApiSpecUid } = useSelector((state) => state.apiSpec);
-
-  const dropdownTippyRef = useRef();
-  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
-
-  let apiSpec = find(apiSpecs, (c) => c.uid === activeApiSpecUid);
-  const { filename, pathname, raw, uid } = apiSpec || {};
-  if (!uid) {
-    return <div className="p-4 opacity-50">API Spec not found!</div>;
-  }
-
-  const MenuIcon = forwardRef((props, ref) => {
-    return (
-      <div ref={ref}>
-        <IconDots size={22} />
-      </div>
-    );
-  });
-
-  const handleOpenApiSpec = () => {
-    dispatch(openApiSpec()).catch(
-      (err) => console.log(err) && toast.error('An error occurred while opening the API spec')
-    );
-  };
-
-  return (
-    <StyledWrapper className="flex flex-col flex-grow relative">
-      {createApiSpecModalOpen ? <CreateApiSpec onClose={() => setCreateApiSpecModalOpen(false)} /> : null}
-      <div className="p-3 mb-2 w-full flex flex-row justify-between grid grid-cols-3">
-        <div className="flex flex-row justify-start gap-x-4 col-span-1">
-          <div className="flex w-fit items-center cursor-pointer">
-            <IconFileCode size={18} strokeWidth={1.5} />
-            <span className="ml-2 mr-4 font-semibold">API Designer</span>
-          </div>
-        </div>
-        <div className="w-full col-span-1 flex justify-center" title={pathname}>
-          {filename}
-        </div>
-        <div className="menu-icon pr-2 col-span-1 flex justify-end">
-          <Dropdown onCreate={onDropdownCreate} icon={<MenuIcon />} placement="bottom-start">
-            <div
-              className="dropdown-item"
-              onClick={(e) => {
-                dropdownTippyRef.current.hide();
-                setCreateApiSpecModalOpen(true);
-              }}
-            >
-              Create API Spec
-            </div>
-            <div
-              className="dropdown-item"
-              onClick={(e) => {
-                dropdownTippyRef.current.hide();
-                handleOpenApiSpec();
-              }}
-            >
-              Open API Spec
-            </div>
-          </Dropdown>
-        </div>
-      </div>
-      <section className="main flex flex-grow px-4 relative">
-        <div className="w-full grid grid-cols-2">
-          <div className="col-span-1">
-            <FileEditor apiSpec={apiSpec} />
-          </div>
-          <div className="col-span-1">
-            <Suspense fallback="">
-              <Swagger string={raw} />
-            </Suspense>
-          </div>
-        </div>
-      </section>
-    </StyledWrapper>
-  );
-};
-
-export default ApiSpecPanel;

packages/bruno-app/src/components/AppTitleBar/StyledWrapper.js

@@ -1,198 +0,0 @@
-import styled from 'styled-components';
-
-const Wrapper = styled.div`
-  height: 36px;
-  display: flex;
-  align-items: center;
-  background: ${(props) => props.theme.sidebar.bg};
-  border-bottom: 1px solid ${(props) => props.theme.sidebar.collection.item.hoverBg};
-  -webkit-app-region: drag;
-  user-select: none;
-
-  .titlebar-content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    height: 100%;
-    padding: 0 12px;
-    padding-left: 70px; /* Space for macOS window controls */
-    transition: padding-left 0.15s ease;
-  }
-
-  /* When in full screen, no traffic lights so reduce padding */
-  &.fullscreen .titlebar-content {
-    padding-left: 4px;
-  }
-
-  /* Remove drag region from interactive elements */
-  .workspace-name-container,
-  .dropdown-item,
-  .home-button,
-  .dropdown,
-  button {
-    -webkit-app-region: no-drag;
-  }
-
-  /* Left section */
-  .titlebar-left {
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    margin-left: 10px;
-    -webkit-app-region: no-drag;
-  }
-
-  /* When in full screen, no traffic lights so remove margin-left */
-  &.fullscreen .titlebar-left {
-    margin-left: 0px;
-  }
-
-  /* Workspace Name Dropdown Trigger */
-  .workspace-name-container {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 5px 10px;
-    border-radius: 6px;
-    cursor: pointer;
-    transition: all 0.15s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
-    }
-
-    .workspace-name {
-      font-size: 13px;
-      font-weight: 500;
-      color: ${(props) => props.theme.sidebar.color};
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      max-width: 180px;
-    }
-
-    .chevron-icon {
-      flex-shrink: 0;
-      color: ${(props) => props.theme.sidebar.muted};
-      transition: transform 0.2s ease;
-    }
-  }
-
-  /* Center section - Bruno branding */
-  .titlebar-center {
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%);
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    pointer-events: none;
-
-    .bruno-text {
-      font-size: 13px;
-      font-weight: 600;
-      color: ${(props) => props.theme.text};
-      letter-spacing: 0.5px;
-    }
-  }
-
-  /* Right section */
-  .titlebar-right {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    flex-shrink: 0;
-  }
-
-  /* Workspace Dropdown Styles */
-  .workspace-item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 4px 10px !important;
-    margin: 0 !important;
-
-    &.active {
-      .check-icon {
-        opacity: 1;
-      }
-    }
-
-    &:hover {
-      .pin-btn:not(.pinned) {
-        opacity: 1;
-      }
-    }
-
-    .workspace-name {
-      flex: 1;
-      min-width: 0;
-      font-size: 13px;
-      font-weight: 400;
-      color: ${(props) => props.theme.dropdown.color};
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .workspace-actions {
-      display: flex;
-      align-items: center;
-      gap: 4px;
-      margin-left: 8px;
-      flex-shrink: 0;
-      pointer-events: none;
-
-      > * {
-        pointer-events: auto;
-      }
-    }
-
-    .check-icon {
-      color: ${(props) => props.theme.workspace?.accent || props.theme.colors?.text?.yellow};
-      flex-shrink: 0;
-    }
-
-    .pin-btn {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 22px;
-      height: 22px;
-      padding: 0;
-      border: none;
-      background: transparent;
-      border-radius: 4px;
-      cursor: pointer;
-      color: ${(props) => props.theme.dropdown.mutedText};
-      transition: background 0.15s ease, color 0.15s ease, opacity 0.15s ease;
-      opacity: 0;
-
-      &.pinned {
-        opacity: 1;
-      }
-
-      &:hover {
-        background: ${(props) => props.theme.dropdown.hoverBg};
-        color: ${(props) => props.theme.dropdown.mutedText};
-      }
-    }
-  }
-
-  /* Adjust for non-macOS platforms */
-  body:not(.os-mac) & {
-    .titlebar-content {
-      padding-left: 12px;
-    }
-  }
-
-  /* Leave room for Windows caption buttons when the overlay is enabled */
-  body.os-windows & {
-    .titlebar-content {
-      padding-right: 120px;
-    }
-  }
-`;
-
-export default Wrapper;

packages/bruno-app/src/components/AppTitleBar/index.js

@@ -1,252 +0,0 @@
-import React from 'react';
-import { IconCheck, IconChevronDown, IconFolder, IconHome, IconLayoutColumns, IconLayoutRows, IconPin, IconPinned, IconPlus } from '@tabler/icons';
-import { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
-import toast from 'react-hot-toast';
-import { useDispatch, useSelector } from 'react-redux';
-
-import { savePreferences, showHomePage, toggleSidebarCollapse } from 'providers/ReduxStore/slices/app';
-import { closeConsole, openConsole } from 'providers/ReduxStore/slices/logs';
-import { openWorkspaceDialog, switchWorkspace } from 'providers/ReduxStore/slices/workspaces/actions';
-import { sortWorkspaces, toggleWorkspacePin } from 'utils/workspaces';
-
-import Bruno from 'components/Bruno';
-import MenuDropdown from 'ui/MenuDropdown';
-import ActionIcon from 'ui/ActionIcon';
-import IconSidebarToggle from 'components/Icons/IconSidebarToggle';
-import CreateWorkspace from 'components/WorkspaceSidebar/CreateWorkspace';
-
-import IconBottombarToggle from 'components/Icons/IconBottombarToggle/index';
-import StyledWrapper from './StyledWrapper';
-import { toTitleCase } from 'utils/common/index';
-
-const AppTitleBar = () => {
-  const dispatch = useDispatch();
-  const [isFullScreen, setIsFullScreen] = useState(false);
-
-  // Listen for fullscreen changes
-  useEffect(() => {
-    const { ipcRenderer } = window;
-    if (!ipcRenderer) return;
-
-    const removeEnterFullScreenListener = ipcRenderer.on('main:enter-full-screen', () => {
-      setIsFullScreen(true);
-    });
-
-    const removeLeaveFullScreenListener = ipcRenderer.on('main:leave-full-screen', () => {
-      setIsFullScreen(false);
-    });
-
-    return () => {
-      removeEnterFullScreenListener();
-      removeLeaveFullScreenListener();
-    };
-  }, []);
-
-  // Get workspace info
-  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
-  const preferences = useSelector((state) => state.app.preferences);
-  const sidebarCollapsed = useSelector((state) => state.app.sidebarCollapsed);
-  const isConsoleOpen = useSelector((state) => state.logs.isConsoleOpen);
-  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid);
-
-  // Sort workspaces according to preferences
-  const sortedWorkspaces = useMemo(() => {
-    return sortWorkspaces(workspaces, preferences);
-  }, [workspaces, preferences]);
-
-  const [createWorkspaceModalOpen, setCreateWorkspaceModalOpen] = useState(false);
-
-  const WorkspaceName = forwardRef((props, ref) => {
-    return (
-      <div ref={ref} className="workspace-name-container" {...props}>
-        <span className="workspace-name">{toTitleCase(activeWorkspace?.name) || 'Default Workspace'}</span>
-        <IconChevronDown size={14} stroke={1.5} className="chevron-icon" />
-      </div>
-    );
-  });
-
-  const handleHomeClick = () => {
-    dispatch(showHomePage());
-  };
-
-  const handleWorkspaceSwitch = (workspaceUid) => {
-    dispatch(switchWorkspace(workspaceUid));
-    toast.success(`Switched to ${workspaces.find((w) => w.uid === workspaceUid)?.name}`);
-  };
-
-  const handleOpenWorkspace = async () => {
-    try {
-      await dispatch(openWorkspaceDialog());
-      toast.success('Workspace opened successfully');
-    } catch (error) {
-      toast.error(error.message || 'Failed to open workspace');
-    }
-  };
-
-  const handleCreateWorkspace = () => {
-    setCreateWorkspaceModalOpen(true);
-  };
-
-  const handlePinWorkspace = useCallback((workspaceUid, e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    const newPreferences = toggleWorkspacePin(workspaceUid, preferences);
-    dispatch(savePreferences(newPreferences));
-  }, [dispatch, preferences]);
-
-  const orientation = preferences?.layout?.responsePaneOrientation || 'horizontal';
-
-  const handleToggleSidebar = () => {
-    dispatch(toggleSidebarCollapse());
-  };
-
-  const handleToggleDevtools = () => {
-    if (isConsoleOpen) {
-      dispatch(closeConsole());
-    } else {
-      dispatch(openConsole());
-    }
-  };
-
-  const handleToggleVerticalLayout = () => {
-    const newOrientation = orientation === 'horizontal' ? 'vertical' : 'horizontal';
-    const updatedPreferences = {
-      ...preferences,
-      layout: {
-        ...preferences?.layout || {},
-        responsePaneOrientation: newOrientation
-      }
-    };
-    dispatch(savePreferences(updatedPreferences));
-  };
-
-  // Build workspace menu items
-  const workspaceMenuItems = useMemo(() => {
-    const items = sortedWorkspaces.map((workspace) => {
-      const isActive = workspace.uid === activeWorkspaceUid;
-      const isPinned = preferences?.workspaces?.pinnedWorkspaceUids?.includes(workspace.uid);
-
-      return {
-        id: workspace.uid,
-        label: toTitleCase(workspace.name),
-        onClick: () => handleWorkspaceSwitch(workspace.uid),
-        className: `workspace-item ${isActive ? 'active' : ''}`,
-        rightSection: (
-          <div className="workspace-actions">
-            {workspace.type !== 'default' && (
-              <ActionIcon
-                className={`pin-btn ${isPinned ? 'pinned' : ''}`}
-                onClick={(e) => handlePinWorkspace(workspace.uid, e)}
-                label={isPinned ? 'Unpin workspace' : 'Pin workspace'}
-                size="sm"
-              >
-                {isPinned ? (
-                  <IconPinned size={14} stroke={1.5} />
-                ) : (
-                  <IconPin size={14} stroke={1.5} />
-                )}
-              </ActionIcon>
-            )}
-            {isActive && <IconCheck size={16} stroke={1.5} className="check-icon" />}
-          </div>
-        )
-      };
-    });
-
-    // Add label and action items
-    items.push(
-      { type: 'label', label: 'Workspaces' },
-      {
-        id: 'create-workspace',
-        leftSection: IconPlus,
-        label: 'Create workspace',
-        onClick: handleCreateWorkspace
-      },
-      {
-        id: 'open-workspace',
-        leftSection: IconFolder,
-        label: 'Open workspace',
-        onClick: handleOpenWorkspace
-      }
-    );
-
-    return items;
-  }, [sortedWorkspaces, activeWorkspaceUid, preferences, handlePinWorkspace]);
-
-  return (
-    <StyledWrapper className={`app-titlebar ${isFullScreen ? 'fullscreen' : ''}`}>
-      {createWorkspaceModalOpen && (
-        <CreateWorkspace onClose={() => setCreateWorkspaceModalOpen(false)} />
-      )}
-
-      <div className="titlebar-content">
-        {/* Left section: Home + Workspace */}
-        <div className="titlebar-left">
-          <ActionIcon
-            onClick={handleHomeClick}
-            label="Home"
-            size="lg"
-            className="home-button"
-          >
-            <IconHome size={16} stroke={1.5} />
-          </ActionIcon>
-
-          {/* Workspace Dropdown */}
-          <MenuDropdown
-            data-testid="workspace-menu"
-            items={workspaceMenuItems}
-            placement="bottom-start"
-            selectedItemId={activeWorkspaceUid}
-          >
-            <WorkspaceName />
-          </MenuDropdown>
-        </div>
-
-        {/* Center section: Bruno logo + text */}
-        <div className="titlebar-center">
-          <Bruno width={18} />
-          <span className="bruno-text">Bruno</span>
-        </div>
-
-        {/* Right section: Action buttons */}
-        <div className="titlebar-right">
-          {/* Toggle sidebar */}
-          <ActionIcon
-            onClick={handleToggleSidebar}
-            label={sidebarCollapsed ? 'Show sidebar' : 'Hide sidebar'}
-            size="lg"
-            data-testid="toggle-sidebar-button"
-          >
-            <IconSidebarToggle collapsed={sidebarCollapsed} size={16} strokeWidth={1.5} />
-          </ActionIcon>
-
-          {/* Toggle devtools */}
-          <ActionIcon
-            onClick={handleToggleDevtools}
-            label={isConsoleOpen ? 'Hide devtools' : 'Show devtools'}
-            size="lg"
-            data-testid="toggle-devtools-button"
-          >
-            <IconBottombarToggle collapsed={!isConsoleOpen} size={16} strokeWidth={1.5} />
-          </ActionIcon>
-
-          {/* Toggle vertical layout */}
-          <ActionIcon
-            onClick={handleToggleVerticalLayout}
-            label={orientation === 'horizontal' ? 'Switch to vertical layout' : 'Switch to horizontal layout'}
-            size="lg"
-            data-testid="toggle-vertical-layout-button"
-          >
-            {orientation === 'horizontal' ? (
-              <IconLayoutColumns size={16} stroke={1.5} />
-            ) : (
-              <IconLayoutRows size={16} stroke={1.5} />
-            )}
-          </ActionIcon>
-        </div>
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default AppTitleBar;

packages/bruno-app/src/components/BrunoSupport/index.js

@@ -6,7 +6,7 @@ import StyledWrapper from './StyledWrapper';
 const BrunoSupport = ({ onClose }) => {
   return (
     <StyledWrapper>
-      <Modal size="sm" title="Support" handleCancel={onClose} hideFooter={true}>
+      <Modal size="sm" title={'Support'} handleCancel={onClose} hideFooter={true}>
         <div className="collection-options">
           <div className="mt-2">
             <a href="https://docs.usebruno.com" target="_blank" className="flex items-end">

packages/bruno-app/src/components/CodeEditor/StyledWrapper.js

@@ -18,33 +18,6 @@ const StyledWrapper = styled.div`
     flex-direction: column-reverse;
   }
 
-  .CodeMirror-placeholder {
-    color: ${(props) => props.theme.text} !important;
-    opacity: 0.5 !important;
-  }
-
-  .CodeMirror-linenumber {
-    text-align: left !important;
-    padding-left: 3px !important;
-  }
-
-  /* Override default lint highlight background when emphasizing the gutter */
-  .CodeMirror-lint-line-error,
-  .CodeMirror-lint-line-warning {
-    background: none !important;
-  }
-
-  /* Style line numbers when there's a lint issue */
-  .CodeMirror-lint-line-error .CodeMirror-linenumber {
-    color: #d32f2f !important;
-    text-decoration: underline;
-  }
-
-  .CodeMirror-lint-line-warning .CodeMirror-linenumber {
-    color: #f57c00 !important;
-    text-decoration: underline;
-  }
-
   /* Removes the glow outline around the folded json */
   .CodeMirror-foldmarker {
     text-shadow: none;
@@ -100,48 +73,41 @@ const StyledWrapper = styled.div`
     }
   }
 
-  .cm-s-default, .cm-s-monokai {
-    span.cm-def {
-      color: ${(props) => props.theme.codemirror.tokens.definition} !important;
-    }
-    span.cm-property {
-      color: ${(props) => props.theme.codemirror.tokens.property} !important;
-    }
-    span.cm-string {
-      color: ${(props) => props.theme.codemirror.tokens.string} !important;
-    }
-    span.cm-number {
-      color: ${(props) => props.theme.codemirror.tokens.number} !important;
-    }
-    span.cm-atom {
-      color: ${(props) => props.theme.codemirror.tokens.atom} !important;
-    }
-    span.cm-variable {
-      color: ${(props) => props.theme.codemirror.tokens.variable} !important;
-    }
-    span.cm-keyword {
-      color: ${(props) => props.theme.codemirror.tokens.keyword} !important;
-    }
-    span.cm-comment {
-      color: ${(props) => props.theme.codemirror.tokens.comment} !important;
-    }
-    span.cm-operator {
-      color: ${(props) => props.theme.codemirror.tokens.operator} !important;
-    }
+  .cm-s-monokai span.cm-property,
+  .cm-s-monokai span.cm-attribute {
+    color: #9cdcfe !important;
+  }
+
+  .cm-s-monokai span.cm-string {
+    color: #ce9178 !important;
+  }
+
+  .cm-s-monokai span.cm-number {
+    color: #b5cea8 !important;
+  }
+
+  .cm-s-monokai span.cm-atom {
+    color: #569cd6 !important;
   }
 
-  /* Variable validation colors */
   .cm-variable-valid {
-    color: #5fad89 !important; /* Soft sage */
+    color: green;
   }
   .cm-variable-invalid {
-    color: #d17b7b !important; /* Soft coral */
+    color: red;
   }
 
   .CodeMirror-search-hint {
     display: inline;
   }
-  
+
+  .cm-s-default span.cm-property {
+    color: #1f61a0 !important;
+  }
+
+  .cm-s-default span.cm-variable {
+    color: #397d13 !important;
+  }
   
   //matching bracket fix
   .CodeMirror-matchingbracket {
@@ -160,31 +126,6 @@ const StyledWrapper = styled.div`
   .cm-search-current {
     background: rgba(255, 193, 7, 0.4);
   }
-
-  .lint-error-tooltip {
-    position: fixed;
-    z-index: 10000;
-    background: ${(props) => props.theme.codemirror.bg};
-    border-radius: ${(props) => props.theme.border.radius.base};
-    padding: 8px 12px;
-    max-width: 400px;
-    box-shadow: ${(props) => props.theme.shadow.sm};
-    font-size: ${(props) => props.theme.font.size.xs};
-    line-height: 1.5;
-    pointer-events: none;
-
-    .lint-tooltip-message {
-      padding: 2px 0;
-    }
-
-    .lint-tooltip-message.error {
-      color: ${(props) => props.theme.colors.text.danger};
-    }
-
-    .lint-tooltip-message.warning {
-      color: ${(props) => props.theme.colors.text.warning};
-    }
-  }
 `;
 
 export default StyledWrapper;

packages/bruno-app/src/components/CodeEditor/index.js

@@ -15,7 +15,6 @@ import { JSHINT } from 'jshint';
 import stripJsonComments from 'strip-json-comments';
 import { getAllVariables } from 'utils/collections';
 import { setupLinkAware } from 'utils/codemirror/linkAware';
-import { setupLintErrorTooltip } from 'utils/codemirror/lint-errors';
 import CodeMirrorSearch from 'components/CodeMirrorSearch';
 
 const CodeMirror = require('codemirror');
@@ -38,8 +37,7 @@ export default class CodeEditor extends React.Component {
     this.lintOptions = {
       esversion: 11,
       expr: true,
-      asi: true,
-      highlightLines: true
+      asi: true
     };
 
     this.state = {
@@ -52,7 +50,6 @@ export default class CodeEditor extends React.Component {
 
     const editor = (this.editor = CodeMirror(this._node, {
       value: this.props.value || '',
-      placeholder: '...',
       lineNumbers: true,
       lineWrapping: this.props.enableLineWrapping ?? true,
       tabSize: TAB_SIZE,
@@ -67,7 +64,7 @@ export default class CodeEditor extends React.Component {
       matchBrackets: true,
       showCursorWhenSelecting: true,
       foldGutter: true,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
       lint: this.lintOptions,
       readOnly: this.props.readOnly,
       scrollbarStyle: 'overlay',
@@ -105,7 +102,7 @@ export default class CodeEditor extends React.Component {
         },
         'Cmd-H': 'replace',
         'Ctrl-H': 'replace',
-        'Tab': function (cm) {
+        Tab: function (cm) {
           cm.getSelection().includes('\n') || editor.getLine(cm.getCursor().line) == cm.getSelection()
             ? cm.execCommand('indentMore')
             : cm.replaceSelection('  ', 'end');
@@ -151,7 +148,7 @@ export default class CodeEditor extends React.Component {
           } else if (this.props.mode == 'application/xml') {
             var doc = new DOMParser();
             try {
-              // add header element and remove prefix namespaces for DOMParser
+              //add header element and remove prefix namespaces for DOMParser
               var dcm = doc.parseFromString(
                 '<a> ' + internal.replace(/(?<=\<|<\/)\w+:/g, '') + '</a>',
                 'application/xml'
@@ -188,7 +185,7 @@ export default class CodeEditor extends React.Component {
       }
       return found;
     });
-
+    
     if (editor) {
       editor.setOption('lint', this.props.mode && editor.getValue().trim().length > 0 ? this.lintOptions : false);
       editor.on('change', this._onEdit);
@@ -197,7 +194,7 @@ export default class CodeEditor extends React.Component {
       this.addOverlay();
 
       const getAllVariablesHandler = () => getAllVariables(this.props.collection, this.props.item);
-
+      
       // Setup AutoComplete Helper for all modes
       const autoCompleteOptions = {
         showHintsFor: this.props.showHintsFor,
@@ -210,9 +207,6 @@ export default class CodeEditor extends React.Component {
       );
 
       setupLinkAware(editor);
-
-      // Setup lint error tooltip on line number hover
-      this.cleanupLintErrorTooltip = setupLintErrorTooltip(editor);
     }
   }
 
@@ -278,10 +272,6 @@ export default class CodeEditor extends React.Component {
       this.editor?._destroyLinkAware?.();
       this.editor.off('change', this._onEdit);
       this.editor.off('scroll', this.onScroll);
-
-      // Clean up lint error tooltip
-      this.cleanupLintErrorTooltip?.();
-
       this.editor = null;
     }
   }

packages/bruno-app/src/components/CodeEditor/index.spec.js

@@ -10,10 +10,10 @@ jest.mock('codemirror', () => {
 
 const MOCK_THEME = {
   codemirror: {
-    bg: '#1e1e1e',
-    border: '#333'
+    bg: "#1e1e1e",
+    border: "#333",
   },
-  textLink: '#007acc'
+  textLink: "#007acc",
 };
 
 const setupEditorState = (editor, { value, cursorPosition }) => {
@@ -27,8 +27,8 @@ const setupEditorState = (editor, { value, cursorPosition }) => {
   });
 
   editor.state = {
-    completionActive: null
-  };
+    completionActive: null,
+  }
 };
 
 const setupEditorWithRef = () => {
@@ -47,5 +47,5 @@ describe('CodeEditor', () => {
     jest.resetModules();
   });
 
-  it('add CodeEditor related tests here', () => {});
-});
+  it("add CodeEditor related tests here", () => {});
+});

packages/bruno-app/src/components/CodeMirrorSearch/StyledWrapper.js

@@ -27,7 +27,7 @@ const StyledWrapper = styled.div`
     border: none;
     outline: none;
     padding: 1px 2px;
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     margin: 0 1px;
     height: 28px;
   }
@@ -50,7 +50,7 @@ const StyledWrapper = styled.div`
   .searchbar-result-count {
     min-width: 28px;
     text-align: center;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     color: #aaa;
     margin: 0 8px 0 1px; 
     white-space: nowrap;
@@ -74,7 +74,7 @@ const StyledWrapper = styled.div`
     color: inherit;
     border: none;
     outline: none;
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     padding: 1px 2px;
     min-width: 80px;
   }

packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/index.js

@@ -43,16 +43,16 @@ const ApiKeyAuth = ({ collection }) => {
   };
 
   useEffect(() => {
-    !apikeyAuth?.placement
-    && dispatch(
-      updateCollectionAuth({
-        mode: 'apikey',
-        collectionUid: collection.uid,
-        content: {
-          placement: 'header'
-        }
-      })
-    );
+    !apikeyAuth?.placement &&
+      dispatch(
+        updateCollectionAuth({
+          mode: 'apikey',
+          collectionUid: collection.uid,
+          content: {
+            placement: 'header'
+          }
+        })
+      );
   }, [apikeyAuth]);
 
   return (

packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/StyledWrapper.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: ${(props) => props.theme.font.size.base};
+  font-size: 0.8125rem;
 
   .auth-mode-selector {
     background: transparent;

packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/index.js

@@ -87,7 +87,7 @@ const AuthMode = ({ collection }) => {
             }}
           >
             NTLM Auth
-          </div>
+          </div>          
           <div
             className="dropdown-item"
             onClick={() => {

packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js

@@ -9,7 +9,13 @@ import { updateCollectionAuth } from 'providers/ReduxStore/slices/collections';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import StyledWrapper from './StyledWrapper';
 
+
+
+
+
 const NTLMAuth = ({ collection }) => {
+
+
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
 
@@ -19,6 +25,7 @@ const NTLMAuth = ({ collection }) => {
 
   const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
 
+
   const handleUsernameChange = (username) => {
     dispatch(
       updateCollectionAuth({
@@ -60,7 +67,10 @@ const NTLMAuth = ({ collection }) => {
         }
       })
     );
-  };
+  };  
+
+
+
 
   return (
     <StyledWrapper className="mt-2 w-full">

packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
   .single-line-editor-wrapper {
     max-width: 400px;

packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js

@@ -10,7 +10,7 @@ import OAuth2ClientCredentials from 'components/RequestPane/Auth/OAuth2/ClientCr
 import OAuth2Implicit from 'components/RequestPane/Auth/OAuth2/Implicit/index';
 import GrantTypeSelector from 'components/RequestPane/Auth/OAuth2/GrantTypeSelector/index';
 
-const GrantTypeComponentMap = ({ collection }) => {
+const GrantTypeComponentMap = ({collection }) => {
   const dispatch = useDispatch();
 
   const save = () => {

packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/StyledWrapper.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .single-line-editor-wrapper {

packages/bruno-app/src/components/CollectionSettings/Auth/index.js

@@ -13,6 +13,7 @@ import StyledWrapper from './StyledWrapper';
 import OAuth2 from './OAuth2';
 import NTLMAuth from './NTLMAuth';
 
+
 const Auth = ({ collection }) => {
   const authMode = collection.draft?.root ? get(collection, 'draft.root.request.auth.mode') : get(collection, 'root.request.auth.mode');
   const dispatch = useDispatch();
@@ -35,7 +36,7 @@ const Auth = ({ collection }) => {
       }
       case 'ntlm': {
         return <NTLMAuth collection={collection} />;
-      }
+      }       
       case 'oauth2': {
         return <OAuth2 collection={collection} />;
       }

packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js

@@ -39,7 +39,7 @@ const ClientCertSettings = ({ collection }) => {
       domain: Yup.string()
         .required()
         .trim()
-        .test('not-empty-after-trim', 'Domain is required', (value) => value && value.trim().length > 0),
+        .test('not-empty-after-trim', 'Domain is required', value => value && value.trim().length > 0),
       type: Yup.string().required().oneOf(['cert', 'pfx']),
       certFilePath: Yup.string().when('type', {
         is: (type) => type == 'cert',
@@ -146,30 +146,30 @@ const ClientCertSettings = ({ collection }) => {
     <StyledWrapper className="w-full h-full">
       <div className="text-xs mb-4 text-muted">Add client certificates to be used for specific domains.</div>
 
-      <h1 className="font-medium">Client Certificates</h1>
+      <h1 className="font-semibold">Client Certificates</h1>
       <ul className="mt-4">
         {!clientCertConfig.length
           ? 'No client certificates added'
           : clientCertConfig.map((clientCert, index) => (
-              <li key={`client-cert-${index}`} className="flex items-center available-certificates p-2 rounded-lg mb-2">
-                <div className="flex items-center w-full justify-between">
-                  <div className="flex w-full items-center">
-                    <IconWorld className="mr-2" size={18} strokeWidth={1.5} />
-                    {clientCert.domain}
-                  </div>
-                  <div className="flex w-full items-center">
-                    <IconCertificate className="mr-2 flex-shrink-0" size={18} strokeWidth={1.5} />
-                    {clientCert.type === 'cert' ? clientCert.certFilePath : clientCert.pfxFilePath}
-                  </div>
-                  <button onClick={() => handleRemove(index)} className="remove-certificate ml-2">
-                    <IconTrash size={18} strokeWidth={1.5} />
-                  </button>
+            <li key={`client-cert-${index}`} className="flex items-center available-certificates p-2 rounded-lg mb-2">
+              <div className="flex items-center w-full justify-between">
+                <div className="flex w-full items-center">
+                  <IconWorld className="mr-2" size={18} strokeWidth={1.5} />
+                  {clientCert.domain}
                 </div>
-              </li>
-            ))}
+                <div className="flex w-full items-center">
+                  <IconCertificate className="mr-2 flex-shrink-0" size={18} strokeWidth={1.5} />
+                  {clientCert.type === 'cert' ? clientCert.certFilePath : clientCert.pfxFilePath}
+                </div>
+                  <button onClick={() => handleRemove(index)} className="remove-certificate ml-2">
+                  <IconTrash size={18} strokeWidth={1.5} />
+                  </button>
+              </div>
+            </li>
+          ))}
       </ul>
 
-      <h1 className="font-medium mt-8 mb-2">Add Client Certificate</h1>
+      <h1 className="font-semibold mt-8 mb-2">Add Client Certificate</h1>
       <form className="bruno-form" onSubmit={formik.handleSubmit}>
         <div className="mb-3 flex items-center">
           <label className="settings-label" htmlFor="domain">
@@ -373,7 +373,7 @@ const ClientCertSettings = ({ collection }) => {
           ) : null}
         </div>
         <div className="mt-6 flex flex-row gap-2 items-center">
-          <button type="submit" className="submit btn btn-sm btn-secondary" data-testid="add-client-cert">
+          <button type="submit" className="submit btn btn-sm btn-secondary">
             Add
           </button>
           <div className="h-4 border-l border-gray-600"></div>

packages/bruno-app/src/components/CollectionSettings/Docs/index.js

@@ -38,21 +38,21 @@ const Docs = ({ collection }) => {
       }))
     );
     toggleViewMode();
-  };
+  }
 
   const onSave = () => {
     dispatch(saveCollectionSettings(collection.uid));
     toggleViewMode();
-  };
+  }
 
   return (
     <StyledWrapper className="h-full w-full relative flex flex-col">
-      <div className="flex flex-row w-full justify-between items-center mb-4">
-        <div className="text-lg font-medium flex items-center gap-2">
+      <div className='flex flex-row w-full justify-between items-center mb-4'>
+        <div className='text-lg font-medium flex items-center gap-2'>
           <IconFileText size={20} strokeWidth={1.5} />
           Documentation
         </div>
-        <div className="flex flex-row gap-2 items-center justify-center">
+        <div className='flex flex-row gap-2 items-center justify-center'>
           {isEditing ? (
             <>
               <div className="editing-mode" role="tab" onClick={handleDiscardChanges}>
@@ -81,13 +81,14 @@ const Docs = ({ collection }) => {
           fontSize={get(preferences, 'font.codeFontSize')}
         />
       ) : (
-        <div className="h-full overflow-auto pl-1">
-          <div className="h-[1px] min-h-[500px]">
+        <div className='h-full overflow-auto pl-1'>
+          <div className='h-[1px] min-h-[500px]'>
             {
-              docs?.length > 0
-                ? <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={docs} />
-                : <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={documentationPlaceholder} />
-            }
+              docs?.length > 0 ?
+                <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={docs} />
+                :
+                <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={documentationPlaceholder} />
+            }         
           </div>
         </div>
       )}
@@ -97,6 +98,7 @@ const Docs = ({ collection }) => {
 
 export default Docs;
 
+
 const documentationPlaceholder = `
 Welcome to your collection documentation! This space is designed to help you document your API collection effectively.
 

packages/bruno-app/src/components/CollectionSettings/Headers/StyledWrapper.js

@@ -6,7 +6,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 500;
+    font-weight: 600;
     table-layout: fixed;
 
     thead,
@@ -16,7 +16,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 0.8125rem;
       user-select: none;
     }
     td {
@@ -33,7 +33,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-header {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   input[type='text'] {

packages/bruno-app/src/components/CollectionSettings/Headers/index.js

@@ -1,77 +1,78 @@
-import React, { useState, useCallback } from 'react';
+import React, { useState } from 'react';
 import get from 'lodash/get';
+import cloneDeep from 'lodash/cloneDeep';
+import { IconTrash } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
-import { setCollectionHeaders } from 'providers/ReduxStore/slices/collections';
+import {
+  addCollectionHeader,
+  updateCollectionHeader,
+  deleteCollectionHeader,
+  setCollectionHeaders
+} from 'providers/ReduxStore/slices/collections';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import SingleLineEditor from 'components/SingleLineEditor';
-import EditableTable from 'components/EditableTable';
 import StyledWrapper from './StyledWrapper';
 import { headers as StandardHTTPHeaders } from 'know-your-http-well';
 import { MimeTypes } from 'utils/codemirror/autocompleteConstants';
 import BulkEditor from 'components/BulkEditor/index';
-
 const headerAutoCompleteList = StandardHTTPHeaders.map((e) => e.header);
 
 const Headers = ({ collection }) => {
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
-  const headers = collection.draft?.root
-    ? get(collection, 'draft.root.request.headers', [])
-    : get(collection, 'root.request.headers', []);
+  const headers = collection.draft?.root ? get(collection, 'draft.root.request.headers', []) : get(collection, 'root.request.headers', []);
   const [isBulkEditMode, setIsBulkEditMode] = useState(false);
 
   const toggleBulkEditMode = () => {
     setIsBulkEditMode(!isBulkEditMode);
   };
 
-  const handleHeadersChange = useCallback((updatedHeaders) => {
-    dispatch(setCollectionHeaders({ collectionUid: collection.uid, headers: updatedHeaders }));
-  }, [dispatch, collection.uid]);
+  const handleBulkHeadersChange = (newHeaders) => {
+    dispatch(setCollectionHeaders({ collectionUid: collection.uid, headers: newHeaders }));
+  };
+
+  const addHeader = () => {
+    dispatch(
+      addCollectionHeader({
+        collectionUid: collection.uid
+      })
+    );
+  };
 
   const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
-
-  const columns = [
-    {
-      key: 'name',
-      name: 'Name',
-      isKeyField: true,
-      placeholder: 'Name',
-      width: '30%',
-      render: ({ row, value, onChange, isLastEmptyRow }) => (
-        <SingleLineEditor
-          value={value || ''}
-          theme={storedTheme}
-          onSave={handleSave}
-          onChange={(newValue) => onChange(newValue.replace(/[\r\n]/g, ''))}
-          autocomplete={headerAutoCompleteList}
-          collection={collection}
-          placeholder={isLastEmptyRow ? 'Name' : ''}
-        />
-      )
-    },
-    {
-      key: 'value',
-      name: 'Value',
-      placeholder: 'Value',
-      render: ({ row, value, onChange, isLastEmptyRow }) => (
-        <SingleLineEditor
-          value={value || ''}
-          theme={storedTheme}
-          onSave={handleSave}
-          onChange={onChange}
-          collection={collection}
-          autocomplete={MimeTypes}
-          placeholder={isLastEmptyRow ? 'Value' : ''}
-        />
-      )
+  const handleHeaderValueChange = (e, _header, type) => {
+    const header = cloneDeep(_header);
+    switch (type) {
+      case 'name': {
+        // Strip newlines from header keys
+        header.name = e.target.value.replace(/[\r\n]/g, '');
+        break;
+      }
+      case 'value': {
+        header.value = e.target.value;
+        break;
+      }
+      case 'enabled': {
+        header.enabled = e.target.checked;
+        break;
+      }
     }
-  ];
+    dispatch(
+      updateCollectionHeader({
+        header: header,
+        collectionUid: collection.uid
+      })
+    );
+  };
 
-  const defaultRow = {
-    name: '',
-    value: '',
-    description: ''
+  const handleRemoveHeader = (header) => {
+    dispatch(
+      deleteCollectionHeader({
+        headerUid: header.uid,
+        collectionUid: collection.uid
+      })
+    );
   };
 
   if (isBulkEditMode) {
@@ -82,7 +83,7 @@ const Headers = ({ collection }) => {
         </div>
         <BulkEditor
           params={headers}
-          onChange={handleHeadersChange}
+          onChange={handleBulkHeadersChange}
           onToggle={toggleBulkEditMode}
           onSave={handleSave}
         />
@@ -95,17 +96,88 @@ const Headers = ({ collection }) => {
       <div className="text-xs mb-4 text-muted">
         Add request headers that will be sent with every request in this collection.
       </div>
-      <EditableTable
-        columns={columns}
-        rows={headers}
-        onChange={handleHeadersChange}
-        defaultRow={defaultRow}
-      />
-      <div className="flex justify-end mt-2">
+      <table>
+        <thead>
+          <tr>
+            <td>Name</td>
+            <td>Value</td>
+            <td></td>
+          </tr>
+        </thead>
+        <tbody>
+          {headers && headers.length
+            ? headers.map((header) => {
+                return (
+                  <tr key={header.uid}>
+                    <td>
+                      <SingleLineEditor
+                        value={header.name}
+                        theme={storedTheme}
+                        onSave={handleSave}
+                        onChange={(newValue) =>
+                          handleHeaderValueChange(
+                            {
+                              target: {
+                                value: newValue
+                              }
+                            },
+                            header,
+                            'name'
+                          )
+                        }
+                        autocomplete={headerAutoCompleteList}
+                        collection={collection}
+                      />
+                    </td>
+                    <td>
+                      <SingleLineEditor
+                        value={header.value}
+                        theme={storedTheme}
+                        onSave={handleSave}
+                        onChange={(newValue) =>
+                          handleHeaderValueChange(
+                            {
+                              target: {
+                                value: newValue
+                              }
+                            },
+                            header,
+                            'value'
+                          )
+                        }
+                        collection={collection}
+                        autocomplete={MimeTypes}
+                      />
+                    </td>
+                    <td>
+                      <div className="flex items-center">
+                        <input
+                          type="checkbox"
+                          checked={header.enabled}
+                          tabIndex="-1"
+                          className="mr-3 mousetrap"
+                          onChange={(e) => handleHeaderValueChange(e, header, 'enabled')}
+                        />
+                        <button tabIndex="-1" onClick={() => handleRemoveHeader(header)}>
+                          <IconTrash strokeWidth={1.5} size={20} />
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                );
+              })
+            : null}
+        </tbody>
+      </table>
+      <div className="flex justify-between mt-2">
+        <button className="btn-add-header text-link pr-2 py-3 select-none" onClick={addHeader}>
+          + Add Header
+        </button>
         <button className="text-link select-none" onClick={toggleBulkEditMode}>
           Bulk Edit
         </button>
       </div>
+
       <div className="mt-6">
         <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
           Save
@@ -114,5 +186,4 @@ const Headers = ({ collection }) => {
     </StyledWrapper>
   );
 };
-
 export default Headers;

packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js

@@ -1,41 +1,33 @@
-import React from 'react';
+import React from "react";
 import { getTotalRequestCountInCollection } from 'utils/collections/';
-import { IconBox, IconFolder, IconWorld, IconApi, IconShare } from '@tabler/icons';
-import { areItemsLoading, getItemsLoadStats } from 'utils/collections/index';
-import { useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import ShareCollection from 'components/ShareCollection/index';
-import { updateEnvironmentSettingsModalVisibility, updateGlobalEnvironmentSettingsModalVisibility } from 'providers/ReduxStore/slices/app';
+import { IconFolder, IconWorld, IconApi, IconShare } from '@tabler/icons';
+import { areItemsLoading, getItemsLoadStats } from "utils/collections/index";
+import { useState } from "react";
+import ShareCollection from "components/ShareCollection/index";
 
 const Info = ({ collection }) => {
-  const dispatch = useDispatch();
   const totalRequestsInCollection = getTotalRequestCountInCollection(collection);
 
   const isCollectionLoading = areItemsLoading(collection);
   const { loading: itemsLoadingCount, total: totalItems } = getItemsLoadStats(collection);
   const [showShareCollectionModal, toggleShowShareCollectionModal] = useState(false);
-
-  const globalEnvironments = useSelector((state) => state.globalEnvironments.globalEnvironments);
-
-  const collectionEnvironmentCount = collection.environments?.length || 0;
-  const globalEnvironmentCount = globalEnvironments?.length || 0;
-
+  
   const handleToggleShowShareCollectionModal = (value) => (e) => {
     toggleShowShareCollectionModal(value);
-  };
+  }
 
   return (
     <div className="w-full flex flex-col h-fit">
       <div className="rounded-lg py-6">
-        <div className="grid gap-5">
+        <div className="grid gap-6">
           {/* Location Row */}
           <div className="flex items-start">
             <div className="flex-shrink-0 p-3 bg-blue-50 dark:bg-blue-900/20 rounded-lg">
               <IconFolder className="w-5 h-5 text-blue-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-medium">Location</div>
-              <div className="mt-1 text-muted break-all text-xs">
+              <div className="font-semibold text-sm">Location</div>
+              <div className="mt-1 text-sm text-muted break-all">
                 {collection.pathname}
               </div>
             </div>
@@ -47,24 +39,9 @@ const Info = ({ collection }) => {
               <IconWorld className="w-5 h-5 text-green-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-medium text-sm">Environments</div>
-              <div className="mt-1 flex flex-col gap-1">
-                <button
-                  type="button"
-                  className="text-sm text-link cursor-pointer hover:underline text-left bg-transparent"
-                  onClick={() => {
-                    dispatch(updateEnvironmentSettingsModalVisibility(true));
-                  }}
-                >
-                  {collectionEnvironmentCount} collection environment{collectionEnvironmentCount !== 1 ? 's' : ''}
-                </button>
-                <button
-                  type="button"
-                  className="text-sm text-link cursor-pointer hover:underline text-left bg-transparent"
-                  onClick={() => dispatch(updateGlobalEnvironmentSettingsModalVisibility(true))}
-                >
-                  {globalEnvironmentCount} global environment{globalEnvironmentCount !== 1 ? 's' : ''}
-                </button>
+              <div className="font-semibold text-sm">Environments</div>
+              <div className="mt-1 text-sm text-muted">
+                {collection.environments?.length || 0} environment{collection.environments?.length !== 1 ? 's' : ''} configured
               </div>
             </div>
           </div>
@@ -75,10 +52,10 @@ const Info = ({ collection }) => {
               <IconApi className="w-5 h-5 text-purple-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-medium">Requests</div>
-              <div className="mt-1 text-muted text-xs">
+              <div className="font-semibold text-sm">Requests</div>
+              <div className="mt-1 text-sm text-muted">
                 {
-                  isCollectionLoading ? `${totalItems - itemsLoadingCount} out of ${totalItems} requests in the collection loaded` : `${totalRequestsInCollection} request${totalRequestsInCollection !== 1 ? 's' : ''} in collection`
+                  isCollectionLoading? `${totalItems - itemsLoadingCount} out of ${totalItems} requests in the collection loaded` : `${totalRequestsInCollection} request${totalRequestsInCollection !== 1 ? 's' : ''} in collection`
                 }
               </div>
             </div>
@@ -89,8 +66,8 @@ const Info = ({ collection }) => {
               <IconShare className="w-5 h-5 text-indigo-500" stroke={1.5} />
             </div>
             <div className="ml-4 h-full flex flex-col justify-start">
-              <div className="font-medium h-fit my-auto">Share</div>
-              <div className="group-hover:underline text-link text-xs">
+              <div className="font-semibold text-sm h-fit my-auto">Share</div>
+              <div className="mt-1 text-sm group-hover:underline text-link">
                 Share Collection
               </div>
             </div>
@@ -102,4 +79,4 @@ const Info = ({ collection }) => {
   );
 };
 
-export default Info;
+export default Info;

packages/bruno-app/src/components/CollectionSettings/Overview/RequestsNotLoaded/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { flattenItems } from 'utils/collections';
+import { flattenItems } from "utils/collections";
 import { IconAlertTriangle } from '@tabler/icons';
-import StyledWrapper from './StyledWrapper';
+import StyledWrapper from "./StyledWrapper";
 import { useDispatch, useSelector } from 'react-redux';
 import { isItemARequest, itemIsOpenedInTabs } from 'utils/tabs/index';
 import { getDefaultRequestPaneTab } from 'utils/collections/index';
@@ -12,13 +12,13 @@ const RequestsNotLoaded = ({ collection }) => {
   const dispatch = useDispatch();
   const tabs = useSelector((state) => state.tabs.tabs);
   const flattenedItems = flattenItems(collection.items);
-  const itemsFailedLoading = flattenedItems?.filter((item) => item?.partial && !item?.loading);
+  const itemsFailedLoading = flattenedItems?.filter(item => item?.partial && !item?.loading);
 
   if (!itemsFailedLoading?.length) {
     return null;
   }
 
-  const handleRequestClick = (item) => (e) => {
+  const handleRequestClick = (item) => e => {
     e.preventDefault();
     if (isItemARequest(item)) {
       dispatch(hideHomePage());
@@ -39,7 +39,7 @@ const RequestsNotLoaded = ({ collection }) => {
       );
       return;
     }
-  };
+  }
 
   return (
     <StyledWrapper className="w-full card my-2">
@@ -61,7 +61,7 @@ const RequestsNotLoaded = ({ collection }) => {
         <tbody>
           {flattenedItems?.map((item, index) => (
             item?.partial && !item?.loading ? (
-              <tr key={index} className="cursor-pointer" onClick={handleRequestClick(item)}>
+              <tr key={index} className='cursor-pointer' onClick={handleRequestClick(item)}>
                 <td className="py-1.5 px-3">
                   {item?.pathname?.split(`${collection?.pathname}/`)?.[1]}
                 </td>

packages/bruno-app/src/components/CollectionSettings/Overview/index.js

@@ -1,16 +1,16 @@
-import StyledWrapper from './StyledWrapper';
-import Docs from '../Docs';
-import Info from './Info';
+import StyledWrapper from "./StyledWrapper";
+import Docs from "../Docs";
+import Info from "./Info";
 import { IconBox } from '@tabler/icons';
-import RequestsNotLoaded from './RequestsNotLoaded';
+import RequestsNotLoaded from "./RequestsNotLoaded";
 
 const Overview = ({ collection }) => {
   return (
     <div className="h-full">
-      <div className="grid grid-cols-5 gap-5 h-full">
+      <div className="grid grid-cols-5 gap-4 h-full">
         <div className="col-span-2">
-          <div className="text-lg font-medium flex items-center gap-2">
-            <IconBox size={20} stroke={1.5} />
+          <div className="text-xl font-semibold flex items-center gap-2">
+            <IconBox size={24} stroke={1.5} />
             {collection?.name}
           </div>
           <Info collection={collection} />
@@ -22,6 +22,6 @@ const Overview = ({ collection }) => {
       </div>
     </div>
   );
-};
+}
 
-export default Overview;
+export default Overview;

packages/bruno-app/src/components/CollectionSettings/Presets/StyledWrapper.js

@@ -0,0 +1,29 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  max-width: 800px;
+
+  .settings-label {
+    width: 110px;
+  }
+
+  .textbox {
+    border: 1px solid #ccc;
+    padding: 0.15rem 0.45rem;
+    box-shadow: none;
+    border-radius: 0px;
+    outline: none;
+    box-shadow: none;
+    transition: border-color ease-in-out 0.1s;
+    border-radius: 3px;
+    background-color: ${(props) => props.theme.modal.input.bg};
+    border: 1px solid ${(props) => props.theme.modal.input.border};
+
+    &:focus {
+      border: solid 1px ${(props) => props.theme.modal.input.focusBorder} !important;
+      outline: none !important;
+    }
+  }
+`;
+
+export default StyledWrapper;

packages/bruno-app/src/components/CollectionSettings/Presets/index.js

@@ -0,0 +1,123 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import StyledWrapper from './StyledWrapper';
+import { updateCollectionPresets } from 'providers/ReduxStore/slices/collections';
+import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
+import { get } from 'lodash';
+import DeprecationWarning from 'components/DeprecationWarning';
+
+const PresetsSettings = ({ collection }) => {
+  const dispatch = useDispatch();
+  const initialPresets = { requestType: 'http', requestUrl: '' };
+
+  // Get presets from draft.brunoConfig if it exists, otherwise from brunoConfig
+  const currentPresets = collection.draft?.brunoConfig
+    ? get(collection, 'draft.brunoConfig.presets', initialPresets)
+    : get(collection, 'brunoConfig.presets', initialPresets);
+
+  // Helper to update presets config
+  const updatePresets = (updates) => {
+    const updatedPresets = { ...currentPresets, ...updates };
+    dispatch(updateCollectionPresets({
+      collectionUid: collection.uid,
+      presets: updatedPresets
+    }));
+  };
+
+  const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
+
+  const handleRequestTypeChange = (e) => {
+    updatePresets({ requestType: e.target.value });
+  };
+
+  const handleRequestUrlChange = (e) => {
+    updatePresets({ requestUrl: e.target.value });
+  };
+
+  return (
+    <StyledWrapper className="h-full w-full">
+      <DeprecationWarning featureName="Presets" learnMoreUrl="https://github.com/usebruno/bruno/discussions/6234" />
+      <div className="text-xs mb-4 mt-4 text-muted">
+        These presets will be used as the default values for new requests in this collection.
+      </div>
+      <div className="bruno-form">
+        <div className="mb-3 flex items-center">
+          <label className="settings-label flex  items-center" htmlFor="enabled">
+            Request Type
+          </label>
+          <div className="flex items-center">
+            <input
+              id="http"
+              className="cursor-pointer"
+              type="radio"
+              name="requestType"
+              onChange={handleRequestTypeChange}
+              value="http"
+              checked={(currentPresets.requestType || 'http') === 'http'}
+            />
+            <label htmlFor="http" className="ml-1 cursor-pointer select-none">
+              HTTP
+            </label>
+
+            <input
+              id="graphql"
+              className="ml-4 cursor-pointer"
+              type="radio"
+              name="requestType"
+              onChange={handleRequestTypeChange}
+              value="graphql"
+              checked={(currentPresets.requestType || 'http') === 'graphql'}
+            />
+            <label htmlFor="graphql" className="ml-1 cursor-pointer select-none">
+              GraphQL
+            </label>
+
+            <input
+              id="grpc"
+              className="ml-4 cursor-pointer"
+              type="radio"
+              name="requestType"
+              onChange={handleRequestTypeChange}
+              value="grpc"
+              checked={(currentPresets.requestType || 'http') === 'grpc'}
+            />
+            <label htmlFor="grpc" className="ml-1 cursor-pointer select-none">
+              gRPC
+            </label>
+          </div>
+        </div>
+        <div className="mb-3 flex items-center">
+          <label className="settings-label" htmlFor="requestUrl">
+            Base URL
+          </label>
+          <div className="flex items-center w-full">
+            <div className="flex items-center flex-grow input-container h-full">
+              <input
+                id="request-url"
+                type="text"
+                name="requestUrl"
+                placeholder="Request URL"
+                className="block textbox"
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                onChange={handleRequestUrlChange}
+                value={currentPresets.requestUrl || ''}
+                style={{ width: '100%' }}
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className="mt-6">
+          <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
+            Save
+          </button>
+        </div>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default PresetsSettings;

packages/bruno-app/src/components/CollectionSettings/Protobuf/index.js

@@ -112,7 +112,7 @@ const ProtobufSettings = ({ collection }) => {
       <div className="mb-6" data-testid="protobuf-proto-files-section">
         <div className="flex items-center justify-between mb-3">
           <div className="flex items-center">
-            <label className="font-medium flex items-center" htmlFor="protoFiles">
+            <label className="font-semibold text-sm flex items-center" htmlFor="protoFiles">
               Proto Files (
               {protoFiles.length}
               )
@@ -156,7 +156,7 @@ const ProtobufSettings = ({ collection }) => {
                   <td colSpan="3" className="border border-gray-200 dark:border-gray-700 px-3 py-8 text-center">
                     <div className="flex flex-col items-center">
                       <IconFile size={24} className="text-gray-400 mb-2" />
-                      <span className="text-gray-500 dark:text-gray-400">No proto files added</span>
+                      <span className="text-sm text-gray-500 dark:text-gray-400">No proto files added</span>
                     </div>
                   </td>
                 </tr>
@@ -169,7 +169,7 @@ const ProtobufSettings = ({ collection }) => {
                       <td className="border border-gray-200 dark:border-gray-700 px-3 py-2">
                         <div className="flex items-center">
                           <IconFile size={16} className="text-gray-500 dark:text-gray-400 mr-2" />
-                          <span className="font-medium text-gray-900 dark:text-gray-100" data-testid="protobuf-proto-file-name">
+                          <span className="text-sm font-medium text-gray-900 dark:text-gray-100" data-testid="protobuf-proto-file-name">
                             {getBasename(collection.pathname, file.path)}
                           </span>
                           {!isValid && <IconAlertCircle size={12} className="text-red-600 dark:text-red-400 ml-2" />}
@@ -219,7 +219,7 @@ const ProtobufSettings = ({ collection }) => {
       <div className="mb-6" data-testid="protobuf-import-paths-section">
         <div className="flex items-center justify-between mb-3">
           <div className="flex items-center">
-            <label className="font-medium flex items-center" htmlFor="importPaths">
+            <label className="font-semibold text-sm flex items-center" htmlFor="importPaths">
               Import Paths (
               {importPaths.length}
               )
@@ -265,7 +265,7 @@ const ProtobufSettings = ({ collection }) => {
                   <td colSpan="4" className="border border-gray-200 dark:border-gray-700 px-3 py-8 text-center">
                     <div className="flex flex-col items-center">
                       <IconFolder size={24} className="text-gray-400 mb-2" />
-                      <span className="text-gray-500 dark:text-gray-400">No import paths added</span>
+                      <span className="text-sm text-gray-500 dark:text-gray-400">No import paths added</span>
                     </div>
                   </td>
                 </tr>
@@ -288,7 +288,7 @@ const ProtobufSettings = ({ collection }) => {
                       <td className="border border-gray-200 dark:border-gray-700 px-3 py-2">
                         <div className="flex items-center">
                           <IconFolder size={16} className="text-gray-500 dark:text-gray-400 mr-2" />
-                          <span className="font-medium text-gray-900 dark:text-gray-100">
+                          <span className="text-sm font-medium text-gray-900 dark:text-gray-100">
                             {getBasename(collection.pathname, importPath.path)}
                           </span>
                           {!isValid && <IconAlertCircle size={12} className="text-red-600 dark:text-red-400 ml-2" />}

packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js

@@ -156,9 +156,9 @@ const ProxySettings = ({ collection }) => {
             <InfoTip infotipId="request-var">
               <div>
                 <ul>
-                  <li><span style={{ width: '50px', display: 'inline-block' }}>global</span> - use global proxy config</li>
-                  <li><span style={{ width: '50px', display: 'inline-block' }}>enabled</span> - use collection proxy config</li>
-                  <li><span style={{ width: '50px', display: 'inline-block' }}>disable</span> - disable proxy</li>
+                  <li><span style={{width: "50px", display: "inline-block"}}>global</span> - use global proxy config</li>
+                  <li><span style={{width: "50px", display: "inline-block"}}>enabled</span> - use collection proxy config</li>
+                  <li><span style={{width: "50px", display: "inline-block"}}>disable</span> - disable proxy</li>
                 </ul>
               </div>
             </InfoTip>
@@ -367,4 +367,4 @@ const ProxySettings = ({ collection }) => {
   );
 };
 
-export default ProxySettings;
+export default ProxySettings;

packages/bruno-app/src/components/CollectionSettings/StyledWrapper.js

@@ -6,7 +6,7 @@ const StyledWrapper = styled.div`
       padding: 6px 0px;
       border: none;
       border-bottom: solid 2px transparent;
-      margin-right: ${(props) => props.theme.tabs.marginRight};
+      margin-right: 1.25rem;
       color: var(--color-tab-inactive);
       cursor: pointer;
 
@@ -20,7 +20,6 @@ const StyledWrapper = styled.div`
       }
 
       &.active {
-        font-weight: ${(props) => props.theme.tabs.active.fontWeight} !important;
         color: ${(props) => props.theme.tabs.active.color} !important;
         border-bottom: solid 2px ${(props) => props.theme.tabs.active.border} !important;
       }

packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/StyledWrapper.js

@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 500;
+    font-weight: 600;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 0.8125rem;
       user-select: none;
     }
     td {
@@ -31,7 +31,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-var {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   input[type='text'] {

packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/index.js

@@ -1,81 +1,161 @@
-import React, { useCallback } from 'react';
+import React from 'react';
+import cloneDeep from 'lodash/cloneDeep';
+import { IconTrash } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import MultiLineEditor from 'components/MultiLineEditor';
 import InfoTip from 'components/InfoTip';
-import EditableTable from 'components/EditableTable';
 import StyledWrapper from './StyledWrapper';
 import toast from 'react-hot-toast';
 import { variableNameRegex } from 'utils/common/regex';
-import { setCollectionVars } from 'providers/ReduxStore/slices/collections/index';
+import {
+  addCollectionVar,
+  deleteCollectionVar,
+  updateCollectionVar
+} from 'providers/ReduxStore/slices/collections/index';
 
 const VarsTable = ({ collection, vars, varType }) => {
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
 
+  const addVar = () => {
+    dispatch(
+      addCollectionVar({
+        collectionUid: collection.uid,
+        type: varType
+      })
+    );
+  };
+
   const onSave = () => dispatch(saveCollectionSettings(collection.uid));
+  const handleVarChange = (e, v, type) => {
+    const _var = cloneDeep(v);
+    switch (type) {
+      case 'name': {
+        const value = e.target.value;
 
-  const handleVarsChange = useCallback((updatedVars) => {
-    dispatch(setCollectionVars({ collectionUid: collection.uid, vars: updatedVars, type: varType }));
-  }, [dispatch, collection.uid, varType]);
+        if (variableNameRegex.test(value) === false) {
+          toast.error(
+            'Variable contains invalid characters! Variables must only contain alpha-numeric characters, "-", "_", "."'
+          );
+          return;
+        }
 
-  const getRowError = useCallback((row, index, key) => {
-    if (key !== 'name') return null;
-    if (!row.name || row.name.trim() === '') return null;
-    if (!variableNameRegex.test(row.name)) {
-      return 'Variable contains invalid characters. Must only contain alphanumeric characters, "-", "_", "."';
+        _var.name = value;
+        break;
+      }
+      case 'value': {
+        _var.value = e.target.value;
+        break;
+      }
+      case 'enabled': {
+        _var.enabled = e.target.checked;
+        break;
+      }
     }
-    return null;
-  }, []);
+    dispatch(
+      updateCollectionVar({
+        type: varType,
+        var: _var,
+        collectionUid: collection.uid
+      })
+    );
+  };
 
-  const columns = [
-    {
-      key: 'name',
-      name: 'Name',
-      isKeyField: true,
-      placeholder: 'Name',
-      width: '40%'
-    },
-    {
-      key: 'value',
-      name: varType === 'request' ? 'Value' : (
-        <div className="flex items-center">
-          <span>Expr</span>
-          <InfoTip content="You can write any valid JS Template Literal here" infotipId={`collection-${varType}-var`} />
-        </div>
-      ),
-      placeholder: varType === 'request' ? 'Value' : 'Expr',
-      render: ({ row, value, onChange, isLastEmptyRow }) => (
-        <MultiLineEditor
-          value={value || ''}
-          theme={storedTheme}
-          onSave={onSave}
-          onChange={onChange}
-          collection={collection}
-          placeholder={isLastEmptyRow ? (varType === 'request' ? 'Value' : 'Expr') : ''}
-        />
-      )
-    }
-  ];
-
-  const defaultRow = {
-    name: '',
-    value: '',
-    ...(varType === 'response' ? { local: false } : {})
+  const handleRemoveVar = (_var) => {
+    dispatch(
+      deleteCollectionVar({
+        type: varType,
+        varUid: _var.uid,
+        collectionUid: collection.uid
+      })
+    );
   };
 
   return (
     <StyledWrapper className="w-full">
-      <EditableTable
-        columns={columns}
-        rows={vars}
-        onChange={handleVarsChange}
-        defaultRow={defaultRow}
-        getRowError={getRowError}
-      />
+      <table>
+        <thead>
+          <tr>
+            <td>Name</td>
+            {varType === 'request' ? (
+              <td>
+                <div className="flex items-center">
+                  <span>Value</span>
+                </div>
+              </td>
+            ) : (
+              <td>
+                <div className="flex items-center">
+                  <span>Expr</span>
+                  <InfoTip content="You can write any valid JS Template Literal here" infotipId="request-var" />
+                </div>
+              </td>
+            )}
+            <td></td>
+          </tr>
+        </thead>
+        <tbody>
+          {vars && vars.length
+            ? vars.map((_var) => {
+                return (
+                  <tr key={_var.uid}>
+                    <td>
+                      <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={_var.name}
+                        className="mousetrap"
+                        onChange={(e) => handleVarChange(e, _var, 'name')}
+                      />
+                    </td>
+                    <td>
+                      <MultiLineEditor
+                        value={_var.value}
+                        theme={storedTheme}
+                        onSave={onSave}
+                        onChange={(newValue) =>
+                          handleVarChange(
+                            {
+                              target: {
+                                value: newValue
+                              }
+                            },
+                            _var,
+                            'value'
+                          )
+                        }
+                        collection={collection}
+                      />
+                    </td>
+                    <td>
+                      <div className="flex items-center">
+                        <input
+                          type="checkbox"
+                          checked={_var.enabled}
+                          tabIndex="-1"
+                          className="mr-3 mousetrap"
+                          onChange={(e) => handleVarChange(e, _var, 'enabled')}
+                        />
+                        <button tabIndex="-1" onClick={() => handleRemoveVar(_var)}>
+                          <IconTrash strokeWidth={1.5} size={20} />
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                );
+              })
+            : null}
+        </tbody>
+      </table>
+      <button className="btn-add-var text-link pr-2 py-3 mt-2 select-none" onClick={addVar}>
+        + Add
+      </button>
     </StyledWrapper>
   );
 };
-
 export default VarsTable;

packages/bruno-app/src/components/CollectionSettings/index.js

@@ -9,6 +9,7 @@ import Headers from './Headers';
 import Auth from './Auth';
 import Script from './Script';
 import Test from './Tests';
+import Presets from './Presets';
 import Protobuf from './Protobuf';
 import StyledWrapper from './StyledWrapper';
 import Vars from './Vars/index';
@@ -32,32 +33,21 @@ const CollectionSettings = ({ collection }) => {
   const hasTests = root?.request?.tests;
   const hasDocs = root?.docs;
 
-  const headers = collection.draft?.root
-    ? get(collection, 'draft.root.request.headers', [])
-    : get(collection, 'root.request.headers', []);
+  const headers = collection.draft?.root ? get(collection, 'draft.root.request.headers', []) : get(collection, 'root.request.headers', []);
   const activeHeadersCount = headers.filter((header) => header.enabled).length;
 
-  const requestVars = collection.draft?.root
-    ? get(collection, 'draft.root.request.vars.req', [])
-    : get(collection, 'root.request.vars.req', []);
-  const responseVars = collection.draft?.root
-    ? get(collection, 'draft.root.request.vars.res', [])
-    : get(collection, 'root.request.vars.res', []);
+  const requestVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.req', []) : get(collection, 'root.request.vars.req', []);
+  const responseVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.res', []) : get(collection, 'root.request.vars.res', []);
   const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
-  const authMode
-    = (collection.draft?.root ? get(collection, 'draft.root.request.auth', {}) : get(collection, 'root.request.auth', {}))
-      .mode || 'none';
+  const authMode = (collection.draft?.root ? get(collection, 'draft.root.request.auth', {}) : get(collection, 'root.request.auth', {})).mode || 'none';
 
-  const proxyConfig = collection.draft?.brunoConfig
-    ? get(collection, 'draft.brunoConfig.proxy', {})
-    : get(collection, 'brunoConfig.proxy', {});
+  const presets = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.presets', []) : get(collection, 'brunoConfig.presets', []);
+  const hasPresets = presets && presets.requestUrl !== '';
+
+  const proxyConfig = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.proxy', {}) : get(collection, 'brunoConfig.proxy', {});
   const proxyEnabled = proxyConfig.hostname ? true : false;
-  const clientCertConfig = collection.draft?.brunoConfig
-    ? get(collection, 'draft.brunoConfig.clientCertificates.certs', [])
-    : get(collection, 'brunoConfig.clientCertificates.certs', []);
-  const protobufConfig = collection.draft?.brunoConfig
-    ? get(collection, 'draft.brunoConfig.protobuf', {})
-    : get(collection, 'brunoConfig.protobuf', {});
+  const clientCertConfig = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.clientCertificates.certs', []) : get(collection, 'brunoConfig.clientCertificates.certs', []);
+  const protobufConfig = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.protobuf', {}) : get(collection, 'brunoConfig.protobuf', {});
 
   const getTabPanel = (tab) => {
     switch (tab) {
@@ -79,11 +69,18 @@ const CollectionSettings = ({ collection }) => {
       case 'tests': {
         return <Test collection={collection} />;
       }
+      case 'presets': {
+        return <Presets collection={collection} />;
+      }
       case 'proxy': {
         return <ProxySettings collection={collection} />;
       }
       case 'clientCert': {
-        return <ClientCertSettings collection={collection} />;
+        return (
+          <ClientCertSettings
+            collection={collection}
+          />
+        );
       }
       case 'protobuf': {
         return <Protobuf collection={collection} />;
@@ -123,6 +120,10 @@ const CollectionSettings = ({ collection }) => {
           Tests
           {hasTests && <StatusDot />}
         </div>
+        <div className={getTabClassname('presets')} role="tab" onClick={() => setTab('presets')}>
+          Presets
+          {hasPresets && <StatusDot />}
+        </div>
         <div className={getTabClassname('proxy')} role="tab" onClick={() => setTab('proxy')}>
           Proxy
           {Object.keys(proxyConfig).length > 0 && proxyEnabled && <StatusDot />}

packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js

@@ -125,7 +125,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
         );
 
         if (!isEmpty(validationErrors)) {
-          toast.error(Object.values(validationErrors).join('\n'));
+          toast.error(Object.values(validationErrors).join("\n"));
           return;
         }
 
@@ -208,9 +208,9 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
       onClose={onClose}
       handleCancel={onClose}
       handleConfirm={onSubmit}
-      customHeader={(
+      customHeader={
         <div className="flex items-center justify-between w-full">
-          <h2 className="font-bold">{title}</h2>
+          <h2 className="text-sm font-bold">{title}</h2>
           <div className="ml-auto flex items-center ">
             <ToggleSwitch
               className="mr-2"
@@ -220,16 +220,16 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                 setIsRawMode(e.target.checked);
               }}
             />
-            <label className="font-normal mr-4 normal-case">Edit Raw</label>
+            <label className="text-sm font-normal mr-4 normal-case">Edit Raw</label>
           </div>
         </div>
-      )}
+      }
     >
       <form onSubmit={(e) => e.preventDefault()} className="px-2">
         {isRawMode ? (
           <div>
             <div className="flex items-center gap-2 mb-1">
-              <label className="block">Set-Cookie String</label>
+              <label className="block text-sm">Set-Cookie String</label>
               <IconInfoCircle id="cookie-raw-info" size={16} strokeWidth={1.5} className="text-gray-400" />
               <Tooltip
                 anchorId="cookie-raw-info"
@@ -248,7 +248,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
           <div className="space-y-4">
             <div className="grid grid-cols-2 gap-4">
               <div>
-                <label className="block mb-1">
+                <label className="block text-sm mb-1">
                   Domain<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -262,11 +262,11 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.domain && formik.errors.domain && (
-                  <div className="text-red-500 mt-1">{formik.errors.domain}</div>
+                  <div className="text-red-500 text-sm mt-1">{formik.errors.domain}</div>
                 )}
               </div>
               <div>
-                <label className="block mb-1">Path</label>
+                <label className="block text-sm mb-1">Path</label>
                 <input
                   type="text"
                   name="path"
@@ -276,11 +276,11 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.path && formik.errors.path && (
-                  <div className="text-red-500 mt-1">{formik.errors.path}</div>
+                  <div className="text-red-500 text-sm mt-1">{formik.errors.path}</div>
                 )}
               </div>
               <div>
-                <label className="block mb-1">
+                <label className="block text-sm mb-1">
                   Key<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -294,12 +294,12 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.key && formik.errors.key && (
-                  <div className="text-red-500 mt-1">{formik.errors.key}</div>
+                  <div className="text-red-500 text-sm mt-1">{formik.errors.key}</div>
                 )}
               </div>
 
               <div>
-                <label className="block mb-1">
+                <label className="block text-sm mb-1">
                   Value<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -312,7 +312,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   className="block textbox non-passphrase-input w-full"
                 />
                 {formik.touched.value && formik.errors.value && (
-                  <div className="text-red-500 mt-1">{formik.errors.value}</div>
+                  <div className="text-red-500 text-sm mt-1">{formik.errors.value}</div>
                 )}
               </div>
             </div>
@@ -320,7 +320,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
             {/* Date Picker */}
             <div className="w-full flex items-end">
               <div>
-                <label className="block mb-1">Expiration ({moment.tz.guess()})</label>
+                <label className="block text-sm mb-1">Expiration ({moment.tz.guess()})</label>
                 <input
                   type="datetime-local"
                   name="expires"
@@ -332,7 +332,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   min={moment().format(moment.HTML5_FMT.DATETIME_LOCAL)}
                 />
                 {formik.touched.expires && formik.errors.expires && (
-                  <div className="text-red-500 mt-1">{formik.errors.expires}</div>
+                  <div className="text-red-500 text-sm mt-1">{formik.errors.expires}</div>
                 )}
               </div>
 
@@ -346,7 +346,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                     onChange={formik.handleChange}
                     className="mr-2"
                   />
-                  <span>Secure</span>
+                  <span className="text-sm">Secure</span>
                 </label>
 
                 <label className="flex items-center">
@@ -357,7 +357,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                     onChange={formik.handleChange}
                     className="mr-2"
                   />
-                  <span>HTTP Only</span>
+                  <span className="text-sm">HTTP Only</span>
                 </label>
               </div>
             </div>

packages/bruno-app/src/components/Cookies/StyledWrapper.js

@@ -7,7 +7,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 0.8125rem;
       user-select: none;
     }
   }

packages/bruno-app/src/components/Cookies/index.js

@@ -14,7 +14,7 @@ const ClearDomainCookiesModal = ({ onClose, domain, onClear }) => (
   <Modal onClose={onClose} handleCancel={onClose} title="Clear Domain Cookies" hideFooter={true}>
     <div className="flex items-center font-normal">
       <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-      <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
+      <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
     </div>
     <div className="font-normal mt-4">
       Are you sure you want to clear all cookies for the domain {domain}?
@@ -39,7 +39,7 @@ const DeleteCookieModal = ({ onClose, cookieName, onDelete }) => (
   <Modal onClose={onClose} handleCancel={onClose} title="Delete Cookie" hideFooter={true}>
     <div className="flex items-center font-normal">
       <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-      <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
+      <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
     </div>
     <div className="font-normal mt-4">
       Are you sure you want to delete the cookie {cookieName}?
@@ -72,7 +72,7 @@ const CollectionProperties = ({ onClose }) => {
   const [searchText, setSearchText] = useState(null);
 
   const handleAddCookie = (domain) => {
-    if (domain) setCurrentDomain(domain);
+    if(domain) setCurrentDomain(domain);
     setIsModifyCookieModalOpen(true);
   };
 
@@ -157,7 +157,7 @@ const CollectionProperties = ({ onClose }) => {
             // No cookies found
             <div className="flex items-center justify-center flex-col">
               <IconCookieOff size={48} strokeWidth={1.5} className="text-gray-500" />
-              <h2 className="text-lg font-medium mt-4">No cookies found</h2>
+              <h2 className="text-lg font-semibold mt-4">No cookies found</h2>
               <p className="text-gray-500 mt-2">Add cookies to get started</p>
               <button
                 type="submit"
@@ -175,7 +175,7 @@ const CollectionProperties = ({ onClose }) => {
             // No search results
             <div className="flex items-center justify-center flex-col">
               <IconSearch size={48} />
-              <h2 className="text-lg font-medium mt-4">No search results</h2>
+              <h2 className="text-lg font-semibold mt-4">No search results</h2>
               <p className="text-gray-500 mt-2">Try a different search term</p>
             </div>
           ) : (
@@ -219,13 +219,13 @@ const CollectionProperties = ({ onClose }) => {
                         <table className="w-full">
                           <thead>
                             <tr className="text-left border-b border-gray-200 dark:border-neutral-600 text-gray-700 dark:text-gray-300">
-                              <th className="py-2 px-4 font-medium w-32">Name</th>
-                              <th className="py-2 px-4 font-medium w-52">Value</th>
-                              <th className="py-2 px-4 font-medium">Path</th>
-                              <th className="py-2 px-4 font-medium">Expires</th>
-                              <th className="py-2 px-4 font-medium text-center">Secure</th>
-                              <th className="py-2 px-4 font-medium text-center">HTTP Only</th>
-                              <th className="py-2 px-4 font-medium text-right w-24">Actions</th>
+                              <th className="py-2 px-4 font-semibold w-32">Name</th>
+                              <th className="py-2 px-4 font-semibold w-52">Value</th>
+                              <th className="py-2 px-4 font-semibold">Path</th>
+                              <th className="py-2 px-4 font-semibold">Expires</th>
+                              <th className="py-2 px-4 font-semibold text-center">Secure</th>
+                              <th className="py-2 px-4 font-semibold text-center">HTTP Only</th>
+                              <th className="py-2 px-4 font-semibold text-right w-24">Actions</th>
                             </tr>
                           </thead>
                           <tbody>

packages/bruno-app/src/components/CreateUntitledRequest/StyledWrapper.js

@@ -1,8 +0,0 @@
-import styled from 'styled-components';
-
-const Wrapper = styled.div`
-  position: relative;
-  display: inline-block;
-`;
-
-export default Wrapper;

packages/bruno-app/src/components/CreateUntitledRequest/index.js

@@ -1,172 +0,0 @@
-import React, { useRef, forwardRef } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import Dropdown from 'components/Dropdown';
-import { newHttpRequest, newGrpcRequest, newWsRequest } from 'providers/ReduxStore/slices/collections/actions';
-import { generateUniqueRequestName } from 'utils/collections';
-import { sanitizeName } from 'utils/common/regex';
-import toast from 'react-hot-toast';
-import { IconApi, IconBrandGraphql, IconPlugConnected, IconCode, IconPlus } from '@tabler/icons';
-
-const CreateUntitledRequest = ({ collectionUid, itemUid = null, onRequestCreated, placement = 'bottom' }) => {
-  const dispatch = useDispatch();
-  const collections = useSelector((state) => state.collections.collections);
-  const collection = collections?.find((c) => c.uid === collectionUid);
-  const dropdownTippyRef = useRef();
-
-  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
-
-  if (!collection) {
-    return null;
-  }
-
-  const handleCreateHttpRequest = async () => {
-    dropdownTippyRef.current?.hide();
-    const uniqueName = await generateUniqueRequestName(collection, 'Untitled', itemUid);
-    const filename = sanitizeName(uniqueName);
-
-    dispatch(
-      newHttpRequest({
-        requestName: uniqueName,
-        filename: filename,
-        requestType: 'http-request',
-        requestUrl: '',
-        requestMethod: 'GET',
-        collectionUid: collection.uid,
-        itemUid: itemUid
-      })
-    )
-      .then(() => {
-        toast.success('New request created!');
-        onRequestCreated?.();
-      })
-      .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
-  };
-
-  const handleCreateGraphQLRequest = async () => {
-    dropdownTippyRef.current?.hide();
-    const uniqueName = await generateUniqueRequestName(collection, 'Untitled', itemUid);
-    const filename = sanitizeName(uniqueName);
-
-    dispatch(
-      newHttpRequest({
-        requestName: uniqueName,
-        filename: filename,
-        requestType: 'graphql-request',
-        requestUrl: '',
-        requestMethod: 'POST',
-        collectionUid: collection.uid,
-        itemUid: itemUid,
-        body: {
-          mode: 'graphql',
-          graphql: {
-            query: '',
-            variables: ''
-          }
-        }
-      })
-    )
-      .then(() => {
-        toast.success('New request created!');
-        onRequestCreated?.();
-      })
-      .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
-  };
-
-  const handleCreateWebSocketRequest = async () => {
-    dropdownTippyRef.current?.hide();
-    const uniqueName = await generateUniqueRequestName(collection, 'Untitled', itemUid);
-    const filename = sanitizeName(uniqueName);
-
-    dispatch(
-      newWsRequest({
-        requestName: uniqueName,
-        filename: filename,
-        requestUrl: '',
-        requestMethod: 'ws',
-        collectionUid: collection.uid,
-        itemUid: itemUid
-      })
-    )
-      .then(() => {
-        toast.success('New request created!');
-        onRequestCreated?.();
-      })
-      .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
-  };
-
-  const handleCreateGrpcRequest = async () => {
-    dropdownTippyRef.current?.hide();
-    const uniqueName = await generateUniqueRequestName(collection, 'Untitled', itemUid);
-    const filename = sanitizeName(uniqueName);
-
-    dispatch(
-      newGrpcRequest({
-        requestName: uniqueName,
-        filename: filename,
-        requestUrl: '',
-        collectionUid: collection.uid,
-        itemUid: itemUid
-      })
-    )
-      .then(() => {
-        toast.success('New request created!');
-        onRequestCreated?.();
-      })
-      .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
-  };
-
-  return (
-    <Dropdown onCreate={onDropdownCreate} icon={<IconPlus size={16} strokeWidth={2} />} placement={placement}>
-      <div
-        className="dropdown-item"
-        onClick={(e) => {
-          dropdownTippyRef.current.hide();
-          handleCreateHttpRequest();
-        }}
-      >
-        <span className="dropdown-icon">
-          <IconApi size={16} strokeWidth={2} />
-        </span>
-        HTTP
-      </div>
-      <div
-        className="dropdown-item"
-        onClick={(e) => {
-          dropdownTippyRef.current.hide();
-          handleCreateGraphQLRequest();
-        }}
-      >
-        <span className="dropdown-icon">
-          <IconBrandGraphql size={16} strokeWidth={2} />
-        </span>
-        GraphQL
-      </div>
-      <div
-        className="dropdown-item"
-        onClick={(e) => {
-          dropdownTippyRef.current.hide();
-          handleCreateWebSocketRequest();
-        }}
-      >
-        <span className="dropdown-icon">
-          <IconPlugConnected size={16} strokeWidth={2} />
-        </span>
-        WebSocket
-      </div>
-      <div
-        className="dropdown-item"
-        onClick={(e) => {
-          dropdownTippyRef.current.hide();
-          handleCreateGrpcRequest();
-        }}
-      >
-        <span className="dropdown-icon">
-          <IconCode size={16} strokeWidth={2} />
-        </span>
-        gRPC
-      </div>
-    </Dropdown>
-  );
-};
-
-export default CreateUntitledRequest;

packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js

@@ -22,12 +22,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     font-weight: 500;
 
     .error-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       font-weight: 400;
     }
   }
@@ -73,12 +73,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 14px;
       font-weight: 500;
     }
 
     span {
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       opacity: 0.7;
     }
   }
@@ -98,8 +98,8 @@ const StyledWrapper = styled.div`
     padding: 8px 16px;
     background: ${(props) => props.theme.console.headerBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: ${(props) => props.theme.font.size.xs};
-    font-weight: 500;
+    font-size: 11px;
+    font-weight: 600;
     color: ${(props) => props.theme.console.titleColor};
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -121,7 +121,7 @@ const StyledWrapper = styled.div`
     border-bottom: 1px solid ${(props) => props.theme.console.border};
     cursor: pointer;
     transition: background-color 0.1s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     align-items: center;
 
     &:hover {
@@ -149,15 +149,15 @@ const StyledWrapper = styled.div`
     text-overflow: ellipsis;
     white-space: nowrap;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
   }
 
   .error-time {
     color: ${(props) => props.theme.console.timestampColor};
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     text-align: right;
   }
 `;
 
-export default StyledWrapper;
+export default StyledWrapper; 

packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { IconBug } from '@tabler/icons';
-import {
+import { 
   setSelectedError,
   clearDebugErrors
 } from 'providers/ReduxStore/slices/logs';
@@ -10,10 +10,10 @@ import StyledWrapper from './StyledWrapper';
 const ErrorRow = ({ error, isSelected, onClick }) => {
   const formatTime = (timestamp) => {
     const date = new Date(timestamp);
-    return date.toLocaleTimeString('en-US', {
-      hour12: false,
-      hour: '2-digit',
-      minute: '2-digit',
+    return date.toLocaleTimeString('en-US', { 
+      hour12: false, 
+      hour: '2-digit', 
+      minute: '2-digit', 
       second: '2-digit',
       fractionalSecondDigits: 3
     });
@@ -38,18 +38,18 @@ const ErrorRow = ({ error, isSelected, onClick }) => {
   };
 
   return (
-    <div
+    <div 
       className={`error-row ${isSelected ? 'selected' : ''}`}
       onClick={onClick}
     >
       <div className="error-message" title={error.message}>
         {getShortMessage(error.message)}
       </div>
-
+      
       <div className="error-location" title={error.filename}>
         {getLocation(error)}
       </div>
-
+      
       <div className="error-time">
         {formatTime(error.timestamp)}
       </div>
@@ -59,7 +59,7 @@ const ErrorRow = ({ error, isSelected, onClick }) => {
 
 const DebugTab = () => {
   const dispatch = useDispatch();
-  const { debugErrors, selectedError } = useSelector((state) => state.logs);
+  const { debugErrors, selectedError } = useSelector(state => state.logs);
 
   const handleErrorClick = (error) => {
     dispatch(setSelectedError(error));
@@ -85,7 +85,7 @@ const DebugTab = () => {
               <div>Location</div>
               <div className="text-right">Time</div>
             </div>
-
+            
             <div className="errors-list">
               {debugErrors.map((error, index) => (
                 <ErrorRow
@@ -103,4 +103,4 @@ const DebugTab = () => {
   );
 };
 
-export default DebugTab;
+export default DebugTab; 

packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js

@@ -26,12 +26,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     font-weight: 500;
 
     .error-time {
       color: ${(props) => props.theme.console.countColor};
-      font-size: ${(props) => props.theme.font.size.xs};
+      font-size: 11px;
       font-weight: 400;
     }
   }
@@ -73,7 +73,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
 
     &:hover {
@@ -111,8 +111,8 @@ const StyledWrapper = styled.div`
 
     h4 {
       margin: 0 0 12px 0;
-      font-size: ${(props) => props.theme.font.size.base};
-      font-weight: 500;
+      font-size: 13px;
+      font-weight: 600;
       color: ${(props) => props.theme.console.titleColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
@@ -131,15 +131,15 @@ const StyledWrapper = styled.div`
     gap: 4px;
 
     label {
-      font-size: ${(props) => props.theme.font.size.xs};
-      font-weight: 500;
+      font-size: 11px;
+      font-weight: 600;
       color: ${(props) => props.theme.console.titleColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
     }
 
     span {
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       color: ${(props) => props.theme.console.messageColor};
       font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
       word-break: break-all;
@@ -167,7 +167,7 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       color: ${(props) => props.theme.console.messageColor};
       line-height: 1.4;
     }
@@ -184,7 +184,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
     text-decoration: none;
     align-self: flex-start;
@@ -212,7 +212,7 @@ const StyledWrapper = styled.div`
   .arguments {
     margin: 0;
     padding: 16px;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     line-height: 1.5;
     color: ${(props) => props.theme.console.messageColor};
     background: transparent;
@@ -225,4 +225,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
+export default StyledWrapper; 

packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import {
+import { 
   IconX,
   IconBug,
   IconFileText,
@@ -15,7 +15,7 @@ import StyledWrapper from './StyledWrapper';
 
 const ErrorInfoTab = ({ error }) => {
   const { version } = useApp();
-
+  
   const formatTimestamp = (timestamp) => {
     const date = new Date(timestamp);
     return date.toLocaleString();
@@ -23,7 +23,7 @@ const ErrorInfoTab = ({ error }) => {
 
   const generateGitHubIssueUrl = () => {
     const title = `Bug: ${error.message.substring(0, 50)}${error.message.length > 50 ? '...' : ''}`;
-
+    
     const body = `## Bug Report
 
 ### Error Details
@@ -66,7 +66,7 @@ ${error.args ? error.args.map((arg, index) => {
 
     const encodedTitle = encodeURIComponent(title);
     const encodedBody = encodeURIComponent(body);
-
+    
     return `https://github.com/usebruno/bruno/issues/new?template=BLANK_ISSUE&title=${encodedTitle}&body=${encodedBody}`;
   };
 
@@ -84,33 +84,33 @@ ${error.args ? error.args.map((arg, index) => {
             <label>Message:</label>
             <span className="error-message-full">{error.message || 'No message available'}</span>
           </div>
-
+          
           {error.filename && (
             <div className="info-item">
               <label>File:</label>
               <span className="file-path">{error.filename}</span>
             </div>
           )}
-
+          
           {error.lineno && (
             <div className="info-item">
               <label>Line:</label>
               <span>{error.lineno}{error.colno ? `:${error.colno}` : ''}</span>
             </div>
           )}
-
+          
           <div className="info-item">
             <label>Timestamp:</label>
             <span>{formatTimestamp(error.timestamp)}</span>
           </div>
         </div>
       </div>
-
+      
       <div className="section">
         <h4>Report Issue</h4>
         <div className="report-section">
           <p>Found a bug? Help us improve Bruno by reporting this error on GitHub.</p>
-          <button
+          <button 
             className="report-button"
             onClick={handleReportIssue}
             title="Report this error on GitHub"
@@ -127,11 +127,11 @@ ${error.args ? error.args.map((arg, index) => {
 const StackTraceTab = ({ error }) => {
   const formatStackTrace = (stack) => {
     if (!stack) return 'Stack trace not available';
-
+    
     return stack
       .split('\n')
-      .map((line) => line.trim())
-      .filter((line) => line.length > 0)
+      .map(line => line.trim())
+      .filter(line => line.length > 0)
       .join('\n');
   };
 
@@ -152,18 +152,18 @@ const StackTraceTab = ({ error }) => {
 const ArgumentsTab = ({ error }) => {
   const formatArguments = (args) => {
     if (!args || args.length === 0) return 'No arguments available';
-
+    
     try {
       return args.map((arg, index) => {
         // Handle special Error object format
         if (arg && typeof arg === 'object' && arg.__type === 'Error') {
           return `[${index}]: Error: ${arg.message}\n  Name: ${arg.name}\n  Stack: ${arg.stack || 'No stack trace'}`;
         }
-
+        
         if (typeof arg === 'object' && arg !== null) {
           return `[${index}]: ${JSON.stringify(arg, null, 2)}`;
         }
-
+        
         return `[${index}]: ${String(arg)}`;
       }).join('\n\n');
     } catch (e) {
@@ -187,7 +187,7 @@ const ArgumentsTab = ({ error }) => {
 
 const ErrorDetailsPanel = () => {
   const dispatch = useDispatch();
-  const { selectedError } = useSelector((state) => state.logs);
+  const { selectedError } = useSelector(state => state.logs);
   const [activeTab, setActiveTab] = useState('info');
 
   if (!selectedError) return null;
@@ -222,8 +222,8 @@ const ErrorDetailsPanel = () => {
           <span>Error Details</span>
           <span className="error-time">({formatTime(selectedError.timestamp)})</span>
         </div>
-
-        <button
+        
+        <button 
           className="close-button"
           onClick={handleClose}
           title="Close details panel"
@@ -233,23 +233,23 @@ const ErrorDetailsPanel = () => {
       </div>
 
       <div className="panel-tabs">
-        <button
+        <button 
           className={`tab-button ${activeTab === 'info' ? 'active' : ''}`}
           onClick={() => setActiveTab('info')}
         >
           <IconFileText size={14} strokeWidth={1.5} />
           Info
         </button>
-
-        <button
+        
+        <button 
           className={`tab-button ${activeTab === 'stack' ? 'active' : ''}`}
           onClick={() => setActiveTab('stack')}
         >
           <IconStack size={14} strokeWidth={1.5} />
           Stack
         </button>
-
-        <button
+        
+        <button 
           className={`tab-button ${activeTab === 'args' ? 'active' : ''}`}
           onClick={() => setActiveTab('args')}
         >
@@ -265,4 +265,4 @@ const ErrorDetailsPanel = () => {
   );
 };
 
-export default ErrorDetailsPanel;
+export default ErrorDetailsPanel; 

packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js

@@ -22,12 +22,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     font-weight: 500;
 
     .request-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       font-weight: 400;
     }
   }
@@ -59,12 +59,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 14px;
       font-weight: 500;
     }
 
     span {
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       opacity: 0.7;
     }
   }
@@ -84,8 +84,8 @@ const StyledWrapper = styled.div`
     padding: 8px 16px;
     background: ${(props) => props.theme.console.headerBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: ${(props) => props.theme.font.size.xs};
-    font-weight: 500;
+    font-size: 11px;
+    font-weight: 600;
     color: ${(props) => props.theme.console.titleColor};
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -107,7 +107,7 @@ const StyledWrapper = styled.div`
     border-bottom: 1px solid ${(props) => props.theme.console.border};
     cursor: pointer;
     transition: background-color 0.1s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     align-items: center;
 
     &:hover {
@@ -127,7 +127,7 @@ const StyledWrapper = styled.div`
     padding: 2px 6px;
     border-radius: 4px;
     font-size: 10px;
-    font-weight: 500;
+    font-weight: 600;
     color: white;
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -135,8 +135,8 @@ const StyledWrapper = styled.div`
   }
 
   .status-badge {
-    font-weight: 500;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-weight: 600;
+    font-size: 12px;
   }
 
   .request-domain {
@@ -158,20 +158,20 @@ const StyledWrapper = styled.div`
   .request-time {
     color: ${(props) => props.theme.console.timestampColor};
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
   }
 
   .request-duration {
     color: ${(props) => props.theme.console.messageColor};
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     text-align: right;
   }
 
   .request-size {
     color: ${(props) => props.theme.console.messageColor};
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     text-align: right;
   }
 
@@ -190,7 +190,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
 
     &:hover {
       background: ${(props) => props.theme.console.buttonHoverBg};
@@ -225,7 +225,7 @@ const StyledWrapper = styled.div`
     padding: 8px 12px;
     background: ${(props) => props.theme.console.dropdownHeaderBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
   }
@@ -235,7 +235,7 @@ const StyledWrapper = styled.div`
     border: none;
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     font-weight: 500;
     padding: 2px 4px;
     border-radius: 2px;
@@ -278,16 +278,16 @@ const StyledWrapper = styled.div`
 
   .filter-option-label {
     color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 400;
   }
 
   .filter-option-count {
     color: ${(props) => props.theme.console.optionCountColor};
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     font-weight: 400;
     margin-left: auto;
   }
 `;
 
-export default StyledWrapper;
+export default StyledWrapper; 

packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js

@@ -1,13 +1,13 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import {
+import { 
   IconFilter,
   IconChevronDown,
-  IconNetwork
+  IconNetwork,
 } from '@tabler/icons';
-import {
-  updateNetworkFilter,
-  toggleAllNetworkFilters,
+import { 
+  updateNetworkFilter, 
+  toggleAllNetworkFilters, 
   setSelectedRequest
 } from 'providers/ReduxStore/slices/logs';
 import StyledWrapper from './StyledWrapper';
@@ -27,8 +27,8 @@ const MethodBadge = ({ method }) => {
   };
 
   return (
-    <span
-      className="method-badge"
+    <span 
+      className="method-badge" 
       style={{ backgroundColor: getMethodColor(method) }}
     >
       {method?.toUpperCase() || 'GET'}
@@ -46,10 +46,10 @@ const StatusBadge = ({ status, statusCode }) => {
   };
 
   const displayStatus = statusCode || status;
-
+  
   return (
-    <span
-      className="status-badge"
+    <span 
+      className="status-badge" 
       style={{ color: getStatusColor(statusCode) }}
     >
       {displayStatus}
@@ -61,7 +61,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every((f) => f);
+  const allFiltersEnabled = Object.values(filters).every(f => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   useEffect(() => {
@@ -77,7 +77,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button
+      <button 
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter requests by method"
@@ -88,21 +88,21 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-
+      
       {isOpen && (
-        <div className="filter-dropdown-menu right">
+        <div className={`filter-dropdown-menu right`}>
           <div className="filter-dropdown-header">
             <span>Filter by Method</span>
-            <button
+            <button 
               className="filter-toggle-all"
               onClick={() => onToggleAll(!allFiltersEnabled)}
             >
               {allFiltersEnabled ? 'Hide All' : 'Show All'}
             </button>
           </div>
-
+          
           <div className="filter-dropdown-options">
-            {Object.keys(filters).map((method) => (
+            {Object.keys(filters).map(method => (
               <label key={method} className="filter-option">
                 <input
                   type="checkbox"
@@ -126,13 +126,13 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 const RequestRow = ({ request, isSelected, onClick }) => {
   const { data } = request;
   const { request: req, response: res, timestamp } = data;
-
+  
   const formatTime = (timestamp) => {
     const date = new Date(timestamp);
-    return date.toLocaleTimeString('en-US', {
-      hour12: false,
-      hour: '2-digit',
-      minute: '2-digit',
+    return date.toLocaleTimeString('en-US', { 
+      hour12: false, 
+      hour: '2-digit', 
+      minute: '2-digit', 
       second: '2-digit',
       fractionalSecondDigits: 3
     });
@@ -174,34 +174,34 @@ const RequestRow = ({ request, isSelected, onClick }) => {
   };
 
   return (
-    <div
+    <div 
       className={`request-row ${isSelected ? 'selected' : ''}`}
       onClick={onClick}
     >
       <div className="request-method">
         <MethodBadge method={req?.method} />
       </div>
-
+      
       <div className="request-status">
         <StatusBadge status={res?.status} statusCode={res?.statusCode} />
       </div>
-
+      
       <div className="request-domain" title={getDomain()}>
         {getDomain()}
       </div>
-
+      
       <div className="request-path" title={getPath()}>
         {getPath()}
       </div>
-
+      
       <div className="request-time">
         {formatTime(timestamp)}
       </div>
-
+      
       <div className="request-duration">
         {formatDuration(res?.duration)}
       </div>
-
+      
       <div className="request-size">
         {formatSize(res?.size)}
       </div>
@@ -211,17 +211,17 @@ const RequestRow = ({ request, isSelected, onClick }) => {
 
 const NetworkTab = () => {
   const dispatch = useDispatch();
-  const { networkFilters, selectedRequest } = useSelector((state) => state.logs);
-  const collections = useSelector((state) => state.collections.collections);
+  const { networkFilters, selectedRequest } = useSelector(state => state.logs);
+  const collections = useSelector(state => state.collections.collections);
 
   const allRequests = useMemo(() => {
     const requests = [];
-
-    collections.forEach((collection) => {
+    
+    collections.forEach(collection => {
       if (collection.timeline) {
         collection.timeline
-          .filter((entry) => entry.type === 'request')
-          .forEach((entry) => {
+          .filter(entry => entry.type === 'request')
+          .forEach(entry => {
             requests.push({
               ...entry,
               collectionName: collection.name,
@@ -230,12 +230,12 @@ const NetworkTab = () => {
           });
       }
     });
-
+    
     return requests.sort((a, b) => a.timestamp - b.timestamp);
   }, [collections]);
 
   const filteredRequests = useMemo(() => {
-    return allRequests.filter((request) => {
+    return allRequests.filter(request => {
       const method = request.data?.request?.method?.toUpperCase() || 'GET';
       return networkFilters[method];
     });
@@ -281,7 +281,7 @@ const NetworkTab = () => {
               <div className="text-right">Duration</div>
               <div className="text-right">Size</div>
             </div>
-
+            
             <div className="requests-list">
               {filteredRequests.map((request, index) => (
                 <RequestRow
@@ -299,4 +299,4 @@ const NetworkTab = () => {
   );
 };
 
-export default NetworkTab;
+export default NetworkTab; 

packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js

@@ -26,12 +26,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     font-weight: 500;
 
     .request-time {
       color: ${(props) => props.theme.console.countColor};
-      font-size: ${(props) => props.theme.font.size.xs};
+      font-size: 11px;
       font-weight: 400;
     }
   }
@@ -73,7 +73,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
 
     &:hover {
@@ -111,8 +111,8 @@ const StyledWrapper = styled.div`
 
     h4 {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.base};
-      font-weight: 500;
+      font-size: 13px;
+      font-weight: 600;
       color: ${(props) => props.theme.console.titleColor};
       padding-bottom: 4px;
       border-bottom: 1px solid ${(props) => props.theme.console.border};
@@ -131,15 +131,15 @@ const StyledWrapper = styled.div`
     gap: 2px;
 
     .label {
-      font-size: ${(props) => props.theme.font.size.xs};
-      font-weight: 500;
+      font-size: 11px;
+      font-weight: 600;
       color: ${(props) => props.theme.console.countColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
     }
 
     .value {
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       color: ${(props) => props.theme.console.messageColor};
       font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
       word-break: break-all;
@@ -160,7 +160,7 @@ const StyledWrapper = styled.div`
     table {
       width: 100%;
       border-collapse: collapse;
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       background: ${(props) => props.theme.console.headerBg};
 
       thead {
@@ -168,13 +168,13 @@ const StyledWrapper = styled.div`
         position: sticky;
         top: 0;
         z-index: 10;
-
+        
         td {
           padding: 8px 12px;
-          font-weight: 500;
+          font-weight: 600;
           color: ${(props) => props.theme.console.titleColor};
           text-transform: uppercase;
-          font-size: ${(props) => props.theme.font.size.xs};
+          font-size: 11px;
           letter-spacing: 0.5px;
           border-bottom: 1px solid ${(props) => props.theme.console.border};
         }
@@ -209,7 +209,7 @@ const StyledWrapper = styled.div`
   .header-name,
   .timeline-phase {
     color: ${(props) => props.theme.console.countColor};
-    font-weight: 500;
+    font-weight: 600;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
     min-width: 120px;
   }
@@ -234,7 +234,7 @@ const StyledWrapper = styled.div`
     border-radius: 4px;
     padding: 12px;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     line-height: 1.4;
     color: ${(props) => props.theme.console.messageColor};
     overflow: auto;
@@ -249,15 +249,17 @@ const StyledWrapper = styled.div`
     text-align: center;
     color: ${(props) => props.theme.console.emptyColor};
     font-style: italic;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     background: ${(props) => props.theme.console.headerBg};
     border: 1px solid ${(props) => props.theme.console.border};
     border-radius: 4px;
   }
 
   .response-body-container {
+    border: 1px solid ${(props) => props.theme.console.border};
     border-radius: 4px;
     overflow: hidden;
+    background: ${(props) => props.theme.console.headerBg};
     height: 400px;
     display: flex;
     flex-direction: column;
@@ -265,11 +267,13 @@ const StyledWrapper = styled.div`
     .w-full.h-full.relative.flex {
       height: 100% !important;
       width: 100% !important;
+      background: ${(props) => props.theme.console.headerBg} !important;
       display: flex !important;
       flex-direction: column !important;
     }
 
     div[role="tablist"] {
+      background: ${(props) => props.theme.console.dropdownHeaderBg};
       padding: 8px 12px;
       border-bottom: 1px solid ${(props) => props.theme.console.border};
       display: flex !important;
@@ -278,17 +282,28 @@ const StyledWrapper = styled.div`
       align-items: center !important;
       min-height: 40px !important;
       flex-shrink: 0 !important;
-
+      
       > div {
         color: ${(props) => props.theme.console.buttonColor};
-        font-size: ${(props) => props.theme.font.size.sm} !important;
+        font-size: 12px !important;
+        padding: 6px 12px !important;
+        border-radius: 4px;
+        transition: all 0.2s ease;
         cursor: pointer;
+        border: 1px solid ${(props) => props.theme.console.border};
+        background: ${(props) => props.theme.console.contentBg};
         white-space: nowrap !important;
         min-width: auto !important;
         height: auto !important;
         line-height: 1.2 !important;
         font-weight: 500 !important;
 
+        &:hover {
+          background: ${(props) => props.theme.console.buttonHoverBg};
+          color: ${(props) => props.theme.console.buttonHoverColor};
+          border-color: ${(props) => props.theme.console.buttonHoverBg};
+        }
+
         &.active {
           background: ${(props) => props.theme.console.checkboxColor};
           color: white;
@@ -321,7 +336,7 @@ const StyledWrapper = styled.div`
       
       pre {
         color: ${(props) => props.theme.console.messageColor} !important;
-        font-size: ${(props) => props.theme.font.size.xs} !important;
+        font-size: 11px !important;
         line-height: 1.4 !important;
         padding: 12px !important;
       }
@@ -329,4 +344,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
+export default StyledWrapper; 

packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import {
+import { 
   IconX,
   IconFileText,
   IconArrowRight,
   IconNetwork
 } from '@tabler/icons';
 import { clearSelectedRequest } from 'providers/ReduxStore/slices/logs';
-import QueryResponse from 'components/ResponsePane/QueryResponse/index';
+import QueryResult from 'components/ResponsePane/QueryResult';
 import Network from 'components/ResponsePane/Timeline/TimelineItem/Network';
 import StyledWrapper from './StyledWrapper';
 import { uuid } from 'utils/common/index';
@@ -116,8 +116,8 @@ const ResponseTab = ({ response, request, collection }) => {
         <h4>Response Body</h4>
         <div className="response-body-container">
           {response?.data || response?.dataBuffer ? (
-            <QueryResponse
-              item={{ uid: uuid() }}
+            <QueryResult
+              item={{ uid:  uuid()}}
               collection={collection}
               data={response.data}
               dataBuffer={response.dataBuffer}
@@ -155,8 +155,8 @@ const NetworkTab = ({ response }) => {
 
 const RequestDetailsPanel = () => {
   const dispatch = useDispatch();
-  const { selectedRequest } = useSelector((state) => state.logs);
-  const collections = useSelector((state) => state.collections.collections);
+  const { selectedRequest } = useSelector(state => state.logs);
+  const collections = useSelector(state => state.collections.collections);
   const [activeTab, setActiveTab] = useState('request');
 
   if (!selectedRequest) return null;
@@ -164,7 +164,7 @@ const RequestDetailsPanel = () => {
   const { data } = selectedRequest;
   const { request, response } = data;
 
-  const collection = collections.find((c) => c.uid === selectedRequest.collectionUid);
+  const collection = collections.find(c => c.uid === selectedRequest.collectionUid);
 
   const handleClose = () => {
     dispatch(clearSelectedRequest());
@@ -196,8 +196,8 @@ const RequestDetailsPanel = () => {
           <span>Request Details</span>
           <span className="request-time">({formatTime(selectedRequest.timestamp)})</span>
         </div>
-
-        <button
+        
+        <button 
           className="close-button"
           onClick={handleClose}
           title="Close details panel"
@@ -207,23 +207,23 @@ const RequestDetailsPanel = () => {
       </div>
 
       <div className="panel-tabs">
-        <button
+        <button 
           className={`tab-button ${activeTab === 'request' ? 'active' : ''}`}
           onClick={() => setActiveTab('request')}
         >
           <IconArrowRight size={14} strokeWidth={1.5} />
           Request
         </button>
-
-        <button
+        
+        <button 
           className={`tab-button ${activeTab === 'response' ? 'active' : ''}`}
           onClick={() => setActiveTab('response')}
         >
           <IconFileText size={14} strokeWidth={1.5} />
           Response
         </button>
-
-        <button
+        
+        <button 
           className={`tab-button ${activeTab === 'network' ? 'active' : ''}`}
           onClick={() => setActiveTab('network')}
         >
@@ -239,4 +239,4 @@ const RequestDetailsPanel = () => {
   );
 };
 
-export default RequestDetailsPanel;
+export default RequestDetailsPanel; 

packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js

@@ -37,7 +37,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
     border-radius: 4px 4px 0 0;
 
@@ -89,12 +89,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 13px;
     font-weight: 500;
 
     .log-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       font-weight: 400;
     }
   }
@@ -194,7 +194,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
 
     &:hover {
       background: ${(props) => props.theme.console.buttonHoverBg};
@@ -235,7 +235,7 @@ const StyledWrapper = styled.div`
     padding: 8px 12px;
     background: ${(props) => props.theme.console.dropdownHeaderBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
   }
@@ -245,7 +245,7 @@ const StyledWrapper = styled.div`
     border: none;
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     font-weight: 500;
     padding: 2px 4px;
     border-radius: 2px;
@@ -288,13 +288,13 @@ const StyledWrapper = styled.div`
 
   .filter-option-label {
     color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 400;
   }
 
   .filter-option-count {
     color: ${(props) => props.theme.console.optionCountColor};
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     font-weight: 400;
     margin-left: auto;
   }
@@ -312,12 +312,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 14px;
       font-weight: 500;
     }
 
     span {
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 12px;
       opacity: 0.7;
     }
   }
@@ -333,7 +333,7 @@ const StyledWrapper = styled.div`
     padding: 2px 6px;
     border-radius: 4px;
     font-size: 10px;
-    font-weight: 500;
+    font-weight: 600;
     color: white;
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -346,7 +346,7 @@ const StyledWrapper = styled.div`
     gap: 12px;
     padding: 4px 16px;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     line-height: 1.4;
     border-left: 2px solid transparent;
     transition: background-color 0.1s ease;
@@ -431,13 +431,13 @@ const StyledWrapper = styled.div`
 
   .log-timestamp {
     color: ${(props) => props.theme.console.timestampColor};
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     font-weight: 400;
   }
 
   .log-level {
     font-size: 9px;
-    font-weight: 500;
+    font-weight: 600;
     padding: 2px 4px;
     border-radius: 2px;
     text-transform: uppercase;
@@ -465,7 +465,7 @@ const StyledWrapper = styled.div`
         background: transparent !important;
         
         .object-key-val {
-          font-size: ${(props) => props.theme.font.size.sm} !important;
+          font-size: 12px !important;
         }
         
         .object-key {
@@ -517,4 +517,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
+export default StyledWrapper; 

packages/bruno-app/src/components/Devtools/Console/TerminalTab/SessionList.js

@@ -1,151 +0,0 @@
-import React from 'react';
-import { IconTerminal, IconX } from '@tabler/icons';
-import styled from 'styled-components';
-import ToolHint from 'components/ToolHint/index';
-
-const StyledSessionList = styled.div`
-  .session-list-item {
-    padding: 10px 12px;
-    cursor: pointer;
-    border-bottom: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.05)'};
-    transition: all 0.2s;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    position: relative;
-
-    &:hover {
-      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.05)'};
-      
-      .session-close-btn {
-        opacity: 1;
-      }
-    }
-
-    &.active {
-      background: ${(props) => props.theme.sidebarActive || 'rgba(59, 142, 234, 0.12)'};
-      border-left: 2px solid ${(props) => props.theme.brandColor || '#3b8eea'};
-    }
-
-    &:last-child {
-      border-bottom: none;
-    }
-  }
-
-  .session-close-btn {
-    position: absolute;
-    right: 8px;
-    top: 50%;
-    transform: translateY(-50%);
-    opacity: 0;
-    transition: opacity 0.2s;
-    padding: 4px;
-    cursor: pointer;
-    color: ${(props) => props.theme.textSecondary || '#888'};
-    
-    &:hover {
-      color: ${(props) => props.theme.text};
-      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.1)'};
-      border-radius: 4px;
-    }
-  }
-
-  .session-name {
-    font-size: 13px;
-    font-weight: 500;
-    color: ${(props) => props.theme.text};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    padding-right: 24px;
-    display: flex;
-    align-items: center;
-    gap: 6px;
-  }
-
-  .session-icon {
-    flex-shrink: 0;
-    opacity: 0.7;
-  }
-
-  .session-path {
-    font-size: 11px;
-    color: ${(props) => props.theme.textSecondary || '#888'};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-`;
-
-const SessionList = ({ sessions, activeSessionId, onSelectSession, onCloseSession }) => {
-  const getSessionDisplayInfo = (session) => {
-    if (session.name) {
-      return { name: session.name };
-    }
-
-    if (session.cwd) {
-      // Normalize path and get the last directory name
-      const normalizedPath = session.cwd.replace(/\\/g, '/').replace(/\/$/, '');
-      const pathParts = normalizedPath.split('/').filter((p) => p);
-
-      if (pathParts.length > 0) {
-        const folderName = pathParts[pathParts.length - 1];
-        return { name: folderName };
-      }
-
-      // If it's root or home directory
-      if (normalizedPath === '' || normalizedPath === '/' || normalizedPath.match(/^[A-Z]:\/?$/)) {
-        return { name: 'Root' };
-      }
-    }
-
-    // Fallback: use a cool name based on session ID
-    const shortId = session.sessionId.split('_')[1]?.slice(-6) || session.sessionId.slice(-6);
-    return { name: `Terminal ${shortId}` };
-  };
-
-  const getFullPath = (session) => {
-    if (session.cwd) {
-      return session.cwd;
-    }
-    return '~ (Home Directory)';
-  };
-
-  return (
-    <StyledSessionList>
-      {sessions.map((session) => {
-        const { name } = getSessionDisplayInfo(session);
-        return (
-          <ToolHint
-            key={session.sessionId}
-            text={getFullPath(session)}
-            toolhintId={`session-path-${session.sessionId}`}
-            place="bottom-start"
-            delayShow={100}
-          >
-            <div
-              className={`session-list-item ${activeSessionId === session.sessionId ? 'active' : ''}`}
-              onClick={() => onSelectSession(session.sessionId)}
-            >
-              <div className="session-name">
-                <IconTerminal className="session-icon" size={14} />
-                <span>{name}</span>
-              </div>
-              <div
-                className="session-close-btn"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onCloseSession(session.sessionId);
-                }}
-              >
-                <IconX size={14} />
-              </div>
-            </div>
-          </ToolHint>
-        );
-      })}
-    </StyledSessionList>
-  );
-};
-
-export default SessionList;

packages/bruno-app/src/components/Devtools/Console/TerminalTab/StyledWrapper.js

@@ -1,201 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  color: ${(props) => props.theme.text};
-
-  .xterm-rows {
-    color: ${(props) => props.theme.text} !important;
-  }
-
-  .terminal-content {
-    height: 100%;
-    width: 100%;
-    position: relative;
-    display: flex;
-    flex-direction: row;
-  }
-
-  .terminal-sessions-sidebar {
-    width: 200px;
-    min-width: 200px;
-    border-right: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.08)'};
-    background: ${(props) => props.theme.sidebarBackground || props.theme.background};
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-  }
-
-  .terminal-sessions-header {
-    padding: 12px;
-    font-weight: 600;
-    font-size: 13px;
-    color: ${(props) => props.theme.text};
-    border-bottom: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.08)'};
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .terminal-sessions-list {
-    flex: 1;
-    overflow-y: auto;
-
-    /* Custom scrollbar styling - subtle */
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-
-    &::-webkit-scrollbar-track {
-      background: transparent;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: rgba(255, 255, 255, 0.1);
-      border-radius: 3px;
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      background: rgba(255, 255, 255, 0.15);
-    }
-  }
-
-  .terminal-session-item {
-    padding: 10px 12px;
-    cursor: pointer;
-    border-bottom: 1px solid ${(props) => props.theme.border};
-    transition: background 0.2s;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-
-    &:hover {
-      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.05)'};
-    }
-
-    &.active {
-      background: ${(props) => props.theme.sidebarActive || 'rgba(59, 142, 234, 0.15)'};
-      border-left: 3px solid ${(props) => props.theme.brandColor || '#3b8eea'};
-    }
-  }
-
-  .terminal-session-name {
-    font-size: 13px;
-    font-weight: 500;
-    color: ${(props) => props.theme.text};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .terminal-session-path {
-    font-size: 11px;
-    color: ${(props) => props.theme.textSecondary || '#888'};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .terminal-display-container {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    position: relative;
-  }
-
-  .terminal-loading {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 12px;
-    color: #888;
-    font-size: 14px;
-    z-index: 10;
-
-    svg {
-      opacity: 0.7;
-    }
-
-    span {
-      font-weight: 500;
-    }
-  }
-
-  .terminal-container {
-    flex: 1;
-    position: relative;
-    
-    .xterm {
-      height: 100% !important;
-      width: 100% !important;
-      padding: 8px;
-    }
-
-    .xterm-viewport {
-      background: transparent !important;
-    }
-
-    .xterm-screen {
-      background: transparent !important;
-    }
-
-    .xterm-decoration-overview-ruler {
-      display: none;
-    }
-
-    /* Custom scrollbar for terminal */
-    .xterm-viewport::-webkit-scrollbar {
-      width: 8px;
-    }
-
-    .xterm-viewport::-webkit-scrollbar-track {
-      background: rgba(255, 255, 255, 0.05);
-      border-radius: 4px;
-    }
-
-    .xterm-viewport::-webkit-scrollbar-thumb {
-      background: rgba(255, 255, 255, 0.2);
-      border-radius: 4px;
-    }
-
-    .xterm-viewport::-webkit-scrollbar-thumb:hover {
-      background: rgba(255, 255, 255, 0.3);
-    }
-  }
-
-  /* Dark theme adjustments */
-  .xterm-helper-textarea {
-    position: absolute !important;
-    left: -9999px !important;
-    top: -9999px !important;
-  }
-
-  /* Selection styling */
-  .xterm .xterm-selection div {
-    background-color: rgba(255, 255, 255, 0.3) !important;
-  }
-
-  /* Cursor styling */
-  .xterm .xterm-cursor-layer .xterm-cursor {
-    background-color: #d4d4d4 !important;
-  }
-
-  /* Link styling */
-  .xterm .xterm-decoration-link {
-    text-decoration: underline;
-    color: #3b8eea;
-  }
-
-  .xterm .xterm-decoration-link:hover {
-    color: #5ba7f7;
-  }
-`;
-
-export default StyledWrapper;

packages/bruno-app/src/components/Devtools/Console/TerminalTab/index.js

@@ -1,449 +0,0 @@
-import React, { useRef, useEffect, useState, useCallback } from 'react';
-import { Terminal } from '@xterm/xterm';
-import { FitAddon } from '@xterm/addon-fit';
-import { IconTerminal2, IconPlus } from '@tabler/icons';
-import StyledWrapper from './StyledWrapper';
-import SessionList from './SessionList';
-import '@xterm/xterm/css/xterm.css';
-
-// Terminal instances per session - Map<sessionId, { terminal, fitAddon, inputDisposable, resizeDisposable }>
-const terminalInstances = new Map();
-
-// Data listeners per session - Map<sessionId, { onData, onExit }>
-const sessionListeners = new Map();
-
-// Parking host for terminal DOM when view unmounts
-let parkingHost = null;
-
-// Export function to get current session ID (for backward compatibility)
-export const getSessionId = () => {
-  // Return the first active session ID if any
-  if (terminalInstances.size > 0) {
-    return Array.from(terminalInstances.keys())[0];
-  }
-  return null;
-};
-
-const ensureParkingHost = () => {
-  if (parkingHost && document.body.contains(parkingHost)) return parkingHost;
-  parkingHost = document.createElement('div');
-  parkingHost.style.display = 'none';
-  parkingHost.setAttribute('data-terminal-parking-host', 'true');
-  document.body.appendChild(parkingHost);
-  return parkingHost;
-};
-
-const createTerminalForSession = (sessionId) => {
-  if (terminalInstances.has(sessionId)) {
-    return terminalInstances.get(sessionId);
-  }
-
-  const terminal = new Terminal({
-    cursorBlink: true,
-    fontSize: 14,
-    fontFamily: 'Menlo, Monaco, "Courier New", monospace',
-    theme: {
-      background: '#1e1e1e',
-      foreground: '#d4d4d4',
-      cursor: '#d4d4d4',
-      selection: '#264f78',
-      black: '#1e1e1e',
-      red: '#f14c4c',
-      green: '#23d18b',
-      yellow: '#f5f543',
-      blue: '#3b8eea',
-      magenta: '#d670d6',
-      cyan: '#29b8db',
-      white: '#e5e5e5',
-      brightBlack: '#666666',
-      brightRed: '#f14c4c',
-      brightGreen: '#23d18b',
-      brightYellow: '#f5f543',
-      brightBlue: '#3b8eea',
-      brightMagenta: '#d670d6',
-      brightCyan: '#29b8db',
-      brightWhite: '#e5e5e5'
-    },
-    allowProposedApi: true
-  });
-
-  const fitAddon = new FitAddon();
-  terminal.loadAddon(fitAddon);
-
-  const inputDisposable = terminal.onData((data) => {
-    if (data && sessionId && window.ipcRenderer) {
-      window.ipcRenderer.send('terminal:input', sessionId, data);
-    }
-  });
-
-  const resizeDisposable = terminal.onResize(({ cols, rows }) => {
-    if (sessionId && window.ipcRenderer) {
-      window.ipcRenderer.send('terminal:resize', sessionId, { cols, rows });
-    }
-  });
-
-  const instance = {
-    terminal,
-    fitAddon,
-    inputDisposable,
-    resizeDisposable
-  };
-
-  terminalInstances.set(sessionId, instance);
-
-  // Setup IPC listeners for this session
-  if (window.ipcRenderer && !sessionListeners.has(sessionId)) {
-    const onData = (data) => {
-      if (!data) return;
-      const instance = terminalInstances.get(sessionId);
-      if (instance && instance.terminal) {
-        try {
-          instance.terminal.write(data);
-        } catch (err) {
-          console.warn('Failed to write terminal data:', err);
-        }
-      }
-    };
-
-    const onExit = ({ exitCode, signal } = {}) => {
-      const msg = `\r\n[Process exited with code ${exitCode ?? ''} ${signal ? `(signal ${signal})` : ''}]\r\n`;
-      const instance = terminalInstances.get(sessionId);
-      if (instance && instance.terminal) {
-        try {
-          instance.terminal.write(msg);
-        } catch (err) {
-          console.warn('Failed to write terminal exit message:', err);
-        }
-      }
-      // Cleanup on exit
-      cleanupTerminalInstance(sessionId);
-    };
-
-    window.ipcRenderer.on(`terminal:data:${sessionId}`, onData);
-    window.ipcRenderer.on(`terminal:exit:${sessionId}`, onExit);
-
-    sessionListeners.set(sessionId, { onData, onExit });
-  }
-
-  return instance;
-};
-
-const cleanupTerminalInstance = (sessionId) => {
-  const instance = terminalInstances.get(sessionId);
-  if (instance) {
-    try {
-      if (instance.inputDisposable) instance.inputDisposable.dispose();
-      if (instance.resizeDisposable) instance.resizeDisposable.dispose();
-      if (instance.terminal) {
-        instance.terminal.dispose();
-      }
-    } catch (err) {
-      console.warn('Error disposing terminal instance:', err);
-    }
-    terminalInstances.delete(sessionId);
-  }
-
-  // Remove IPC listeners
-  const listeners = sessionListeners.get(sessionId);
-  if (listeners && window.ipcRenderer) {
-    try {
-      window.ipcRenderer.removeAllListeners(`terminal:data:${sessionId}`);
-      window.ipcRenderer.removeAllListeners(`terminal:exit:${sessionId}`);
-    } catch (err) {
-      console.warn('Error removing IPC listeners:', err);
-    }
-    sessionListeners.delete(sessionId);
-  }
-};
-
-const openTerminalIntoContainer = async (container, sessionId) => {
-  if (!container || !sessionId) return;
-
-  const instance = createTerminalForSession(sessionId);
-  const { terminal, fitAddon } = instance;
-
-  if (!terminal.element) {
-    terminal.open(container);
-  } else {
-    // Move terminal element to new container
-    if (terminal.element.parentElement !== container) {
-      container.appendChild(terminal.element);
-    }
-  }
-
-  await new Promise((resolve) => setTimeout(resolve, 50));
-  try {
-    fitAddon.fit();
-    const { cols, rows } = terminal;
-    if (cols && rows && window.ipcRenderer) {
-      window.ipcRenderer.send('terminal:resize', sessionId, { cols, rows });
-    }
-  } catch (e) {
-    console.warn('Error fitting terminal:', e);
-  }
-};
-
-const TerminalTab = () => {
-  const terminalRef = useRef(null);
-  const [sessions, setSessions] = useState([]);
-  const [activeSessionId, setActiveSessionId] = useState(null);
-  const [isLoading, setIsLoading] = useState(true);
-
-  // Load sessions list
-  const loadSessions = useCallback(async (currentActiveSessionId = null) => {
-    if (!window.ipcRenderer) return [];
-
-    try {
-      const sessionList = await window.ipcRenderer.invoke('terminal:list-sessions');
-      setSessions(sessionList);
-
-      // Use functional state updates to get the current activeSessionId
-      setActiveSessionId((prevActiveSessionId) => {
-        const activeId = currentActiveSessionId !== null ? currentActiveSessionId : prevActiveSessionId;
-
-        // Auto-select first session if none selected
-        if (!activeId && sessionList.length > 0) {
-          return sessionList[0].sessionId;
-        }
-
-        // If active session no longer exists, select first available
-        if (activeId && !sessionList.find((s) => s.sessionId === activeId)) {
-          return sessionList.length > 0 ? sessionList[0].sessionId : null;
-        }
-
-        // Keep current selection if it still exists
-        return activeId;
-      });
-
-      return sessionList;
-    } catch (err) {
-      console.error('Failed to load sessions:', err);
-      return [];
-    }
-  }, []);
-
-  // Create new terminal session
-  const createNewSession = useCallback(async (cwd = null) => {
-    if (!window.ipcRenderer) return null;
-
-    try {
-      const options = cwd ? { cwd } : {};
-      const newSessionId = await window.ipcRenderer.invoke('terminal:create', options);
-      if (newSessionId) {
-        await loadSessions(newSessionId);
-        setActiveSessionId(newSessionId);
-        return newSessionId;
-      }
-    } catch (err) {
-      console.error('Failed to create terminal session:', err);
-    }
-    return null;
-  }, [loadSessions]);
-
-  // Listen for requests to open terminal at specific CWD
-  useEffect(() => {
-    const normalizePath = (path) => {
-      if (!path) return '';
-      // Normalize path separators and remove trailing separators for comparison
-      return path.replace(/\\/g, '/').replace(/\/$/, '') || '/';
-    };
-
-    const handleOpenTerminalAtCwd = async (event) => {
-      const { cwd } = event.detail;
-      if (!cwd) return;
-
-      const normalizedCwd = normalizePath(cwd);
-
-      // Check if session already exists at this CWD
-      const sessionList = await window.ipcRenderer.invoke('terminal:list-sessions');
-      const existingSession = sessionList.find((s) => normalizePath(s.cwd) === normalizedCwd);
-
-      if (existingSession) {
-        // Switch to existing session
-        await loadSessions(existingSession.sessionId);
-        setActiveSessionId(existingSession.sessionId);
-      } else {
-        // Create new session at this CWD
-        await createNewSession(cwd);
-      }
-    };
-
-    window.addEventListener('terminal:open-at-cwd', handleOpenTerminalAtCwd);
-
-    return () => {
-      window.removeEventListener('terminal:open-at-cwd', handleOpenTerminalAtCwd);
-    };
-  }, [loadSessions, createNewSession]);
-
-  // Close terminal session
-  const closeSession = async (sessionId) => {
-    if (!window.ipcRenderer) return;
-
-    try {
-      window.ipcRenderer.send('terminal:kill', sessionId);
-      cleanupTerminalInstance(sessionId);
-
-      // Load updated sessions (this will also handle active session switching)
-      const updatedSessions = await loadSessions();
-
-      // If we closed the active session and there are no sessions left, clear selection
-      if (activeSessionId === sessionId && updatedSessions.length === 0) {
-        setActiveSessionId(null);
-      }
-    } catch (err) {
-      console.error('Failed to close terminal session:', err);
-    }
-  };
-
-  // Load sessions on mount and set up polling
-  useEffect(() => {
-    if (!window.ipcRenderer) {
-      setIsLoading(false);
-      return;
-    }
-
-    let mounted = true;
-
-    const initialLoad = async () => {
-      const sessionList = await loadSessions();
-      if (mounted) {
-        setIsLoading(false);
-      }
-    };
-
-    initialLoad();
-
-    // Poll for session updates every 2 seconds
-    // Note: We don't pass currentActiveSessionId here to avoid stale closures
-    // The functional update inside loadSessions will use the current state
-    const pollInterval = setInterval(() => {
-      if (mounted) {
-        loadSessions();
-      }
-    }, 2000);
-
-    return () => {
-      mounted = false;
-      clearInterval(pollInterval);
-    };
-  }, []);
-
-  // Handle terminal display for active session
-  useEffect(() => {
-    if (!activeSessionId || !terminalRef.current) return;
-
-    let mounted = true;
-
-    const setupTerminal = async () => {
-      await openTerminalIntoContainer(terminalRef.current, activeSessionId);
-
-      if (mounted) {
-        const instance = terminalInstances.get(activeSessionId);
-        if (instance && instance.fitAddon) {
-          const onResize = () => {
-            try {
-              instance.fitAddon.fit();
-            } catch (e) {}
-          };
-
-          window.addEventListener('resize', onResize);
-
-          // Initial resize
-          setTimeout(() => {
-            try {
-              instance.fitAddon.fit();
-              const { cols, rows } = instance.terminal;
-              if (cols && rows && window.ipcRenderer) {
-                window.ipcRenderer.send('terminal:resize', activeSessionId, { cols, rows });
-              }
-            } catch (err) {
-              console.warn('Failed to perform initial resize:', err);
-            }
-          }, 100);
-
-          return () => {
-            window.removeEventListener('resize', onResize);
-
-            // Park terminal element when switching sessions
-            if (instance.terminal && instance.terminal.element) {
-              const host = ensureParkingHost();
-              if (instance.terminal.element.parentElement !== host) {
-                host.appendChild(instance.terminal.element);
-              }
-            }
-          };
-        }
-      }
-    };
-
-    const cleanup = setupTerminal();
-
-    return () => {
-      mounted = false;
-      Promise.resolve(cleanup).then((fn) => {
-        if (typeof fn === 'function') fn();
-      });
-    };
-  }, [activeSessionId]);
-
-  return (
-    <StyledWrapper>
-      <div className="terminal-content">
-        {/* Left Sidebar */}
-        <div className="terminal-sessions-sidebar">
-          <div className="terminal-sessions-header">
-            <span>Sessions</span>
-            <IconPlus
-              size={16}
-              style={{ cursor: 'pointer', color: '#888' }}
-              onClick={(e) => {
-                e.stopPropagation();
-                createNewSession();
-              }}
-              title="New Terminal Session"
-            />
-          </div>
-          <div className="terminal-sessions-list">
-            {isLoading ? (
-              <div style={{ padding: '12px', color: '#888', fontSize: '13px' }}>
-                Loading sessions...
-              </div>
-            ) : sessions.length === 0 ? (
-              <div style={{ padding: '12px', color: '#888', fontSize: '13px' }}>
-                No active sessions
-              </div>
-            ) : (
-              <SessionList
-                sessions={sessions}
-                activeSessionId={activeSessionId}
-                onSelectSession={setActiveSessionId}
-                onCloseSession={closeSession}
-              />
-            )}
-          </div>
-        </div>
-
-        {/* Right Terminal Display */}
-        <div className="terminal-display-container">
-          {!activeSessionId && window.ipcRenderer && (
-            <div className="terminal-loading">
-              <IconTerminal2 size={24} strokeWidth={1.5} />
-              <span>No terminal session selected</span>
-            </div>
-          )}
-          <div
-            ref={terminalRef}
-            className="terminal-container"
-            style={{
-              height: '100%',
-              width: '100%',
-              display: activeSessionId ? 'block' : 'none'
-            }}
-          />
-        </div>
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default TerminalTab;

packages/bruno-app/src/components/Devtools/Console/index.js

@@ -2,12 +2,12 @@ import React, { useEffect, useRef, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import ReactJson from 'react-json-view';
 import { useTheme } from 'providers/Theme';
-import {
-  IconX,
-  IconTrash,
+import { 
+  IconX, 
+  IconTrash, 
   IconFilter,
-  IconAlertTriangle,
-  IconAlertCircle,
+  IconAlertTriangle, 
+  IconAlertCircle, 
   IconBug,
   IconCode,
   IconChevronDown,
@@ -15,10 +15,10 @@ import {
   IconNetwork,
   IconDashboard
 } from '@tabler/icons';
-import {
-  closeConsole,
-  clearLogs,
-  updateFilter,
+import { 
+  closeConsole, 
+  clearLogs, 
+  updateFilter, 
   toggleAllFilters,
   setActiveTab,
   clearDebugErrors,
@@ -27,7 +27,6 @@ import {
 } from 'providers/ReduxStore/slices/logs';
 
 import NetworkTab from './NetworkTab';
-import TerminalTab from './TerminalTab';
 import RequestDetailsPanel from './RequestDetailsPanel';
 // import DebugTab from './DebugTab';
 import ErrorDetailsPanel from './ErrorDetailsPanel';
@@ -36,7 +35,7 @@ import StyledWrapper from './StyledWrapper';
 
 const LogIcon = ({ type }) => {
   const iconProps = { size: 16, strokeWidth: 1.5 };
-
+  
   switch (type) {
     case 'error':
       return <IconAlertCircle className="log-icon error" {...iconProps} />;
@@ -53,20 +52,20 @@ const LogIcon = ({ type }) => {
 
 const LogTimestamp = ({ timestamp }) => {
   const date = new Date(timestamp);
-  const time = date.toLocaleTimeString('en-US', {
-    hour12: false,
-    hour: '2-digit',
-    minute: '2-digit',
+  const time = date.toLocaleTimeString('en-US', { 
+    hour12: false, 
+    hour: '2-digit', 
+    minute: '2-digit', 
     second: '2-digit',
     fractionalSecondDigits: 3
   });
-
+  
   return <span className="log-timestamp">{time}</span>;
 };
 
 const LogMessage = ({ message, args }) => {
   const { displayedTheme } = useTheme();
-
+  
   const formatMessage = (msg, originalArgs) => {
     if (originalArgs && originalArgs.length > 0) {
       return originalArgs.map((arg, index) => {
@@ -85,7 +84,7 @@ const LogMessage = ({ message, args }) => {
                 name={false}
                 style={{
                   backgroundColor: 'transparent',
-                  fontSize: '${(props) => props.theme.font.size.sm}',
+                  fontSize: '12px',
                   fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace'
                 }}
               />
@@ -99,7 +98,7 @@ const LogMessage = ({ message, args }) => {
   };
 
   const formattedMessage = formatMessage(message, args);
-
+  
   return (
     <span className="log-message">
       {Array.isArray(formattedMessage) ? formattedMessage.map((item, index) => (
@@ -113,7 +112,7 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every((f) => f);
+  const allFiltersEnabled = Object.values(filters).every(f => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   useEffect(() => {
@@ -129,7 +128,7 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button
+      <button 
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter logs by type"
@@ -140,19 +139,19 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-
+      
       {isOpen && (
-        <div className="filter-dropdown-menu right">
+        <div className={`filter-dropdown-menu right`}>
           <div className="filter-dropdown-header">
             <span>Filter by Type</span>
-            <button
+            <button 
               className="filter-toggle-all"
               onClick={() => onToggleAll(!allFiltersEnabled)}
             >
               {allFiltersEnabled ? 'Hide All' : 'Show All'}
             </button>
           </div>
-
+          
           <div className="filter-dropdown-options">
             {Object.entries(filters).map(([filterType, enabled]) => (
               <label key={filterType} className="filter-option">
@@ -179,7 +178,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every((f) => f);
+  const allFiltersEnabled = Object.values(filters).every(f => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   const getMethodColor = (method) => {
@@ -208,7 +207,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button
+      <button 
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter requests by method"
@@ -219,19 +218,19 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-
+      
       {isOpen && (
-        <div className="filter-dropdown-menu right">
+        <div className={`filter-dropdown-menu right`}>
           <div className="filter-dropdown-header">
             <span>Filter by Method</span>
-            <button
+            <button 
               className="filter-toggle-all"
               onClick={() => onToggleAll(!allFiltersEnabled)}
             >
               {allFiltersEnabled ? 'Hide All' : 'Show All'}
             </button>
           </div>
-
+          
           <div className="filter-dropdown-options">
             {Object.entries(filters).map(([method, enabled]) => (
               <label key={method} className="filter-option">
@@ -259,7 +258,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onClearLogs }) => {
   const logsEndRef = useRef(null);
   const prevLogsCountRef = useRef(0);
-
+  
   useEffect(() => {
     // Only scroll when new logs are added, not when switching tabs
     if (logsEndRef.current && logs.length > prevLogsCountRef.current) {
@@ -268,7 +267,7 @@ const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onC
     prevLogsCountRef.current = logs.length;
   }, [logs]);
 
-  const filteredLogs = logs.filter((log) => filters[log.type]);
+  const filteredLogs = logs.filter(log => filters[log.type]);
 
   return (
     <div className="tab-content">
@@ -300,8 +299,8 @@ const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onC
 
 const Console = () => {
   const dispatch = useDispatch();
-  const { logs, filters, activeTab, selectedRequest, selectedError, networkFilters, debugErrors } = useSelector((state) => state.logs);
-  const collections = useSelector((state) => state.collections.collections);
+  const { logs, filters, activeTab, selectedRequest, selectedError, networkFilters, debugErrors } = useSelector(state => state.logs);
+  const collections = useSelector(state => state.collections.collections);
   const consoleRef = useRef(null);
 
   const logCounts = logs.reduce((counts, log) => {
@@ -311,12 +310,12 @@ const Console = () => {
 
   const allRequests = React.useMemo(() => {
     const requests = [];
-
-    collections.forEach((collection) => {
+    
+    collections.forEach(collection => {
       if (collection.timeline) {
         collection.timeline
-          .filter((entry) => entry.type === 'request')
-          .forEach((entry) => {
+          .filter(entry => entry.type === 'request')
+          .forEach(entry => {
             requests.push({
               ...entry,
               collectionName: collection.name,
@@ -325,12 +324,12 @@ const Console = () => {
           });
       }
     });
-
+    
     return requests.sort((a, b) => a.timestamp - b.timestamp);
   }, [collections]);
 
-  const filteredLogs = logs.filter((log) => filters[log.type]);
-  const filteredRequests = allRequests.filter((request) => {
+  const filteredLogs = logs.filter(log => filters[log.type]);
+  const filteredRequests = allRequests.filter(request => {
     const method = request.data?.request?.method?.toUpperCase() || 'GET';
     return networkFilters[method];
   });
@@ -390,8 +389,6 @@ const Console = () => {
         return <NetworkTab />;
       case 'performance':
         return <Performance />;
-      case 'terminal':
-        return <TerminalTab />;
       // case 'debug':
       //   return <DebugTab />;
       default:
@@ -422,7 +419,7 @@ const Console = () => {
               />
             </div>
             <div className="action-controls">
-              <button
+              <button 
                 className="control-button"
                 onClick={handleClearLogs}
                 title="Clear all logs"
@@ -445,14 +442,12 @@ const Console = () => {
             </div>
           </div>
         );
-      case 'terminal':
-        return null; // No controls needed for terminal
       // case 'debug':
       //   return (
       //     <div className="tab-controls">
       //       <div className="action-controls">
       //         {debugErrors.length > 0 && (
-      //           <button
+      //           <button 
       //             className="control-button"
       //             onClick={handleClearDebugErrors}
       //             title="Clear all errors"
@@ -468,30 +463,32 @@ const Console = () => {
     }
   };
 
+
+
   return (
     <StyledWrapper ref={consoleRef}>
-      <div
+      <div 
         className="console-resize-handle"
       />
-
+      
       <div className="console-header">
         <div className="console-tabs">
-          <button
+          <button 
             className={`console-tab ${activeTab === 'console' ? 'active' : ''}`}
             onClick={() => handleTabChange('console')}
           >
             <IconTerminal2 size={16} strokeWidth={1.5} />
             <span>Console</span>
           </button>
-
-          <button
+          
+          <button 
             className={`console-tab ${activeTab === 'network' ? 'active' : ''}`}
             onClick={() => handleTabChange('network')}
           >
             <IconNetwork size={16} strokeWidth={1.5} />
             <span>Network</span>
           </button>
-
+          
           <button
             className={`console-tab ${activeTab === 'performance' ? 'active' : ''}`}
             onClick={() => handleTabChange('performance')}
@@ -500,15 +497,7 @@ const Console = () => {
             <span>Performance</span>
           </button>
 
-          <button
-            className={`console-tab ${activeTab === 'terminal' ? 'active' : ''}`}
-            onClick={() => handleTabChange('terminal')}
-          >
-            <IconTerminal2 size={16} strokeWidth={1.5} />
-            <span>Terminal</span>
-          </button>
-
-          {/* <button
+          {/* <button 
             className={`console-tab ${activeTab === 'debug' ? 'active' : ''}`}
             onClick={() => handleTabChange('debug')}
           >
@@ -519,7 +508,7 @@ const Console = () => {
 
         <div className="console-controls">
           {renderTabControls()}
-          <button
+          <button 
             className="control-button close-button"
             onClick={handlecloseConsole}
             title="Close console"
@@ -552,4 +541,4 @@ const Console = () => {
   );
 };
 
-export default Console;
+export default Console; 

packages/bruno-app/src/components/Devtools/Performance/StyledWrapper.js

@@ -35,13 +35,13 @@ const StyledWrapper = styled.div`
     h3 {
       margin: 0 0 4px 0;
       font-size: 16px;
-      font-weight: 500;
+      font-weight: 600;
       color: ${(props) => props.theme.console.titleColor};
     }
 
     p {
       margin: 0;
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 13px;
       color: ${(props) => props.theme.console.textMuted};
     }
   }
@@ -51,8 +51,8 @@ const StyledWrapper = styled.div`
 
     h2 {
       margin: 0 0 8px 0;
-      font-size: ${(props) => props.theme.font.size.base};
-      font-weight: 500;
+      font-size: 14px;
+      font-weight: 600;
       color: ${(props) => props.theme.console.titleColor};
     }
   }
@@ -80,19 +80,19 @@ const StyledWrapper = styled.div`
   }
 
   .resource-title {
-    font-size: ${(props) => props.theme.font.size.sm};
+    font-size: 12px;
     font-weight: 500;
   }
 
   .resource-value {
     font-size: 18px;
-    font-weight: 500;
+    font-weight: 600;
     color: ${(props) => props.theme.console.titleColor};
     margin-bottom: 2px;
   }
 
   .resource-subtitle {
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     color: ${(props) => props.theme.console.buttonColor};
   }
 
@@ -100,7 +100,7 @@ const StyledWrapper = styled.div`
     display: flex;
     align-items: center;
     gap: 4px;
-    font-size: ${(props) => props.theme.font.size.xs};
+    font-size: 11px;
     margin-top: 8px;
 
     &.up {
@@ -115,237 +115,6 @@ const StyledWrapper = styled.div`
       color: ${(props) => props.theme.console.buttonColor};
     }
   }
-
-  .performance-header {
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    padding: 12px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-  }
-
-  .performance-selector-wrapper {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-  }
-
-  .performance-selector-label {
-    font-size: 13px;
-    font-weight: 500;
-    color: ${(props) => props.theme.console.titleColor};
-    user-select: none;
-  }
-
-  .performance-selector {
-    position: relative;
-    display: inline-flex;
-    align-items: center;
-  }
-
-  .performance-select {
-    appearance: none;
-    background: ${(props) => props.theme.console.bg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    padding: 6px 32px 6px 12px;
-    font-size: 13px;
-    font-weight: 500;
-    color: ${(props) => props.theme.console.titleColor};
-    cursor: pointer;
-    outline: none;
-    transition: all 0.2s ease;
-    min-width: 250px;
-    max-width: 400px;
-
-    &:hover {
-      border-color: ${(props) => props.theme.colors.primary};
-    }
-
-    &:focus {
-      border-color: ${(props) => props.theme.colors.primary};
-      box-shadow: 0 0 0 2px ${(props) => props.theme.colors.primary}33;
-    }
-
-    option {
-      background: ${(props) => props.theme.console.bg};
-      color: ${(props) => props.theme.console.titleColor};
-      padding: 8px;
-    }
-  }
-
-  .performance-select-icon {
-    position: absolute;
-    right: 10px;
-    pointer-events: none;
-    color: ${(props) => props.theme.console.buttonColor};
-  }
-
-  .processes-table-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    min-height: 0;
-
-    h2 {
-      margin: 0 0 16px 0;
-      font-size: 14px;
-      font-weight: 600;
-      color: ${(props) => props.theme.console.titleColor};
-      flex-shrink: 0;
-    }
-  }
-
-  .no-processes {
-    padding: 32px;
-    text-align: center;
-    color: ${(props) => props.theme.console.buttonColor};
-    font-size: 13px;
-  }
-
-  .processes-table-wrapper {
-    flex: 1;
-    min-height: 0;
-    overflow: auto;
-  }
-
-  .processes-table {
-    width: 100%;
-    border-collapse: collapse;
-    background: ${(props) => props.theme.console.headerBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    overflow: hidden;
-
-    thead {
-      background: ${(props) => props.theme.console.bg};
-      border-bottom: 1px solid ${(props) => props.theme.console.border};
-
-      th {
-        padding: 10px 12px;
-        text-align: left;
-        font-size: 12px;
-        font-weight: 600;
-        color: ${(props) => props.theme.console.titleColor};
-        text-transform: uppercase;
-        letter-spacing: 0.5px;
-
-        &:first-child {
-          padding-left: 16px;
-        }
-
-        &:last-child {
-          padding-right: 16px;
-        }
-      }
-    }
-
-    tbody {
-      tr {
-        border-bottom: 1px solid ${(props) => props.theme.console.border};
-        transition: background 0.15s ease;
-
-        &:hover {
-          background: ${(props) => props.theme.console.bg};
-        }
-
-        &:last-child {
-          border-bottom: none;
-        }
-      }
-
-      td {
-        padding: 10px 12px;
-        font-size: 13px;
-        color: ${(props) => props.theme.console.textColor};
-
-        &:first-child {
-          padding-left: 16px;
-        }
-
-        &:last-child {
-          padding-right: 16px;
-        }
-      }
-    }
-
-    .pid-cell {
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-      font-size: 12px;
-      color: ${(props) => props.theme.console.buttonColor};
-    }
-
-    .type-cell {
-      .process-type-badge {
-        display: inline-block;
-        padding: 2px 8px;
-        border-radius: 3px;
-        font-size: 11px;
-        font-weight: 500;
-        text-transform: lowercase;
-        background: ${(props) => props.theme.console.border};
-        color: ${(props) => props.theme.console.buttonColor};
-
-        &.Browser {
-          background: rgba(59, 130, 246, 0.2);
-          color: #3b82f6;
-        }
-
-        &.Renderer {
-          background: rgba(16, 185, 129, 0.2);
-          color: #10b981;
-        }
-
-        &.Utility {
-          background: rgba(139, 92, 246, 0.2);
-          color: #8b5cf6;
-        }
-
-        &.Zygote {
-          background: rgba(245, 158, 11, 0.2);
-          color: #f59e0b;
-        }
-
-        &.Sandbox {
-          background: rgba(239, 68, 68, 0.2);
-          color: #ef4444;
-        }
-      }
-    }
-
-    .title-cell {
-      max-width: 300px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    .cpu-cell {
-      font-weight: 500;
-
-      .high-cpu {
-        color: #ef4444;
-      }
-
-      .medium-cpu {
-        color: #f59e0b;
-      }
-
-      .low-cpu {
-        color: ${(props) => props.theme.console.buttonColor};
-      }
-    }
-
-    .memory-cell {
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-      font-size: 12px;
-    }
-
-    .created-cell {
-      font-size: 12px;
-      color: ${(props) => props.theme.console.buttonColor};
-    }
-  }
 `;
 
 export default StyledWrapper;

packages/bruno-app/src/components/Devtools/Performance/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useMemo } from 'react';
+import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import StyledWrapper from './StyledWrapper';
 import {
@@ -6,23 +6,11 @@ import {
   IconDatabase,
   IconClock,
   IconServer,
-  IconChevronDown,
   IconChartLine
 } from '@tabler/icons';
 
-const getProcessOptions = (processes) => {
-  return [
-    { value: 'cumulative', label: 'Cumulative (All Processes)' },
-    ...(processes ?? []).map((process) => ({
-      value: String(process.pid),
-      label: `PID ${process.pid}${process.title ? ` - ${process.title}` : ''}${process.type ? ` (${process.type})` : ''}`
-    }))
-  ];
-};
-
 const Performance = () => {
   const { systemResources } = useSelector((state) => state.performance);
-  const [selectedPid, setSelectedPid] = useState('cumulative');
 
   useEffect(() => {
     const { ipcRenderer } = window;
@@ -94,140 +82,47 @@ const Performance = () => {
     </div>
   );
 
-  // Get process options for dropdown
-  const processOptions = useMemo(() => getProcessOptions(systemResources.processes), [systemResources.processes]);
-
-  // Get selected process data
-  const selectedProcess = useMemo(() => {
-    if (selectedPid === 'cumulative') {
-      return null; // Show cumulative view
-    }
-    const processes = systemResources.processes || [];
-    return processes.find((p) => String(p.pid) === selectedPid) || null;
-  }, [selectedPid, systemResources.processes]);
-
-  // Reset to cumulative if selected PID no longer exists
-  useEffect(() => {
-    if (selectedPid !== 'cumulative' && !selectedProcess) {
-      setSelectedPid('cumulative');
-    }
-  }, [selectedPid, selectedProcess]);
-
-  const renderCumulativeView = () => (
-    <div className="system-resources">
-      <h2>System Resources</h2>
-      <div className="resource-cards">
-        <SystemResourceCard
-          icon={IconCpu}
-          title="CPU Usage"
-          value={`${systemResources.cpu.toFixed(1)}%`}
-          subtitle="Total CPU usage"
-          color={systemResources.cpu > 80 ? 'danger' : systemResources.cpu > 60 ? 'warning' : 'success'}
-        />
-
-        <SystemResourceCard
-          icon={IconDatabase}
-          title="Memory Usage"
-          value={formatBytes(systemResources.memory)}
-          subtitle="Total memory usage"
-          color={systemResources.memory > (500 * 1024 * 1024) ? 'danger' : 'default'}
-        />
-
-        <SystemResourceCard
-          icon={IconClock}
-          title="Uptime"
-          value={formatUptime(systemResources.uptime)}
-          subtitle="Process runtime"
-          color="info"
-        />
-
-        <SystemResourceCard
-          icon={IconServer}
-          title="Process ID"
-          value={systemResources.pid || 'N/A'}
-          subtitle="Main process PID"
-          color="default"
-        />
-      </div>
-    </div>
-  );
-
-  const renderProcessView = (process) => {
-    if (!process) return null;
-
-    // Calculate uptime for individual process
-    const processUptime = process.creationTime
-      ? (new Date() - new Date(process.creationTime)) / 1000
-      : 0;
-
-    return (
-      <div className="system-resources">
-        <h2>System Resources</h2>
-        <div className="resource-cards">
-          <SystemResourceCard
-            icon={IconCpu}
-            title="CPU Usage"
-            value={`${process.cpu.toFixed(1)}%`}
-            subtitle="Current CPU usage"
-            color={process.cpu > 80 ? 'danger' : process.cpu > 60 ? 'warning' : 'success'}
-          />
-
-          <SystemResourceCard
-            icon={IconDatabase}
-            title="Memory Usage"
-            value={formatBytes(process.memory)}
-            subtitle="Current memory usage"
-            color={process.memory > (500 * 1024 * 1024) ? 'danger' : 'default'}
-          />
-
-          <SystemResourceCard
-            icon={IconClock}
-            title="Uptime"
-            value={formatUptime(processUptime)}
-            subtitle="Process runtime"
-            color="info"
-          />
-
-          <SystemResourceCard
-            icon={IconServer}
-            title="Process ID"
-            value={process.pid}
-            subtitle="Process PID"
-            color="default"
-          />
-        </div>
-      </div>
-    );
-  };
-
   return (
     <StyledWrapper>
       <div className="tab-content">
-        <div className="performance-header">
-          <div className="performance-selector-wrapper">
-            <label htmlFor="process-selector" className="performance-selector-label">
-              View:
-            </label>
-            <div className="performance-selector">
-              <select
-                id="process-selector"
-                value={selectedPid}
-                onChange={(e) => setSelectedPid(e.target.value)}
-                className="performance-select"
-              >
-                {processOptions.map((option) => (
-                  <option key={option.value} value={option.value}>
-                    {option.label}
-                  </option>
-                ))}
-              </select>
-              <IconChevronDown size={16} className="performance-select-icon" />
+        <div className="tab-content-area">
+          <div className="system-resources">
+            <h2>System Resources</h2>
+            <div className="resource-cards">
+              <SystemResourceCard
+                icon={IconCpu}
+                title="CPU Usage"
+                value={`${systemResources.cpu.toFixed(1)}%`}
+                subtitle="Current process"
+                color={systemResources.cpu > 80 ? 'danger' : systemResources.cpu > 60 ? 'warning' : 'success'}
+              />
+
+              <SystemResourceCard
+                icon={IconDatabase}
+                title="Memory Usage"
+                value={formatBytes(systemResources.memory)}
+                subtitle="Current process"
+                color={systemResources.memory > 500 * 1024 * 1024 ? 'danger' : 'default'}
+              />
+
+              <SystemResourceCard
+                icon={IconClock}
+                title="Uptime"
+                value={formatUptime(systemResources.uptime)}
+                subtitle="Process runtime"
+                color="info"
+              />
+
+              <SystemResourceCard
+                icon={IconServer}
+                title="Process ID"
+                value={systemResources.pid || 'N/A'}
+                subtitle="Current PID"
+                color="default"
+              />
             </div>
           </div>
         </div>
-        <div className="tab-content-area">
-          {selectedPid === 'cumulative' ? renderCumulativeView() : renderProcessView(selectedProcess)}
-        </div>
       </div>
     </StyledWrapper>
   );

packages/bruno-app/src/components/Devtools/index.js

@@ -18,11 +18,11 @@ const Devtools = ({ mainSectionRef }) => {
 
   const handleDevtoolsResize = useCallback((e) => {
     if (!isResizingDevtools || !mainSectionRef.current) return;
-
+    
     const windowHeight = window.innerHeight;
     const statusBarHeight = 22;
     const mouseY = e.clientY;
-
+    
     // Calculate new devtools height - expanding upward from bottom
     const newHeight = windowHeight - mouseY - statusBarHeight;
     const clampedHeight = Math.min(MAX_DEVTOOLS_HEIGHT, Math.max(MIN_DEVTOOLS_HEIGHT, newHeight));
@@ -43,7 +43,7 @@ const Devtools = ({ mainSectionRef }) => {
       document.addEventListener('mousemove', handleDevtoolsResize);
       document.addEventListener('mouseup', handleDevtoolsResizeEnd);
       document.body.style.userSelect = 'none';
-
+      
       return () => {
         document.removeEventListener('mousemove', handleDevtoolsResize);
         document.removeEventListener('mouseup', handleDevtoolsResizeEnd);
@@ -65,7 +65,7 @@ const Devtools = ({ mainSectionRef }) => {
 
   return (
     <>
-      <div
+      <div 
         onMouseDown={handleDevtoolsResizeStart}
         style={{
           height: '4px',
@@ -85,4 +85,4 @@ const Devtools = ({ mainSectionRef }) => {
   );
 };
 
-export default Devtools;
+export default Devtools; 

packages/bruno-app/src/components/Dropdown/StyledWrapper.js

@@ -8,142 +8,59 @@ const Wrapper = styled.div`
   }
 
   .tippy-box {
-    min-width: 160px;
-    font-size: ${(props) => props.theme.font.size.base};
+    min-width: 135px;
+    font-size: 0.8125rem;
     color: ${(props) => props.theme.dropdown.color};
     background-color: ${(props) => props.theme.dropdown.bg};
-    box-shadow: ${(props) => props.theme.shadow.sm};
-    border-radius: ${(props) => props.theme.border.radius.base};
+    box-shadow: ${(props) => props.theme.dropdown.shadow};
+    border-radius: 3px;
     max-height: 90vh;
     overflow-y: auto;
     max-width: unset !important;
-    padding: 0.25rem;
 
     .tippy-content {
       padding-left: 0;
       padding-right: 0;
-      padding-top: 0;
-      padding-bottom: 0;
-
-      [role="menu"] {
-        outline: none;
-        &:focus {
-          outline: none;
-        }
-        &:focus-visible {
-          outline: none;
-        }
-      }
+      padding-top: 0.25rem;
+      padding-bottom: 0.25rem;
 
       .label-item {
         display: flex;
         align-items: center;
-        padding: 0.375rem 0.625rem 0.25rem 0.625rem;
-        font-size: 0.6875rem;
-        font-weight: 600;
-        text-transform: uppercase;
-        letter-spacing: 0.025em;
-        color: ${(props) => props.theme.dropdown.color};
-        opacity: 0.6;
-        margin-top: 0.25rem;
-        
-        &:first-child {
-          margin-top: 0;
-        }
+        padding: 0.35rem 0.6rem;
+        background-color: ${(props) => props.theme.dropdown.labelBg};
       }
 
       .dropdown-item {
         display: flex;
         align-items: center;
-        gap: 0.5rem;
-        padding: 0.275rem 0.625rem;
+        padding: 0.35rem 0.6rem;
         cursor: pointer;
-        border-radius: 6px;
-        margin: 0.0625rem 0;
-        font-size: 0.8125rem;
 
         &.active {
           color: ${(props) => props.theme.colors.text.yellow} !important;
-          .dropdown-icon {
+          .icon {
             color: ${(props) => props.theme.colors.text.yellow} !important;
           }
         }
 
-        .dropdown-label {
-          flex: 1;
-        }
-
-        .dropdown-icon {
-          flex-shrink: 0;
-          width: 16px;
-          height: 16px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
+        .icon {
           color: ${(props) => props.theme.dropdown.iconColor};
-          opacity: 0.8;
-        }
-
-        .dropdown-right-section {
-          margin-left: auto;
-          flex-shrink: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
         }
 
         &:hover:not(:disabled) {
           background-color: ${(props) => props.theme.dropdown.hoverBg};
         }
 
-        &.selected-focused:not(:disabled) {
-          background-color: ${(props) => props.theme.dropdown.hoverBg};
-        }
-
-        &:focus-visible:not(:disabled) {
-          outline: none;
-          background-color: ${(props) => props.theme.dropdown.hoverBg};
-        }
-
-        &:focus:not(:focus-visible) {
-          outline: none;
-        }
-
         &:disabled {
           cursor: not-allowed;
-          opacity: 0.5;
-        }
-
-        &.delete-item {
-          color: ${(props) => props.theme.colors.text.danger};
-          .dropdown-icon {
-            color: ${(props) => props.theme.colors.text.danger};
-          }
-          &:hover {
-            background-color: ${({ theme }) => {
-              const hex = theme.colors.text.danger.replace('#', '');
-              const r = parseInt(hex.substring(0, 2), 16);
-              const g = parseInt(hex.substring(2, 4), 16);
-              const b = parseInt(hex.substring(4, 6), 16);
-              return `rgba(${r}, ${g}, ${b}, 0.04)`; // 4% opacity
-            }} !important;
-
-            color: ${(props) => props.theme.colors.text.danger} !important;
-          }
+          color: gray;
         }
 
         &.border-top {
           border-top: solid 1px ${(props) => props.theme.dropdown.separator};
-          margin-top: 0.25rem;
-          padding-top: 0.375rem;
         }
       }
-
-      .dropdown-separator {
-        height: 1px;
-        background-color: ${(props) => props.theme.dropdown.separator};
-        margin: 0.25rem 0;
-      }
     }
   }
 `;

packages/bruno-app/src/components/EditableTable/StyledWrapper.js

@@ -1,154 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  overflow: hidden;
-
-  .table-container {
-    overflow-y: auto;
-    border-radius: ${(props) => props.theme.border.radius.base};
-    border: ${(props) => props.theme.workspace.environments.indentBorder};
-  }
-
-  table {
-    width: 100%;
-    border-collapse: collapse;
-    table-layout: fixed;
-    font-size: ${(props) => props.theme.font.size.base};
-  }
-
-  thead {
-    color: ${(props) => props.theme.colors.text} !important;
-    background: ${(props) => props.theme.sidebar.bg};
-    font-size: ${(props) => props.theme.font.size.base};
-    user-select: none;
-
-    border: none !important;
-
-    td {
-      padding: 8px 10px;
-      border-top: none !important;
-      border-left: none !important;
-      border-bottom: ${(props) => props.theme.workspace.environments.indentBorder};
-      border-right: ${(props) => props.theme.workspace.environments.indentBorder};
-      vertical-align: middle;
-
-      &:nth-child(1) {
-        width: 25px !important;
-        border-right: none;
-      }
-
-      &:last-child {
-        border-right: none;
-      }
-    }
-  }
-
-  tbody {
-    tr {
-      transition: background 0.1s ease;
-
-      &:last-child td {
-        border-bottom: none;
-      }
-
-      td {
-        padding: 2px 10px;
-        border-top: none !important;
-        border-left: none !important;
-        border-bottom: ${(props) => props.theme.workspace.environments.indentBorder};
-        border-right: ${(props) => props.theme.workspace.environments.indentBorder};
-        vertical-align: middle;
-
-        &:nth-child(1) {
-          width: 25px;
-          border-right: none;
-          text-align: center;
-          vertical-align: middle;
-          line-height: 1;
-
-          input[type='checkbox'] {
-            vertical-align: baseline;
-            display: inline-block;
-          }
-        }
-
-        &:last-child {
-          border-right: none;
-        }
-      }
-    }
-  }
-
-  .tooltip-mod {
-    font-size: 11px !important;
-    max-width: 200px !important;
-  }
-
-  input[type='text'] {
-    width: 100%;
-    outline: none !important;
-    background-color: transparent;
-    color: ${(props) => props.theme.text};
-    padding: 0;
-    font-size: 12px;
-    border-radius: 4px;
-    transition: all 0.15s ease;
-
-    &:focus {
-      outline: none !important;
-    }
-  }
-
-  input[type='checkbox'] {
-    cursor: pointer;
-    width: 14px;
-    height: 14px;
-    accent-color: ${(props) => props.theme.workspace.accent};
-    vertical-align: middle;
-    margin: 0;
-  }
-
-  button {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 4px;
-    color: ${(props) => props.theme.colors.text.muted};
-    background: transparent;
-    border: none;
-    cursor: pointer;
-    border-radius: 4px;
-    transition: color 0.15s ease, background 0.15s ease;
-
-    &:hover {
-      color: ${(props) => props.theme.colors.text.danger};
-    }
-  }
-
-  .drag-handle {
-    .icon-grip,
-    .icon-minus {
-      color: ${(props) => props.theme.colors.text.muted};
-    }
-  }
-
-  select {
-    background-color: transparent;
-    color: ${(props) => props.theme.text};
-    border: none;
-    outline: none;
-    padding: 2px 8px;
-    font-size: 12px;
-    cursor: pointer;
-
-    option {
-      background-color: ${(props) => props.theme.bg};
-      color: ${(props) => props.theme.text};
-    }
-  }
-`;
-
-export default StyledWrapper;

packages/bruno-app/src/components/EditableTable/index.js

@@ -1,318 +0,0 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { IconTrash, IconAlertCircle, IconGripVertical, IconMinusVertical } from '@tabler/icons';
-import { Tooltip } from 'react-tooltip';
-import { uuid } from 'utils/common';
-import StyledWrapper from './StyledWrapper';
-
-const EditableTable = ({
-  columns,
-  rows,
-  onChange,
-  defaultRow,
-  getRowError,
-  showCheckbox = true,
-  showDelete = true,
-  checkboxLabel = '',
-  checkboxKey = 'enabled',
-  reorderable = false,
-  onReorder,
-  showAddRow = true
-}) => {
-  const tableRef = useRef(null);
-  const emptyRowUidRef = useRef(null);
-  const [hoveredRow, setHoveredRow] = useState(null);
-  const [dragStart, setDragStart] = useState(null);
-
-  const createEmptyRow = useCallback(() => {
-    const newUid = uuid();
-    emptyRowUidRef.current = newUid;
-    return {
-      uid: newUid,
-      [checkboxKey]: true,
-      ...defaultRow
-    };
-  }, [defaultRow, checkboxKey]);
-
-  const rowsWithEmpty = useMemo(() => {
-    if (!showAddRow) {
-      return rows;
-    }
-
-    if (rows.length === 0) {
-      return [createEmptyRow()];
-    }
-
-    const lastRow = rows[rows.length - 1];
-    const keyColumn = columns.find((col) => col.isKeyField);
-
-    if (keyColumn) {
-      const lastRowKeyValue = keyColumn.getValue ? keyColumn.getValue(lastRow) : lastRow[keyColumn.key];
-      const isLastRowEmpty = !lastRowKeyValue || (typeof lastRowKeyValue === 'string' && lastRowKeyValue.trim() === '');
-
-      if (isLastRowEmpty) {
-        return rows;
-      }
-    }
-
-    if (!emptyRowUidRef.current || rows.some((r) => r.uid === emptyRowUidRef.current)) {
-      emptyRowUidRef.current = uuid();
-    }
-
-    return [...rows, {
-      uid: emptyRowUidRef.current,
-      [checkboxKey]: true,
-      ...defaultRow
-    }];
-  }, [rows, columns, defaultRow, checkboxKey, createEmptyRow, showAddRow]);
-
-  const isEmptyRow = useCallback((row) => {
-    const keyColumn = columns.find((col) => col.isKeyField);
-    if (!keyColumn) return false;
-
-    const value = keyColumn.getValue ? keyColumn.getValue(row) : row[keyColumn.key];
-    return !value || (typeof value === 'string' && value.trim() === '');
-  }, [columns]);
-
-  const isLastEmptyRow = useCallback((row, index) => {
-    if (!showAddRow) return false;
-    return index === rowsWithEmpty.length - 1 && isEmptyRow(row);
-  }, [rowsWithEmpty.length, isEmptyRow, showAddRow]);
-
-  const handleValueChange = useCallback((rowUid, key, value) => {
-    const rowIndex = rowsWithEmpty.findIndex((r) => r.uid === rowUid);
-    if (rowIndex === -1) return;
-
-    const currentRow = rowsWithEmpty[rowIndex];
-    const isLast = rowIndex === rowsWithEmpty.length - 1;
-    const wasEmpty = isEmptyRow(currentRow);
-
-    const keyColumn = columns.find((col) => col.isKeyField);
-    const isKeyFieldChange = keyColumn && keyColumn.key === key;
-
-    let updatedRows = rowsWithEmpty.map((row) => {
-      if (row.uid === rowUid) {
-        return { ...row, [key]: value };
-      }
-      return row;
-    });
-
-    // Only add a new empty row when the key field is filled
-    if (showAddRow && isLast && wasEmpty && isKeyFieldChange && value && value.trim() !== '') {
-      emptyRowUidRef.current = uuid();
-      updatedRows.push({
-        uid: emptyRowUidRef.current,
-        [checkboxKey]: true,
-        ...defaultRow
-      });
-    }
-
-    const hasAnyValue = (row) => {
-      for (const col of columns) {
-        const val = col.getValue ? col.getValue(row) : row[col.key];
-        const defaultVal = defaultRow[col.key];
-        if (val && val !== defaultVal && (typeof val !== 'string' || val.trim() !== '')) {
-          return true;
-        }
-      }
-      return false;
-    };
-
-    const result = updatedRows.filter((row, i) => {
-      if (showAddRow && i === updatedRows.length - 1) {
-        return hasAnyValue(row);
-      }
-      return true;
-    });
-
-    onChange(result);
-  }, [rowsWithEmpty, columns, onChange, checkboxKey, defaultRow, isEmptyRow, showAddRow]);
-
-  const handleCheckboxChange = useCallback((rowUid, checked) => {
-    handleValueChange(rowUid, checkboxKey, checked);
-  }, [handleValueChange, checkboxKey]);
-
-  const handleRemoveRow = useCallback((rowUid) => {
-    const filteredRows = rows.filter((row) => row.uid !== rowUid);
-    onChange(filteredRows);
-  }, [rows, onChange]);
-
-  const getColumnWidth = useCallback((column) => {
-    if (column.width) return column.width;
-    return 'auto';
-  }, []);
-
-  const handleDragStart = useCallback((e, index) => {
-    e.dataTransfer.effectAllowed = 'move';
-    e.dataTransfer.setData('text/plain', index);
-    setDragStart(index);
-  }, []);
-
-  const handleDragOver = useCallback((e, index) => {
-    e.preventDefault();
-    e.dataTransfer.dropEffect = 'move';
-    setHoveredRow(index);
-  }, []);
-
-  const handleDrop = useCallback((e, toIndex) => {
-    e.preventDefault();
-    const fromIndex = parseInt(e.dataTransfer.getData('text/plain'), 10);
-    if (fromIndex !== toIndex && onReorder) {
-      const reorderableRows = showAddRow ? rowsWithEmpty.slice(0, -1) : rowsWithEmpty;
-      const updatedOrder = [...reorderableRows];
-      const [movedRow] = updatedOrder.splice(fromIndex, 1);
-      updatedOrder.splice(toIndex, 0, movedRow);
-      onReorder({ updateReorderedItem: updatedOrder.map((row) => row.uid) });
-    }
-    setDragStart(null);
-    setHoveredRow(null);
-  }, [onReorder, rowsWithEmpty, showAddRow]);
-
-  const handleDragEnd = useCallback(() => {
-    setDragStart(null);
-    setHoveredRow(null);
-  }, []);
-
-  const renderCell = useCallback((column, row, rowIndex) => {
-    const isEmpty = isLastEmptyRow(row, rowIndex);
-    const value = column.getValue ? column.getValue(row) : row[column.key];
-    const error = getRowError?.(row, rowIndex, column.key);
-
-    if (column.render) {
-      return column.render({
-        row,
-        value,
-        rowIndex,
-        isLastEmptyRow: isEmpty,
-        onChange: (newValue) => handleValueChange(row.uid, column.key, newValue),
-        error
-      });
-    }
-
-    return (
-      <div className="flex items-center">
-        <input
-          type="text"
-          autoComplete="off"
-          autoCorrect="off"
-          autoCapitalize="off"
-          spellCheck="false"
-          className="mousetrap"
-          value={value || ''}
-          readOnly={column.readOnly}
-          placeholder={isEmpty ? column.placeholder || column.name : ''}
-          onChange={(e) => handleValueChange(row.uid, column.key, e.target.value)}
-        />
-        {error && !isEmpty && (
-          <span>
-            <IconAlertCircle
-              data-tooltip-id={`error-${row.uid}-${column.key}`}
-              className="text-red-600 cursor-pointer"
-              size={20}
-            />
-            <Tooltip
-              className="tooltip-mod"
-              id={`error-${row.uid}-${column.key}`}
-              html={error}
-            />
-          </span>
-        )}
-      </div>
-    );
-  }, [isLastEmptyRow, getRowError, handleValueChange]);
-
-  const reorderableRowCount = showAddRow ? rowsWithEmpty.length - 1 : rowsWithEmpty.length;
-
-  return (
-    <StyledWrapper>
-      <div className="table-container" ref={tableRef}>
-        <table>
-          <thead>
-            <tr>
-              {showCheckbox && (
-                <td className="text-center">{checkboxLabel}</td>
-              )}
-              {columns.map((column) => (
-                <td
-                  key={column.key}
-                  style={{ width: getColumnWidth(column) }}
-                >
-                  {column.name}
-                </td>
-              ))}
-              {showDelete && (
-                <td style={{ width: '60px' }}></td>
-              )}
-            </tr>
-          </thead>
-          <tbody>
-            {rowsWithEmpty.map((row, rowIndex) => {
-              const isEmpty = isLastEmptyRow(row, rowIndex);
-              const canDrag = reorderable && !isEmpty && rowIndex < reorderableRowCount;
-
-              return (
-                <tr
-                  key={row.uid}
-                  draggable={canDrag}
-                  onDragStart={canDrag ? (e) => handleDragStart(e, rowIndex) : undefined}
-                  onDragOver={canDrag ? (e) => handleDragOver(e, rowIndex) : undefined}
-                  onDrop={canDrag ? (e) => handleDrop(e, rowIndex) : undefined}
-                  onDragEnd={canDrag ? handleDragEnd : undefined}
-                  onMouseEnter={() => setHoveredRow(rowIndex)}
-                  onMouseLeave={() => setHoveredRow(null)}
-                >
-                  {showCheckbox && (
-                    <td className="text-center relative">
-                      {reorderable && canDrag && (
-                        <div
-                          draggable
-                          className="drag-handle group absolute z-10 left-[-8px] top-1/2 -translate-y-1/2 p-1 cursor-grab"
-                        >
-                          {hoveredRow === rowIndex && (
-                            <>
-                              <IconGripVertical
-                                size={14}
-                                className="icon-grip hidden group-hover:block"
-                              />
-                              <IconMinusVertical
-                                size={14}
-                                className="icon-minus block group-hover:hidden"
-                              />
-                            </>
-                          )}
-                        </div>
-                      )}
-                      {!isEmpty && (
-                        <input
-                          type="checkbox"
-                          className="mousetrap"
-                          checked={row[checkboxKey] ?? true}
-                          onChange={(e) => handleCheckboxChange(row.uid, e.target.checked)}
-                        />
-                      )}
-                    </td>
-                  )}
-                  {columns.map((column) => (
-                    <td key={column.key}>
-                      {renderCell(column, row, rowIndex)}
-                    </td>
-                  ))}
-                  {showDelete && (
-                    <td>
-                      {!isEmpty && (
-                        <button onClick={() => handleRemoveRow(row.uid)}>
-                          <IconTrash strokeWidth={1.5} size={18} />
-                        </button>
-                      )}
-                    </td>
-                  )}
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default EditableTable;

packages/bruno-app/src/components/Environments/Common/ExportEnvironmentModal/index.js

@@ -146,7 +146,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
               {environments && environments.length > 0 ? (
                 <div className="flex flex-col h-full">
                   <div className="flex justify-between items-center mb-2 pb-1">
-                    <h3 className="font-medium text-theme">
+                    <h3 className="font-semibold text-sm text-theme">
                       {environmentType === 'global' ? 'Global Environments' : 'Collection Environments'}
                     </h3>
                     <button
@@ -175,7 +175,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
               ) : (
                 <div className="flex flex-col h-full">
                   <div className="flex justify-between items-center mb-2 pb-1">
-                    <h3 className="font-medium text-theme">
+                    <h3 className="font-semibold text-sm text-theme">
                       {environmentType === 'global' ? 'Global Environments' : 'Collection Environments'}
                     </h3>
                   </div>
@@ -191,7 +191,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
             {/* Export Format Section */}
             {selectedCount > 0 && (
               <div className="mb-4">
-                <label className="block font-medium mb-2 text-theme">
+                <label className="block text-sm font-medium mb-2 text-theme">
                   Export Format
                 </label>
                 <div className="space-y-2">
@@ -207,7 +207,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
                         className={`mt-0.5 mr-3 w-4 h-4 ${option.disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`}
                       />
                       <div>
-                        <div className={`font-medium ${option.disabled ? 'text-muted' : 'text-theme'}`}>{option.label}</div>
+                        <div className={`text-sm font-medium ${option.disabled ? 'text-muted' : 'text-theme'}`}>{option.label}</div>
                         <div className="text-xs text-muted">{option.description}</div>
                       </div>
                     </label>
@@ -218,7 +218,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
 
             {/* Location Input Section */}
             <div className="mb-4">
-              <label htmlFor="export-location" className="block font-medium mb-2 text-theme">
+              <label htmlFor="export-location" className="block text-sm font-medium mb-2 text-theme">
                 Location
               </label>
               <div className="flex flex-col relative items-center">

packages/bruno-app/src/components/Environments/Common/ImportEnvironmentModal/index.js

@@ -150,7 +150,7 @@ const ImportEnvironmentModal = ({ type = 'collection', collection, onClose, onEn
             data-testid={importTestId}
           >
             <IconFileImport size={64} />
-            <span className="mt-2 block font-medium">
+            <span className="mt-2 block text-sm font-semibold">
               {isDragOver ? 'Drop your environment files here' : 'Import your environments'}
             </span>
             <span className="mt-1 block text-xs text-muted">

packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js

@@ -2,55 +2,46 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   .current-environment {
-    border-radius: ${(props) => props.theme.border.radius.base};
-    padding: 0.25rem 0.3rem 0.25rem 0.5rem;
+    border-radius: 0.9375rem;
+    padding: 0.25rem 0.5rem 0.25rem 0.75rem;
     user-select: none;
-    background-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.bg};
-    border: 1px solid ${(props) => props.theme.app.collection.toolbar.environmentSelector.border};
+    background-color: transparent;
+    border: 1px solid ${(props) => props.theme.dropdown.selectedColor};
     line-height: 1rem;
-    transition: all 0.15s ease;
-
-    &:hover {
-      border-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.hoverBorder};
-      background-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.hoverBg};
-    }
 
     .caret {
       margin-left: 0.25rem;
-      color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.caret};
-      fill: ${(props) => props.theme.app.collection.toolbar.environmentSelector.caret};
-      align-self: center;
+      color: rgb(140, 140, 140);
+      fill: rgb(140, 140, 140);
     }
 
     .env-icon {
       margin-right: 0.25rem;
-      color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.icon};
+      color: ${(props) => props.theme.dropdown.selectedColor};
     }
 
     .env-text {
-      color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.text};
+      color: ${(props) => props.theme.dropdown.selectedColor};
+      font-size: 0.875rem;
       display: block;
     }
 
     .env-separator {
-      color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.separator};
-      margin: 0 0.35rem;
+      color: #8c8c8c;
+      margin: 0 0.25rem;
+      opacity: 0.7;
     }
 
     .env-text-inactive {
-      color: ${(props) => props.theme.colors.text.muted};
-      font-size: ${(props) => props.theme.font.size.sm};
+      color: ${(props) => props.theme.dropdown.color};
+      font-size: 0.875rem;
+      opacity: 0.7;
     }
 
     &.no-environments {
-      color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.noEnvironment.text};
-      background-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.noEnvironment.bg};
-      border: 1px dashed ${(props) => props.theme.app.collection.toolbar.environmentSelector.noEnvironment.border};
-
-      &:hover {
-        border-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.noEnvironment.hoverBorder};
-        background-color: ${(props) => props.theme.app.collection.toolbar.environmentSelector.noEnvironment.hoverBg};
-      }
+      background-color: ${(props) => props.theme.sidebar.badge.bg};
+      border: 1px solid transparent;
+      color: ${(props) => props.theme.dropdown.secondaryText};
     }
   }
 
@@ -60,7 +51,7 @@ const Wrapper = styled.div`
     max-width: 650px !important;
     min-height: 15.5rem;
     max-height: 75vh;
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
     position: relative;
     overflow: hidden;
   }
@@ -76,7 +67,7 @@ const Wrapper = styled.div`
       align-items: center;
       padding: 0.35rem 0.6rem;
       cursor: pointer;
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 0.8125rem;
       color: ${(props) => props.theme.dropdown.primaryText};
 
       &:hover:not(:disabled) {
@@ -120,7 +111,7 @@ const Wrapper = styled.div`
 
   .tab-button {
     color: var(--color-tab-inactive);
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
 
     .tab-content-wrapper {
       position: relative;
@@ -172,7 +163,7 @@ const Wrapper = styled.div`
     h3 {
       color: ${(props) => props.theme.dropdown.primaryText};
       font-size: 1rem;
-      font-weight: 500;
+      font-weight: 600;
       margin-bottom: 0.5rem;
       line-height: 1.4;
     }
@@ -180,7 +171,7 @@ const Wrapper = styled.div`
     p {
       color: ${(props) => props.theme.dropdown.primaryText};
       opacity: 0.75;
-      font-size: ${(props) => props.theme.font.size.xs};
+      font-size: 0.6875rem;
       line-height: 1.5;
       margin-bottom: 1rem;
       max-width: 11.875rem;
@@ -201,7 +192,7 @@ const Wrapper = styled.div`
       border-radius: 0.375rem;
       width: 100%;
       margin-bottom: 0.5rem;
-      font-size: ${(props) => props.theme.font.size.sm};
+      font-size: 0.75rem;
       font-weight: 500;
       display: flex;
       align-items: center;
@@ -225,7 +216,7 @@ const Wrapper = styled.div`
     justify-content: center;
     padding: 2rem 1rem;
     color: ${(props) => props.theme.dropdown.primaryText};
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
     line-height: 1.5;
     text-align: center;
     opacity: 0.75;

packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js

@@ -3,7 +3,7 @@ import find from 'lodash/find';
 import Dropdown from 'components/Dropdown';
 import { IconWorld, IconDatabase, IconCaretDown, IconSettings, IconPlus, IconDownload } from '@tabler/icons';
 import { useSelector, useDispatch } from 'react-redux';
-import { updateEnvironmentSettingsModalVisibility, updateGlobalEnvironmentSettingsModalVisibility } from 'providers/ReduxStore/slices/app';
+import { updateEnvironmentSettingsModalVisibility } from 'providers/ReduxStore/slices/app';
 import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
 import { selectGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
 import toast from 'react-hot-toast';
@@ -20,6 +20,8 @@ const EnvironmentSelector = ({ collection }) => {
   const dispatch = useDispatch();
   const dropdownTippyRef = useRef();
   const [activeTab, setActiveTab] = useState('collection');
+  const [showGlobalSettings, setShowGlobalSettings] = useState(false);
+  const [showCollectionSettings, setShowCollectionSettings] = useState(false);
   const [showCreateGlobalModal, setShowCreateGlobalModal] = useState(false);
   const [showImportGlobalModal, setShowImportGlobalModal] = useState(false);
   const [showCreateCollectionModal, setShowCreateCollectionModal] = useState(false);
@@ -27,8 +29,6 @@ const EnvironmentSelector = ({ collection }) => {
 
   const globalEnvironments = useSelector((state) => state.globalEnvironments.globalEnvironments);
   const activeGlobalEnvironmentUid = useSelector((state) => state.globalEnvironments.activeGlobalEnvironmentUid);
-  const isEnvironmentSettingsModalOpen = useSelector((state) => state.app.isEnvironmentSettingsModalOpen);
-  const isGlobalEnvironmentSettingsModalOpen = useSelector((state) => state.app.isGlobalEnvironmentSettingsModalOpen);
   const activeGlobalEnvironment = activeGlobalEnvironmentUid
     ? find(globalEnvironments, (e) => e.uid === activeGlobalEnvironmentUid)
     : null;
@@ -49,15 +49,15 @@ const EnvironmentSelector = ({ collection }) => {
   };
 
   // Get description based on active tab
-  const description
-    = activeTab === 'collection'
+  const description =
+    activeTab === 'collection'
       ? 'Create your first environment to begin working with your collection.'
       : 'Create your first global environment to begin working across collections.';
 
   // Environment selection handler
   const handleEnvironmentSelect = (environment) => {
-    const action
-      = activeTab === 'collection'
+    const action =
+      activeTab === 'collection'
         ? selectEnvironment(environment ? environment.uid : null, collection.uid)
         : selectGlobalEnvironment({ environmentUid: environment ? environment.uid : null });
 
@@ -79,8 +79,9 @@ const EnvironmentSelector = ({ collection }) => {
   const handleSettingsClick = () => {
     if (activeTab === 'collection') {
       dispatch(updateEnvironmentSettingsModalVisibility(true));
+      setShowCollectionSettings(true);
     } else {
-      dispatch(updateGlobalEnvironmentSettingsModalVisibility(true));
+      setShowGlobalSettings(true);
     }
     dropdownTippyRef.current.hide();
   };
@@ -107,8 +108,9 @@ const EnvironmentSelector = ({ collection }) => {
 
   // Modal handlers
   const handleCloseSettings = () => {
+    setShowGlobalSettings(false);
+    setShowCollectionSettings(false);
     dispatch(updateEnvironmentSettingsModalVisibility(false));
-    dispatch(updateGlobalEnvironmentSettingsModalVisibility(false));
   };
 
   // Calculate dropdown width based on the longest environment name.
@@ -162,7 +164,7 @@ const EnvironmentSelector = ({ collection }) => {
         )}
       </>
     ) : (
-      <span className="env-text-inactive max-w-36 truncate no-wrap">No Environment</span>
+      <span className="env-text-inactive max-w-36 truncate no-wrap">No environments</span>
     );
 
     return (
@@ -174,7 +176,7 @@ const EnvironmentSelector = ({ collection }) => {
         data-testid="environment-selector-trigger"
       >
         {displayContent}
-        <IconCaretDown className="caret flex items-center justify-center" size={12} strokeWidth={2} />
+        <IconCaretDown className="caret" size={14} strokeWidth={2} />
       </div>
     );
   });
@@ -218,7 +220,7 @@ const EnvironmentSelector = ({ collection }) => {
       </div>
 
       {/* Modals - Rendered outside dropdown to avoid conflicts */}
-      {isGlobalEnvironmentSettingsModalOpen && (
+      {showGlobalSettings && (
         <GlobalEnvironmentSettings
           globalEnvironments={globalEnvironments}
           collection={collection}
@@ -227,15 +229,13 @@ const EnvironmentSelector = ({ collection }) => {
         />
       )}
 
-      {isEnvironmentSettingsModalOpen && (
-        <EnvironmentSettings collection={collection} onClose={handleCloseSettings} />
-      )}
+      {showCollectionSettings && <EnvironmentSettings collection={collection} onClose={handleCloseSettings} />}
 
       {showCreateGlobalModal && (
         <CreateGlobalEnvironment
           onClose={() => setShowCreateGlobalModal(false)}
           onEnvironmentCreated={() => {
-            dispatch(updateGlobalEnvironmentSettingsModalVisibility(true));
+            setShowGlobalSettings(true);
           }}
         />
       )}
@@ -245,7 +245,7 @@ const EnvironmentSelector = ({ collection }) => {
           type="global"
           onClose={() => setShowImportGlobalModal(false)}
           onEnvironmentCreated={() => {
-            dispatch(updateGlobalEnvironmentSettingsModalVisibility(true));
+            setShowGlobalSettings(true);
           }}
         />
       )}
@@ -255,7 +255,7 @@ const EnvironmentSelector = ({ collection }) => {
           collection={collection}
           onClose={() => setShowCreateCollectionModal(false)}
           onEnvironmentCreated={() => {
-            dispatch(updateEnvironmentSettingsModalVisibility(true));
+            setShowCollectionSettings(true);
           }}
         />
       )}
@@ -266,7 +266,7 @@ const EnvironmentSelector = ({ collection }) => {
           collection={collection}
           onClose={() => setShowImportCollectionModal(false)}
           onEnvironmentCreated={() => {
-            dispatch(updateEnvironmentSettingsModalVisibility(true));
+            setShowCollectionSettings(true);
           }}
         />
       )}

packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js

@@ -43,10 +43,10 @@ const CopyEnvironment = ({ collection, environment, onClose }) => {
 
   return (
     <Portal>
-      <Modal size="sm" title="Copy Environment" confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
-        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+      <Modal size="sm" title={'Copy Environment'} confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
+        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-medium">
+            <label htmlFor="name" className="block font-semibold">
               New Environment Name
             </label>
             <input

packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js

@@ -12,9 +12,9 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
   const dispatch = useDispatch();
   const inputRef = useRef();
 
-  const validateEnvironmentName = (name) => {
-    return !collection?.environments?.some((env) => env?.name?.toLowerCase().trim() === name?.toLowerCase().trim());
-  };
+ const validateEnvironmentName = (name) => {
+   return !collection?.environments?.some((env) => env?.name?.toLowerCase().trim() === name?.toLowerCase().trim());
+ };
 
   const formik = useFormik({
     enableReinitialize: true,
@@ -25,7 +25,7 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
       name: Yup.string()
         .min(1, 'Must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function (value) {
+        .test('is-valid-filename', function(value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -60,14 +60,14 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
     <Portal>
       <Modal
         size="sm"
-        title="Create Environment"
+        title={'Create Environment'}
         confirmText="Create"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-medium">
+            <label htmlFor="name" className="block font-semibold">
               Environment Name
             </label>
             <div className="flex items-center mt-2">

packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js

@@ -22,12 +22,12 @@ const DeleteEnvironment = ({ onClose, environment, collection }) => {
       <StyledWrapper>
         <Modal
           size="sm"
-          title="Delete Environment"
+          title={'Delete Environment'}
           confirmText="Delete"
           handleConfirm={onConfirm}
           handleCancel={onClose}
         >
-          Are you sure you want to delete <span className="font-medium">{environment.name}</span> ?
+          Are you sure you want to delete <span className="font-semibold">{environment.name}</span> ?
         </Modal>
       </StyledWrapper>
     </Portal>

packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js

@@ -22,7 +22,7 @@ const ConfirmSwitchEnv = ({ onCancel }) => {
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">You have unsaved changes in this environment.</div>
 

packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js

@@ -4,14 +4,13 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 500;
+    font-weight: 600;
     table-layout: fixed;
 
     thead,
     td {
       border: 1px solid ${(props) => props.theme.collection.environment.settings.gridBorder};
       padding: 4px 10px;
-      vertical-align: middle;
 
       &:nth-child(1),
       &:nth-child(4) {
@@ -28,7 +27,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: ${(props) => props.theme.font.size.base};
+      font-size: 0.8125rem;
       user-select: none;
     }
     thead td {
@@ -37,11 +36,11 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: ${(props) => props.theme.font.size.base};
+    font-size: 0.8125rem;
   }
 
   .tooltip-mod {
-    font-size: ${(props) => props.theme.font.size.xs} !important;
+    font-size: 11px !important;
     width: 150px !important;
   }
 
@@ -59,8 +58,8 @@ const Wrapper = styled.div`
 
   input[type='checkbox'] {
     cursor: pointer;
-    vertical-align: middle;
-    margin: 0;
+    position: relative;
+    top: 1px;
   }
 `;
 

packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js

@@ -25,7 +25,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
   const { globalEnvironments, activeGlobalEnvironmentUid } = useSelector((state) => state.globalEnvironments);
 
   let _collection = cloneDeep(collection);
-
+  
   const globalEnvironmentVariables = getGlobalEnvironmentVariables({ globalEnvironments, activeGlobalEnvironmentUid });
   _collection.globalEnvironmentVariables = globalEnvironmentVariables;
 
@@ -39,7 +39,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
       return result;
     }
     const varNames = new Set(nonSecretVars.map((v) => v.name));
-
+    
     const checkSensitiveField = (obj, fieldPath) => {
       const value = get(obj, fieldPath);
       if (typeof value === 'string') {
@@ -62,7 +62,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
     sensitiveFields.forEach((fieldPath) => {
       checkSensitiveField(collectionObj, fieldPath);
     });
-
+    
     const items = flattenItems(collection.items || []);
     items.forEach((item) => {
       const objToProcess = getObjectToProcess(item);
@@ -123,7 +123,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
     }
     return (
       <span>
-        <IconAlertCircle id={id} className="text-red-600 cursor-pointer" size={20} />
+        <IconAlertCircle id={id} className="text-red-600 cursor-pointer	" size={20} />
         <Tooltip className="tooltip-mod" anchorId={id} html={meta.error || ''} />
       </span>
     );
@@ -160,7 +160,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
 
   useEffect(() => {
     if (formik.dirty) {
-      // Smooth scrolling to the changed parameter is temporarily disabled
+      // Smooth scrolling to the changed parameter is temporarily disabled 
       // due to UX issues when editing the first row in a long list of environment variables.
       // addButtonRef.current?.scrollIntoView({ behavior: 'smooth' });
     }

packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js

@@ -29,7 +29,7 @@ const EnvironmentDetails = ({ environment, collection, setIsModified, onClose })
       <div className="flex">
         <div className="flex flex-grow items-center">
           <IconDatabase className="cursor-pointer" size={20} strokeWidth={1.5} />
-          <span className="ml-1 font-medium break-all">{environment.name}</span>
+          <span className="ml-1 font-semibold break-all">{environment.name}</span>
         </div>
         <div className="flex gap-x-2 pl-2">
           <ToolHint text="Edit Environment" toolhintId={`edit-${environment.uid}`}>

packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js

@@ -25,7 +25,7 @@ const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collecti
 
   useEffect(() => {
     if (selectedEnvironment) {
-      const _selectedEnvironment = environments?.find((env) => env?.uid === selectedEnvironment?.uid);
+      const _selectedEnvironment = environments?.find(env => env?.uid === selectedEnvironment?.uid);
       const hasSelectedEnvironmentChanged = !isEqual(selectedEnvironment, _selectedEnvironment);
       if (hasSelectedEnvironmentChanged) {
         setSelectedEnvironment(_selectedEnvironment);
@@ -107,16 +107,16 @@ const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collecti
             </div>
           )}
           <div className="environments-sidebar flex flex-col">
-            {environments
-              && environments.length
-              && environments.map((env) => (
+            {environments &&
+              environments.length &&
+              environments.map((env) => (
                 <ToolHint key={env.uid} text={env.name} toolhintId={env.uid} place="right">
                   <div
                     id={env.uid}
                     className={selectedEnvironment.uid === env.uid ? 'environment-item active' : 'environment-item'}
                     onClick={() => handleEnvironmentClick(env)} // Use handleEnvironmentClick to handle clicks
                   >
-                    <span className="break-all">{env.name}</span>
+                      <span className="break-all">{env.name}</span>
                   </div>
                 </ToolHint>
               ))}

packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js

@@ -20,7 +20,7 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
       name: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function (value) {
+        .test('is-valid-filename', function(value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -53,14 +53,14 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
     <Portal>
       <Modal
         size="sm"
-        title="Rename Environment"
+        title={'Rename Environment'}
         confirmText="Rename"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-medium">
+            <label htmlFor="name" className="block font-semibold">
               Environment Name
             </label>
             <input

packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js

@@ -12,7 +12,7 @@ export const SharedButton = ({ children, className, onClick }) => {
     <button
       type="button"
       onClick={onClick}
-      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-medium text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
+      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-semibold text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
         ${className}`}
     >
       {children}
@@ -24,7 +24,7 @@ const DefaultTab = ({ setTab }) => {
   return (
     <div className="text-center items-center flex flex-col">
       <IconFileAlert size={64} strokeWidth={1} />
-      <span className="font-medium mt-2">No environments found</span>
+      <span className="font-semibold mt-2">No environments found</span>
       <span className="font-extralight mt-2 text-zinc-500 dark:text-zinc-400">
         Get started by using the following buttons :
       </span>

packages/bruno-app/src/components/ErrorCapture/index.js

@@ -33,7 +33,7 @@ class ErrorBoundary extends Component {
 }
 
 const serializeArgs = (args) => {
-  return args.map((arg) => {
+  return args.map(arg => {
     try {
       if (arg === null) return 'null';
       if (arg === undefined) return 'undefined';
@@ -65,12 +65,12 @@ const serializeArgs = (args) => {
 // Helper function to extract file and line info from stack trace
 const extractFileInfo = (stack) => {
   if (!stack) return { filename: null, lineno: null, colno: null };
-
+  
   try {
     const lines = stack.split('\n');
     for (let line of lines) {
       if (line.includes('ErrorCapture') || line.trim() === 'Error') continue;
-
+      
       const match = line.match(/(?:at\s+.*?\s+)?\(?([^)]+):(\d+):(\d+)\)?/);
       if (match) {
         return {
@@ -83,7 +83,7 @@ const extractFileInfo = (stack) => {
   } catch (e) {
     // Ignore parsing errors
   }
-
+  
   return { filename: null, lineno: null, colno: null };
 };
 
@@ -95,7 +95,7 @@ const useGlobalErrorCapture = () => {
 
     console.error = (...args) => {
       const currentStack = new Error().stack;
-
+      
       originalConsoleError.apply(console, args);
 
       if (currentStack && currentStack.includes('useIpcEvents.js')) {
@@ -130,7 +130,7 @@ const useGlobalErrorCapture = () => {
 
 const ErrorCapture = ({ children }) => {
   const dispatch = useDispatch();
-
+  
   useGlobalErrorCapture();
 
   const handleReactError = (errorData) => {
@@ -144,4 +144,4 @@ const ErrorCapture = ({ children }) => {
   );
 };
 
-export default ErrorCapture;
+export default ErrorCapture; 

packages/bruno-app/src/components/FilePickerEditor/index.js

@@ -18,7 +18,7 @@ const FilePickerEditor = ({ value, onChange, collection, isSingleFilePicker = fa
   const title = filenames.map((v) => `- ${v}`).join('\n');
 
   const browse = () => {
-    dispatch(browseFiles([], [!isSingleFilePicker ? 'multiSelections' : '']))
+    dispatch(browseFiles([], [!isSingleFilePicker ? "multiSelections": ""]))
       .then((filePaths) => {
         // If file is in the collection's directory, then we use relative path
         // Otherwise, we use the absolute path
@@ -73,4 +73,4 @@ const FilePickerEditor = ({ value, onChange, collection, isSingleFilePicker = fa
   );
 };
 
-export default FilePickerEditor;
+export default FilePickerEditor;