Skip to content

Commit b28ecff

Browse files
mms-1876: swap default pair
1 parent dc6fd5e commit b28ecff

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ui/hooks/swap/useSwapDefaultToToken.ts

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ function useSwapDefaultToToken(): UseSwapDefaultToTokenReturnType {
2525
const fromToken = useSelector(getFromToken, isEqual);
2626

2727
const defaultToToken = useMemo(() => {
28+
if (!fromToken) {
29+
return null;
30+
}
31+
2832
const chainIdDefaultToken =
2933
SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
3034
chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP

ui/pages/swaps/prepare-swap-page/prepare-swap-page.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ export default function PrepareSwapPage({
282282
shuffledTokensList,
283283
tokenBucketPriority: TokenBucketPriority.top,
284284
});
285-
console.log('olha o to token', toToken);
286285
const selectedToToken =
287286
tokensToSearchSwapFrom.find(({ address }) =>
288287
isEqualCaseInsensitive(address, toToken?.address),
@@ -760,10 +759,11 @@ export default function PrepareSwapPage({
760759

761760
// Set the default destination token for the swap
762761
useEffect(() => {
763-
if (!selectedToToken?.address && defaultToToken) {
762+
if (fromToken?.address && !selectedToToken?.address && defaultToToken) {
764763
dispatch(setSwapToToken(defaultToToken));
765764
}
766-
}, [defaultToToken, dispatch, selectedToToken?.address]);
765+
// eslint-disable-next-line react-hooks/exhaustive-deps
766+
}, [fromToken?.address]);
767767

768768
const onOpenImportTokenModalClick = (item) => {
769769
setTokenForImport(item);

0 commit comments

Comments
 (0)