Fix conflict

janhq · Oct 26, 2023 · c53ca16 · c53ca16
1 parent ecc15b3
commit c53ca16
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/web/app/_components/InputToolbar/index.tsx b/web/app/_components/InputToolbar/index.tsx
@@ -12,7 +12,6 @@ import {
   currentConvoStateAtom,
   getActiveConvoIdAtom,
 } from '@helpers/atoms/Conversation.atom'
-import { userConversationsAtom } from '@helpers/atoms/Conversation.atom'
 import useGetInputState from '@hooks/useGetInputState'
 import { Button } from '../../../uikit/button'
 import useStartStopModel from '@hooks/useStartStopModel'
@@ -21,7 +20,6 @@ import { userConversationsAtom } from '@helpers/atoms/Conversation.atom'
 const InputToolbar: React.FC = () => {
   const activeModel = useAtomValue(activeAssistantModelAtom)
   const currentConvoState = useAtomValue(currentConvoStateAtom)
-  const conversations = useAtomValue(userConversationsAtom)
   const { inputState, currentConvo } = useGetInputState()
   const { requestCreateConvo } = useCreateConversation()
   const { startModel } = useStartStopModel()

diff --git a/web/helpers/ModalWrapper.tsx b/web/helpers/ModalWrapper.tsx
@@ -5,7 +5,6 @@ import ConfirmDeleteConversationModal from '@/_components/ConfirmDeleteConversat
 import ConfirmDeleteModelModal from '@/_components/ConfirmDeleteModelModal'
 import ConfirmSignOutModal from '@/_components/ConfirmSignOutModal'
 import MobileMenuPane from '@/_components/MobileMenuPane'
-import ModalNoActiveModel from '@/_components/ModalNoActiveModel'
 import SwitchingModelConfirmationModal from '@/_components/SwitchingModelConfirmationModal'
 import ModalNoActiveModel from '@/_components/ModalNoActiveModel'
 import { ReactNode } from 'react'