diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index d687c045..ef4b4e39 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -70,7 +70,7 @@ function App() { useEffect(() => { const ch = checkStartAppParams() if (ch) { - navigate(`/client/${ch}`, { state: { closeApp: true } }) + navigate(`/client/${ch}`) return } }, []) diff --git a/frontend/src/pages/admin/MainPage/components/PopularChatsList/PopularChatsList.tsx b/frontend/src/pages/admin/MainPage/components/PopularChatsList/PopularChatsList.tsx index a9caffc0..9503a898 100644 --- a/frontend/src/pages/admin/MainPage/components/PopularChatsList/PopularChatsList.tsx +++ b/frontend/src/pages/admin/MainPage/components/PopularChatsList/PopularChatsList.tsx @@ -22,12 +22,6 @@ export const PopularChatsList = ({ chats }: PopularChatsListProps) => { text={chat.title} description={ - - {chat.tcv < 1 - ? 'New' - : `$${Math.floor(chat.tcv).toLocaleString()}`} - -
{pluralize( ['member', 'members', 'members'], diff --git a/frontend/src/pages/client/ClientJoinPage/ClientJoinPage.tsx b/frontend/src/pages/client/ClientJoinPage/ClientJoinPage.tsx index a3188382..0a3e3041 100644 --- a/frontend/src/pages/client/ClientJoinPage/ClientJoinPage.tsx +++ b/frontend/src/pages/client/ClientJoinPage/ClientJoinPage.tsx @@ -10,7 +10,7 @@ import { import { useError } from '@hooks' import { createMembersCount, goTo } from '@utils' import { useEffect, useState } from 'react' -import { useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router-dom' import { useChat, useChatActions } from '@store' @@ -22,6 +22,7 @@ export const ClientJoinPage = () => { const [canJoinChat, setCanJoinChat] = useState(false) const { notFound } = useError() + const navigate = useNavigate() const [isLoading, setIsLoading] = useState(true) const { chat } = useChat() @@ -67,9 +68,13 @@ export const ClientJoinPage = () => { }, 1500) } + const handleBackNavigation = () => { + navigate('/') + } + return ( - +