chore: cherry-pick to asset picker network commit

MetaMask · Aug 28, 2024 · cdfa820 · cdfa820
1 parent 021800c
commit cdfa820
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/...mponents/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx b/...mponents/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
@@ -14,15 +14,12 @@ import {
   Modal,
   Box,
 } from '../../../component-library';
-import {
-  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
-  RPCDefinition,
-} from '../../../../../shared/constants/network';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 ///: END:ONLY_INCLUDE_IF
 import { NetworkListItem } from '../../network-list-item';
-import { getAllNetworks } from '../../../../selectors';
+import { getNetworkConfigurations } from '../../../../selectors';
 import { getProviderConfig } from '../../../../ducks/metamask/metamask';
 
 /**
@@ -47,8 +44,8 @@ export const AssetPickerModalNetwork = ({
 }: {
   isOpen: boolean;
   network?: ProviderConfig;
-  networks?: (ProviderConfig | RPCDefinition)[];
-  onNetworkChange: (network: ProviderConfig | RPCDefinition) => void;
+  networks?: ProviderConfig[];
+  onNetworkChange: (network: ProviderConfig) => void;
   onClose: () => void;
   onBack: () => void;
 }) => {
@@ -57,8 +54,7 @@ export const AssetPickerModalNetwork = ({
   ///: END:ONLY_INCLUDE_IF
 
   const currentNetwork = useSelector(getProviderConfig);
-  const allNetworks: (ProviderConfig | RPCDefinition)[] =
-    useSelector(getAllNetworks);
+  const allNetworks: ProviderConfig[] = useSelector(getNetworkConfigurations);
 
   const selectedNetwork: ProviderConfig = network ?? currentNetwork;
   const networksList = networks ?? allNetworks ?? [];
@@ -98,7 +94,7 @@ export const AssetPickerModalNetwork = ({
                   iconSrc={
                     networkConfig?.rpcPrefs &&
                     'imageUrl' in networkConfig.rpcPrefs
-                      ? networkConfig.rpcPrefs.imageUrl
+                      ? (networkConfig.rpcPrefs.imageUrl as string)
                       : CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
                           networkConfig.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
                         ]

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -50,7 +50,6 @@ import { getTopAssets } from '../../../../ducks/swaps/swaps';
 import { getRenderableTokenData } from '../../../../hooks/useTokensToSearch';
 import { getSwapsBlockedTokens } from '../../../../ducks/send';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
-import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
 import {
   ERC20Asset,
   NativeAsset,
@@ -327,16 +326,14 @@ export function AssetPickerModal({
             </Text>
           </Box>
         )}
-        {network && onNetworkPickerClick && (
+        {onNetworkPickerClick && (
           <Box className="network-picker">
             <PickerNetwork
-              label={network.nickname ?? 'Select network'}
+              label={network?.nickname ?? 'Select network'}
               src={
                 network?.rpcPrefs && 'imageUrl' in network.rpcPrefs
                   ? (network.rpcPrefs.imageUrl as string)
-                  : CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
-                      network.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
-                    ]
+                  : undefined
               }
               onClick={onNetworkPickerClick}
               data-testid="multichain-asset-picker__network"

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -149,7 +149,7 @@ export function AssetPicker({
           setShowAssetPickerModal(false);
         }}
         sendingAsset={sendingAsset}
-        network={networkProps ? networkProps.network : undefined}
+        network={networkProps?.network ? networkProps.network : undefined}
         onNetworkPickerClick={() => {
           setShowAssetPickerModal(false);
           setIsSelectingNetwork(true);