Skip to content

Commit df1c465

Browse files
authored
fix: app picks model automatically edge cases (#4322)
1 parent 171dad1 commit df1c465

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

web/containers/ModelDropdown/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,7 @@ const ModelDropdown = ({
183183
if (!activeThread) return
184184
const modelId = activeAssistant?.model?.id
185185

186-
let model = downloadedModels.find((model) => model.id === modelId)
187-
if (!model) {
188-
model = undefined
189-
}
186+
const model = downloadedModels.find((model) => model.id === modelId)
190187
setSelectedModel(model)
191188
}, [
192189
recommendedModel,

web/hooks/useDeleteThread.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { currentPromptAtom } from '@/containers/Providers/Jotai'
88

99
import { toaster } from '@/containers/Toast'
1010

11+
import useSetActiveThread from './useSetActiveThread'
12+
1113
import { extensionManager } from '@/extension/ExtensionManager'
1214

1315
import { deleteChatMessageAtom as deleteChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
@@ -27,6 +29,7 @@ export default function useDeleteThread() {
2729
const deleteMessages = useSetAtom(deleteChatMessagesAtom)
2830

2931
const deleteThreadState = useSetAtom(deleteThreadStateAtom)
32+
const { setActiveThread } = useSetActiveThread()
3033

3134
const cleanThread = useCallback(
3235
async (threadId: string) => {
@@ -86,7 +89,7 @@ export default function useDeleteThread() {
8689
type: 'success',
8790
})
8891
if (availableThreads.length > 0) {
89-
setActiveThreadId(availableThreads[0].id)
92+
setActiveThread(availableThreads[0])
9093
} else {
9194
setActiveThreadId(undefined)
9295
}

web/screens/Thread/ThreadRightPanel/Tools/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ const Tools = () => {
3232

3333
useEffect(() => {
3434
if (!activeThread) return
35-
let model = downloadedModels.find(
35+
const model = downloadedModels.find(
3636
(model) => model.id === activeAssistant?.model.id
3737
)
38-
if (!model) {
39-
model = recommendedModel
40-
}
4138
setSelectedModel(model)
4239
}, [
4340
recommendedModel,

0 commit comments

Comments
 (0)