Skip to content

Commit b57bf9f

Browse files
committed
Fix TypeScript error in useSelectedModel after merge conflict resolution
1 parent 49521cc commit b57bf9f

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

webview-ui/src/components/ui/hooks/useSelectedModel.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
ioIntelligenceModels,
2828
qwenCodeModels,
2929
BEDROCK_1M_CONTEXT_MODEL_IDS,
30-
isDynamicProvider,
3130
getProviderDefaultModelId,
3231
} from "@roo-code/types"
3332

@@ -64,22 +63,13 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
6463
const ollamaModels = useOllamaModels(ollamaModelId)
6564

6665
// Compute readiness only for data actually needed; router models use cached data without fetch
67-
const needRouterModels = false
6866
const needOpenRouterProviders = provider === "openrouter"
6967
const needLmStudio = typeof lmStudioModelId !== "undefined"
7068
const needOllama = typeof ollamaModelId !== "undefined"
7169

72-
const hasValidRouterData = needRouterModels
73-
? routerModels.data &&
74-
routerModels.data[provider] !== undefined &&
75-
typeof routerModels.data[provider] === "object" &&
76-
!routerModels.isLoading
77-
: true
78-
7970
const isReady =
8071
(!needLmStudio || typeof lmStudioModels.data !== "undefined") &&
8172
(!needOllama || typeof ollamaModels.data !== "undefined") &&
82-
hasValidRouterData &&
8373
(!needOpenRouterProviders || typeof openRouterModelProviders.data !== "undefined")
8474

8575
const { id, info } =
@@ -99,12 +89,10 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
9989
id,
10090
info,
10191
isLoading:
102-
(needRouterModels && routerModels.isLoading) ||
10392
(needOpenRouterProviders && openRouterModelProviders.isLoading) ||
10493
(needLmStudio && lmStudioModels!.isLoading) ||
10594
(needOllama && ollamaModels!.isLoading),
10695
isError:
107-
(needRouterModels && routerModels.isError) ||
10896
(needOpenRouterProviders && openRouterModelProviders.isError) ||
10997
(needLmStudio && lmStudioModels!.isError) ||
11098
(needOllama && ollamaModels!.isError),

0 commit comments

Comments
 (0)