Skip to content

Commit 9717b76

Browse files
committed
fix bug network auto switching back to default
1 parent 3dc1c41 commit 9717b76

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

packages/core-mobile/app/new/features/swapV2/screens/SelectSwapV2TokenScreen.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import React, { useMemo, useState, useCallback, useEffect, useRef } from 'react'
12
import { ChainId, Network } from '@avalabs/core-chains-sdk'
23
import {
34
ActivityIndicator,
@@ -15,7 +16,6 @@ import { ErrorState } from 'common/components/ErrorState'
1516
import { ListScreenV2 } from 'common/components/ListScreenV2'
1617
import { useRouter } from 'expo-router'
1718
import { LogoWithNetwork } from 'features/portfolio/assets/components/LogoWithNetwork'
18-
import React, { useCallback, useEffect, useMemo, useState } from 'react'
1919
import { ListRenderItem } from '@shopify/flash-list'
2020
import { LocalTokenWithBalance } from 'store/balance'
2121
import { getCaip2ChainId } from 'utils/caip2ChainIds'
@@ -48,17 +48,23 @@ export const SelectSwapV2TokenScreen = ({
4848
undefined
4949
)
5050

51-
// Set default network when networks are loaded
51+
// Track if we've set the default network
52+
const hasSetDefaultNetwork = useRef(false)
53+
54+
// Set default network once when networks are loaded
5255
useEffect(() => {
53-
if (!networks || networks.length === 0) return
56+
if (!networks || networks.length === 0 || hasSetDefaultNetwork.current)
57+
return
5458

5559
if (defaultNetworkChainId) {
5660
const found = networks.find(n => n.chainId === defaultNetworkChainId)
5761
setSelectedNetwork(found ?? networks[0])
58-
} else if (!selectedNetwork) {
62+
} else {
5963
setSelectedNetwork(networks[0])
6064
}
61-
}, [defaultNetworkChainId, networks, selectedNetwork])
65+
66+
hasSetDefaultNetwork.current = true
67+
}, [defaultNetworkChainId, networks])
6268

6369
// Get CAIP2 ID for selected network
6470
const caip2Id = useMemo(() => {

0 commit comments

Comments
 (0)