Skip to content

Commit 085e7d7

Browse files
[Issue-3843-webapp] refactor
1 parent 772a1ea commit 085e7d7

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

packages/extension-web-ui/src/Popup/Home/Tokens/UpperBlock.tsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { ThemeProps } from '@subwallet/extension-web-ui/types';
88
import { Button, Icon, Number, SwNumberProps, Tag, Tooltip } from '@subwallet/react-ui';
99
import CN from 'classnames';
1010
import { ArrowsClockwise, ArrowsLeftRight, CopySimple, Eye, EyeSlash, PaperPlaneTilt, PlusMinus } from 'phosphor-react';
11-
import React, { useCallback, useEffect, useState } from 'react';
12-
import { useNavigate, useSearchParams } from 'react-router-dom';
11+
import React, { useCallback, useState } from 'react';
1312
import styled from 'styled-components';
1413

1514
type Props = ThemeProps & {
@@ -43,9 +42,6 @@ function Component (
4342
const { isShowBalance } = useSelector((state) => state.settings);
4443
const [reloading, setReloading] = useState(false);
4544
const { currencyData } = useSelector((state) => state.price);
46-
const navigate = useNavigate();
47-
const [searchParams, setSearchParams] = useSearchParams();
48-
const openBuyTokens = searchParams.get('openBuyTokens') || '';
4945

5046
const onChangeShowBalance = useCallback(() => {
5147
saveShowBalance(!isShowBalance).catch(console.error);
@@ -60,13 +56,6 @@ function Component (
6056
});
6157
}, []);
6258

63-
useEffect(() => {
64-
if (openBuyTokens === 'true') {
65-
searchParams.delete('openBuyTokens');
66-
navigate('/buy-tokens', { replace: true });
67-
}
68-
}, [openBuyTokens, onOpenBuyTokens, searchParams, navigate, setSearchParams]);
69-
7059
return (
7160
<div className={`tokens-upper-block ${className} ${isShrink ? '-shrink' : ''}`}>
7261
<div className='__total-balance-value-container'>

packages/extension-web-ui/src/Popup/Home/Tokens/index.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Coins, FadersHorizontal, SlidersHorizontal } from 'phosphor-react';
2828
import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
2929
import { Trans } from 'react-i18next';
3030
import { useSelector } from 'react-redux';
31-
import { useNavigate, useOutletContext } from 'react-router-dom';
31+
import { useNavigate, useOutletContext, useSearchParams } from 'react-router-dom';
3232
import styled from 'styled-components';
3333
import { useLocalStorage } from 'usehooks-ts';
3434

@@ -192,6 +192,9 @@ const Component = (): React.ReactElement => {
192192
}));
193193
}, [accountProxies]);
194194

195+
const [searchParams, setSearchParams] = useSearchParams();
196+
const openBuyTokens = searchParams.get('openBuyTokens') || '';
197+
195198
const onCloseAccountSelector = useCallback(() => {
196199
setIsShowTonWarning(false);
197200
inactiveModal(tonAccountSelectorModalId);
@@ -363,6 +366,13 @@ const Component = (): React.ReactElement => {
363366
setShowSearchInput?.(true);
364367
}, [setSearchPlaceholder, setShowSearchInput, t]);
365368

369+
useEffect(() => {
370+
if (openBuyTokens === 'true' && isSupportBuyTokens && !isWebUI) {
371+
searchParams.delete('openBuyTokens');
372+
onOpenBuyTokens();
373+
}
374+
}, [openBuyTokens, onOpenBuyTokens, searchParams, navigate, setSearchParams, isSupportBuyTokens, isWebUI]);
375+
366376
useEffect(() => {
367377
window.addEventListener('resize', handleResize);
368378

0 commit comments

Comments
 (0)