diff --git a/apps/web/src/components/Menu/index.tsx b/apps/web/src/components/Menu/index.tsx index 0807a61090265..c63e38dcaa201 100644 --- a/apps/web/src/components/Menu/index.tsx +++ b/apps/web/src/components/Menu/index.tsx @@ -139,7 +139,7 @@ const Menu = (props) => { activeSubItem={activeSubMenuItem?.href} activeSubItemChildItem={activeSubChildMenuItem?.href} buyCakeLabel={t('Buy CAKE')} - buyCakeLink="https://pancakeswap.finance/swap?outputCurrency=0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82&chainId=56" + buyCakeLink="/swap?outputCurrency=0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82&chainId=56" {...props} /> ) diff --git a/apps/web/src/hooks/useSwitchNetwork.ts b/apps/web/src/hooks/useSwitchNetwork.ts index cbe33f1d872a8..91c35832a5645 100644 --- a/apps/web/src/hooks/useSwitchNetwork.ts +++ b/apps/web/src/hooks/useSwitchNetwork.ts @@ -21,13 +21,15 @@ export function useSwitchNetworkLocal() { }, []) return useCallback( - (chainId: number) => { + (newChainId: number) => { + const { chainId, ...restQuery } = router.query + router.replace( { pathname: router.pathname, query: { - ...router.query, - chain: CHAIN_QUERY_NAME[chainId], + ...restQuery, + chain: CHAIN_QUERY_NAME[newChainId], }, }, undefined, @@ -35,11 +37,11 @@ export function useSwitchNetworkLocal() { shallow: true, }, ) - setQueryChainId(chainId) + setQueryChainId(newChainId) // Blocto in-app browser throws change event when no account change which causes user state reset therefore // this event should not be handled to avoid unexpected behaviour. if (!isBloctoMobileApp) { - clearUserStates(dispatch, { chainId, newChainId: chainId }) + clearUserStates(dispatch, { chainId: newChainId, newChainId }) } }, [dispatch, isBloctoMobileApp, setQueryChainId, router], diff --git a/apps/web/src/utils/addQueryToPath.ts b/apps/web/src/utils/addQueryToPath.ts index d7abf93fcc745..20f1f5446cf3d 100644 --- a/apps/web/src/utils/addQueryToPath.ts +++ b/apps/web/src/utils/addQueryToPath.ts @@ -3,7 +3,11 @@ export function addQueryToPath(path: string, queryParams: { [key: string]: strin const searchParams = new URLSearchParams(search) Object.keys(queryParams).forEach((key) => { - searchParams.set(key, queryParams[key]) + if (key === 'chain') { + searchParams.delete('chainId') + } else { + searchParams.set(key, queryParams[key]) + } }) return `${pathname}?${searchParams.toString()}` diff --git a/apps/web/src/views/Home/components/Banners/OortTradingBanner.tsx b/apps/web/src/views/Home/components/Banners/OortTradingBanner.tsx index 270726ccf43bd..401284e045102 100644 --- a/apps/web/src/views/Home/components/Banners/OortTradingBanner.tsx +++ b/apps/web/src/views/Home/components/Banners/OortTradingBanner.tsx @@ -32,7 +32,7 @@ const OORT_PATH = `${ASSET_CDN}/web/banners/oort` const floatingAsset = `${ASSET_CDN}/web/banners/oort/oort-coin.png` const tradeNowLink = - 'https://pancakeswap.finance/swap?outputCurrency=0x5651fA7a726B9Ec0cAd00Ee140179912B6E73599&utm_source=PCSWebsite&utm_medium=HomePageBanner&utm_campaign=SwapOORT&utm_id=OORTTradingCompetition' + '/swap?outputCurrency=0x5651fA7a726B9Ec0cAd00Ee140179912B6E73599&utm_source=PCSWebsite&utm_medium=HomePageBanner&utm_campaign=SwapOORT&utm_id=OORTTradingCompetition' const learnMoreLink = 'https://blog.pancakeswap.finance/articles/join-the-oort-trading-competition-on-pancake-swap-to-win-50-000?utm_source=PCSWebsite&utm_medium=HomePageBanner&utm_campaign=SwapOORT&utm_id=OORTTradingCompetition' diff --git a/apps/web/src/views/PancakeSquad/components/EventStepsSection/config.tsx b/apps/web/src/views/PancakeSquad/components/EventStepsSection/config.tsx index 483ef949ac231..b10a3417af08d 100644 --- a/apps/web/src/views/PancakeSquad/components/EventStepsSection/config.tsx +++ b/apps/web/src/views/PancakeSquad/components/EventStepsSection/config.tsx @@ -61,7 +61,7 @@ const stepsConfigBuilder = ({ t, userInfos, eventInfos, userStatus, account, the <>