Merge pull request #41 from zhom/dependabot/npm_and_yarn/frontend-dependencies-199434007a

deps(deps): bump the frontend-dependencies group with 35 updates
Merge pull request #40 from zhom/dependabot/github_actions/github-actions-4aaa0eafdc
2026-06-27 08:59:59 +02:00 · 2025-07-05 11:33:00 +00:00 · 2025-07-05 11:32:43 +00:00 · 2025-07-05 09:18:32 +00:00 · 2025-07-05 09:12:21 +00:00 · 2025-07-05 02:40:15 +04:00
49 changed files with 3351 additions and 4483 deletions
@@ -14,9 +14,6 @@ updates:
      frontend-dependencies:
        patterns:
          - "*"
-    ignore:
-      - dependency-name: "eslint"
-        versions: ">= 9"
    commit-message:
      prefix: "deps"
      include: "scope"
@@ -27,6 +27,8 @@ jobs:
            build-mode: none
          - language: javascript-typescript
            build-mode: none
+          # - language: rust
+          #   build-mode: none
    steps:
      - name: Checkout repository
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
@@ -40,8 +42,45 @@ jobs:
          node-version-file: .node-version
          cache: "pnpm"

+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b #master
+        with:
+          toolchain: stable
+          targets: x86_64-unknown-linux-gnu
+
+      - name: Install system dependencies (Rust only)
+        if: matrix.language == 'rust'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config xdg-utils
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 #v2.8.0
+        with:
+          workdir: ./src-tauri
+
      - name: Install dependencies from lockfile
        run: pnpm install --frozen-lockfile
+        
+      - name: Install rust dependencies
+        if: matrix.language == 'rust'
+        working-directory: ./src-tauri
+        run: |
+          cargo build
+        
+      - name: Build nodecar sidecar
+        if: matrix.language == 'rust'
+        shell: bash
+        working-directory: ./nodecar
+        run: |
+          pnpm run build:linux-x64
+
+      - name: Copy nodecar binary to Tauri binaries
+        if: matrix.language == 'rust'
+        shell: bash
+        run: |
+          mkdir -p src-tauri/binaries
+          cp nodecar/dist/nodecar src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu

      - name: Initialize CodeQL
        uses: github/codeql-action/init@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf #v3.29.0
@@ -50,11 +89,6 @@ jobs:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}

-      - if: matrix.build-mode == 'manual'
-        shell: bash
-        run: |
-          pnpm run build
-
      - name: Perform CodeQL Analysis
        uses: github/codeql-action/analyze@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf #v3.29.0
        with:
@@ -69,16 +69,16 @@ jobs:
      - name: Dependabot metadata
        id: metadata
        uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b #v2.4.0
+        secrets: inherit
        with:
          compat-lookup: true
          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          token: "${{ secrets.GITHUB_TOKEN }}"
-
      - name: Auto-merge minor and patch updates
        uses: ridedott/merge-me-action@338053c6f9b9311a6be80208f6f0723981e40627 #v2.10.122
+        secrets: inherit
        with:
-          token: "${{ secrets.SECRET_DEPENDABOT_GITHUB_TOKEN }}"
          GITHUB_TOKEN: ${{ secrets.SECRET_DEPENDABOT_GITHUB_TOKEN }}
-          PRESET: DEPENDABOT_MINOR
          MERGE_METHOD: SQUASH
+          PRESET: DEPENDABOT_MINOR
+          MAXIMUM_RETRIES: 5
    timeout-minutes: 10
@@ -12,5 +12,5 @@ jobs:
      - uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7 #v1.3.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-message: "Thank you for your first issue! If it's a feature request, please make sure it's clear what you want, why you want it, and how important it is to you. If you posted a bug report, please make sure it includes as much detail as possible. Thank you ❤️"
+          issue-message: "Thank you for your first issue ❤️ If it's a feature request, please make sure it's clear what you want, why you want it, and how important it is to you. If you posted a bug report, please make sure it includes as much detail as possible."
          pr-message: "Welcome to the community and thank you for your first contribution ❤️ A human will review your PR shortly. Make sure that the pipelines are green, so that the PR is considered ready for a review and could be merged."
@@ -48,10 +48,5 @@ jobs:
      - name: Install dependencies from lockfile
        run: pnpm install --frozen-lockfile

-      - name: Install nodecar dependencies
-        working-directory: ./nodecar
-        run: |
-          pnpm install --frozen-lockfile
-
      - name: Run lint step
        run: pnpm run lint:js
@@ -71,11 +71,6 @@ jobs:
      - name: Install frontend dependencies
        run: pnpm install --frozen-lockfile

-      - name: Install nodecar dependencies
-        working-directory: ./nodecar
-        run: |
-          pnpm install --frozen-lockfile
-
      - name: Build nodecar binary
        shell: bash
        working-directory: ./nodecar
@@ -128,18 +128,13 @@ jobs:
          sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config xdg-utils

      - name: Rust cache
-        uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 #v2.7.8
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 #v2.8.0
        with:
          workdir: ./src-tauri

      - name: Install frontend dependencies
        run: pnpm install --frozen-lockfile

-      - name: Install nodecar dependencies
-        working-directory: ./nodecar
-        run: |
-          pnpm install --frozen-lockfile
-
      - name: Build nodecar sidecar
        shell: bash
        working-directory: ./nodecar
@@ -160,7 +155,7 @@ jobs:
        run: pnpm build

      - name: Build Tauri app
-        uses: tauri-apps/tauri-action@42e9df6c59070d114bf90dcd3943a1b8f138b113 #v0.5.20
+        uses: tauri-apps/tauri-action@564aea5a8075c7a54c167bb0cf5b3255314a7f9d #v0.5.22
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          GITHUB_REF_NAME: ${{ github.ref_name }}
@@ -127,18 +127,13 @@ jobs:
          sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config xdg-utils

      - name: Rust cache
-        uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 #v2.7.8
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 #v2.8.0
        with:
          workdir: ./src-tauri

      - name: Install frontend dependencies
        run: pnpm install --frozen-lockfile

-      - name: Install nodecar dependencies
-        working-directory: ./nodecar
-        run: |
-          pnpm install --frozen-lockfile
-
      - name: Build nodecar sidecar
        shell: bash
        working-directory: ./nodecar
@@ -168,7 +163,7 @@ jobs:
          echo "Generated timestamp: ${TIMESTAMP}-${COMMIT_HASH}"

      - name: Build Tauri app
-        uses: tauri-apps/tauri-action@42e9df6c59070d114bf90dcd3943a1b8f138b113 #v0.5.20
+        uses: tauri-apps/tauri-action@564aea5a8075c7a54c167bb0cf5b3255314a7f9d #v0.5.22
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          BUILD_TAG: "nightly-${{ steps.timestamp.outputs.timestamp }}"
@@ -23,4 +23,4 @@ jobs:
      - name: Checkout Actions Repository
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
      - name: Spell Check Repo
-        uses: crate-ci/typos@b1ae8d918b6e85bd611117d3d9a3be4f903ee5e4 #v1.33.1
+        uses: crate-ci/typos@392b78fe18a52790c53f42456e46124f77346842 #v1.34.0
@@ -46,7 +46,4 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo

-# eslint
-.eslintcache
-
 !**/.gitkeep
@@ -22,14 +22,15 @@
    "dtolnay",
    "dyld",
    "elif",
+    "errorlevel",
    "esac",
    "esbuild",
-    "eslintcache",
    "frontmost",
    "gifs",
    "gsettings",
    "icns",
    "idletime",
+    "Inno",
    "KHTML",
    "launchservices",
    "libatk",
@@ -42,12 +43,15 @@
    "libwebkit",
    "libxdo",
    "mountpoint",
+    "msiexec",
    "msvc",
    "msys",
    "Mullvad",
    "mullvadbrowser",
    "nodecar",
    "nodemon",
+    "norestart",
+    "NSIS",
    "ntlm",
    "objc",
    "orhun",
@@ -68,19 +72,23 @@
    "staticlib",
    "stefanzweifel",
    "subdirs",
+    "SUPPRESSMSGBOXES",
    "swatinem",
    "sysinfo",
    "systempreferences",
    "taskkill",
+    "tasklist",
    "tauri",
    "titlebar",
    "Torbrowser",
    "turbopack",
+    "udeps",
    "unlisten",
    "unminimize",
    "unrs",
    "urlencoding",
    "vercel",
+    "VERYSILENT",
    "winreg",
    "wiremock",
    "xattr",
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
  "vcs": {
    "enabled": false,
    "clientKind": "git",
@@ -1,92 +0,0 @@
-import { FlatCompat } from "@eslint/eslintrc";
-import eslint from "@eslint/js";
-import tseslint from "typescript-eslint";
-
-const compat = new FlatCompat({
-  baseDirectory: import.meta.dirname,
-});
-
-const eslintConfig = tseslint.config(
-  eslint.configs.recommended,
-  tseslint.configs.strictTypeChecked,
-  tseslint.configs.stylisticTypeChecked,
-  ...compat.extends("next/core-web-vitals"),
-  {
-    // Disabled rules taken from https://biomejs.dev/linter/rules-sources for ones that
-    // are already handled by Prettier and TypeScript or are not needed
-    rules: {
-      // eslint-plugin-jsx-a11y rules - some disabled for performance/specific project needs
-      "jsx-a11y/alt-text": "off",
-      "jsx-a11y/anchor-has-content": "off",
-      "jsx-a11y/anchor-is-valid": "off",
-      "jsx-a11y/aria-activedescendant-has-tabindex": "off",
-      "jsx-a11y/aria-props": "off",
-      "jsx-a11y/aria-proptypes": "off",
-      "jsx-a11y/aria-role": "off",
-      "jsx-a11y/aria-unsupported-elements": "off",
-      "jsx-a11y/autocomplete-valid": "off",
-      "jsx-a11y/click-events-have-key-events": "off",
-      "jsx-a11y/heading-has-content": "off",
-      "jsx-a11y/html-has-lang": "off",
-      "jsx-a11y/iframe-has-title": "off",
-      "jsx-a11y/img-redundant-alt": "off",
-      "jsx-a11y/interactive-supports-focus": "off",
-      "jsx-a11y/label-has-associated-control": "off",
-      "jsx-a11y/lang": "off",
-      "jsx-a11y/media-has-caption": "off",
-      "jsx-a11y/mouse-events-have-key-events": "off",
-      "jsx-a11y/no-access-key": "off",
-      "jsx-a11y/no-aria-hidden-on-focusable": "off",
-      "jsx-a11y/no-autofocus": "off",
-      "jsx-a11y/no-distracting-elements": "off",
-      "jsx-a11y/no-interactive-element-to-noninteractive-role": "off",
-      "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
-      "jsx-a11y/no-noninteractive-tabindex": "off",
-      "jsx-a11y/no-redundant-roles": "off",
-      "jsx-a11y/no-static-element-interactions": "off",
-      "jsx-a11y/prefer-tag-over-role": "off",
-      "jsx-a11y/role-has-required-aria-props": "off",
-      "jsx-a11y/role-supports-aria-props": "off",
-      "jsx-a11y/scope": "off",
-      "jsx-a11y/tabindex-no-positive": "off",
-      // eslint-plugin-react rules - some disabled for performance/specific project needs
-      "react/button-has-type": "off",
-      "react/jsx-boolean-value": "off",
-      "react/jsx-curly-brace-presence": "off",
-      "react/jsx-fragments": "off",
-      "react/jsx-key": "off",
-      "react/jsx-no-comment-textnodes": "off",
-      "react/jsx-no-duplicate-props": "off",
-      "react/jsx-no-target-blank": "off",
-      "react/jsx-no-useless-fragment": "off",
-      "react/no-array-index-key": "off",
-      "react/no-children-prop": "off",
-      "react/no-danger": "off",
-      "react/no-danger-with-children": "off",
-      "react/void-dom-elements-no-children": "off",
-      // eslint-plugin-react-hooks rules - disabled for specific project needs
-      "react-hooks/exhaustive-deps": "off",
-      "react-hooks/rules-of-hooks": "off",
-      // typescript-eslint rules - some handled by TypeScript compiler or disabled for project needs
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/require-await": "off",
-      // Custom rules
-      "@typescript-eslint/restrict-template-expressions": [
-        "error",
-        {
-          allowNumber: true,
-          allowBoolean: true,
-          allowNever: true,
-        },
-      ],
-    },
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-  }
-);
-
-export default eslintConfig;
@@ -1,90 +0,0 @@
-import { FlatCompat } from "@eslint/eslintrc";
-import eslint from "@eslint/js";
-import tseslint from "typescript-eslint";
-
-const compat = new FlatCompat({
-  baseDirectory: import.meta.dirname,
-});
-
-const eslintConfig = tseslint.config(
-  eslint.configs.recommended,
-  ...compat.extends("next/core-web-vitals"),
-  {
-    // Disabled rules taken from https://biomejs.dev/linter/rules-sources for ones that
-    // are already handled by Prettier and TypeScript or are not needed
-    rules: {
-      // eslint-plugin-jsx-a11y rules - some disabled for performance/specific project needs
-      "jsx-a11y/alt-text": "off",
-      "jsx-a11y/anchor-has-content": "off",
-      "jsx-a11y/anchor-is-valid": "off",
-      "jsx-a11y/aria-activedescendant-has-tabindex": "off",
-      "jsx-a11y/aria-props": "off",
-      "jsx-a11y/aria-proptypes": "off",
-      "jsx-a11y/aria-role": "off",
-      "jsx-a11y/aria-unsupported-elements": "off",
-      "jsx-a11y/autocomplete-valid": "off",
-      "jsx-a11y/click-events-have-key-events": "off",
-      "jsx-a11y/heading-has-content": "off",
-      "jsx-a11y/html-has-lang": "off",
-      "jsx-a11y/iframe-has-title": "off",
-      "jsx-a11y/img-redundant-alt": "off",
-      "jsx-a11y/interactive-supports-focus": "off",
-      "jsx-a11y/label-has-associated-control": "off",
-      "jsx-a11y/lang": "off",
-      "jsx-a11y/media-has-caption": "off",
-      "jsx-a11y/mouse-events-have-key-events": "off",
-      "jsx-a11y/no-access-key": "off",
-      "jsx-a11y/no-aria-hidden-on-focusable": "off",
-      "jsx-a11y/no-autofocus": "off",
-      "jsx-a11y/no-distracting-elements": "off",
-      "jsx-a11y/no-interactive-element-to-noninteractive-role": "off",
-      "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
-      "jsx-a11y/no-noninteractive-tabindex": "off",
-      "jsx-a11y/no-redundant-roles": "off",
-      "jsx-a11y/no-static-element-interactions": "off",
-      "jsx-a11y/prefer-tag-over-role": "off",
-      "jsx-a11y/role-has-required-aria-props": "off",
-      "jsx-a11y/role-supports-aria-props": "off",
-      "jsx-a11y/scope": "off",
-      "jsx-a11y/tabindex-no-positive": "off",
-      // eslint-plugin-react rules - some disabled for performance/specific project needs
-      "react/button-has-type": "off",
-      "react/jsx-boolean-value": "off",
-      "react/jsx-curly-brace-presence": "off",
-      "react/jsx-fragments": "off",
-      "react/jsx-key": "off",
-      "react/jsx-no-comment-textnodes": "off",
-      "react/jsx-no-duplicate-props": "off",
-      "react/jsx-no-target-blank": "off",
-      "react/jsx-no-useless-fragment": "off",
-      "react/no-array-index-key": "off",
-      "react/no-children-prop": "off",
-      "react/no-danger": "off",
-      "react/no-danger-with-children": "off",
-      "react/void-dom-elements-no-children": "off",
-      // eslint-plugin-react-hooks rules - disabled for specific project needs
-      "react-hooks/exhaustive-deps": "off",
-      "react-hooks/rules-of-hooks": "off",
-      // typescript-eslint rules - some handled by TypeScript compiler or disabled for project needs
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/require-await": "off",
-      // Custom rules
-      "@typescript-eslint/restrict-template-expressions": [
-        "error",
-        {
-          allowNumber: true,
-          allowBoolean: true,
-          allowNever: true,
-        },
-      ],
-    },
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-  }
-);
-
-export default eslintConfig;
@@ -21,17 +21,16 @@
  "author": "",
  "license": "AGPL-3.0",
  "dependencies": {
-    "@types/node": "^24.0.3",
+    "@types/node": "^24.0.10",
    "@yao-pkg/pkg": "^6.5.1",
    "commander": "^14.0.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^17.0.1",
    "get-port": "^7.1.0",
    "nodemon": "^3.1.10",
    "proxy-chain": "^2.5.9",
    "tmp": "^0.2.3",
    "ts-node": "^10.9.2",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.1"
+    "typescript": "^5.8.3"
  },
  "devDependencies": {
    "@types/tmp": "^0.2.6"
@@ -2,7 +2,7 @@
  "name": "donutbrowser",
  "private": true,
  "license": "AGPL-3.0",
-  "version": "0.5.6",
+  "version": "0.6.1",
  "type": "module",
  "scripts": {
    "dev": "next dev --turbopack",
@@ -11,7 +11,7 @@
    "test": "pnpm test:rust",
    "test:rust": "cd src-tauri && cargo test",
    "lint": "pnpm lint:js && pnpm lint:rust",
-    "lint:js": "biome check src/ && tsc --noEmit && next lint",
+    "lint:js": "biome check src/ && tsc --noEmit",
    "lint:rust": "cd src-tauri && cargo clippy --all-targets --all-features -- -D warnings -D clippy::all && cargo fmt --all",
    "tauri": "tauri",
    "shadcn:add": "pnpm dlx shadcn@latest add",
@@ -35,53 +35,43 @@
    "@radix-ui/react-slot": "^1.2.3",
    "@radix-ui/react-tooltip": "^1.2.7",
    "@tanstack/react-table": "^8.21.3",
-    "@tauri-apps/api": "^2.5.0",
-    "@tauri-apps/plugin-deep-link": "^2.3.0",
-    "@tauri-apps/plugin-dialog": "^2.2.2",
-    "@tauri-apps/plugin-fs": "~2.3.0",
-    "@tauri-apps/plugin-opener": "^2.3.0",
-    "ahooks": "^3.8.5",
+    "@tauri-apps/api": "^2.6.0",
+    "@tauri-apps/plugin-deep-link": "^2.4.0",
+    "@tauri-apps/plugin-dialog": "^2.3.0",
+    "@tauri-apps/plugin-fs": "~2.4.0",
+    "@tauri-apps/plugin-opener": "^2.4.0",
+    "ahooks": "^3.9.0",
    "class-variance-authority": "^0.7.1",
    "clsx": "^2.1.1",
    "cmdk": "^1.1.1",
-    "next": "^15.3.4",
+    "next": "^15.3.5",
    "next-themes": "^0.4.6",
    "react": "^19.1.0",
    "react-dom": "^19.1.0",
    "react-icons": "^5.5.0",
-    "sonner": "^2.0.5",
+    "sonner": "^2.0.6",
    "tailwind-merge": "^3.3.1",
    "tauri-plugin-macos-permissions-api": "^2.3.0"
  },
  "devDependencies": {
-    "@biomejs/biome": "2.0.4",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.29.0",
-    "@next/eslint-plugin-next": "^15.3.4",
-    "@tailwindcss/postcss": "^4.1.10",
-    "@tauri-apps/cli": "^2.5.0",
-    "@types/node": "^24.0.3",
+    "@biomejs/biome": "2.0.6",
+    "@tailwindcss/postcss": "^4.1.11",
+    "@tauri-apps/cli": "^2.6.2",
+    "@types/node": "^24.0.10",
    "@types/react": "^19.1.8",
    "@types/react-dom": "^19.1.6",
-    "@typescript-eslint/eslint-plugin": "^8.34.1",
-    "@typescript-eslint/parser": "^8.34.1",
-    "@vitejs/plugin-react": "^4.5.2",
-    "eslint": "^9.29.0",
-    "eslint-config-next": "^15.3.4",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "@vitejs/plugin-react": "^4.6.0",
    "husky": "^9.1.7",
    "lint-staged": "^16.1.2",
-    "tailwindcss": "^4.1.10",
+    "tailwindcss": "^4.1.11",
    "ts-unused-exports": "^11.0.1",
-    "tw-animate-css": "^1.3.4",
-    "typescript": "~5.8.3",
-    "typescript-eslint": "^8.34.1"
+    "tw-animate-css": "^1.3.5",
+    "typescript": "~5.8.3"
  },
  "packageManager": "pnpm@10.11.1",
  "lint-staged": {
    "**/*.{js,jsx,ts,tsx,json,css,md}": [
-      "biome check --fix",
-      "eslint --cache --fix"
+      "biome check --fix"
    ],
    "src-tauri/**/*.rs": [
      "cd src-tauri && cargo fmt --all",
@@ -226,28 +226,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -384,9 +362,9 @@ dependencies = [

 [[package]]
 name = "brotli"
-version = "7.0.0"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -395,9 +373,9 @@ dependencies = [

 [[package]]
 name = "brotli-decompressor"
-version = "4.0.3"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -405,9 +383,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.18.1"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"

 [[package]]
 name = "bytemuck"
@@ -735,9 +713,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"

 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"

 [[package]]
 name = "crypto-common"
@@ -751,15 +729,15 @@ dependencies = [

 [[package]]
 name = "cssparser"
-version = "0.27.2"
+version = "0.29.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
+checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
 dependencies = [
 "cssparser-macros",
 "dtoa-short",
- "itoa 0.4.8",
+ "itoa",
 "matches",
- "phf 0.8.0",
+ "phf 0.10.1",
 "proc-macro2",
 "quote",
 "smallvec",
@@ -917,7 +895,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -993,7 +971,7 @@ dependencies = [

 [[package]]
 name = "donutbrowser"
-version = "0.5.6"
+version = "0.6.1"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
@@ -1021,10 +999,9 @@ dependencies = [
 "tauri-plugin-single-instance",
 "tempfile",
 "tokio",
- "tokio-test",
 "tower",
 "tower-http",
- "urlencoding",
+ "uuid",
 "windows",
 "winreg",
 "wiremock",
@@ -1146,7 +1123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1755,16 +1732,14 @@ dependencies = [

 [[package]]
 name = "html5ever"
-version = "0.26.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
+checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c"
 dependencies = [
 "log",
 "mac",
 "markup5ever",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "match_token",
 ]

 [[package]]
@@ -1775,7 +1750,7 @@ checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
 "bytes",
 "fnv",
- "itoa 1.0.15",
+ "itoa",
 ]

 [[package]]
@@ -1833,7 +1808,7 @@ dependencies = [
 "http-body",
 "httparse",
 "httpdate",
- "itoa 1.0.15",
+ "itoa",
 "pin-project-lite",
 "smallvec",
 "tokio",
@@ -2120,12 +2095,6 @@ dependencies = [
 "once_cell",
 ]

-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -2232,14 +2201,13 @@ dependencies = [

 [[package]]
 name = "kuchikiki"
-version = "0.8.2"
+version = "0.8.8-speedreader"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
+checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
 dependencies = [
 "cssparser",
 "html5ever",
- "indexmap 1.9.3",
- "matches",
+ "indexmap 2.9.0",
 "selectors",
 ]

@@ -2311,9 +2279,9 @@ dependencies = [

 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
 "bitflags 2.9.1",
 "libc",
@@ -2374,18 +2342,29 @@ dependencies = [

 [[package]]
 name = "markup5ever"
-version = "0.11.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
+checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
 dependencies = [
 "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf 0.11.3",
+ "phf_codegen 0.11.3",
 "string_cache",
 "string_cache_codegen",
 "tendril",
 ]

+[[package]]
+name = "match_token"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -2446,9 +2425,9 @@ dependencies = [

 [[package]]
 name = "muda"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de14a9b5d569ca68d7c891d613b390cf5ab4f851c77aaa2f9e435555d3d9492"
+checksum = "58b89bf91c19bf036347f1ab85a81c560f08c0667c8601bece664d860a600988"
 dependencies = [
 "crossbeam-channel",
 "dpi",
@@ -2573,18 +2552,19 @@ dependencies = [

 [[package]]
 name = "num_enum"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
 dependencies = [
 "num_enum_derive",
+ "rustversion",
 ]

 [[package]]
 name = "num_enum_derive"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
 "proc-macro-crate 3.3.0",
 "proc-macro2",
@@ -3005,9 +2985,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
- "phf_macros 0.8.0",
 "phf_shared 0.8.0",
- "proc-macro-hack",
 ]

 [[package]]
@@ -3016,7 +2994,9 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
+ "phf_macros 0.10.0",
 "phf_shared 0.10.0",
+ "proc-macro-hack",
 ]

 [[package]]
@@ -3041,12 +3021,12 @@ dependencies = [

 [[package]]
 name = "phf_codegen"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
 ]

 [[package]]
@@ -3081,12 +3061,12 @@ dependencies = [

 [[package]]
 name = "phf_macros"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
 dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
 "proc-macro-hack",
 "proc-macro2",
 "quote",
@@ -3627,7 +3607,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -3763,22 +3743,20 @@ dependencies = [

 [[package]]
 name = "selectors"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
+checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
 dependencies = [
 "bitflags 1.3.2",
 "cssparser",
 "derive_more",
 "fxhash",
 "log",
- "matches",
 "phf 0.8.0",
 "phf_codegen 0.8.0",
 "precomputed-hash",
 "servo_arc",
 "smallvec",
- "thin-slice",
 ]

 [[package]]
@@ -3838,7 +3816,7 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "itoa 1.0.15",
+ "itoa",
 "memchr",
 "ryu",
 "serde",
@@ -3871,7 +3849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
 "form_urlencoded",
- "itoa 1.0.15",
+ "itoa",
 "ryu",
 "serde",
 ]
@@ -3931,9 +3909,9 @@ dependencies = [

 [[package]]
 name = "servo_arc"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
+checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
 dependencies = [
 "nodrop",
 "stable_deref_trait",
@@ -4248,9 +4226,9 @@ dependencies = [

 [[package]]
 name = "tao"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e59c1f38e657351a2e822eadf40d6a2ad4627b9c25557bc1180ec1b3295ef82"
+checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
 dependencies = [
 "bitflags 2.9.1",
 "core-foundation 0.10.1",
@@ -4304,17 +4282,16 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "tauri"
-version = "2.5.1"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b0bc1aec81bda6bc455ea98fcaed26b3c98c1648c627ad6ff1c704e8bf8cbc"
+checksum = "124e129c9c0faa6bec792c5948c89e86c90094133b0b9044df0ce5f0a8efaa0d"
 dependencies = [
 "anyhow",
 "bytes",
 "dirs",
 "dunce",
 "embed_plist",
- "futures-util",
- "getrandom 0.2.16",
+ "getrandom 0.3.3",
 "glob",
 "gtk",
 "heck 0.5.0",
@@ -4355,9 +4332,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a0350f0df1db385ca5c02888a83e0e66655c245b7443db8b78a70da7d7f8fc"
+checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83"
 dependencies = [
 "anyhow",
 "cargo_toml",
@@ -4377,9 +4354,9 @@ dependencies = [

 [[package]]
 name = "tauri-codegen"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93f035551bf7b11b3f51ad9bc231ebbe5e085565527991c16cf326aa38cdf47"
+checksum = "f5df493a1075a241065bc865ed5ef8d0fbc1e76c7afdc0bf0eccfaa7d4f0e406"
 dependencies = [
 "base64 0.22.1",
 "brotli",
@@ -4404,9 +4381,9 @@ dependencies = [

 [[package]]
 name = "tauri-macros"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db4df25e2d9d45de0c4c910da61cd5500190da14ae4830749fee3466dddd112"
+checksum = "f237fbea5866fa5f2a60a21bea807a2d6e0379db070d89c3a10ac0f2d4649bbc"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@@ -4418,9 +4395,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a5ebe6a610d1b78a94650896e6f7c9796323f408800cef436e0fa0539de601"
+checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3"
 dependencies = [
 "anyhow",
 "glob",
@@ -4435,9 +4412,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4976ac728ebc0487515aa956cfdf200abcc52b784e441493fc544bc6ce369c8"
+checksum = "ab261eb006db10ab478e3fbb5a4e2692df3f7eb3e28300ee2b64428979167ed0"
 dependencies = [
 "dunce",
 "rust-ini",
@@ -4455,9 +4432,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.2.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33318fe222fc2a612961de8b0419e2982767f213f54a4d3a21b0d7b85c41df8"
+checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28"
 dependencies = [
 "log",
 "raw-window-handle",
@@ -4473,9 +4450,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-fs"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ead0daec5d305adcefe05af9d970fc437bcc7996052d564e7393eb291252da"
+checksum = "c341290d31991dbca38b31d412c73dfbdb070bb11536784f19dd2211d13b778f"
 dependencies = [
 "anyhow",
 "dunce",
@@ -4510,9 +4487,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-opener"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8983f50326d34437142a6d560b5c3426e91324297519b6eeb32ed0a1d1e0f2"
+checksum = "ecee219f11cdac713ab32959db5d0cceec4810ba4f4458da992292ecf9660321"
 dependencies = [
 "dunce",
 "glob",
@@ -4532,9 +4509,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-shell"
-version = "2.2.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34e525a448b80ad5d906fcbd93838ac3ba37985b29ac699a045b5da9b0a1a22"
+checksum = "2b9ffadec5c3523f11e8273465cacb3d86ea7652a28e6e2a2e9b5c182f791d25"
 dependencies = [
 "encoding_rs",
 "log",
@@ -4553,9 +4530,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.2.4"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d0e07b40fb2eb13778e30778f5979347a2bf30e1b9d47f78ff7fe92d2e4b3d"
+checksum = "b441b6d5d1a194e9fee0b358fe0d602ded845d0f580e1f8c8ef78ebc3c8b225d"
 dependencies = [
 "serde",
 "serde_json",
@@ -4563,15 +4540,15 @@ dependencies = [
 "tauri-plugin-deep-link",
 "thiserror 2.0.12",
 "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 "zbus",
 ]

 [[package]]
 name = "tauri-runtime"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f004905d549854069e6774533d742b03cacfd6f03deb08940a8677586cbe39"
+checksum = "9e7bb73d1bceac06c20b3f755b2c8a2cb13b20b50083084a8cf3700daf397ba4"
 dependencies = [
 "cookie",
 "dpi",
@@ -4591,9 +4568,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85d056f4d4b014fe874814034f3416d57114b617a493a4fe552580851a3f3a2"
+checksum = "902b5aa9035e16f342eb64f8bf06ccdc2808e411a2525ed1d07672fa4e780bad"
 dependencies = [
 "gtk",
 "http",
@@ -4618,9 +4595,9 @@ dependencies = [

 [[package]]
 name = "tauri-utils"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2900399c239a471bcff7f15c4399eb1a8c4fe511ba2853e07c996d771a5e0a4"
+checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e"
 dependencies = [
 "anyhow",
 "brotli",
@@ -4675,7 +4652,7 @@ dependencies = [
 "getrandom 0.3.3",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4689,12 +4666,6 @@ dependencies = [
 "utf-8",
 ]

-[[package]]
-name = "thin-slice"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -4742,7 +4713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
 "deranged",
- "itoa 1.0.15",
+ "itoa",
 "num-conv",
 "powerfmt",
 "serde",
@@ -4835,30 +4806,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "tokio-stream"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-test"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
-dependencies = [
- "async-stream",
- "bytes",
- "futures-core",
- "tokio",
- "tokio-stream",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.15"
@@ -5023,9 +4970,9 @@ dependencies = [

 [[package]]
 name = "tray-icon"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7eee98ec5c90daf179d55c20a49d8c0d043054ce7c26336c09a24d31f14fa0"
+checksum = "2da75ec677957aa21f6e0b361df0daab972f13a5bee3606de0638fd4ee1c666a"
 dependencies = [
 "crossbeam-channel",
 "dirs",
@@ -5155,12 +5102,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "urlpattern"
 version = "0.3.0"
@@ -5415,9 +5356,9 @@ dependencies = [

 [[package]]
 name = "webview2-com"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b542b5cfbd9618c46c2784e4d41ba218c336ac70d44c55e47b251033e7d85601"
+checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4"
 dependencies = [
 "webview2-com-macros",
 "webview2-com-sys",
@@ -5440,9 +5381,9 @@ dependencies = [

 [[package]]
 name = "webview2-com-sys"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae2d11c4a686e4409659d7891791254cf9286d3cfe0eef54df1523533d22295"
+checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
 dependencies = [
 "thiserror 2.0.12",
 "windows",
@@ -5471,7 +5412,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -5581,9 +5522,9 @@ dependencies = [

 [[package]]
 name = "windows-registry"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
 "windows-link",
 "windows-result",
@@ -5916,9 +5857,9 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"

 [[package]]
 name = "wry"
-version = "0.51.2"
+version = "0.52.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886a0a9d2a94fd90cfa1d929629b79cfefb1546e2c7430c63a47f0664c0e4e2"
+checksum = "12a714d9ba7075aae04a6e50229d6109e3d584774b99a6a8c60de1698ca111b9"
 dependencies = [
 "base64 0.22.1",
 "block2 0.6.1",
@@ -6160,9 +6101,9 @@ dependencies = [

 [[package]]
 name = "zip"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7dcdb4229c0e79c2531a24de7726a0e980417a74fb4d030a35f535665439a0"
+checksum = "95ab361742de920c5535880f89bbd611ee62002bf11341d16a5f057bb8ba6899"
 dependencies = [
 "aes",
 "arbitrary",
@@ -1,6 +1,6 @@
 [package]
 name = "donutbrowser"
-version = "0.5.6"
+version = "0.6.1"
 description = "Simple Yet Powerful Browser Orchestrator"
 authors = ["zhom@github"]
 edition = "2021"
@@ -34,14 +34,16 @@ tokio = { version = "1", features = ["full"] }
 sysinfo = "0.35"
 lazy_static = "1.4"
 base64 = "0.22"
-zip = "4"
 async-trait = "0.1"
 futures-util = "0.3"
-urlencoding = "2.1"
+uuid = { version = "1.0", features = ["v4", "serde"] }

 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
 tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }

+[target.'cfg(windows)'.dependencies]
+zip = "4"
+
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation="0.10"
 objc2 = "0.6.1"
@@ -63,7 +65,6 @@ windows = { version = "0.61", features = [

 [dev-dependencies]
 tempfile = "3.13.0"
-tokio-test = "0.4.4"
 wiremock = "0.6"
 hyper = { version = "1.0", features = ["full"] }
 hyper-util = { version = "0.1", features = ["full"] }
@@ -35,6 +35,15 @@ pub struct AppUpdateInfo {
  pub published_at: String,
 }

+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct AppUpdateProgress {
+  pub stage: String, // "downloading", "extracting", "installing", "completed"
+  pub percentage: Option<f64>,
+  pub speed: Option<String>, // MB/s
+  pub eta: Option<String>,   // estimated time remaining
+  pub message: String,
+}
+
 pub struct AppAutoUpdater {
  client: Client,
 }
@@ -98,9 +107,7 @@ impl AppAutoUpdater {
      // For stable builds, look for stable releases (semver format)
      let stable_releases: Vec<&AppRelease> = releases
        .iter()
-        .filter(|release| {
-          release.tag_name.starts_with('v') && !release.tag_name.starts_with("nightly-")
-        })
+        .filter(|release| release.tag_name.starts_with('v'))
        .collect();
      println!("Found {} stable releases", stable_releases.len());
      stable_releases
@@ -311,21 +318,48 @@ impl AppAutoUpdater {
      .to_string();

    // Emit download start event
-    let _ = app_handle.emit("app-update-progress", "Downloading update...");
+    let _ = app_handle.emit(
+      "app-update-progress",
+      AppUpdateProgress {
+        stage: "downloading".to_string(),
+        percentage: Some(0.0),
+        speed: None,
+        eta: None,
+        message: "Starting download...".to_string(),
+      },
+    );

-    // Download the update
+    // Download the update with progress tracking
    let download_path = self
-      .download_update(&update_info.download_url, &temp_dir, &filename)
+      .download_update_with_progress(&update_info.download_url, &temp_dir, &filename, app_handle)
      .await?;

    // Emit extraction start event
-    let _ = app_handle.emit("app-update-progress", "Preparing update...");
+    let _ = app_handle.emit(
+      "app-update-progress",
+      AppUpdateProgress {
+        stage: "extracting".to_string(),
+        percentage: None,
+        speed: None,
+        eta: None,
+        message: "Preparing update...".to_string(),
+      },
+    );

    // Extract the update
    let extracted_app_path = self.extract_update(&download_path, &temp_dir).await?;

    // Emit installation start event
-    let _ = app_handle.emit("app-update-progress", "Installing update...");
+    let _ = app_handle.emit(
+      "app-update-progress",
+      AppUpdateProgress {
+        stage: "installing".to_string(),
+        percentage: None,
+        speed: None,
+        eta: None,
+        message: "Installing update...".to_string(),
+      },
+    );

    // Install the update (overwrite current app)
    self.install_update(&extracted_app_path).await?;
@@ -334,7 +368,16 @@ impl AppAutoUpdater {
    let _ = fs::remove_dir_all(&temp_dir);

    // Emit completion event
-    let _ = app_handle.emit("app-update-progress", "Update completed. Restarting...");
+    let _ = app_handle.emit(
+      "app-update-progress",
+      AppUpdateProgress {
+        stage: "completed".to_string(),
+        percentage: Some(100.0),
+        speed: None,
+        eta: None,
+        message: "Update completed. Restarting...".to_string(),
+      },
+    );

    // Restart the application
    self.restart_application().await?;
@@ -342,12 +385,13 @@ impl AppAutoUpdater {
    Ok(())
  }

-  /// Download the update file
-  async fn download_update(
+  /// Download the update file with progress tracking
+  async fn download_update_with_progress(
    &self,
    download_url: &str,
    dest_dir: &Path,
    filename: &str,
+    app_handle: &tauri::AppHandle,
  ) -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
    let file_path = dest_dir.join(filename);

@@ -362,15 +406,75 @@ impl AppAutoUpdater {
      return Err(format!("Download failed with status: {}", response.status()).into());
    }

+    let total_size = response.content_length().unwrap_or(0);
    let mut file = fs::File::create(&file_path)?;
    let mut stream = response.bytes_stream();
+    let mut downloaded = 0u64;
+    let start_time = std::time::Instant::now();
+    let mut last_update = std::time::Instant::now();

    use futures_util::StreamExt;
    while let Some(chunk) = stream.next().await {
      let chunk = chunk?;
      file.write_all(&chunk)?;
+      downloaded += chunk.len() as u64;
+
+      // Update progress every 100ms to avoid overwhelming the UI
+      if last_update.elapsed().as_millis() > 100 {
+        let elapsed = start_time.elapsed().as_secs_f64();
+        let percentage = if total_size > 0 {
+          (downloaded as f64 / total_size as f64) * 100.0
+        } else {
+          0.0
+        };
+
+        let speed = if elapsed > 0.0 {
+          downloaded as f64 / elapsed / 1024.0 / 1024.0 // MB/s
+        } else {
+          0.0
+        };
+
+        let eta = if total_size > 0 && speed > 0.0 {
+          let remaining_bytes = total_size - downloaded;
+          let remaining_seconds = (remaining_bytes as f64 / 1024.0 / 1024.0) / speed;
+          if remaining_seconds < 60.0 {
+            format!("{}s", remaining_seconds as u32)
+          } else {
+            let minutes = remaining_seconds as u32 / 60;
+            let seconds = remaining_seconds as u32 % 60;
+            format!("{minutes}m {seconds}s")
+          }
+        } else {
+          "Unknown".to_string()
+        };
+
+        let _ = app_handle.emit(
+          "app-update-progress",
+          AppUpdateProgress {
+            stage: "downloading".to_string(),
+            percentage: Some(percentage),
+            speed: Some(format!("{speed:.1}")),
+            eta: Some(eta),
+            message: format!("Downloading update... {percentage:.1}%"),
+          },
+        );
+
+        last_update = std::time::Instant::now();
+      }
    }

+    // Emit final download completion
+    let _ = app_handle.emit(
+      "app-update-progress",
+      AppUpdateProgress {
+        stage: "downloading".to_string(),
+        percentage: Some(100.0),
+        speed: None,
+        eta: None,
+        message: "Download completed".to_string(),
+      },
+    );
+
    Ok(file_path)
  }

@@ -101,7 +101,7 @@ impl AutoUpdater {
        if let Some(update) = self.check_profile_update(&profile, &versions)? {
          // Apply chromium threshold logic
          if browser == "chromium" {
-            // For chromium, only show notifications if there are 100+ new versions
+            // For chromium, only show notifications if there are 200+ new versions
            let current_version = &profile.version.parse::<u32>().unwrap();
            let new_version = &update.new_version.parse::<u32>().unwrap();

@@ -109,7 +109,7 @@ impl AutoUpdater {
            println!(
              "Current version: {current_version}, New version: {new_version}, Result: {result}"
            );
-            if result > 100 {
+            if result > 200 {
              notifications.push(update);
            } else {
              println!(
@@ -514,12 +514,12 @@ mod tests {

  fn create_test_profile(name: &str, browser: &str, version: &str) -> BrowserProfile {
    BrowserProfile {
+      id: uuid::Uuid::new_v4(),
      name: name.to_string(),
      browser: browser.to_string(),
      version: version.to_string(),
-      profile_path: format!("/tmp/{name}"),
      process_id: None,
-      proxy: None,
+      proxy_id: None,
      last_launch: None,
      release_type: "stable".to_string(),
    }
@@ -1,9 +1,8 @@
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};

-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProxySettings {
-  pub enabled: bool,
  pub proxy_type: String, // "http", "https", "socks4", or "socks5"
  pub host: String,
  pub port: u16,
@@ -636,12 +635,11 @@ impl Browser for ChromiumBrowser {

    // Add proxy configuration if provided
    if let Some(proxy) = proxy_settings {
-      if proxy.enabled {
-        args.push(format!(
-          "--proxy-server=http://{}:{}",
-          proxy.host, proxy.port
-        ));
-      }
+      // Apply proxy settings
+      args.push(format!(
+        "--proxy-server=http://{}:{}",
+        proxy.host, proxy.port
+      ));
    }

    if let Some(url) = url {
@@ -887,7 +885,6 @@ mod tests {
  #[test]
  fn test_proxy_settings_creation() {
    let proxy = ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "127.0.0.1".to_string(),
      port: 8080,
@@ -895,14 +892,12 @@ mod tests {
      password: None,
    };

-    assert!(proxy.enabled);
    assert_eq!(proxy.proxy_type, "http");
    assert_eq!(proxy.host, "127.0.0.1");
    assert_eq!(proxy.port, 8080);

    // Test different proxy types
    let socks_proxy = ProxySettings {
-      enabled: true,
      proxy_type: "socks5".to_string(),
      host: "proxy.example.com".to_string(),
      port: 1080,
@@ -980,7 +975,6 @@ mod tests {
  #[test]
  fn test_proxy_settings_serialization() {
    let proxy = ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "127.0.0.1".to_string(),
      port: 8080,
@@ -996,7 +990,6 @@ mod tests {

    // Test that it can be deserialized (implements Deserialize)
    let deserialized: ProxySettings = serde_json::from_str(&json).unwrap();
-    assert_eq!(deserialized.enabled, proxy.enabled);
    assert_eq!(deserialized.proxy_type, proxy.proxy_type);
    assert_eq!(deserialized.host, proxy.host);
    assert_eq!(deserialized.port, proxy.port);
@@ -605,9 +605,25 @@ pub async fn smart_open_url(
        }
      }

-      // For Mullvad browser: skip if running (can't open URLs in running Mullvad)
+      // For Mullvad browser: Check if any other Mullvad browser is running
      if profile.browser == "mullvad-browser" {
-        continue;
+        let mut other_mullvad_running = false;
+        for p in &profiles {
+          if p.browser == "mullvad-browser"
+            && p.name != profile.name
+            && runner
+              .check_browser_status(app_handle.clone(), p)
+              .await
+              .unwrap_or(false)
+          {
+            other_mullvad_running = true;
+            break;
+          }
+        }
+
+        if other_mullvad_running {
+          continue; // Skip this one, can't have multiple Mullvad instances
+        }
      }

      // Try to open the URL with this running profile
@@ -174,6 +174,39 @@ async fn check_and_handle_startup_url(app_handle: tauri::AppHandle) -> Result<bo
  Ok(false)
 }

+#[tauri::command]
+async fn create_stored_proxy(
+  name: String,
+  proxy_settings: crate::browser::ProxySettings,
+) -> Result<crate::proxy_manager::StoredProxy, String> {
+  crate::proxy_manager::PROXY_MANAGER
+    .create_stored_proxy(name, proxy_settings)
+    .map_err(|e| format!("Failed to create stored proxy: {e}"))
+}
+
+#[tauri::command]
+async fn get_stored_proxies() -> Result<Vec<crate::proxy_manager::StoredProxy>, String> {
+  Ok(crate::proxy_manager::PROXY_MANAGER.get_stored_proxies())
+}
+
+#[tauri::command]
+async fn update_stored_proxy(
+  proxy_id: String,
+  name: Option<String>,
+  proxy_settings: Option<crate::browser::ProxySettings>,
+) -> Result<crate::proxy_manager::StoredProxy, String> {
+  crate::proxy_manager::PROXY_MANAGER
+    .update_stored_proxy(&proxy_id, name, proxy_settings)
+    .map_err(|e| format!("Failed to update stored proxy: {e}"))
+}
+
+#[tauri::command]
+async fn delete_stored_proxy(proxy_id: String) -> Result<(), String> {
+  crate::proxy_manager::PROXY_MANAGER
+    .delete_stored_proxy(&proxy_id)
+    .map_err(|e| format!("Failed to delete stored proxy: {e}"))
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
  let args: Vec<String> = env::args().collect();
@@ -218,6 +251,26 @@ pub fn run() {
        }
      }

+      // Migrate profiles to UUID format if needed (async)
+      println!("Checking for profile migration...");
+      let browser_runner = browser_runner::BrowserRunner::new();
+      tauri::async_runtime::spawn(async move {
+        match browser_runner.migrate_profiles_to_uuid().await {
+          Ok(migrated) => {
+            if !migrated.is_empty() {
+              println!(
+                "Successfully migrated {} profiles: {:?}",
+                migrated.len(),
+                migrated
+              );
+            }
+          }
+          Err(e) => {
+            eprintln!("Warning: Failed to migrate profiles: {e}");
+          }
+        }
+      });
+
      // Set up deep link handler
      let handle = app.handle().clone();

@@ -376,6 +429,10 @@ pub fn run() {
      import_browser_profile,
      check_missing_binaries,
      ensure_all_binaries_exist,
+      create_stored_proxy,
+      get_stored_proxies,
+      update_stored_proxy,
+      delete_stored_proxy,
    ])
    .run(tauri::generate_context!())
    .expect("error while running tauri application");
@@ -664,26 +664,28 @@ impl ProfileImporter {
      return Err(format!("Profile with name '{new_profile_name}' already exists").into());
    }

-    // Create the new profile directory
-    let snake_case_name = new_profile_name.to_lowercase().replace(' ', "_");
+    // Generate UUID for new profile and create the directory structure
+    let profile_id = uuid::Uuid::new_v4();
    let profiles_dir = self.browser_runner.get_profiles_dir();
-    let new_profile_path = profiles_dir.join(&snake_case_name);
+    let new_profile_uuid_dir = profiles_dir.join(profile_id.to_string());
+    let new_profile_data_dir = new_profile_uuid_dir.join("profile");

-    create_dir_all(&new_profile_path)?;
+    create_dir_all(&new_profile_uuid_dir)?;
+    create_dir_all(&new_profile_data_dir)?;

-    // Copy all files from source to destination
-    Self::copy_directory_recursive(source_path, &new_profile_path)?;
+    // Copy all files from source to destination profile subdirectory
+    Self::copy_directory_recursive(source_path, &new_profile_data_dir)?;

    // Create the profile metadata without overwriting the imported data
    // We need to find a suitable version for this browser type
    let available_versions = self.get_default_version_for_browser(browser_type)?;

    let profile = crate::browser_runner::BrowserProfile {
+      id: profile_id,
      name: new_profile_name.to_string(),
      browser: browser_type.to_string(),
      version: available_versions,
-      profile_path: new_profile_path.to_string_lossy().to_string(),
-      proxy: None,
+      proxy_id: None,
      process_id: None,
      last_launch: None,
      release_type: "stable".to_string(),
@@ -706,7 +708,7 @@ impl ProfileImporter {
    &self,
    browser_type: &str,
  ) -> Result<String, Box<dyn std::error::Error>> {
-    // Try to get a downloaded version first, fallback to a reasonable default
+    // Check if any version of the browser is downloaded
    let registry =
      crate::downloaded_browsers::DownloadedBrowsersRegistry::load().unwrap_or_default();
    let downloaded_versions = registry.get_downloaded_versions(browser_type);
@@ -715,17 +717,12 @@ impl ProfileImporter {
      return Ok(version.clone());
    }

-    // If no downloaded versions, return a sensible default
-    match browser_type {
-      "firefox" => Ok("latest".to_string()),
-      "firefox-developer" => Ok("latest".to_string()),
-      "chromium" => Ok("latest".to_string()),
-      "brave" => Ok("latest".to_string()),
-      "zen" => Ok("latest".to_string()),
-      "mullvad-browser" => Ok("13.5.16".to_string()), // Mullvad Browser common version
-      "tor-browser" => Ok("latest".to_string()),
-      _ => Ok("latest".to_string()),
-    }
+    // If no downloaded versions found, return an error
+    Err(format!(
+      "No downloaded versions found for browser '{}'. Please download a version of {} first before importing profiles.",
+      browser_type,
+      self.get_browser_display_name(browser_type)
+    ).into())
  }

  /// Recursively copy directory contents
@@ -1,6 +1,9 @@
+use directories::BaseDirs;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
 use std::sync::Mutex;
 use tauri_plugin_shell::ShellExt;

@@ -17,19 +20,237 @@ pub struct ProxyInfo {
  pub local_port: u16,
 }

-// Global proxy manager to track active proxies
+// Stored proxy configuration with name and ID for reuse
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct StoredProxy {
+  pub id: String,
+  pub name: String,
+  pub proxy_settings: ProxySettings,
+}
+
+impl StoredProxy {
+  pub fn new(name: String, proxy_settings: ProxySettings) -> Self {
+    Self {
+      id: uuid::Uuid::new_v4().to_string(),
+      name,
+      proxy_settings,
+    }
+  }
+
+  pub fn update_settings(&mut self, proxy_settings: ProxySettings) {
+    self.proxy_settings = proxy_settings;
+  }
+
+  pub fn update_name(&mut self, name: String) {
+    self.name = name;
+  }
+}
+
+// Global proxy manager to track active proxies and stored proxy configurations
 pub struct ProxyManager {
  active_proxies: Mutex<HashMap<u32, ProxyInfo>>, // Maps browser process ID to proxy info
  // Store proxy info by profile name for persistence across browser restarts
  profile_proxies: Mutex<HashMap<String, ProxySettings>>, // Maps profile name to proxy settings
+  stored_proxies: Mutex<HashMap<String, StoredProxy>>,    // Maps proxy ID to stored proxy
+  base_dirs: BaseDirs,
 }

 impl ProxyManager {
  pub fn new() -> Self {
-    Self {
+    let base_dirs = BaseDirs::new().expect("Failed to get base directories");
+    let manager = Self {
      active_proxies: Mutex::new(HashMap::new()),
      profile_proxies: Mutex::new(HashMap::new()),
+      stored_proxies: Mutex::new(HashMap::new()),
+      base_dirs,
+    };
+
+    // Load stored proxies on initialization
+    if let Err(e) = manager.load_stored_proxies() {
+      eprintln!("Warning: Failed to load stored proxies: {e}");
    }
+
+    manager
+  }
+
+  // Get the path to the proxies directory
+  fn get_proxies_dir(&self) -> PathBuf {
+    let mut path = self.base_dirs.data_local_dir().to_path_buf();
+    path.push(if cfg!(debug_assertions) {
+      "DonutBrowserDev"
+    } else {
+      "DonutBrowser"
+    });
+    path.push("proxies");
+    path
+  }
+
+  // Get the path to a specific proxy file
+  fn get_proxy_file_path(&self, proxy_id: &str) -> PathBuf {
+    self.get_proxies_dir().join(format!("{proxy_id}.json"))
+  }
+
+  // Load stored proxies from disk
+  fn load_stored_proxies(&self) -> Result<(), Box<dyn std::error::Error>> {
+    let proxies_dir = self.get_proxies_dir();
+
+    if !proxies_dir.exists() {
+      return Ok(()); // No proxies directory yet
+    }
+
+    let mut stored_proxies = self.stored_proxies.lock().unwrap();
+
+    // Read all JSON files from the proxies directory
+    for entry in fs::read_dir(&proxies_dir)? {
+      let entry = entry?;
+      let path = entry.path();
+
+      if path.extension().is_some_and(|ext| ext == "json") {
+        let content = fs::read_to_string(&path)?;
+        let proxy: StoredProxy = serde_json::from_str(&content)?;
+        stored_proxies.insert(proxy.id.clone(), proxy);
+      }
+    }
+
+    Ok(())
+  }
+
+  // Save a single proxy to disk
+  fn save_proxy(&self, proxy: &StoredProxy) -> Result<(), Box<dyn std::error::Error>> {
+    let proxies_dir = self.get_proxies_dir();
+
+    // Ensure directory exists
+    fs::create_dir_all(&proxies_dir)?;
+
+    let proxy_file = self.get_proxy_file_path(&proxy.id);
+    let content = serde_json::to_string_pretty(proxy)?;
+    fs::write(&proxy_file, content)?;
+
+    Ok(())
+  }
+
+  // Delete a proxy file from disk
+  fn delete_proxy_file(&self, proxy_id: &str) -> Result<(), Box<dyn std::error::Error>> {
+    let proxy_file = self.get_proxy_file_path(proxy_id);
+    if proxy_file.exists() {
+      fs::remove_file(proxy_file)?;
+    }
+    Ok(())
+  }
+
+  // Create a new stored proxy
+  pub fn create_stored_proxy(
+    &self,
+    name: String,
+    proxy_settings: ProxySettings,
+  ) -> Result<StoredProxy, String> {
+    // Check if name already exists
+    {
+      let stored_proxies = self.stored_proxies.lock().unwrap();
+      if stored_proxies.values().any(|p| p.name == name) {
+        return Err(format!("Proxy with name '{name}' already exists"));
+      }
+    }
+
+    let stored_proxy = StoredProxy::new(name, proxy_settings);
+
+    {
+      let mut stored_proxies = self.stored_proxies.lock().unwrap();
+      stored_proxies.insert(stored_proxy.id.clone(), stored_proxy.clone());
+    }
+
+    if let Err(e) = self.save_proxy(&stored_proxy) {
+      eprintln!("Warning: Failed to save proxy: {e}");
+    }
+
+    Ok(stored_proxy)
+  }
+
+  // Get all stored proxies
+  pub fn get_stored_proxies(&self) -> Vec<StoredProxy> {
+    let stored_proxies = self.stored_proxies.lock().unwrap();
+    stored_proxies.values().cloned().collect()
+  }
+
+  // Get a stored proxy by ID
+  #[allow(dead_code)]
+  pub fn get_stored_proxy(&self, proxy_id: &str) -> Option<StoredProxy> {
+    let stored_proxies = self.stored_proxies.lock().unwrap();
+    stored_proxies.get(proxy_id).cloned()
+  }
+
+  // Update a stored proxy
+  pub fn update_stored_proxy(
+    &self,
+    proxy_id: &str,
+    name: Option<String>,
+    proxy_settings: Option<ProxySettings>,
+  ) -> Result<StoredProxy, String> {
+    // First, check for conflicts without holding a mutable reference
+    {
+      let stored_proxies = self.stored_proxies.lock().unwrap();
+
+      // Check if proxy exists
+      if !stored_proxies.contains_key(proxy_id) {
+        return Err(format!("Proxy with ID '{proxy_id}' not found"));
+      }
+
+      // Check if new name conflicts with existing proxies
+      if let Some(ref new_name) = name {
+        if stored_proxies
+          .values()
+          .any(|p| p.id != proxy_id && p.name == *new_name)
+        {
+          return Err(format!("Proxy with name '{new_name}' already exists"));
+        }
+      }
+    } // Release the lock here
+
+    // Now get mutable access for updates
+    let updated_proxy = {
+      let mut stored_proxies = self.stored_proxies.lock().unwrap();
+      let stored_proxy = stored_proxies.get_mut(proxy_id).unwrap(); // Safe because we checked above
+
+      if let Some(new_name) = name {
+        stored_proxy.update_name(new_name);
+      }
+
+      if let Some(new_settings) = proxy_settings {
+        stored_proxy.update_settings(new_settings);
+      }
+
+      stored_proxy.clone()
+    };
+
+    if let Err(e) = self.save_proxy(&updated_proxy) {
+      eprintln!("Warning: Failed to save proxy: {e}");
+    }
+
+    Ok(updated_proxy)
+  }
+
+  // Delete a stored proxy
+  pub fn delete_stored_proxy(&self, proxy_id: &str) -> Result<(), String> {
+    {
+      let mut stored_proxies = self.stored_proxies.lock().unwrap();
+      if stored_proxies.remove(proxy_id).is_none() {
+        return Err(format!("Proxy with ID '{proxy_id}' not found"));
+      }
+    }
+
+    if let Err(e) = self.delete_proxy_file(proxy_id) {
+      eprintln!("Warning: Failed to delete proxy file: {e}");
+    }
+
+    Ok(())
+  }
+
+  // Get proxy settings for a stored proxy ID
+  pub fn get_proxy_settings_by_id(&self, proxy_id: &str) -> Option<ProxySettings> {
+    let stored_proxies = self.stored_proxies.lock().unwrap();
+    stored_proxies
+      .get(proxy_id)
+      .map(|p| p.proxy_settings.clone())
  }

  // Start a proxy for given proxy settings and associate it with a browser process ID
@@ -45,8 +266,7 @@ impl ProxyManager {
      let proxies = self.active_proxies.lock().unwrap();
      if let Some(proxy) = proxies.get(&browser_pid) {
        return Ok(ProxySettings {
-          enabled: true,
-          proxy_type: proxy.upstream_type.clone(),
+          proxy_type: "http".to_string(),
          host: "127.0.0.1".to_string(), // Use 127.0.0.1 instead of localhost for better compatibility
          port: proxy.local_port,
          username: None,
@@ -154,7 +374,6 @@ impl ProxyManager {

    // Return proxy settings for the browser
    Ok(ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "127.0.0.1".to_string(), // Use 127.0.0.1 instead of localhost for better compatibility
      port: proxy_info.local_port,
@@ -202,7 +421,6 @@ impl ProxyManager {
  pub fn get_proxy_settings(&self, browser_pid: u32) -> Option<ProxySettings> {
    let proxies = self.active_proxies.lock().unwrap();
    proxies.get(&browser_pid).map(|proxy| ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "127.0.0.1".to_string(), // Use 127.0.0.1 instead of localhost for better compatibility
      port: proxy.local_port,
@@ -212,6 +430,7 @@ impl ProxyManager {
  }

  // Get stored proxy info for a profile
+  #[allow(dead_code)]
  pub fn get_profile_proxy_info(&self, profile_name: &str) -> Option<ProxySettings> {
    let profile_proxies = self.profile_proxies.lock().unwrap();
    profile_proxies.get(profile_name).cloned()
@@ -321,7 +540,6 @@ mod tests {
    let proxy_manager = ProxyManager::new();

    let proxy_settings = ProxySettings {
-      enabled: true,
      proxy_type: "socks5".to_string(),
      host: "127.0.0.1".to_string(),
      port: 1080,
@@ -373,9 +591,8 @@ mod tests {
    let proxy_settings = proxy_manager.get_proxy_settings(browser_pid);
    assert!(proxy_settings.is_some());
    let settings = proxy_settings.unwrap();
-    assert!(settings.enabled);
-    assert_eq!(settings.host, "127.0.0.1");
-    assert_eq!(settings.port, 8080);
+    assert!(settings.host == "127.0.0.1");
+    assert!(settings.port == 8080);

    // Test non-existent browser PID
    let non_existent = proxy_manager.get_proxy_settings(99999);
@@ -386,7 +603,6 @@ mod tests {
  fn test_proxy_settings_validation() {
    // Test valid proxy settings
    let valid_settings = ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "127.0.0.1".to_string(),
      port: 8080,
@@ -394,14 +610,11 @@ mod tests {
      password: Some("pass".to_string()),
    };

-    assert!(valid_settings.enabled);
-    assert_eq!(valid_settings.proxy_type, "http");
    assert!(!valid_settings.host.is_empty());
    assert!(valid_settings.port > 0);

-    // Test disabled proxy settings
-    let disabled_settings = ProxySettings {
-      enabled: false,
+    // Test proxy settings with empty values
+    let empty_settings = ProxySettings {
      proxy_type: "http".to_string(),
      host: "".to_string(),
      port: 0,
@@ -409,7 +622,7 @@ mod tests {
      password: None,
    };

-    assert!(!disabled_settings.enabled);
+    assert!(empty_settings.host.is_empty());
  }

  #[tokio::test]
@@ -563,7 +776,6 @@ mod tests {
  #[test]
  fn test_proxy_command_construction() {
    let proxy_settings = ProxySettings {
-      enabled: true,
      proxy_type: "http".to_string(),
      host: "proxy.example.com".to_string(),
      port: 8080,
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "Donut Browser",
-  "version": "0.5.6",
+  "version": "0.6.1",
  "identifier": "com.donutbrowser",
  "build": {
    "beforeDevCommand": "pnpm dev",
@@ -24,7 +24,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+        className={`${geistSans.variable} ${geistMono.variable} antialiased overflow-hidden`}
      >
        <CustomThemeProvider>
          <TooltipProvider>{children}</TooltipProvider>
@@ -5,6 +5,7 @@ import { listen } from "@tauri-apps/api/event";
 import { getCurrent } from "@tauri-apps/plugin-deep-link";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { FaDownload } from "react-icons/fa";
+import { FiWifi } from "react-icons/fi";
 import { GoGear, GoKebabHorizontal, GoPlus } from "react-icons/go";
 import { ChangeVersionDialog } from "@/components/change-version-dialog";
 import { CreateProfileDialog } from "@/components/create-profile-dialog";
@@ -12,6 +13,7 @@ import { ImportProfileDialog } from "@/components/import-profile-dialog";
 import { PermissionDialog } from "@/components/permission-dialog";
 import { ProfilesDataTable } from "@/components/profile-data-table";
 import { ProfileSelectorDialog } from "@/components/profile-selector-dialog";
+import { ProxyManagementDialog } from "@/components/proxy-management-dialog";
 import { ProxySettingsDialog } from "@/components/proxy-settings-dialog";
 import { SettingsDialog } from "@/components/settings-dialog";
 import { Button } from "@/components/ui/button";
@@ -33,7 +35,8 @@ import { usePermissions } from "@/hooks/use-permissions";
 import { useUpdateNotifications } from "@/hooks/use-update-notifications";
 import { useVersionUpdater } from "@/hooks/use-version-updater";
 import { showErrorToast } from "@/lib/toast-utils";
-import type { BrowserProfile, ProxySettings } from "@/types";
+import { sleep } from "@/lib/utils";
+import type { BrowserProfile } from "@/types";

 type BrowserTypeString =
  | "mullvad-browser"
@@ -57,6 +60,8 @@ export default function Home() {
  const [changeVersionDialogOpen, setChangeVersionDialogOpen] = useState(false);
  const [settingsDialogOpen, setSettingsDialogOpen] = useState(false);
  const [importProfileDialogOpen, setImportProfileDialogOpen] = useState(false);
+  const [proxyManagementDialogOpen, setProxyManagementDialogOpen] =
+    useState(false);
  const [pendingUrls, setPendingUrls] = useState<PendingUrl[]>([]);
  const [currentProfileForProxy, setCurrentProfileForProxy] =
    useState<BrowserProfile | null>(null);
@@ -66,6 +71,7 @@ export default function Home() {
  const [permissionDialogOpen, setPermissionDialogOpen] = useState(false);
  const [currentPermissionType, setCurrentPermissionType] =
    useState<PermissionType>("microphone");
+  const [proxyDataReloadTrigger, setProxyDataReloadTrigger] = useState(0);
  const { isMicrophoneAccessGranted, isCameraAccessGranted, isInitialized } =
    usePermissions();

@@ -139,6 +145,11 @@ export default function Home() {
    }
  }, [checkMissingBinaries]);

+  // Trigger proxy data reload in ProfilesDataTable
+  const triggerProxyDataReload = useCallback(() => {
+    setProxyDataReloadTrigger((prev) => prev + 1);
+  }, []);
+
  const handleUrlOpen = useCallback(async (url: string) => {
    try {
      // Use smart profile selection
@@ -174,6 +185,17 @@ export default function Home() {
      );
      setProfiles(profileList);

+      // TODO: remove after a few version bumps, needed to properly display migrated profiles
+      setTimeout(async () => {
+        for (let i = 0; i < 10; i++) {
+          const profiles = await invoke<BrowserProfile[]>(
+            "list_browser_profiles",
+          );
+          setProfiles(profiles);
+        }
+        await sleep(500);
+      }, 0);
+
      // Check for updates after loading profiles
      await checkForUpdates();
      await checkMissingBinaries();
@@ -305,7 +327,7 @@ export default function Home() {
  }, []);

  const handleSaveProxy = useCallback(
-    async (proxySettings: ProxySettings) => {
+    async (proxyId: string | null) => {
      setProxyDialogOpen(false);
      setError(null);

@@ -313,16 +335,18 @@ export default function Home() {
        if (currentProfileForProxy) {
          await invoke("update_profile_proxy", {
            profileName: currentProfileForProxy.name,
-            proxy: proxySettings,
+            proxyId: proxyId,
          });
        }
        await loadProfiles();
+        // Trigger proxy data reload in the table
+        triggerProxyDataReload();
      } catch (err: unknown) {
        console.error("Failed to update proxy settings:", err);
        setError(`Failed to update proxy settings: ${JSON.stringify(err)}`);
      }
    },
-    [currentProfileForProxy, loadProfiles],
+    [currentProfileForProxy, loadProfiles, triggerProxyDataReload],
  );

  const handleCreateProfile = useCallback(
@@ -331,30 +355,25 @@ export default function Home() {
      browserStr: BrowserTypeString;
      version: string;
      releaseType: string;
-      proxy?: ProxySettings;
+      proxyId?: string;
    }) => {
      setError(null);

      try {
-        const profile = await invoke<BrowserProfile>(
+        const _profile = await invoke<BrowserProfile>(
          "create_browser_profile_new",
          {
            name: profileData.name,
            browserStr: profileData.browserStr,
            version: profileData.version,
            releaseType: profileData.releaseType,
+            proxyId: profileData.proxyId,
          },
        );

-        // Update proxy if provided
-        if (profileData.proxy) {
-          await invoke("update_profile_proxy", {
-            profileName: profile.name,
-            proxy: profileData.proxy,
-          });
-        }
-
        await loadProfiles();
+        // Trigger proxy data reload in the table
+        triggerProxyDataReload();
      } catch (error) {
        setError(
          `Failed to create profile: ${
@@ -364,7 +383,7 @@ export default function Home() {
        throw error;
      }
    },
-    [loadProfiles],
+    [loadProfiles, triggerProxyDataReload],
  );

  const [runningProfiles, setRunningProfiles] = useState<Set<string>>(
@@ -595,6 +614,14 @@ export default function Home() {
                      <GoGear className="mr-2 w-4 h-4" />
                      Settings
                    </DropdownMenuItem>
+                    <DropdownMenuItem
+                      onClick={() => {
+                        setProxyManagementDialogOpen(true);
+                      }}
+                    >
+                      <FiWifi className="mr-2 w-4 h-4" />
+                      Proxies
+                    </DropdownMenuItem>
                    <DropdownMenuItem
                      onClick={() => {
                        setImportProfileDialogOpen(true);
@@ -633,6 +660,9 @@ export default function Home() {
              onChangeVersion={openChangeVersionDialog}
              runningProfiles={runningProfiles}
              isUpdating={isUpdating}
+              onReloadProxyData={
+                proxyDataReloadTrigger > 0 ? triggerProxyDataReload : undefined
+              }
            />
          </CardContent>
        </Card>
@@ -643,8 +673,8 @@ export default function Home() {
        onClose={() => {
          setProxyDialogOpen(false);
        }}
-        onSave={(proxy: ProxySettings) => void handleSaveProxy(proxy)}
-        initialSettings={currentProfileForProxy?.proxy}
+        onSave={handleSaveProxy}
+        initialProxyId={currentProfileForProxy?.proxy_id}
        browserType={currentProfileForProxy?.browser}
      />

@@ -680,6 +710,13 @@ export default function Home() {
        onImportComplete={() => void loadProfiles()}
      />

+      <ProxyManagementDialog
+        isOpen={proxyManagementDialogOpen}
+        onClose={() => {
+          setProxyManagementDialogOpen(false);
+        }}
+      />
+
      {pendingUrls.map((pendingUrl) => (
        <ProfileSelectorDialog
          key={pendingUrl.id}
@@ -1,25 +1,57 @@
 "use client";

 import { FaDownload, FaTimes } from "react-icons/fa";
-import { LuRefreshCw } from "react-icons/lu";
+import { LuCheckCheck, LuCog, LuRefreshCw } from "react-icons/lu";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-
-interface AppUpdateInfo {
-  current_version: string;
-  new_version: string;
-  release_notes: string;
-  download_url: string;
-  is_nightly: boolean;
-  published_at: string;
-}
+import type { AppUpdateInfo, AppUpdateProgress } from "@/types";

 interface AppUpdateToastProps {
  updateInfo: AppUpdateInfo;
  onUpdate: (updateInfo: AppUpdateInfo) => Promise<void>;
  onDismiss: () => void;
  isUpdating?: boolean;
-  updateProgress?: string;
+  updateProgress?: AppUpdateProgress | null;
+}
+
+function getStageIcon(stage?: string, isUpdating?: boolean) {
+  if (!isUpdating) {
+    return <FaDownload className="flex-shrink-0 w-5 h-5 text-blue-500" />;
+  }
+
+  switch (stage) {
+    case "downloading":
+      return <FaDownload className="flex-shrink-0 w-5 h-5 text-blue-500" />;
+    case "extracting":
+      return (
+        <LuRefreshCw className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
+      );
+    case "installing":
+      return (
+        <LuCog className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
+      );
+    case "completed":
+      return <LuCheckCheck className="flex-shrink-0 w-5 h-5 text-green-500" />;
+    default:
+      return (
+        <LuRefreshCw className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
+      );
+  }
+}
+
+function getStageDisplayName(stage?: string) {
+  switch (stage) {
+    case "downloading":
+      return "Downloading";
+    case "extracting":
+      return "Extracting";
+    case "installing":
+      return "Installing";
+    case "completed":
+      return "Completed";
+    default:
+      return "Updating";
+  }
 }

 export function AppUpdateToast({
@@ -33,14 +65,15 @@ export function AppUpdateToast({
    await onUpdate(updateInfo);
  };

+  const showProgress =
+    isUpdating &&
+    updateProgress?.stage === "downloading" &&
+    updateProgress.percentage !== undefined;
+
  return (
    <div className="flex items-start p-4 w-full max-w-md bg-white rounded-lg border border-gray-200 shadow-lg dark:bg-gray-800 dark:border-gray-700">
      <div className="mr-3 mt-0.5">
-        {isUpdating ? (
-          <LuRefreshCw className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
-        ) : (
-          <FaDownload className="flex-shrink-0 w-5 h-5 text-blue-500" />
-        )}
+        {getStageIcon(updateProgress?.stage, isUpdating)}
      </div>

      <div className="flex-1 min-w-0">
@@ -48,7 +81,9 @@ export function AppUpdateToast({
          <div className="flex flex-col gap-1">
            <div className="flex gap-2 items-center">
              <span className="text-sm font-semibold text-foreground">
-                Donut Browser Update Available
+                {isUpdating
+                  ? `${getStageDisplayName(updateProgress?.stage)} Donut Browser Update`
+                  : "Donut Browser Update Available"}
              </span>
              <Badge
                variant={updateInfo.is_nightly ? "secondary" : "default"}
@@ -58,8 +93,14 @@ export function AppUpdateToast({
              </Badge>
            </div>
            <div className="text-xs text-muted-foreground">
-              Update from {updateInfo.current_version} to{" "}
-              <span className="font-medium">{updateInfo.new_version}</span>
+              {isUpdating ? (
+                updateProgress?.message || "Updating..."
+              ) : (
+                <>
+                  Update from {updateInfo.current_version} to{" "}
+                  <span className="font-medium">{updateInfo.new_version}</span>
+                </>
+              )}
            </div>
          </div>

@@ -75,12 +116,51 @@ export function AppUpdateToast({
          )}
        </div>

-        {isUpdating && updateProgress && (
-          <div className="mt-2">
-            <p className="text-xs text-muted-foreground">{updateProgress}</p>
+        {/* Download progress */}
+        {showProgress && updateProgress && (
+          <div className="mt-2 space-y-1">
+            <div className="flex justify-between items-center">
+              <p className="flex-1 min-w-0 text-xs text-muted-foreground">
+                {updateProgress.percentage?.toFixed(1)}%
+                {updateProgress.speed && ` • ${updateProgress.speed} MB/s`}
+                {updateProgress.eta && ` • ${updateProgress.eta} remaining`}
+              </p>
+            </div>
+            <div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5">
+              <div
+                className="bg-blue-500 h-1.5 rounded-full transition-all duration-300"
+                style={{ width: `${updateProgress.percentage}%` }}
+              />
+            </div>
          </div>
        )}

+        {/* Other stage progress (without percentage) */}
+        {isUpdating &&
+          updateProgress &&
+          updateProgress.stage !== "downloading" && (
+            <div className="mt-2">
+              <p className="text-xs text-muted-foreground">
+                {updateProgress.message}
+              </p>
+              {updateProgress.stage === "extracting" && (
+                <p className="mt-1 text-xs text-muted-foreground">
+                  Preparing update files...
+                </p>
+              )}
+              {updateProgress.stage === "installing" && (
+                <p className="mt-1 text-xs text-muted-foreground">
+                  Installing new version...
+                </p>
+              )}
+              {updateProgress.stage === "completed" && (
+                <p className="mt-1 text-xs text-green-600 dark:text-green-400">
+                  Update completed! Restarting application...
+                </p>
+              )}
+            </div>
+          )}
+
        {!isUpdating && (
          <div className="flex gap-2 items-center mt-3">
            <Button
@@ -2,11 +2,12 @@

 import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useState } from "react";
+import { FiPlus } from "react-icons/fi";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
+import { ProxyFormDialog } from "@/components/proxy-form-dialog";
 import { ReleaseTypeSelector } from "@/components/release-type-selector";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
  Dialog,
  DialogContent,
@@ -31,11 +32,7 @@ import {
 import { useBrowserDownload } from "@/hooks/use-browser-download";
 import { useBrowserSupport } from "@/hooks/use-browser-support";
 import { getBrowserDisplayName } from "@/lib/browser-utils";
-import type {
-  BrowserProfile,
-  BrowserReleaseTypes,
-  ProxySettings,
-} from "@/types";
+import type { BrowserProfile, BrowserReleaseTypes, StoredProxy } from "@/types";
 import { Alert, AlertDescription } from "./ui/alert";

 type BrowserTypeString =
@@ -55,7 +52,7 @@ interface CreateProfileDialogProps {
    browserStr: BrowserTypeString;
    version: string;
    releaseType: string;
-    proxy?: ProxySettings;
+    proxyId?: string;
  }) => Promise<void>;
 }

@@ -80,13 +77,11 @@ export function CreateProfileDialog({
  );
  const [isLoadingReleaseTypes, setIsLoadingReleaseTypes] = useState(false);

-  // Proxy settings
-  const [proxyEnabled, setProxyEnabled] = useState(false);
-  const [proxyType, setProxyType] = useState("http");
-  const [proxyHost, setProxyHost] = useState("");
-  const [proxyPort, setProxyPort] = useState(8080);
-  const [proxyUsername, setProxyUsername] = useState("");
-  const [proxyPassword, setProxyPassword] = useState("");
+  // Proxy settings - now using stored proxy selection
+  const [selectedProxyId, setSelectedProxyId] = useState<string | null>(null);
+  const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
+  const [isLoadingProxies, setIsLoadingProxies] = useState(false);
+  const [showProxyForm, setShowProxyForm] = useState(false);

  const {
    downloadBrowser,
@@ -136,6 +131,19 @@ export function CreateProfileDialog({
    }
  }, []);

+  const loadStoredProxies = useCallback(async () => {
+    try {
+      setIsLoadingProxies(true);
+      const proxies = await invoke<StoredProxy[]>("get_stored_proxies");
+      setStoredProxies(proxies);
+    } catch (error) {
+      console.error("Failed to load stored proxies:", error);
+      toast.error("Failed to load available proxies");
+    } finally {
+      setIsLoadingProxies(false);
+    }
+  }, []);
+
  const loadReleaseTypes = useCallback(async (browser: string) => {
    try {
      setIsLoadingReleaseTypes(true);
@@ -191,12 +199,37 @@ export function CreateProfileDialog({
  // Helper to determine if proxy should be disabled for the selected browser
  const isProxyDisabled = selectedBrowser === "tor-browser";

-  // Update proxy enabled state when browser changes to tor-browser
+  // Update proxy selection when browser changes to tor-browser
  useEffect(() => {
-    if (selectedBrowser === "tor-browser" && proxyEnabled) {
-      setProxyEnabled(false);
+    if (selectedBrowser === "tor-browser" && selectedProxyId) {
+      setSelectedProxyId(null);
    }
-  }, [selectedBrowser, proxyEnabled]);
+  }, [selectedBrowser, selectedProxyId]);
+
+  const handleCreateProxy = useCallback(() => {
+    setShowProxyForm(true);
+  }, []);
+
+  const handleProxySaved = useCallback((savedProxy: StoredProxy) => {
+    setStoredProxies((prev) => {
+      const existingIndex = prev.findIndex((p) => p.id === savedProxy.id);
+      if (existingIndex >= 0) {
+        // Update existing proxy
+        const updated = [...prev];
+        updated[existingIndex] = savedProxy;
+        return updated;
+      } else {
+        // Add new proxy
+        return [...prev, savedProxy];
+      }
+    });
+    setSelectedProxyId(savedProxy.id);
+    setShowProxyForm(false);
+  }, []);
+
+  const handleProxyFormClose = useCallback(() => {
+    setShowProxyForm(false);
+  }, []);

  const handleCreate = useCallback(async () => {
    if (!profileName.trim() || !selectedBrowser || !selectedReleaseType) return;
@@ -219,34 +252,18 @@ export function CreateProfileDialog({

    setIsCreating(true);
    try {
-      const proxy =
-        proxyEnabled && !isProxyDisabled
-          ? {
-              enabled: true,
-              proxy_type: proxyType,
-              host: proxyHost,
-              port: proxyPort,
-              username: proxyUsername || undefined,
-              password: proxyPassword || undefined,
-            }
-          : undefined;
-
      await onCreateProfile({
        name: profileName.trim(),
        browserStr: selectedBrowser,
        version,
        releaseType: selectedReleaseType,
-        proxy,
+        proxyId: isProxyDisabled ? undefined : (selectedProxyId ?? undefined),
      });

      // Reset form
      setProfileName("");
      setSelectedReleaseType(null);
-      setProxyEnabled(false);
-      setProxyHost("");
-      setProxyPort(8080);
-      setProxyUsername("");
-      setProxyPassword("");
+      setSelectedProxyId(null);
      onClose();
    } catch (error) {
      console.error("Failed to create profile:", error);
@@ -258,14 +275,9 @@ export function CreateProfileDialog({
    selectedBrowser,
    selectedReleaseType,
    onCreateProfile,
-    proxyEnabled,
    isProxyDisabled,
+    selectedProxyId,
    onClose,
-    proxyHost,
-    proxyPassword,
-    proxyPort,
-    proxyType,
-    proxyUsername,
    releaseTypes.nightly,
    releaseTypes.stable,
    validateProfileName,
@@ -286,14 +298,14 @@ export function CreateProfileDialog({
    selectedReleaseType &&
    selectedVersion &&
    isVersionDownloaded(selectedVersion) &&
-    (!proxyEnabled || isProxyDisabled || (proxyHost && proxyPort)) &&
    !nameError;

  useEffect(() => {
    if (isOpen) {
      void loadExistingProfiles();
+      void loadStoredProxies();
    }
-  }, [isOpen, loadExistingProfiles]);
+  }, [isOpen, loadExistingProfiles, loadStoredProxies]);

  useEffect(() => {
    if (isOpen && selectedBrowser) {
@@ -305,260 +317,239 @@ export function CreateProfileDialog({
  }, [isOpen, selectedBrowser, loadDownloadedVersions, loadReleaseTypes]);

  return (
-    <Dialog open={isOpen} onOpenChange={onClose}>
-      <DialogContent className="max-w-md max-h-[80vh] my-8 flex flex-col">
-        <DialogHeader className="flex-shrink-0">
-          <DialogTitle>Create New Profile</DialogTitle>
-        </DialogHeader>
+    <>
+      <Dialog open={isOpen} onOpenChange={onClose}>
+        <DialogContent className="max-w-md max-h-[80vh] my-8 flex flex-col">
+          <DialogHeader className="flex-shrink-0">
+            <DialogTitle>Create New Profile</DialogTitle>
+          </DialogHeader>

-        <div className="grid overflow-y-scroll flex-1 gap-6 py-4 min-h-0">
-          {/* Profile Name */}
-          <div className="grid gap-2">
-            <Label htmlFor="profile-name">Profile Name</Label>
-            <Input
-              id="profile-name"
-              value={profileName}
-              onChange={(e) => {
-                setProfileName(e.target.value);
-              }}
-              placeholder="Enter profile name"
-              className={nameError ? "border-red-500" : ""}
-            />
-            {nameError && <p className="text-sm text-red-600">{nameError}</p>}
-          </div>
-
-          {/* Browser Selection */}
-          <div className="grid gap-2">
-            <Label>Browser</Label>
-            <Select
-              value={selectedBrowser ?? undefined}
-              onValueChange={(value) => {
-                setSelectedBrowser(value as BrowserTypeString);
-              }}
-              disabled={isLoadingSupport}
-            >
-              <SelectTrigger>
-                <SelectValue
-                  placeholder={
-                    isLoadingSupport ? "Loading browsers..." : "Select browser"
-                  }
-                />
-              </SelectTrigger>
-              <SelectContent>
-                {(
-                  [
-                    "mullvad-browser",
-                    "firefox",
-                    "firefox-developer",
-                    "chromium",
-                    "brave",
-                    "zen",
-                    "tor-browser",
-                  ] as BrowserTypeString[]
-                ).map((browser) => {
-                  const isSupported = isBrowserSupported(browser);
-                  const displayName = getBrowserDisplayName(browser);
-
-                  if (!isSupported) {
-                    return (
-                      <Tooltip key={browser}>
-                        <TooltipTrigger asChild>
-                          <SelectItem
-                            value={browser}
-                            disabled={true}
-                            className="opacity-50"
-                          >
-                            {displayName} (Not supported)
-                          </SelectItem>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                          <p>
-                            {displayName} is not supported on your current
-                            platform or architecture.
-                          </p>
-                        </TooltipContent>
-                      </Tooltip>
-                    );
-                  }
-
-                  return (
-                    <SelectItem key={browser} value={browser}>
-                      {displayName}
-                    </SelectItem>
-                  );
-                })}
-              </SelectContent>
-            </Select>
-          </div>
-
-          {selectedBrowser ? (
+          <div className="grid overflow-y-scroll flex-1 gap-6 py-4 min-h-0">
+            {/* Profile Name */}
            <div className="grid gap-2">
-              <Label>Release Type</Label>
-              {isLoadingReleaseTypes ? (
-                <div className="text-sm text-muted-foreground">
-                  Loading release types...
-                </div>
-              ) : Object.keys(releaseTypes).length === 0 ? (
-                <Alert>
-                  <AlertDescription>
-                    No releases are available for{" "}
-                    {getBrowserDisplayName(selectedBrowser)}.
-                  </AlertDescription>
-                </Alert>
-              ) : (
-                <div className="space-y-4">
-                  {(!releaseTypes.stable || !releaseTypes.nightly) && (
-                    <Alert>
-                      <AlertDescription>
-                        Only {(releaseTypes.stable && "Stable") ?? "Nightly"}{" "}
-                        releases are available for{" "}
-                        {getBrowserDisplayName(selectedBrowser)}.
-                      </AlertDescription>
-                    </Alert>
+              <Label htmlFor="profile-name">Profile Name</Label>
+              <Input
+                id="profile-name"
+                value={profileName}
+                onChange={(e) => {
+                  setProfileName(e.target.value);
+                }}
+                placeholder="Enter profile name"
+                className={nameError ? "border-red-500" : ""}
+              />
+              {nameError && <p className="text-sm text-red-600">{nameError}</p>}
+            </div>
+
+            {/* Browser Selection */}
+            <div className="grid gap-2">
+              <Label>Browser</Label>
+              <Select
+                value={selectedBrowser ?? undefined}
+                onValueChange={(value) => {
+                  setSelectedBrowser(value as BrowserTypeString);
+                }}
+                disabled={isLoadingSupport}
+              >
+                <SelectTrigger>
+                  <SelectValue
+                    placeholder={
+                      isLoadingSupport
+                        ? "Loading browsers..."
+                        : "Select browser"
+                    }
+                  />
+                </SelectTrigger>
+                <SelectContent>
+                  {(
+                    [
+                      "mullvad-browser",
+                      "firefox",
+                      "firefox-developer",
+                      "chromium",
+                      "brave",
+                      "zen",
+                      "tor-browser",
+                    ] as BrowserTypeString[]
+                  ).map((browser) => {
+                    const isSupported = isBrowserSupported(browser);
+                    const displayName = getBrowserDisplayName(browser);
+
+                    if (!isSupported) {
+                      return (
+                        <Tooltip key={browser}>
+                          <TooltipTrigger asChild>
+                            <SelectItem
+                              value={browser}
+                              disabled={true}
+                              className="opacity-50"
+                            >
+                              {displayName} (Not supported)
+                            </SelectItem>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            <p>
+                              {displayName} is not supported on your current
+                              platform or architecture.
+                            </p>
+                          </TooltipContent>
+                        </Tooltip>
+                      );
+                    }
+
+                    return (
+                      <SelectItem key={browser} value={browser}>
+                        {displayName}
+                      </SelectItem>
+                    );
+                  })}
+                </SelectContent>
+              </Select>
+            </div>
+
+            {selectedBrowser ? (
+              <div className="grid gap-2">
+                <Label>Release Type</Label>
+                {isLoadingReleaseTypes ? (
+                  <div className="text-sm text-muted-foreground">
+                    Loading release types...
+                  </div>
+                ) : Object.keys(releaseTypes).length === 0 ? (
+                  <Alert>
+                    <AlertDescription>
+                      No releases are available for{" "}
+                      {getBrowserDisplayName(selectedBrowser)}.
+                    </AlertDescription>
+                  </Alert>
+                ) : (
+                  <div className="space-y-4">
+                    {(!releaseTypes.stable || !releaseTypes.nightly) && (
+                      <Alert>
+                        <AlertDescription>
+                          Only {(releaseTypes.stable && "Stable") ?? "Nightly"}{" "}
+                          releases are available for{" "}
+                          {getBrowserDisplayName(selectedBrowser)}.
+                        </AlertDescription>
+                      </Alert>
+                    )}
+
+                    <ReleaseTypeSelector
+                      selectedReleaseType={selectedReleaseType}
+                      onReleaseTypeSelect={setSelectedReleaseType}
+                      availableReleaseTypes={releaseTypes}
+                      browser={selectedBrowser}
+                      isDownloading={isDownloading}
+                      onDownload={() => {
+                        void handleDownload();
+                      }}
+                      placeholder="Select release type..."
+                      downloadedVersions={downloadedVersions}
+                    />
+                  </div>
+                )}
+              </div>
+            ) : null}
+
+            {/* Proxy Settings */}
+            <div className="grid gap-4 pt-4 border-t">
+              <div className="grid gap-2">
+                <div className="flex justify-between items-center">
+                  <Label>Proxy Settings</Label>
+                  {!isProxyDisabled && (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={handleCreateProxy}
+                          className="flex gap-2 items-center"
+                        >
+                          <FiPlus className="w-4 h-4" />
+                          Create Proxy
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        <p>Create a new proxy configuration</p>
+                      </TooltipContent>
+                    </Tooltip>
                  )}
-
-                  <ReleaseTypeSelector
-                    selectedReleaseType={selectedReleaseType}
-                    onReleaseTypeSelect={setSelectedReleaseType}
-                    availableReleaseTypes={releaseTypes}
-                    browser={selectedBrowser}
-                    isDownloading={isDownloading}
-                    onDownload={() => {
-                      void handleDownload();
-                    }}
-                    placeholder="Select release type..."
-                    downloadedVersions={downloadedVersions}
-                  />
                </div>
-              )}
-            </div>
-          ) : null}

-          {/* Proxy Settings */}
-          <div className="grid gap-4 pt-4 border-t">
-            <div className="flex items-center space-x-2">
-              {isProxyDisabled ? (
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <div className="flex items-center space-x-2 opacity-50">
-                      <Checkbox
-                        id="proxy-enabled"
-                        checked={false}
-                        disabled={true}
-                      />
-                      <Label htmlFor="proxy-enabled" className="text-gray-500">
-                        Enable Proxy
-                      </Label>
-                    </div>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    <p>
-                      Tor Browser has its own built-in proxy system and
-                      doesn&apos;t support additional proxy configuration
-                    </p>
-                  </TooltipContent>
-                </Tooltip>
-              ) : (
-                <>
-                  <Checkbox
-                    id="proxy-enabled"
-                    checked={proxyEnabled}
-                    onCheckedChange={(checked) => {
-                      setProxyEnabled(checked as boolean);
+                {isProxyDisabled ? (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <div className="p-3 bg-yellow-50 rounded-md border border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">
+                        <p className="text-sm text-yellow-800 dark:text-yellow-200">
+                          Tor Browser has its own built-in proxy system and
+                          doesn&apos;t support additional proxy configuration.
+                        </p>
+                      </div>
+                    </TooltipTrigger>
+                    <TooltipContent>
+                      <p>
+                        Tor Browser manages its own proxy routing automatically
+                      </p>
+                    </TooltipContent>
+                  </Tooltip>
+                ) : (
+                  <Select
+                    value={selectedProxyId ?? "none"}
+                    onValueChange={(value) => {
+                      setSelectedProxyId(value === "none" ? null : value);
                    }}
-                  />
-                  <Label htmlFor="proxy-enabled">Enable Proxy</Label>
-                </>
-              )}
-            </div>
-
-            {proxyEnabled && !isProxyDisabled && (
-              <>
-                <div className="grid gap-2">
-                  <Label>Proxy Type</Label>
-                  <Select value={proxyType} onValueChange={setProxyType}>
+                    disabled={isLoadingProxies}
+                  >
                    <SelectTrigger>
-                      <SelectValue />
+                      <SelectValue
+                        placeholder={
+                          isLoadingProxies
+                            ? "Loading proxies..."
+                            : "Select proxy (optional)"
+                        }
+                      />
                    </SelectTrigger>
                    <SelectContent>
-                      {["http", "https", "socks4", "socks5"].map((type) => (
-                        <SelectItem key={type} value={type}>
-                          {type.toUpperCase()}
+                      <SelectItem value="none">No Proxy</SelectItem>
+                      {storedProxies.map((proxy) => (
+                        <SelectItem key={proxy.id} value={proxy.id}>
+                          {proxy.name}
                        </SelectItem>
                      ))}
                    </SelectContent>
                  </Select>
-                </div>
+                )}

-                <div className="grid gap-2">
-                  <Label htmlFor="proxy-host">Host</Label>
-                  <Input
-                    id="proxy-host"
-                    value={proxyHost}
-                    onChange={(e) => {
-                      setProxyHost(e.target.value);
-                    }}
-                    placeholder="e.g. 127.0.0.1"
-                  />
-                </div>
-
-                <div className="grid gap-2">
-                  <Label htmlFor="proxy-port">Port</Label>
-                  <Input
-                    id="proxy-port"
-                    type="number"
-                    value={proxyPort}
-                    onChange={(e) => {
-                      setProxyPort(Number.parseInt(e.target.value, 10) || 0);
-                    }}
-                    placeholder="e.g. 8080"
-                    min="1"
-                    max="65535"
-                  />
-                </div>
-
-                <div className="grid gap-2">
-                  <Label htmlFor="proxy-username">Username (optional)</Label>
-                  <Input
-                    id="proxy-username"
-                    value={proxyUsername}
-                    onChange={(e) => {
-                      setProxyUsername(e.target.value);
-                    }}
-                    placeholder="Proxy username"
-                  />
-                </div>
-
-                <div className="grid gap-2">
-                  <Label htmlFor="proxy-password">Password (optional)</Label>
-                  <Input
-                    id="proxy-password"
-                    type="password"
-                    value={proxyPassword}
-                    onChange={(e) => {
-                      setProxyPassword(e.target.value);
-                    }}
-                    placeholder="Proxy password"
-                  />
-                </div>
-              </>
-            )}
+                {!isProxyDisabled &&
+                  storedProxies.length === 0 &&
+                  !isLoadingProxies && (
+                    <p className="text-sm text-muted-foreground">
+                      No saved proxies available. Use the "Create Proxy" button
+                      above to create proxy configurations.
+                    </p>
+                  )}
+              </div>
+            </div>
          </div>
-        </div>

-        <DialogFooter>
-          <Button variant="outline" onClick={onClose}>
-            Cancel
-          </Button>
-          <LoadingButton
-            isLoading={isCreating}
-            onClick={() => void handleCreate()}
-            disabled={!canCreate}
-          >
-            Create Profile
-          </LoadingButton>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+          <DialogFooter>
+            <Button variant="outline" onClick={onClose}>
+              Cancel
+            </Button>
+            <LoadingButton
+              isLoading={isCreating}
+              onClick={() => void handleCreate()}
+              disabled={!canCreate}
+            >
+              Create Profile
+            </LoadingButton>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <ProxyFormDialog
+        isOpen={showProxyForm}
+        onClose={handleProxyFormClose}
+        onSave={handleProxySaved}
+      />
+    </>
  );
 }
@@ -111,6 +111,16 @@ interface TwilightUpdateToastProps extends BaseToastProps {
  hasUpdate?: boolean;
 }

+interface AppUpdateToastProps extends BaseToastProps {
+  type: "app-update";
+  stage?: "downloading" | "extracting" | "installing" | "completed";
+  progress?: {
+    percentage: number;
+    speed?: string;
+    eta?: string;
+  };
+}
+
 type ToastProps =
  | LoadingToastProps
  | SuccessToastProps
@@ -118,7 +128,8 @@ type ToastProps =
  | DownloadToastProps
  | VersionUpdateToastProps
  | FetchingToastProps
-  | TwilightUpdateToastProps;
+  | TwilightUpdateToastProps
+  | AppUpdateToastProps;

 function getToastIcon(type: ToastProps["type"], stage?: string) {
  switch (type) {
@@ -133,6 +144,21 @@ function getToastIcon(type: ToastProps["type"], stage?: string) {
        );
      }
      return <LuDownload className="flex-shrink-0 w-4 h-4 text-blue-500" />;
+    case "app-update":
+      if (stage === "completed") {
+        return (
+          <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-green-500" />
+        );
+      } else if (stage === "downloading") {
+        return <LuDownload className="flex-shrink-0 w-4 h-4 text-blue-500" />;
+      } else if (stage === "installing") {
+        return (
+          <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
+        );
+      }
+      return (
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
+      );
    case "version-update":
      return (
        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
@@ -213,6 +239,28 @@ export function UnifiedToast(props: ToastProps) {
            </div>
          )}

+        {/* App update progress */}
+        {type === "app-update" &&
+          progress &&
+          "percentage" in progress &&
+          stage === "downloading" && (
+            <div className="mt-2 space-y-1">
+              <div className="flex justify-between items-center">
+                <p className="flex-1 min-w-0 text-xs text-gray-600 dark:text-gray-300">
+                  {progress.percentage.toFixed(1)}%
+                  {progress.speed && ` • ${progress.speed} MB/s`}
+                  {progress.eta && ` • ${progress.eta} remaining`}
+                </p>
+              </div>
+              <div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5">
+                <div
+                  className="bg-blue-500 h-1.5 rounded-full transition-all duration-300"
+                  style={{ width: `${progress.percentage}%` }}
+                />
+              </div>
+            </div>
+          )}
+
        {/* Version update progress */}
        {type === "version-update" &&
          progress &&
@@ -288,6 +336,27 @@ export function UnifiedToast(props: ToastProps) {
            )}
          </>
        )}
+
+        {/* Stage-specific descriptions for app updates */}
+        {type === "app-update" && !description && (
+          <>
+            {stage === "extracting" && (
+              <p className="mt-1 text-xs text-gray-600 dark:text-gray-300">
+                Preparing update files...
+              </p>
+            )}
+            {stage === "installing" && (
+              <p className="mt-1 text-xs text-gray-600 dark:text-gray-300">
+                Installing new version...
+              </p>
+            )}
+            {stage === "completed" && (
+              <p className="mt-1 text-xs text-green-600 dark:text-green-400">
+                Update completed! Restarting application...
+              </p>
+            )}
+          </>
+        )}
      </div>
    </div>
  );
@@ -142,7 +142,19 @@ export function ImportProfileDialog({
      console.error("Failed to import profile:", error);
      const errorMessage =
        error instanceof Error ? error.message : String(error);
-      toast.error(`Failed to import profile: ${errorMessage}`);
+
+      // Check if error is about browser not being downloaded
+      if (errorMessage.includes("No downloaded versions found")) {
+        const browserDisplayName = getBrowserDisplayName(profile.browser);
+        toast.error(
+          `${browserDisplayName} is not installed. Please download ${browserDisplayName} first from the main window, then try importing again.`,
+          {
+            duration: 8000,
+          },
+        );
+      } else {
+        toast.error(`Failed to import profile: ${errorMessage}`);
+      }
    } finally {
      setIsImporting(false);
    }
@@ -183,7 +195,19 @@ export function ImportProfileDialog({
      console.error("Failed to import profile:", error);
      const errorMessage =
        error instanceof Error ? error.message : String(error);
-      toast.error(`Failed to import profile: ${errorMessage}`);
+
+      // Check if error is about browser not being downloaded
+      if (errorMessage.includes("No downloaded versions found")) {
+        const browserDisplayName = getBrowserDisplayName(manualBrowserType);
+        toast.error(
+          `${browserDisplayName} is not installed. Please download ${browserDisplayName} first from the main window, then try importing again.`,
+          {
+            duration: 8000,
+          },
+        );
+      } else {
+        toast.error(`Failed to import profile: ${errorMessage}`);
+      }
    } finally {
      setIsImporting(false);
    }
@@ -8,6 +8,7 @@ import {
  type SortingState,
  useReactTable,
 } from "@tanstack/react-table";
+import { invoke } from "@tauri-apps/api/core";
 import * as React from "react";
 import { CiCircleCheck } from "react-icons/ci";
 import { IoEllipsisHorizontal } from "react-icons/io5";
@@ -29,6 +30,7 @@ import {
  DropdownMenuSeparator,
  DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { ScrollArea } from "@/components/ui/scroll-area";
 import {
  Table,
  TableBody,
@@ -44,7 +46,7 @@ import {
 } from "@/components/ui/tooltip";
 import { useTableSorting } from "@/hooks/use-table-sorting";
 import { getBrowserDisplayName, getBrowserIcon } from "@/lib/browser-utils";
-import type { BrowserProfile } from "@/types";
+import type { BrowserProfile, StoredProxy } from "@/types";
 import { Input } from "./ui/input";
 import { Label } from "./ui/label";

@@ -58,6 +60,7 @@ interface ProfilesDataTableProps {
  onChangeVersion: (profile: BrowserProfile) => void;
  runningProfiles: Set<string>;
  isUpdating?: (browser: string) => boolean;
+  onReloadProxyData?: () => void | Promise<void>;
 }

 export function ProfilesDataTable({
@@ -70,6 +73,7 @@ export function ProfilesDataTable({
  onChangeVersion,
  runningProfiles,
  isUpdating = () => false,
+  onReloadProxyData,
 }: ProfilesDataTableProps) {
  const { getTableSorting, updateSorting, isLoaded } = useTableSorting();
  const [sorting, setSorting] = React.useState<SortingState>([]);
@@ -83,12 +87,65 @@ export function ProfilesDataTable({
    React.useState("");
  const [deleteError, setDeleteError] = React.useState<string | null>(null);
  const [isClient, setIsClient] = React.useState(false);
+  const [storedProxies, setStoredProxies] = React.useState<StoredProxy[]>([]);
+
+  // Helper function to check if a profile has a proxy
+  const hasProxy = React.useCallback(
+    (profile: BrowserProfile): boolean => {
+      if (!profile.proxy_id) return false;
+      const proxy = storedProxies.find((p) => p.id === profile.proxy_id);
+      return proxy !== undefined;
+    },
+    [storedProxies],
+  );
+
+  // Helper function to get proxy info for a profile
+  const getProxyInfo = React.useCallback(
+    (profile: BrowserProfile): StoredProxy | null => {
+      if (!profile.proxy_id) return null;
+      return storedProxies.find((p) => p.id === profile.proxy_id) ?? null;
+    },
+    [storedProxies],
+  );
+
+  // Helper function to get proxy name for display
+  const getProxyDisplayName = React.useCallback(
+    (profile: BrowserProfile): string => {
+      if (!profile.proxy_id) return "Disabled";
+      const proxy = storedProxies.find((p) => p.id === profile.proxy_id);
+      return proxy?.name ?? "Unknown Proxy";
+    },
+    [storedProxies],
+  );

  // Ensure we're on the client side to prevent hydration mismatches
  React.useEffect(() => {
    setIsClient(true);
  }, []);

+  // Load stored proxies
+  const loadStoredProxies = React.useCallback(async () => {
+    try {
+      const proxiesList = await invoke<StoredProxy[]>("get_stored_proxies");
+      setStoredProxies(proxiesList);
+    } catch (error) {
+      console.error("Failed to load stored proxies:", error);
+    }
+  }, []);
+
+  React.useEffect(() => {
+    if (isClient) {
+      void loadStoredProxies();
+    }
+  }, [isClient, loadStoredProxies]);
+
+  // Reload proxy data when requested from parent
+  React.useEffect(() => {
+    if (onReloadProxyData) {
+      void loadStoredProxies();
+    }
+  }, [onReloadProxyData, loadStoredProxies]);
+
  // Update local sorting state when settings are loaded
  React.useEffect(() => {
    if (isLoaded && isClient) {
@@ -320,32 +377,41 @@ export function ProfilesDataTable({
        header: "Proxy",
        cell: ({ row }) => {
          const profile = row.original;
-          const hasProxy = profile.proxy?.enabled;
-          const regularText = hasProxy ? profile.proxy?.proxy_type : "Disabled";
-          const regularTooltipText = hasProxy
-            ? `${profile.proxy?.proxy_type.toUpperCase()} proxy enabled (${
-                profile.proxy?.host
-              }:${profile.proxy?.port})`
-            : "No proxy configured";
+          const profileHasProxy = hasProxy(profile);
+          const proxyDisplayName = getProxyDisplayName(profile);
+          const proxyInfo = getProxyInfo(profile);
+
+          const tooltipText =
+            profile.browser === "tor-browser"
+              ? "Proxies are not supported for TOR browser"
+              : profileHasProxy && proxyInfo
+                ? `${proxyDisplayName}, ${proxyInfo.proxy_settings.proxy_type.toUpperCase()} (${
+                    proxyInfo.proxy_settings.host
+                  }:${proxyInfo.proxy_settings.port})`
+                : "No proxy configured";
+
          return (
            <Tooltip>
              <TooltipTrigger>
                <div className="flex gap-2 items-center">
-                  {hasProxy && (
+                  {profileHasProxy && (
                    <CiCircleCheck className="w-4 h-4 text-green-500" />
                  )}
-                  <span className="text-sm text-muted-foreground">
-                    {profile.browser === "tor-browser"
-                      ? "Not supported"
-                      : regularText}
-                  </span>
+
+                  {proxyDisplayName.length > 10 ? (
+                    <span className="text-sm truncate text-muted-foreground">
+                      {proxyDisplayName.slice(0, 10)}...
+                    </span>
+                  ) : (
+                    <span className="text-sm text-muted-foreground">
+                      {profile.browser === "tor-browser"
+                        ? "Not supported"
+                        : proxyDisplayName}
+                    </span>
+                  )}
                </div>
              </TooltipTrigger>
-              <TooltipContent>
-                {profile.browser === "tor-browser"
-                  ? "Proxies are not supported for TOR browser"
-                  : regularTooltipText}
-              </TooltipContent>
+              <TooltipContent>{tooltipText}</TooltipContent>
            </Tooltip>
          );
        },
@@ -426,6 +492,9 @@ export function ProfilesDataTable({
      onKillProfile,
      onProxySettings,
      onChangeVersion,
+      getProxyInfo,
+      hasProxy,
+      getProxyDisplayName,
    ],
  );

@@ -442,7 +511,7 @@ export function ProfilesDataTable({

  return (
    <>
-      <div className="rounded-md border">
+      <ScrollArea className="h-[400px] rounded-md border">
        <Table>
          <TableHeader>
            {table.getHeaderGroups().map((headerGroup) => (
@@ -491,7 +560,7 @@ export function ProfilesDataTable({
            )}
          </TableBody>
        </Table>
-      </div>
+      </ScrollArea>

      <Dialog
        open={profileToRename !== null}
@@ -28,7 +28,7 @@ import {
  TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { getBrowserDisplayName, getBrowserIcon } from "@/lib/browser-utils";
-import type { BrowserProfile } from "@/types";
+import type { BrowserProfile, StoredProxy } from "@/types";

 interface ProfileSelectorDialogProps {
  isOpen: boolean;
@@ -47,6 +47,17 @@ export function ProfileSelectorDialog({
  const [selectedProfile, setSelectedProfile] = useState<string | null>(null);
  const [isLoading, setIsLoading] = useState(false);
  const [isLaunching, setIsLaunching] = useState(false);
+  const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
+
+  // Helper function to check if a profile has a proxy
+  const hasProxy = useCallback(
+    (profile: BrowserProfile): boolean => {
+      if (!profile.proxy_id) return false;
+      const proxy = storedProxies.find((p) => p.id === profile.proxy_id);
+      return proxy !== undefined;
+    },
+    [storedProxies],
+  );

  // Helper function to determine if a profile can be used for opening links
  const canUseProfileForLinks = useCallback(
@@ -72,12 +83,21 @@ export function ProfileSelectorDialog({
        return isRunning;
      }

-      // For Mullvad browser: never allow if running
-      if (profile.browser === "mullvad-browser" && isRunning) {
-        return false;
+      // For Mullvad browser: Check if any Mullvad browser is running
+      if (profile.browser === "mullvad-browser") {
+        const runningMullvadProfiles = allProfiles.filter(
+          (p) => p.browser === "mullvad-browser" && runningProfiles.has(p.name),
+        );
+
+        // If no Mullvad browser is running, allow any Mullvad profile
+        if (runningMullvadProfiles.length === 0) {
+          return true;
+        }
+
+        // If Mullvad browser(s) are running, only allow the running one(s)
+        return isRunning;
      }

-      // For other browsers: always allow
      return true;
    },
    [],
@@ -86,15 +106,18 @@ export function ProfileSelectorDialog({
  const loadProfiles = useCallback(async () => {
    setIsLoading(true);
    try {
-      const profileList = await invoke<BrowserProfile[]>(
-        "list_browser_profiles",
-      );
+      // Load both profiles and stored proxies
+      const [profileList, proxiesList] = await Promise.all([
+        invoke<BrowserProfile[]>("list_browser_profiles"),
+        invoke<StoredProxy[]>("get_stored_proxies"),
+      ]);

      // Sort profiles by name
      profileList.sort((a, b) => a.name.localeCompare(b.name));

-      // Don't filter any profiles, show all of them
+      // Set both profiles and proxies
      setProfiles(profileList);
+      setStoredProxies(proxiesList);

      // Auto-select first available profile for link opening
      if (profileList.length > 0) {
@@ -134,18 +157,14 @@ export function ProfileSelectorDialog({
  const getProfileTooltipContent = (profile: BrowserProfile): string => {
    const isRunning = runningProfiles.has(profile.name);

-    if (profile.browser === "tor-browser") {
-      // If another TOR profile is running, this one is not available
+    if (
+      profile.browser === "tor-browser" ||
+      profile.browser === "mullvad-browser"
+    ) {
+      // If another TOR/Mullvad profile is running, this one is not available
      return "Only 1 instance can run at a time";
    }

-    if (profile.browser === "mullvad-browser") {
-      if (isRunning) {
-        return "Only launching the browser is supported, opening them in a running browser is not yet available";
-      }
-      return "Only launching the browser is supported, opening them in a running browser is not yet available";
-    }
-
    if (isRunning) {
      return "URL will open in a new tab in the existing browser window";
    }
@@ -305,7 +324,7 @@ export function ProfileSelectorDialog({
                              <Badge variant="secondary" className="text-xs">
                                {getBrowserDisplayName(profile.browser)}
                              </Badge>
-                              {profile.proxy?.enabled && (
+                              {hasProxy(profile) && (
                                <Badge variant="outline" className="text-xs">
                                  Proxy
                                </Badge>
@@ -0,0 +1,285 @@
+"use client";
+
+import { invoke } from "@tauri-apps/api/core";
+import { useCallback, useEffect, useState } from "react";
+import { toast } from "sonner";
+import { LoadingButton } from "@/components/loading-button";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import type { StoredProxy } from "@/types";
+
+interface ProxyFormData {
+  name: string;
+  proxy_type: string;
+  host: string;
+  port: number;
+  username: string;
+  password: string;
+}
+
+interface ProxyFormDialogProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSave: (proxy: StoredProxy) => void;
+  editingProxy?: StoredProxy | null;
+}
+
+export function ProxyFormDialog({
+  isOpen,
+  onClose,
+  onSave,
+  editingProxy,
+}: ProxyFormDialogProps) {
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [formData, setFormData] = useState<ProxyFormData>({
+    name: "",
+    proxy_type: "http",
+    host: "",
+    port: 8080,
+    username: "",
+    password: "",
+  });
+
+  const resetForm = useCallback(() => {
+    setFormData({
+      name: "",
+      proxy_type: "http",
+      host: "",
+      port: 8080,
+      username: "",
+      password: "",
+    });
+  }, []);
+
+  // Load editing proxy data when dialog opens
+  useEffect(() => {
+    if (isOpen) {
+      if (editingProxy) {
+        setFormData({
+          name: editingProxy.name,
+          proxy_type: editingProxy.proxy_settings.proxy_type,
+          host: editingProxy.proxy_settings.host,
+          port: editingProxy.proxy_settings.port,
+          username: editingProxy.proxy_settings.username || "",
+          password: editingProxy.proxy_settings.password || "",
+        });
+      } else {
+        resetForm();
+      }
+    }
+  }, [isOpen, editingProxy, resetForm]);
+
+  const handleSubmit = useCallback(async () => {
+    if (!formData.name.trim()) {
+      toast.error("Proxy name is required");
+      return;
+    }
+
+    if (!formData.host.trim() || !formData.port) {
+      toast.error("Host and port are required");
+      return;
+    }
+
+    setIsSubmitting(true);
+    try {
+      const proxySettings = {
+        proxy_type: formData.proxy_type,
+        host: formData.host.trim(),
+        port: formData.port,
+        username: formData.username.trim() || undefined,
+        password: formData.password.trim() || undefined,
+      };
+
+      let savedProxy: StoredProxy;
+
+      if (editingProxy) {
+        // Update existing proxy
+        savedProxy = await invoke<StoredProxy>("update_stored_proxy", {
+          proxyId: editingProxy.id,
+          name: formData.name.trim(),
+          proxySettings,
+        });
+        toast.success("Proxy updated successfully");
+      } else {
+        // Create new proxy
+        savedProxy = await invoke<StoredProxy>("create_stored_proxy", {
+          name: formData.name.trim(),
+          proxySettings,
+        });
+        toast.success("Proxy created successfully");
+      }
+
+      onSave(savedProxy);
+      onClose();
+    } catch (error) {
+      console.error("Failed to save proxy:", error);
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      toast.error(`Failed to save proxy: ${errorMessage}`);
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [formData, editingProxy, onSave, onClose]);
+
+  const handleClose = useCallback(() => {
+    if (!isSubmitting) {
+      onClose();
+    }
+  }, [isSubmitting, onClose]);
+
+  const isFormValid =
+    formData.name.trim() &&
+    formData.host.trim() &&
+    formData.port > 0 &&
+    formData.port <= 65535;
+
+  return (
+    <Dialog open={isOpen} onOpenChange={handleClose}>
+      <DialogContent className="max-w-md">
+        <DialogHeader>
+          <DialogTitle>
+            {editingProxy ? "Edit Proxy" : "Create New Proxy"}
+          </DialogTitle>
+        </DialogHeader>
+
+        <div className="grid gap-4 py-4">
+          <div className="grid gap-2">
+            <Label htmlFor="proxy-name">Proxy Name</Label>
+            <Input
+              id="proxy-name"
+              value={formData.name}
+              onChange={(e) =>
+                setFormData({ ...formData, name: e.target.value })
+              }
+              placeholder="e.g. Office Proxy, Home VPN, etc."
+              disabled={isSubmitting}
+            />
+          </div>
+
+          <div className="grid gap-2">
+            <Label>Proxy Type</Label>
+            <Select
+              value={formData.proxy_type}
+              onValueChange={(value) =>
+                setFormData({ ...formData, proxy_type: value })
+              }
+              disabled={isSubmitting}
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select proxy type" />
+              </SelectTrigger>
+              <SelectContent>
+                {["http", "https", "socks4", "socks5"].map((type) => (
+                  <SelectItem key={type} value={type}>
+                    {type.toUpperCase()}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div className="grid gap-2">
+              <Label htmlFor="proxy-host">Host</Label>
+              <Input
+                id="proxy-host"
+                value={formData.host}
+                onChange={(e) =>
+                  setFormData({ ...formData, host: e.target.value })
+                }
+                placeholder="e.g. 127.0.0.1"
+                disabled={isSubmitting}
+              />
+            </div>
+
+            <div className="grid gap-2">
+              <Label htmlFor="proxy-port">Port</Label>
+              <Input
+                id="proxy-port"
+                type="number"
+                value={formData.port}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    port: parseInt(e.target.value, 10) || 0,
+                  })
+                }
+                placeholder="e.g. 8080"
+                min="1"
+                max="65535"
+                disabled={isSubmitting}
+              />
+            </div>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div className="grid gap-2">
+              <Label htmlFor="proxy-username">Username (optional)</Label>
+              <Input
+                id="proxy-username"
+                value={formData.username}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    username: e.target.value,
+                  })
+                }
+                placeholder="Proxy username"
+                disabled={isSubmitting}
+              />
+            </div>
+
+            <div className="grid gap-2">
+              <Label htmlFor="proxy-password">Password (optional)</Label>
+              <Input
+                id="proxy-password"
+                type="password"
+                value={formData.password}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    password: e.target.value,
+                  })
+                }
+                placeholder="Proxy password"
+                disabled={isSubmitting}
+              />
+            </div>
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={handleClose}
+            disabled={isSubmitting}
+          >
+            Cancel
+          </Button>
+          <LoadingButton
+            isLoading={isSubmitting}
+            onClick={handleSubmit}
+            disabled={!isFormValid}
+          >
+            {editingProxy ? "Update Proxy" : "Create Proxy"}
+          </LoadingButton>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
@@ -0,0 +1,240 @@
+"use client";
+
+import { invoke } from "@tauri-apps/api/core";
+import { useCallback, useEffect, useState } from "react";
+import { FiEdit2, FiPlus, FiTrash2, FiWifi } from "react-icons/fi";
+import { toast } from "sonner";
+import { ProxyFormDialog } from "@/components/proxy-form-dialog";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import type { StoredProxy } from "@/types";
+
+interface ProxyManagementDialogProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+export function ProxyManagementDialog({
+  isOpen,
+  onClose,
+}: ProxyManagementDialogProps) {
+  const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [showProxyForm, setShowProxyForm] = useState(false);
+  const [editingProxy, setEditingProxy] = useState<StoredProxy | null>(null);
+
+  const loadStoredProxies = useCallback(async () => {
+    try {
+      setLoading(true);
+      const proxies = await invoke<StoredProxy[]>("get_stored_proxies");
+      setStoredProxies(proxies);
+    } catch (error) {
+      console.error("Failed to load stored proxies:", error);
+      toast.error("Failed to load proxies");
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (isOpen) {
+      loadStoredProxies();
+    }
+  }, [isOpen, loadStoredProxies]);
+
+  const handleDeleteProxy = useCallback(async (proxy: StoredProxy) => {
+    if (
+      !confirm(`Are you sure you want to delete the proxy "${proxy.name}"?`)
+    ) {
+      return;
+    }
+
+    try {
+      await invoke("delete_stored_proxy", { proxyId: proxy.id });
+      setStoredProxies((prev) => prev.filter((p) => p.id !== proxy.id));
+      toast.success("Proxy deleted successfully");
+    } catch (error) {
+      console.error("Failed to delete proxy:", error);
+      toast.error("Failed to delete proxy");
+    }
+  }, []);
+
+  const handleCreateProxy = useCallback(() => {
+    setEditingProxy(null);
+    setShowProxyForm(true);
+  }, []);
+
+  const handleEditProxy = useCallback((proxy: StoredProxy) => {
+    setEditingProxy(proxy);
+    setShowProxyForm(true);
+  }, []);
+
+  const handleProxySaved = useCallback((savedProxy: StoredProxy) => {
+    setStoredProxies((prev) => {
+      const existingIndex = prev.findIndex((p) => p.id === savedProxy.id);
+      if (existingIndex >= 0) {
+        // Update existing proxy
+        const updated = [...prev];
+        updated[existingIndex] = savedProxy;
+        return updated;
+      } else {
+        // Add new proxy
+        return [...prev, savedProxy];
+      }
+    });
+    setShowProxyForm(false);
+    setEditingProxy(null);
+  }, []);
+
+  const handleProxyFormClose = useCallback(() => {
+    setShowProxyForm(false);
+    setEditingProxy(null);
+  }, []);
+
+  const trimName = useCallback((name: string) => {
+    return name.length > 30 ? `${name.substring(0, 30)}...` : name;
+  }, []);
+
+  return (
+    <>
+      <Dialog open={isOpen} onOpenChange={onClose}>
+        <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+          <DialogHeader className="flex-shrink-0">
+            <div className="flex gap-2 items-center">
+              <FiWifi className="w-5 h-5" />
+              <DialogTitle>Proxy Management</DialogTitle>
+            </div>
+          </DialogHeader>
+
+          <div className="flex flex-col flex-1 gap-4 py-4 min-h-0">
+            {/* Header with Create Button */}
+            <div className="flex flex-shrink-0 justify-between items-center">
+              <div>
+                <h3 className="text-lg font-medium">Stored Proxies</h3>
+                <p className="text-sm text-muted-foreground">
+                  Manage your saved proxy configurations for reuse across
+                  profiles
+                </p>
+              </div>
+              <Button
+                onClick={handleCreateProxy}
+                className="flex gap-2 items-center"
+              >
+                <FiPlus className="w-4 h-4" />
+                Create Proxy
+              </Button>
+            </div>
+
+            {/* Proxy List - Scrollable */}
+            <div className="flex-1 min-h-0">
+              {loading ? (
+                <div className="flex justify-center items-center h-32">
+                  <p className="text-sm text-muted-foreground">
+                    Loading proxies...
+                  </p>
+                </div>
+              ) : storedProxies.length === 0 ? (
+                <div className="flex flex-col justify-center items-center h-32 text-center">
+                  <FiWifi className="mx-auto mb-4 w-12 h-12 text-muted-foreground" />
+                  <p className="mb-2 text-muted-foreground">
+                    No proxies configured
+                  </p>
+                  <p className="mb-4 text-sm text-muted-foreground">
+                    Create your first proxy configuration to get started
+                  </p>
+                  <Button variant="outline" onClick={handleCreateProxy}>
+                    <FiPlus className="mr-2 w-4 h-4" />
+                    Create First Proxy
+                  </Button>
+                </div>
+              ) : (
+                <div className="overflow-y-auto pr-2 space-y-2 h-full">
+                  {storedProxies.map((proxy) => (
+                    <div
+                      key={proxy.id}
+                      className="flex justify-between items-center p-1 rounded border bg-card"
+                    >
+                      <div className="flex-1 ml-2 min-w-0">
+                        {proxy.name.length > 30 ? (
+                          <Tooltip>
+                            <TooltipTrigger asChild>
+                              <span className="block font-medium truncate text-card-foreground">
+                                {trimName(proxy.name)}
+                              </span>
+                            </TooltipTrigger>
+                            <TooltipContent>
+                              <span className="text-sm font-medium text-card-foreground">
+                                {proxy.name}
+                              </span>
+                            </TooltipContent>
+                          </Tooltip>
+                        ) : (
+                          <span className="text-sm font-medium text-card-foreground">
+                            {proxy.name}
+                          </span>
+                        )}
+                      </div>
+                      <div className="flex flex-shrink-0 gap-1 items-center">
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              onClick={() => handleEditProxy(proxy)}
+                            >
+                              <FiEdit2 className="w-4 h-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            <p>Edit proxy</p>
+                          </TooltipContent>
+                        </Tooltip>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              onClick={() => handleDeleteProxy(proxy)}
+                              className="text-destructive hover:text-destructive"
+                            >
+                              <FiTrash2 className="w-4 h-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            <p>Delete proxy</p>
+                          </TooltipContent>
+                        </Tooltip>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </div>
+          </div>
+
+          <DialogFooter className="flex-shrink-0">
+            <Button onClick={onClose}>Close</Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <ProxyFormDialog
+        isOpen={showProxyForm}
+        onClose={handleProxyFormClose}
+        onSave={handleProxySaved}
+        editingProxy={editingProxy}
+      />
+    </>
+  );
+}
@@ -1,8 +1,13 @@
 "use client";

-import { useEffect, useState } from "react";
+import { invoke } from "@tauri-apps/api/core";
+import { useCallback, useEffect, useState } from "react";
+import { FiPlus } from "react-icons/fi";
+import { toast } from "sonner";
+import { ProxyFormDialog } from "@/components/proxy-form-dialog";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
+import { Card, CardContent } from "@/components/ui/card";
 import {
  Dialog,
  DialogContent,
@@ -10,35 +15,20 @@ import {
  DialogHeader,
  DialogTitle,
 } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
 import {
  Tooltip,
  TooltipContent,
  TooltipTrigger,
 } from "@/components/ui/tooltip";
-
-interface ProxySettings {
-  enabled: boolean;
-  proxy_type: string;
-  host: string;
-  port: number;
-  username?: string;
-  password?: string;
-}
+import { cn } from "@/lib/utils";
+import type { StoredProxy } from "@/types";

 interface ProxySettingsDialogProps {
  isOpen: boolean;
  onClose: () => void;
-  onSave: (proxySettings: ProxySettings) => void;
-  initialSettings?: ProxySettings;
+  onSave: (proxyId: string | null) => void;
+  initialProxyId?: string | null;
  browserType?: string;
 }

@@ -46,232 +36,245 @@ export function ProxySettingsDialog({
  isOpen,
  onClose,
  onSave,
-  initialSettings,
+  initialProxyId,
  browserType,
 }: ProxySettingsDialogProps) {
-  const [settings, setSettings] = useState<ProxySettings>({
-    enabled: initialSettings?.enabled ?? false,
-    proxy_type: initialSettings?.proxy_type ?? "http",
-    host: initialSettings?.host ?? "",
-    port: initialSettings?.port ?? 8080,
-    username: initialSettings?.username ?? "",
-    password: initialSettings?.password ?? "",
-  });
-
-  const [initialSettingsState, setInitialSettingsState] =
-    useState<ProxySettings>({
-      enabled: false,
-      proxy_type: "http",
-      host: "",
-      port: 8080,
-      username: "",
-      password: "",
-    });
-
-  useEffect(() => {
-    if (isOpen && initialSettings) {
-      const newSettings = {
-        enabled: initialSettings.enabled,
-        proxy_type: initialSettings.proxy_type,
-        host: initialSettings.host,
-        port: initialSettings.port,
-        username: initialSettings.username ?? "",
-        password: initialSettings.password ?? "",
-      };
-      setSettings(newSettings);
-      setInitialSettingsState(newSettings);
-    } else if (isOpen) {
-      const defaultSettings = {
-        enabled: false,
-        proxy_type: "http",
-        host: "",
-        port: 80,
-        username: "",
-        password: "",
-      };
-      setSettings(defaultSettings);
-      setInitialSettingsState(defaultSettings);
-    }
-  }, [isOpen, initialSettings]);
-
-  const handleSubmit = () => {
-    onSave(settings);
-  };
-
-  // Check if settings have changed
-  const hasChanged = () => {
-    return (
-      settings.enabled !== initialSettingsState.enabled ||
-      settings.proxy_type !== initialSettingsState.proxy_type ||
-      settings.host !== initialSettingsState.host ||
-      settings.port !== initialSettingsState.port ||
-      settings.username !== initialSettingsState.username ||
-      settings.password !== initialSettingsState.password
-    );
-  };
+  const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
+  const [selectedProxyId, setSelectedProxyId] = useState<string | null>(
+    initialProxyId || null,
+  );
+  const [loading, setLoading] = useState(false);
+  const [showProxyForm, setShowProxyForm] = useState(false);

  // Helper to determine if proxy should be disabled for the selected browser
  const isProxyDisabled = browserType === "tor-browser";

-  // Update proxy enabled state when browser is tor-browser
-  useEffect(() => {
-    if (browserType === "tor-browser" && settings.enabled) {
-      setSettings((prev) => ({ ...prev, enabled: false }));
+  const loadStoredProxies = useCallback(async () => {
+    try {
+      setLoading(true);
+      const proxies = await invoke<StoredProxy[]>("get_stored_proxies");
+      setStoredProxies(proxies);
+    } catch (error) {
+      console.error("Failed to load stored proxies:", error);
+      toast.error("Failed to load proxies");
+    } finally {
+      setLoading(false);
    }
-  }, [browserType, settings.enabled]);
+  }, []);
+
+  useEffect(() => {
+    if (isOpen) {
+      loadStoredProxies();
+      if (isProxyDisabled) {
+        setSelectedProxyId(null);
+      }
+    }
+  }, [isOpen, isProxyDisabled, loadStoredProxies]);
+
+  const handleCreateProxy = useCallback(() => {
+    setShowProxyForm(true);
+  }, []);
+
+  const handleProxySaved = useCallback((savedProxy: StoredProxy) => {
+    setStoredProxies((prev) => {
+      const existingIndex = prev.findIndex((p) => p.id === savedProxy.id);
+      if (existingIndex >= 0) {
+        // Update existing proxy
+        const updated = [...prev];
+        updated[existingIndex] = savedProxy;
+        return updated;
+      } else {
+        // Add new proxy
+        return [...prev, savedProxy];
+      }
+    });
+    setSelectedProxyId(savedProxy.id);
+    setShowProxyForm(false);
+  }, []);
+
+  const handleProxyFormClose = useCallback(() => {
+    setShowProxyForm(false);
+  }, []);
+
+  const handleSave = () => {
+    onSave(selectedProxyId);
+  };
+
+  const hasChanged = () => {
+    return selectedProxyId !== initialProxyId;
+  };

  return (
-    <Dialog
-      open={isOpen}
-      onOpenChange={(open) => {
-        if (!open) {
-          onClose();
-        }
-      }}
-    >
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>Proxy Settings</DialogTitle>
-        </DialogHeader>
+    <>
+      <Dialog
+        open={isOpen}
+        onOpenChange={(open) => {
+          if (!open) {
+            onClose();
+          }
+        }}
+      >
+        <DialogContent className="max-w-md max-h-[80vh] my-8 flex flex-col">
+          <DialogHeader className="flex-shrink-0">
+            <DialogTitle>Proxy Settings</DialogTitle>
+          </DialogHeader>

-        <div className="grid gap-4 py-4">
-          <div className="flex items-center space-x-2">
-            {isProxyDisabled ? (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <div className="flex items-center space-x-2 opacity-50">
-                    <Checkbox
-                      id="proxy-enabled"
-                      checked={false}
-                      disabled={true}
-                    />
-                    <Label htmlFor="proxy-enabled" className="text-gray-500">
-                      Enable Proxy
-                    </Label>
-                  </div>
-                </TooltipTrigger>
-                <TooltipContent>
-                  <p>
-                    Tor Browser has its own built-in proxy system and
-                    doesn&apos;t support additional proxy configuration
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            ) : (
+          <div className="grid gap-6 py-4">
+            {isProxyDisabled && (
+              <div className="p-4 bg-yellow-50 rounded-md border border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">
+                <p className="text-sm text-yellow-800 dark:text-yellow-200">
+                  Tor Browser has its own built-in proxy system and doesn't
+                  support additional proxy configuration.
+                </p>
+              </div>
+            )}
+
+            {!isProxyDisabled && (
              <>
-                <Checkbox
-                  id="proxy-enabled"
-                  checked={settings.enabled}
-                  onCheckedChange={(checked) => {
-                    setSettings({ ...settings, enabled: checked as boolean });
-                  }}
-                />
-                <Label htmlFor="proxy-enabled">Enable Proxy</Label>
+                {/* Proxy Selection */}
+                <div className="space-y-3">
+                  <div className="flex justify-between items-center">
+                    <Label className="text-base font-medium">
+                      Select Proxy
+                    </Label>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={handleCreateProxy}
+                          className="flex gap-2 items-center"
+                        >
+                          <FiPlus className="w-4 h-4" />
+                          Create New
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        <p>Create a new proxy configuration</p>
+                      </TooltipContent>
+                    </Tooltip>
+                  </div>
+
+                  <div className="overflow-y-auto p-2 space-y-2 h-full">
+                    <Button
+                      variant="ghost"
+                      onClick={() => setSelectedProxyId(null)}
+                      asChild
+                    >
+                      <Card
+                        className={cn(
+                          "w-full bg-card cursor-pointer transition-colors",
+                          selectedProxyId === null
+                            ? "ring-2 ring-blue-500"
+                            : "",
+                        )}
+                      >
+                        <CardContent className="p-4 w-full">
+                          <div className="flex items-center space-x-3">
+                            <input
+                              type="radio"
+                              id="no-proxy"
+                              name="proxy-selection"
+                              checked={selectedProxyId === null}
+                              onChange={() => setSelectedProxyId(null)}
+                            />
+                            <div className="flex gap-2 items-center">
+                              <Label
+                                htmlFor="no-proxy"
+                                className="font-medium cursor-pointer"
+                              >
+                                No Proxy
+                              </Label>
+                            </div>
+                          </div>
+                        </CardContent>
+                      </Card>
+                    </Button>
+
+                    {loading ? (
+                      <p className="text-sm text-muted-foreground">
+                        Loading proxies...
+                      </p>
+                    ) : (
+                      storedProxies.map((proxy) => (
+                        <Button
+                          key={proxy.id}
+                          variant="ghost"
+                          onClick={() => setSelectedProxyId(proxy.id)}
+                          asChild
+                        >
+                          <Card
+                            className={cn(
+                              "w-full bg-card cursor-pointer transition-colors",
+                              selectedProxyId === proxy.id
+                                ? "ring-2 ring-blue-500"
+                                : "",
+                            )}
+                          >
+                            <CardContent className="p-4 w-full">
+                              <div className="flex items-center space-x-3">
+                                <input
+                                  type="radio"
+                                  id={`proxy-${proxy.id}`}
+                                  name="proxy-selection"
+                                  checked={selectedProxyId === proxy.id}
+                                  onChange={() => setSelectedProxyId(proxy.id)}
+                                />
+                                <div className="flex gap-2 items-center">
+                                  <Label
+                                    htmlFor={`proxy-${proxy.id}`}
+                                    className="font-medium cursor-pointer"
+                                  >
+                                    {proxy.name}
+                                  </Label>
+                                  <Badge variant="outline">
+                                    {proxy.proxy_settings.proxy_type.toUpperCase()}
+                                  </Badge>
+                                </div>
+                              </div>
+                            </CardContent>
+                          </Card>
+                        </Button>
+                      ))
+                    )}
+
+                    {!loading && storedProxies.length === 0 && (
+                      <div className="py-4 text-center">
+                        <p className="mb-2 text-sm text-muted-foreground">
+                          No saved proxies available.
+                        </p>
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={handleCreateProxy}
+                        >
+                          <FiPlus className="mr-2 w-4 h-4" />
+                          Create First Proxy
+                        </Button>
+                      </div>
+                    )}
+                  </div>
+                </div>
              </>
            )}
          </div>

-          {settings.enabled && !isProxyDisabled && (
-            <>
-              <div className="grid gap-2">
-                <Label>Proxy Type</Label>
-                <Select
-                  value={settings.proxy_type}
-                  onValueChange={(value) => {
-                    setSettings({
-                      ...settings,
-                      proxy_type: value,
-                    });
-                  }}
-                >
-                  <SelectTrigger>
-                    <SelectValue placeholder="Select proxy type" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {["http", "https", "socks4", "socks5"].map((type) => (
-                      <SelectItem key={type} value={type}>
-                        {type.toUpperCase()}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
+          <DialogFooter>
+            <Button variant="outline" onClick={onClose}>
+              Cancel
+            </Button>
+            <Button onClick={handleSave} disabled={!hasChanged()}>
+              Save
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>

-              <div className="grid gap-2">
-                <Label htmlFor="host">Host</Label>
-                <Input
-                  id="host"
-                  value={settings.host}
-                  onChange={(e) => {
-                    setSettings({ ...settings, host: e.target.value });
-                  }}
-                  placeholder="e.g. 127.0.0.1"
-                />
-              </div>
-
-              <div className="grid gap-2">
-                <Label htmlFor="port">Port</Label>
-                <Input
-                  id="port"
-                  type="number"
-                  value={settings.port}
-                  onChange={(e) => {
-                    setSettings({
-                      ...settings,
-                      port: Number.parseInt(e.target.value, 10) || 0,
-                    });
-                  }}
-                  placeholder="e.g. 8080"
-                  min="1"
-                  max="65535"
-                />
-              </div>
-
-              <div className="grid gap-2">
-                <Label htmlFor="username">Username (optional)</Label>
-                <Input
-                  id="username"
-                  value={settings.username}
-                  onChange={(e) => {
-                    setSettings({ ...settings, username: e.target.value });
-                  }}
-                  placeholder="Proxy username"
-                />
-              </div>
-
-              <div className="grid gap-2">
-                <Label htmlFor="password">Password (optional)</Label>
-                <Input
-                  id="password"
-                  type="password"
-                  value={settings.password}
-                  onChange={(e) => {
-                    setSettings({ ...settings, password: e.target.value });
-                  }}
-                  placeholder="Proxy password"
-                />
-              </div>
-            </>
-          )}
-        </div>
-
-        <DialogFooter>
-          <Button variant="outline" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button
-            onClick={handleSubmit}
-            disabled={
-              !hasChanged() ||
-              (!isProxyDisabled &&
-                settings.enabled &&
-                (!settings.host || !settings.port))
-            }
-          >
-            Save
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+      <ProxyFormDialog
+        isOpen={showProxyForm}
+        onClose={handleProxyFormClose}
+        onSave={handleProxySaved}
+      />
+    </>
  );
 }
@@ -95,7 +95,7 @@ export function ReleaseTypeSelector({
              <LuChevronsUpDown className="ml-2 w-4 h-4 opacity-50 shrink-0" />
            </Button>
          </PopoverTrigger>
-          <PopoverContent className="w-[300px] p-0">
+          <PopoverContent className="p-0">
            <Command>
              <CommandEmpty>No release types available.</CommandEmpty>
              <CommandList>
@@ -155,8 +155,8 @@ export function ReleaseTypeSelector({
      ) : (
        // Show a simple display when only one release type is available
        releaseOptions.length === 1 && (
-          <div className="flex gap-2 items-center justify-center p-3 border rounded-md bg-muted/50">
-            <span className="capitalize text-sm font-medium">
+          <div className="flex gap-2 justify-center items-center p-3 rounded-md border bg-muted/50">
+            <span className="text-sm font-medium capitalize">
              {releaseOptions[0].type}
            </span>
            {releaseOptions[0].type === "nightly" && (
@@ -42,7 +42,7 @@ function DropdownMenuContent({
        data-slot="dropdown-menu-content"
        sideOffset={sideOffset}
        className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
+          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[50000] max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
          className,
        )}
        {...props}
@@ -230,7 +230,7 @@ function DropdownMenuSubContent({
    <DropdownMenuPrimitive.SubContent
      data-slot="dropdown-menu-sub-content"
      className={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
+        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[50000] min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
        className,
      )}
      {...props}
@@ -30,7 +30,7 @@ function PopoverContent({
        align={align}
        sideOffset={sideOffset}
        className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",
+          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[50000] origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",
          className,
        )}
        {...props}
@@ -61,7 +61,7 @@ function SelectContent({
      <SelectPrimitive.Content
        data-slot="select-content"
        className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
+          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-[50000] max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
          position === "popper" &&
            "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
          className,
@@ -8,11 +8,11 @@ function Table({ className, ...props }: React.ComponentProps<"table">) {
  return (
    <div
      data-slot="table-container"
-      className="relative w-full overflow-x-auto"
+      className="overflow-x-auto relative w-full"
    >
      <table
        data-slot="table"
-        className={cn("w-full caption-bottom text-sm", className)}
+        className={cn("w-full text-sm caption-bottom", className)}
        {...props}
      />
    </div>
@@ -98,7 +98,7 @@ function TableCaption({
  return (
    <caption
      data-slot="table-caption"
-      className={cn("text-muted-foreground mt-4 text-sm", className)}
+      className={cn("mt-4 text-sm text-muted-foreground", className)}
      {...props}
    />
  );
@@ -46,13 +46,13 @@ function TooltipContent({
        data-slot="tooltip-content"
        sideOffset={sideOffset}
        className={cn(
-          "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
+          "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[50000] w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
          className,
        )}
        {...props}
      >
        {children}
-        <TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />
+        <TooltipPrimitive.Arrow className="bg-primary fill-primary z-[50000] size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />
      </TooltipPrimitive.Content>
    </TooltipPrimitive.Portal>
  );
@@ -6,12 +6,13 @@ import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { AppUpdateToast } from "@/components/app-update-toast";
 import { showToast } from "@/lib/toast-utils";
-import type { AppUpdateInfo } from "@/types";
+import type { AppUpdateInfo, AppUpdateProgress } from "@/types";

 export function useAppUpdateNotifications() {
  const [updateInfo, setUpdateInfo] = useState<AppUpdateInfo | null>(null);
  const [isUpdating, setIsUpdating] = useState(false);
-  const [updateProgress, setUpdateProgress] = useState<string>("");
+  const [updateProgress, setUpdateProgress] =
+    useState<AppUpdateProgress | null>(null);
  const [isClient, setIsClient] = useState(false);
  const [dismissedVersion, setDismissedVersion] = useState<string | null>(null);

@@ -59,7 +60,13 @@ export function useAppUpdateNotifications() {
  const handleAppUpdate = useCallback(async (appUpdateInfo: AppUpdateInfo) => {
    try {
      setIsUpdating(true);
-      setUpdateProgress("Starting update...");
+      setUpdateProgress({
+        stage: "downloading",
+        percentage: 0,
+        speed: undefined,
+        eta: undefined,
+        message: "Starting update...",
+      });

      await invoke("download_and_install_app_update", {
        updateInfo: appUpdateInfo,
@@ -73,7 +80,7 @@ export function useAppUpdateNotifications() {
        duration: 6000,
      });
      setIsUpdating(false);
-      setUpdateProgress("");
+      setUpdateProgress(null);
    }
  }, []);

@@ -102,10 +109,21 @@ export function useAppUpdateNotifications() {
      },
    );

-    const unlistenProgress = listen<string>("app-update-progress", (event) => {
-      console.log("App update progress:", event.payload);
-      setUpdateProgress(event.payload);
-    });
+    const unlistenProgress = listen<AppUpdateProgress>(
+      "app-update-progress",
+      (event) => {
+        console.log("App update progress:", event.payload);
+        setUpdateProgress(event.payload);
+
+        // If update is completed, mark as no longer updating after a delay
+        if (event.payload.stage === "completed") {
+          setTimeout(() => {
+            setIsUpdating(false);
+            setUpdateProgress(null);
+          }, 2000);
+        }
+      },
+    );

    return () => {
      void unlistenUpdate.then((unlisten) => {
@@ -161,6 +179,7 @@ export function useAppUpdateNotifications() {
  return {
    updateInfo,
    isUpdating,
+    updateProgress,
    checkForAppUpdates,
    checkForAppUpdatesManual,
    dismissAppUpdate,
@@ -46,12 +46,23 @@ interface VersionUpdateToastProps extends BaseToastProps {
  };
 }

+interface AppUpdateToastProps extends BaseToastProps {
+  type: "app-update";
+  stage?: "downloading" | "extracting" | "installing" | "completed";
+  progress?: {
+    percentage: number;
+    speed?: string;
+    eta?: string;
+  };
+}
+
 type ToastProps =
  | SuccessToastProps
  | ErrorToastProps
  | DownloadToastProps
  | LoadingToastProps
-  | VersionUpdateToastProps;
+  | VersionUpdateToastProps
+  | AppUpdateToastProps;

 export function showToast(props: ToastProps & { id?: string }) {
  const toastId = props.id ?? `toast-${props.type}-${Date.now()}`;
@@ -246,3 +257,27 @@ export function showUnifiedVersionUpdateToast(
    ...options,
  });
 }
+
+export function showAppUpdateToast(
+  title: string,
+  stage: "downloading" | "extracting" | "installing" | "completed",
+  options?: {
+    id?: string;
+    description?: string;
+    progress?: {
+      percentage: number;
+      speed?: string;
+      eta?: string;
+    };
+    duration?: number;
+  },
+) {
+  return showToast({
+    type: "app-update",
+    title,
+    stage,
+    id: options?.id ?? "app-update-progress",
+    duration: stage === "downloading" ? Number.POSITIVE_INFINITY : 5000,
+    ...options,
+  });
+}
@@ -4,3 +4,7 @@ import { twMerge } from "tailwind-merge";
 export function cn(...inputs: ClassValue[]) {
  return twMerge(clsx(inputs));
 }
+
+export function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
@@ -1,5 +1,4 @@
 export interface ProxySettings {
-  enabled: boolean;
  proxy_type: string; // "http", "https", "socks4", or "socks5"
  host: string;
  port: number;
@@ -13,16 +12,22 @@ export interface TableSortingSettings {
 }

 export interface BrowserProfile {
+  id: string; // UUID of the profile
  name: string;
  browser: string;
  version: string;
-  profile_path: string;
-  proxy?: ProxySettings;
+  proxy_id?: string; // Reference to stored proxy
  process_id?: number;
  last_launch?: number;
  release_type: string; // "stable" or "nightly"
 }

+export interface StoredProxy {
+  id: string;
+  name: string;
+  proxy_settings: ProxySettings;
+}
+
 export interface DetectedProfile {
  browser: string;
  name: string;
@@ -43,3 +48,11 @@ export interface AppUpdateInfo {
  is_nightly: boolean;
  published_at: string;
 }
+
+export interface AppUpdateProgress {
+  stage: string; // "downloading", "extracting", "installing", "completed"
+  percentage?: number;
+  speed?: string; // MB/s
+  eta?: string; // estimated time remaining
+  message: string;
+}