Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { ThemeContext } from '@context'
import '@styles/index.scss'
import { TonConnectUIProvider } from '@tonconnect/ui-react'
import { checkIsMobile, checkStartAppParams } from '@utils'

Check warning on line 4 in frontend/src/App.tsx

View workflow job for this annotation

GitHub Actions / lint / lint

'checkIsMobile' is defined but never used
import { useContext, useEffect } from 'react'
import { useNavigate, useParams } from 'react-router-dom'

import config from '@config'
import { AuthService } from '@services'

Check warning on line 9 in frontend/src/App.tsx

View workflow job for this annotation

GitHub Actions / lint / lint

'AuthService' is defined but never used
import { useUser, useUserActions } from '@store'
import { useAuthQuery } from '@store-new'

Check warning on line 11 in frontend/src/App.tsx

View workflow job for this annotation

GitHub Actions / lint / lint

'useAuthQuery' is defined but never used

import Routes from './Routes'

Expand Down Expand Up @@ -70,7 +70,7 @@
useEffect(() => {
const ch = checkStartAppParams()
if (ch) {
navigate(`/client/${ch}`, { state: { closeApp: true } })
navigate(`/client/${ch}`)
return
}
}, [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ export const PopularChatsList = ({ chats }: PopularChatsListProps) => {
text={chat.title}
description={
<BlockNew gap={6} row align="center" fadeIn={false}>
<Text type="caption2" color="secondary">
{chat.tcv < 1
? 'New'
: `$${Math.floor(chat.tcv).toLocaleString()}`}
</Text>
<div className={styles.divider} />
<Text type="caption2" color="secondary">
{pluralize(
['member', 'members', 'members'],
Expand Down
9 changes: 7 additions & 2 deletions frontend/src/pages/client/ClientJoinPage/ClientJoinPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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()
Expand Down Expand Up @@ -67,9 +68,13 @@ export const ClientJoinPage = () => {
}, 1500)
}

const handleBackNavigation = () => {
navigate('/')
}

return (
<PageLayout center>
<TelegramBackButton />
<TelegramBackButton onClick={handleBackNavigation} />
<TelegramMainButton text="Join Group" onClick={handleJoinGroup} />
<ConfettiAnimation active={true} duration={5000} />
<Image
Expand Down
Loading