Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try fix chain param issue #2267

Merged
merged 8 commits into from
Sep 26, 2023
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
14 changes: 6 additions & 8 deletions src/hooks/web3/useSyncNetworkParamWithStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function useSyncNetworkParamWithStore() {
const tried = triedEager.current

useEffect(() => {
if (!paramChainId) {
if (!networkParam || !paramChainId) {
triedSync.current = true
return
}
Expand All @@ -36,16 +36,14 @@ export function useSyncNetworkParamWithStore() {
*/
;(async () => {
if (triedSync.current) return
triedSync.current = true
setRequestingNetwork(networkParam)
await changeNetwork(paramChainId, undefined, () => {
if (networkParam) {
navigate(
{ ...location, pathname: location.pathname.replace(networkParam, networkInfo.route) },
{ replace: true },
)
}
navigate(
{ ...location, pathname: location.pathname.replace(networkParam, networkInfo.route) },
{ replace: true },
)
})
triedSync.current = true
})()
}, [changeNetwork, location, navigate, networkInfo.route, networkParam, paramChainId, tried])

Expand Down
1 change: 0 additions & 1 deletion src/pages/TrueSightV2/components/NetworkSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ const DropdownItem = styled(Row)`
`

const NetworkSelect = ({ filter, setFilter }: { filter?: string; setFilter: (c?: string) => void }) => {
console.log('🚀 ~ file: NetworkSelect.tsx:63 ~ NetworkSelect ~ filter:', filter)
const theme = useTheme()

const [isShowOptions, setIsShowOptions] = useState(false)
Expand Down
4 changes: 2 additions & 2 deletions src/pages/TrueSightV2/components/chart/datafeed.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useEffect, useMemo, useRef } from 'react'
import { useParams } from 'react-router-dom'

import {
ErrorCallback,
Expand All @@ -12,6 +11,7 @@ import {
} from 'components/TradingViewChart/charting_library'
import { getTradingViewTimeZone } from 'components/TradingViewChart/utils'
import { DEFAULT_EXPLORE_PAGE_TOKEN } from 'pages/TrueSightV2/constants'
import useKyberAIAssetOverview from 'pages/TrueSightV2/hooks/useKyberAIAssetOverview'
import { useLazyChartingDataQuery } from 'pages/TrueSightV2/hooks/useKyberAIData'
import { IAssetOverview, OHLCData } from 'pages/TrueSightV2/types'

Expand All @@ -21,7 +21,7 @@ const configurationData = {

export const useDatafeed = (isBTC: boolean, token?: IAssetOverview) => {
const intervalRef = useRef<any>()
const { chain, address } = useParams()
const { chain, address } = useKyberAIAssetOverview()
const [getChartingData, { isLoading }] = useLazyChartingDataQuery()
useEffect(() => {
return () => {
Expand Down
3 changes: 0 additions & 3 deletions src/pages/TrueSightV2/components/table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import AnimatedLoader from 'components/Loader/AnimatedLoader'
import Pagination from 'components/Pagination'
import Row, { RowFit } from 'components/Row'
import { APP_PATHS } from 'constants/index'
import { useActiveWeb3React } from 'hooks'
import { MIXPANEL_TYPE, useMixpanelKyberAI } from 'hooks/useMixpanel'
import { useOnClickOutside } from 'hooks/useOnClickOutside'
import useTheme from 'hooks/useTheme'
Expand Down Expand Up @@ -589,7 +588,6 @@ const WidgetTokenRow = ({
}) => {
const theme = useTheme()
const navigate = useNavigate()
const { account } = useActiveWeb3React()
const mixpanelHandler = useMixpanelKyberAI()
const reachedMaxLimit = useIsReachMaxLimitWatchedToken(token?.tokens.length)

Expand Down Expand Up @@ -627,7 +625,6 @@ const WidgetTokenRow = ({

const handleWatchlistClick = (e: any) => {
e.stopPropagation()
if (!account) return
setLoadingStar(true)
if (isWatched) {
mixpanelHandler(MIXPANEL_TYPE.KYBERAI_ADD_TOKEN_TO_WATCHLIST, {
Expand Down
2 changes: 2 additions & 0 deletions src/pages/TrueSightV2/hooks/useKyberAIData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const kyberAIApi = createApi({
},
providesTags: (result, error, arg) => (arg.watchlist === true ? ['myWatchList', 'tokenList'] : ['tokenList']),
}),
//2.
XiaoYhun marked this conversation as resolved.
Show resolved Hide resolved
addToWatchlist: builder.mutation({
query: (params: { tokenAddress: string; chain: string }) => ({
url: `/watchlist`,
Expand All @@ -65,6 +66,7 @@ const kyberAIApi = createApi({
}),
invalidatesTags: (res, err, params) => [{ type: 'tokenOverview', id: params.tokenAddress }, 'myWatchList'],
}),
//3.
removeFromWatchlist: builder.mutation({
query: (params: { tokenAddress: string; chain: string }) => ({
url: `/watchlist`,
Expand Down
4 changes: 1 addition & 3 deletions src/pages/TrueSightV2/pages/SingleToken.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import Column from 'components/Column'
import Icon from 'components/Icons/Icon'
import Row, { RowBetween, RowFit } from 'components/Row'
import { APP_PATHS } from 'constants/index'
import { useActiveWeb3React } from 'hooks'
import { MIXPANEL_TYPE, useMixpanelKyberAI } from 'hooks/useMixpanel'
import useTheme from 'hooks/useTheme'
import { PROFILE_MANAGE_ROUTES } from 'pages/NotificationCenter/const'
Expand Down Expand Up @@ -249,7 +248,6 @@ const TokenDescription = ({ description }: { description: string }) => {
}

const TokenNameGroup = ({ token, isLoading }: { token?: IAssetOverview; isLoading?: boolean }) => {
const { account } = useActiveWeb3React()
const theme = useTheme()
const mixpanelHandler = useMixpanelKyberAI()
const navigate = useNavigate()
Expand All @@ -262,7 +260,7 @@ const TokenNameGroup = ({ token, isLoading }: { token?: IAssetOverview; isLoadin
const [isWatched, setIsWatched] = useState(false)

const handleStarClick = () => {
if (!token || !chain || !address || !account) return
if (!token || !chain || !address) return
if (isWatched) {
mixpanelHandler(MIXPANEL_TYPE.KYBERAI_ADD_TOKEN_TO_WATCHLIST, {
token_name: token.symbol?.toUpperCase(),
Expand Down
10 changes: 6 additions & 4 deletions src/pages/TrueSightV2/pages/TokenAnalysisList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import Row, { RowBetween, RowFit } from 'components/Row'
import { MouseoverTooltipDesktopOnly } from 'components/Tooltip'
import { APP_PATHS, ICON_ID } from 'constants/index'
import { NETWORKS_INFO } from 'constants/networks'
import { useActiveWeb3React } from 'hooks'
import { MIXPANEL_TYPE, useMixpanelKyberAI } from 'hooks/useMixpanel'
import { useOnClickOutside } from 'hooks/useOnClickOutside'
import useTheme from 'hooks/useTheme'
Expand Down Expand Up @@ -51,12 +50,15 @@ const TableWrapper = styled.div`
border-bottom: none;
transition: all 0.15s ease;
overflow: hidden;
min-height: 500px;
background-color: ${({ theme }) => theme.background};
@media only screen and (max-width: 1080px) {
margin-left: -16px;
margin-right: -16px;
border-radius: 0px;
border: none;
overflow-x: scroll;
min-height: 250px;
}
`
const PaginationWrapper = styled.div`
Expand All @@ -67,6 +69,8 @@ const PaginationWrapper = styled.div`
overflow: hidden;
min-height: 50px;
background-color: ${({ theme }) => theme.background};
border-top: 1px solid ${({ theme }) => theme.border};

@media only screen and (max-width: 1080px) {
margin-left: -16px;
margin-right: -16px;
Expand Down Expand Up @@ -475,7 +479,6 @@ const TokenRow = React.memo(function TokenRow({
const navigate = useNavigate()
const location = useLocation()
const mixpanelHandler = useMixpanelKyberAI()
const { account } = useActiveWeb3React()
const theme = useTheme()
const reachedMaxLimit = useIsReachMaxLimitWatchedToken()
const [showSwapMenu, setShowSwapMenu] = useState(false)
Expand All @@ -501,7 +504,6 @@ const TokenRow = React.memo(function TokenRow({

const handleWatchlistClick = (e: any) => {
e.stopPropagation()
if (!account) return
setLoadingStar(true)
if (isWatched) {
mixpanelHandler(MIXPANEL_TYPE.KYBERAI_ADD_TOKEN_TO_WATCHLIST, {
Expand Down Expand Up @@ -991,7 +993,7 @@ export default function TokenAnalysisList() {
</td>
</tr>
) : (
<tr style={{ height: '201px' }}>
<tr style={{ height: '250px' }}>
<Row
style={{
position: 'absolute',
Expand Down
Loading