fix native assets outside of eth not working with preferred network (#…

…6252)
rainbow-me · Nov 4, 2024 · e7844a2 · e7844a2
1 parent 68f5b65
commit e7844a2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/__swaps__/screens/Swap/Swap.tsx b/src/__swaps__/screens/Swap/Swap.tsx
@@ -108,7 +108,7 @@ const useMountSignal = () => {
 const useCleanupOnUnmount = () => {
   useEffect(() => {
     return () => {
-      const highestValueEth = userAssetsStore.getState().getHighestValueEth();
+      const highestValueEth = userAssetsStore.getState().getHighestValueNativeAsset();
       const preferredNetwork = swapsStore.getState().preferredNetwork;
       const parsedAsset = highestValueEth
         ? parseSearchAsset({
@@ -139,7 +139,7 @@ const WalletAddressObserver = () => {
   const { setAsset } = useSwapContext();
 
   const setNewInputAsset = useCallback(() => {
-    const newHighestValueEth = userAssetsStore.getState().getHighestValueEth();
+    const newHighestValueEth = userAssetsStore.getState().getHighestValueNativeAsset();
 
     if (userAssetsStore.getState().filter !== 'all') {
       userAssetsStore.setState({ filter: 'all' });

diff --git a/src/components/DappBrowser/control-panel/ControlPanel.tsx b/src/components/DappBrowser/control-panel/ControlPanel.tsx
@@ -442,7 +442,7 @@ const HomePanel = ({
     if (!valid) return;
 
     swapsStore.setState({
-      inputAsset: userAssetsStore.getState().getHighestValueEth(),
+      inputAsset: userAssetsStore.getState().getHighestValueNativeAsset(),
     });
     InteractionManager.runAfterInteractions(() => {
       navigate(Routes.SWAP);
@@ -454,7 +454,7 @@ const HomePanel = ({
     if (!valid) return;
 
     swapsStore.setState({
-      inputAsset: userAssetsStore.getState().getHighestValueEth(),
+      inputAsset: userAssetsStore.getState().getHighestValueNativeAsset(),
     });
     InteractionManager.runAfterInteractions(() => {
       navigate(Routes.SWAP);

diff --git a/src/components/asset-list/RecyclerAssetList2/profile-header/ProfileActionButtonsRow.tsx b/src/components/asset-list/RecyclerAssetList2/profile-header/ProfileActionButtonsRow.tsx
@@ -175,7 +175,7 @@ function SwapButton() {
         category: 'home screen',
       });
       swapsStore.setState({
-        inputAsset: userAssetsStore.getState().getHighestValueEth(),
+        inputAsset: userAssetsStore.getState().getHighestValueNativeAsset(),
       });
       InteractionManager.runAfterInteractions(() => {
         navigate(Routes.SWAP);

diff --git a/src/components/context-menu-buttons/ChainContextMenu.tsx b/src/components/context-menu-buttons/ChainContextMenu.tsx
@@ -61,7 +61,7 @@ export const ChainContextMenu = ({
         actionTitle: chainsLabel[chainId],
         icon: {
           iconType: 'ASSET',
-          iconValue: `${chainsName[chainId]}Badge${chainId === ChainId.mainnet ? '' : 'NoShadow'}`,
+          iconValue: chainId === ChainId.mainnet ? 'ethereumBadge' : `${chainsName[chainId]}BadgeNoShadow`,
         },
       };
     });

diff --git a/src/state/assets/userAssets.ts b/src/state/assets/userAssets.ts
@@ -2,7 +2,7 @@ import { ParsedSearchAsset, UniqueId, UserAssetFilter } from '@/__swaps__/types/
 import { Address } from 'viem';
 import { RainbowError, logger } from '@/logger';
 import reduxStore, { AppState } from '@/redux/store';
-import { ETH_ADDRESS, supportedNativeCurrencies } from '@/references';
+import { supportedNativeCurrencies } from '@/references';
 import { createRainbowStore } from '@/state/internal/createRainbowStore';
 import { useStore } from 'zustand';
 import { swapsStore } from '@/state/swaps/swapsStore';
@@ -38,7 +38,7 @@ export interface UserAssetsState {
   getBalanceSortedChainList: () => ChainId[];
   getChainsWithBalance: () => ChainId[];
   getFilteredUserAssetIds: () => UniqueId[];
-  getHighestValueEth: () => ParsedSearchAsset | null;
+  getHighestValueNativeAsset: () => ParsedSearchAsset | null;
   getUserAsset: (uniqueId: UniqueId) => ParsedSearchAsset | null;
   getUserAssets: () => ParsedSearchAsset[];
   selectUserAssetIds: (selector: (asset: ParsedSearchAsset) => boolean, filter?: UserAssetFilter) => Generator<UniqueId, void, unknown>;
@@ -60,7 +60,7 @@ type UserAssetsStateToPersist = Omit<
   | 'getBalanceSortedChainList'
   | 'getChainsWithBalance'
   | 'getFilteredUserAssetIds'
-  | 'getHighestValueEth'
+  | 'getHighestValueNativeAsset'
   | 'getUserAsset'
   | 'getUserAssets'
   | 'selectUserAssetIds'
@@ -219,14 +219,14 @@ export const createUserAssetsStore = (address: Address | string) =>
           return filteredIds;
         }
       },
-      getHighestValueEth: () => {
+      getHighestValueNativeAsset: () => {
         const preferredNetwork = swapsStore.getState().preferredNetwork;
         const assets = get().userAssets;
 
         let highestValueEth = null;
 
         for (const [, asset] of assets) {
-          if (asset.mainnetAddress !== ETH_ADDRESS) continue;
+          if (!asset.isNativeAsset) continue;
 
           if (preferredNetwork && asset.chainId === preferredNetwork) {
             return asset;

diff --git a/src/state/sync/UserAssetsSync.tsx b/src/state/sync/UserAssetsSync.tsx
@@ -28,7 +28,7 @@ export const UserAssetsSync = function UserAssetsSync() {
         if (!isSwapsOpen || isUserAssetsStoreMissingData) {
           userAssetsStore.getState().setUserAssets(data as ParsedSearchAsset[]);
 
-          const inputAsset = userAssetsStore.getState().getHighestValueEth();
+          const inputAsset = userAssetsStore.getState().getHighestValueNativeAsset();
           useSwapsStore.setState({
             inputAsset,
             selectedOutputChainId: inputAsset?.chainId ?? ChainId.mainnet,