From 2684e3077f26d9257477da05e1e12581eb7e0238 Mon Sep 17 00:00:00 2001
From: Teknium <127238744+teknium1@users.noreply.github.com>
Date: Sun, 19 Jul 2026 23:55:45 -0700
Subject: [PATCH] chore: fix import ordering after cherry-pick conflict
 resolution

---
 apps/desktop/src/app/shell/model-menu-panel.test.tsx | 2 +-
 apps/desktop/src/app/shell/model-menu-panel.tsx      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/app/shell/model-menu-panel.test.tsx b/apps/desktop/src/app/shell/model-menu-panel.test.tsx
index 64532b2541a04..5a8e1d649b02f 100644
--- a/apps/desktop/src/app/shell/model-menu-panel.test.tsx
+++ b/apps/desktop/src/app/shell/model-menu-panel.test.tsx
@@ -3,8 +3,8 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { DropdownMenu, DropdownMenuContent } from '@/components/ui/dropdown-menu'
-import { $activeSessionId, $currentModel, $currentProvider } from '@/store/session'
 import { $collapsedProviders, toggleCollapsedProvider } from '@/store/provider-collapse'
+import { $activeSessionId, $currentModel, $currentProvider } from '@/store/session'
 
 import { ModelMenuPanel } from './model-menu-panel'
 
diff --git a/apps/desktop/src/app/shell/model-menu-panel.tsx b/apps/desktop/src/app/shell/model-menu-panel.tsx
index 6a600f7b8c383..100b9b04eea92 100644
--- a/apps/desktop/src/app/shell/model-menu-panel.tsx
+++ b/apps/desktop/src/app/shell/model-menu-panel.tsx
@@ -18,6 +18,7 @@ import {
 import { Skeleton } from '@/components/ui/skeleton'
 import type { HermesGateway } from '@/hermes'
 import { useI18n } from '@/i18n'
+import { ChevronDown, ChevronRight } from '@/lib/icons'
 import { requestModelOptions } from '@/lib/model-options'
 import {
   currentPickerSelection,
@@ -27,7 +28,6 @@ import {
 } from '@/lib/model-status-label'
 import { normalize } from '@/lib/text'
 import { cn } from '@/lib/utils'
-import { ChevronDown, ChevronRight } from '@/lib/icons'
 import { $modelPresets, applyModelPreset, modelPresetKey } from '@/store/model-presets'
 import {
   $visibleModels,
@@ -245,6 +245,7 @@ export function ModelMenuPanel({ gateway, onSelectModel, requestGateway }: Model
         <div className="max-h-[max(150px,30dvh)] overflow-y-auto py-0.5">
           {groups.map(group => {
             const slug = group.provider.slug
+
             // Collapsed when stored + no active search + not the current provider.
             const collapsed =
               collapsedProviders.includes(slug) && !search && slug !== optionsProvider