diff --git a/frontend/src/Navigation.tsx b/frontend/src/Navigation.tsx index 3d1dc614..ac7063be 100644 --- a/frontend/src/Navigation.tsx +++ b/frontend/src/Navigation.tsx @@ -2,7 +2,6 @@ import { useEffect, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import { NavLink, useNavigate } from 'react-router-dom'; - import conversationService from './api/services/conversationService'; import userService from './api/services/userService'; import Add from './assets/add.svg'; @@ -10,7 +9,6 @@ import DocsGPT3 from './assets/cute_docsgpt3.svg'; import Discord from './assets/discord.svg'; import Expand from './assets/expand.svg'; import Github from './assets/github.svg'; -import Hamburger from './assets/hamburger.svg'; import SettingGear from './assets/settingGear.svg'; import Twitter from './assets/TwitterX.svg'; import UploadIcon from './assets/upload.svg'; @@ -40,8 +38,10 @@ import { setSourceDocs, } from './preferences/preferenceSlice'; import Upload from './upload/Upload'; +import ShareButton from './components/ShareButton'; import Help from './components/Help'; + interface NavigationProps { navOpen: boolean; setNavOpen: React.Dispatch>; @@ -73,7 +73,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) { const [isDarkTheme] = useDarkTheme(); const [isDocsListOpen, setIsDocsListOpen] = useState(false); const { t } = useTranslation(); - const isApiKeySet = useSelector(selectApiKeyStatus); const [apiKeyModalState, setApiKeyModalState] = useState('INACTIVE'); @@ -412,15 +411,21 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
+ + {conversationId && }
(false); + return ( + <> + + {isShareModalOpen && ( + { + setShareModalState(false); + }} + conversationId={conversationId} + /> + )} + + ); +} diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx index fb819922..ae4ed7a9 100644 --- a/frontend/src/conversation/Conversation.tsx +++ b/frontend/src/conversation/Conversation.tsx @@ -5,13 +5,11 @@ import { useDispatch, useSelector } from 'react-redux'; import ArrowDown from '../assets/arrow-down.svg'; import Send from '../assets/send.svg'; import SendDark from '../assets/send_dark.svg'; -import ShareIcon from '../assets/share.svg'; import SpinnerDark from '../assets/spinner-dark.svg'; import Spinner from '../assets/spinner.svg'; import RetryIcon from '../components/RetryIcon'; import Hero from '../Hero'; import { useDarkTheme, useMediaQuery } from '../hooks'; -import { ShareConversationModal } from '../modals/ShareConversationModal'; import { selectConversationId } from '../preferences/preferenceSlice'; import { AppDispatch } from '../store'; import ConversationBubble from './ConversationBubble'; @@ -24,6 +22,7 @@ import { selectStatus, updateQuery, } from './conversationSlice'; +import ShareButton from '../components/ShareButton'; export default function Conversation() { const queries = useSelector(selectQueries); @@ -37,7 +36,6 @@ export default function Conversation() { const fetchStream = useRef(null); const [eventInterrupt, setEventInterrupt] = useState(false); const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false); - const [isShareModalOpen, setShareModalState] = useState(false); const { t } = useTranslation(); const { isMobile } = useMediaQuery(); @@ -199,30 +197,9 @@ export default function Conversation() { return (
{conversationId && ( - <> - {' '} - - {isShareModalOpen && ( - { - setShareModalState(false); - }} - conversationId={conversationId} - /> - )} - +
+ +
)}