refactor: Update controller packages to v44

app/components/UI/ApproveTransactionReview/AddNickname/index.tsx

@@ -34,13 +34,11 @@ import {
 import {
   selectChainId,
   selectNetwork,
+  selectNetworkConfigurations,
   selectProviderType,
   selectRpcTarget,
 } from '../../../../selectors/networkController';
-import {
-  selectFrequentRpcList,
-  selectIdentities,
-} from '../../../../selectors/preferencesController';
+import { selectIdentities } from '../../../../selectors/preferencesController';
 
 const getAnalyticsParams = () => ({});
 
@@ -56,7 +54,7 @@ const AddNickname = (props: AddNicknameProps) => {
     providerRpcTarget,
     addressBook,
     identities,
-    frequentRpcList,
+    networkConfigurations,
   } = props;
 
   const [newNickname, setNewNickname] = useState(addressNickname);
@@ -159,7 +157,7 @@ const AddNickname = (props: AddNicknameProps) => {
   const hasBlockExplorer = shouldShowBlockExplorer({
     providerType,
     providerRpcTarget,
-    frequentRpcList,
+    networkConfigurations,
   });
 
   return (
@@ -173,7 +171,7 @@ const AddNickname = (props: AddNicknameProps) => {
           headerTextStyle={styles.headerText}
           iconStyle={styles.icon}
           providerRpcTarget={providerRpcTarget}
-          frequentRpcList={[]}
+          networkConfigurations={{}}
         />
       ) : (
         <>
@@ -268,7 +266,7 @@ const mapStateToProps = (state: any) => ({
   providerNetwork: selectNetwork(state),
   addressBook: state.engine.backgroundState.AddressBookController.addressBook,
   identities: selectIdentities(state),
-  frequentRpcList: selectFrequentRpcList(state),
+  networkConfigurations: selectNetworkConfigurations(state),
 });
 
 const mapDispatchToProps = (dispatch: any) => ({

app/components/UI/ApproveTransactionReview/AddNickname/types.ts

@@ -1,8 +1,10 @@
+import type { NetworkState } from '@metamask/network-controller';
+
 export interface AddNicknameProps {
   closeModal: () => void;
   address: string;
   addressNickname: string;
-  frequentRpcList: any;
+  networkConfigurations: NetworkState['networkConfigurations'];
   nicknameExists: boolean;
   showModalAlert: (config: any) => void;
   providerType: string;

app/components/UI/ApproveTransactionReview/ShowBlockExplorer/index.tsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { SafeAreaView, StyleSheet, View } from 'react-native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign';
 import { WebView } from 'react-native-webview';
+import type { NetworkState } from '@metamask/network-controller';
 
 import Text, {
   TextVariant,
@@ -37,7 +38,7 @@ interface ShowBlockExplorerProps {
   headerTextStyle?: any;
   iconStyle?: any;
   providerRpcTarget?: string;
-  frequentRpcList: any[];
+  networkConfigurations: NetworkState['networkConfigurations'];
   learnMoreURL?: string;
 }
 
@@ -50,7 +51,7 @@ const ShowBlockExplorer = (props: ShowBlockExplorerProps) => {
     headerTextStyle,
     iconStyle,
     providerRpcTarget,
-    frequentRpcList,
+    networkConfigurations,
     learnMoreURL,
   } = props;
 
@@ -61,13 +62,14 @@ const ShowBlockExplorer = (props: ShowBlockExplorerProps) => {
     (type === RPC
       ? `${findBlockExplorerForRpc(
           providerRpcTarget,
-          frequentRpcList,
+          networkConfigurations,
         )}/address/${address}`
       : getEtherscanAddressUrl(type, address));
   const title =
     type === RPC
-      ? new URL(findBlockExplorerForRpc(providerRpcTarget, frequentRpcList))
-          .hostname
+      ? new URL(
+          findBlockExplorerForRpc(providerRpcTarget, networkConfigurations),
+        ).hostname
       : getEtherscanBaseUrl(type).replace('https://', '');
 
   const onLoadProgress = ({

app/components/UI/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.test.tsx

@@ -34,7 +34,7 @@ describe('VerifyContractDetails', () => {
         tokenStandard={''}
         providerType={''}
         providerRpcTarget={''}
-        frequentRpcList={[]}
+        networkConfigurations={{}}
       />,
       { state: initialState },
     );

app/components/UI/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.tsx

@@ -30,7 +30,7 @@ const VerifyContractDetails = ({
   savedContactListToArray,
   providerType,
   providerRpcTarget,
-  frequentRpcList,
+  networkConfigurations,
   tokenStandard,
   tokenSymbol,
 }: VerifyContractDetailsProps) => {
@@ -68,10 +68,10 @@ const VerifyContractDetails = ({
 
   const showBlockExplorerIcon = useCallback(() => {
     if (providerType === RPC) {
-      return findBlockExplorerForRpc(providerRpcTarget, frequentRpcList);
+      return findBlockExplorerForRpc(providerRpcTarget, networkConfigurations);
     }
     return true;
-  }, [providerType, providerRpcTarget, frequentRpcList]);
+  }, [providerType, providerRpcTarget, networkConfigurations]);
 
   const hasBlockExplorer = showBlockExplorerIcon();
 

app/components/UI/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.types.ts

@@ -1,3 +1,5 @@
+import type { NetworkState } from '@metamask/network-controller';
+
 export interface VerifyContractDetailsProps {
   /**
    * contract address
@@ -22,5 +24,5 @@ export interface VerifyContractDetailsProps {
   tokenSymbol: string;
   providerType: string;
   providerRpcTarget: string;
-  frequentRpcList: any[];
+  networkConfigurations: NetworkState['networkConfigurations'];
 }

app/components/UI/ApproveTransactionReview/index.js

@@ -73,14 +73,14 @@ import createStyles from './styles';
 import {
   selectChainId,
   selectNetwork,
+  selectNetworkConfigurations,
   selectProviderType,
   selectTicker,
   selectRpcTarget,
 } from '../../../selectors/networkController';
 import { selectTokenList } from '../../../selectors/tokenListController';
 import { selectTokensLength } from '../../../selectors/tokensController';
 import { selectAccountsLength } from '../../../selectors/accountTrackerController';
-import { selectFrequentRpcList } from '../../../selectors/preferencesController';
 import Text, {
   TextVariant,
 } from '../../../component-library/components/Texts/Text';
@@ -251,7 +251,7 @@ class ApproveTransactionReview extends PureComponent {
     savedContactListToArray: PropTypes.array,
     closeVerifyContractDetails: PropTypes.func,
     shouldVerifyContractDetails: PropTypes.bool,
-    frequentRpcList: PropTypes.array,
+    networkConfigurations: PropTypes.object,
     providerRpcTarget: PropTypes.string,
     /**
      * Boolean that indicates if the native token buy is supported
@@ -307,7 +307,9 @@ class ApproveTransactionReview extends PureComponent {
       return;
     }
     try {
-      const eth = new Eth(Engine.context.NetworkController.provider);
+      const eth = new Eth(
+        Engine.context.NetworkController.getProviderAndBlockTracker().provider,
+      );
       const result = await fetchEstimatedMultiLayerL1Fee(eth, {
         txParams: transaction.transaction,
         chainId,
@@ -714,7 +716,7 @@ class ApproveTransactionReview extends PureComponent {
       showVerifyContractDetails,
       providerType,
       providerRpcTarget,
-      frequentRpcList,
+      networkConfigurations,
       isNativeTokenBuySupported,
       isGasEstimateStatusIn,
     } = this.props;
@@ -736,7 +738,7 @@ class ApproveTransactionReview extends PureComponent {
     const hasBlockExplorer = shouldShowBlockExplorer({
       providerType,
       providerRpcTarget,
-      frequentRpcList,
+      networkConfigurations,
     });
 
     const tokenLabel = `${
@@ -1005,7 +1007,7 @@ class ApproveTransactionReview extends PureComponent {
       savedContactListToArray,
       toggleModal,
       closeVerifyContractDetails,
-      frequentRpcList,
+      networkConfigurations,
     } = this.props;
     const {
       transaction: { to },
@@ -1038,7 +1040,7 @@ class ApproveTransactionReview extends PureComponent {
         providerType={providerType}
         tokenSymbol={tokenSymbol}
         providerRpcTarget={providerRpcTarget}
-        frequentRpcList={frequentRpcList}
+        networkConfigurations={networkConfigurations}
         tokenStandard={this.state.token?.tokenStandard}
       />
     );
@@ -1048,7 +1050,7 @@ class ApproveTransactionReview extends PureComponent {
     const {
       providerType,
       showVerifyContractDetails,
-      frequentRpcList,
+      networkConfigurations,
       providerRpcTarget,
     } = this.props;
     const { showBlockExplorerModal, address, learnMoreURL } = this.state;
@@ -1071,7 +1073,7 @@ class ApproveTransactionReview extends PureComponent {
         headerTextStyle={styles.headerText}
         iconStyle={styles.icon}
         providerRpcTarget={providerRpcTarget}
-        frequentRpcList={frequentRpcList}
+        networkConfigurations={networkConfigurations}
         learnMoreURL={learnMoreURL}
       />
     );
@@ -1176,7 +1178,7 @@ class ApproveTransactionReview extends PureComponent {
 
 const mapStateToProps = (state) => ({
   ticker: selectTicker(state),
-  frequentRpcList: selectFrequentRpcList(state),
+  networkConfigurations: selectNetworkConfigurations(state),
   transaction: getNormalizedTxState(state),
   tokensLength: selectTokensLength(state),
   accountsLength: selectAccountsLength(state),

app/components/UI/DrawerView/index.js

@@ -74,6 +74,7 @@ import { scale } from 'react-native-size-matters';
 import generateTestId from '../../../../wdio/utils/generateTestId';
 import { DRAWER_VIEW_LOCK_TEXT_ID } from '../../../../wdio/screen-objects/testIDs/Screens/DrawerView.testIds';
 import {
+  selectNetworkConfigurations,
   selectProviderConfig,
   selectTicker,
 } from '../../../selectors/networkController';
@@ -82,7 +83,6 @@ import { selectTokens } from '../../../selectors/tokensController';
 import { selectAccounts } from '../../../selectors/accountTrackerController';
 import { selectContractBalances } from '../../../selectors/tokenBalancesController';
 import {
-  selectFrequentRpcList,
   selectIdentities,
   selectSelectedAddress,
 } from '../../../selectors/preferencesController';
@@ -399,9 +399,9 @@ class DrawerView extends PureComponent {
      */
     ticker: PropTypes.string,
     /**
-     * Frequent RPC list from PreferencesController
+     * Network configurations
      */
-    frequentRpcList: PropTypes.array,
+    networkConfigurations: PropTypes.object,
     /**
      * Array of ERC20 assets
      */
@@ -712,11 +712,12 @@ class DrawerView extends PureComponent {
   };
 
   viewInEtherscan = () => {
-    const { selectedAddress, providerConfig, frequentRpcList } = this.props;
+    const { selectedAddress, providerConfig, networkConfigurations } =
+      this.props;
     if (providerConfig.type === RPC) {
       const blockExplorer = findBlockExplorerForRpc(
         providerConfig.rpcTarget,
-        frequentRpcList,
+        networkConfigurations,
       );
       const url = `${blockExplorer}/address/${selectedAddress}`;
       const title = new URL(blockExplorer).hostname;
@@ -768,12 +769,15 @@ class DrawerView extends PureComponent {
   };
 
   hasBlockExplorer = (providerType) => {
-    const { frequentRpcList } = this.props;
+    const { networkConfigurations } = this.props;
     if (providerType === RPC) {
       const {
         providerConfig: { rpcTarget },
       } = this.props;
-      const blockExplorer = findBlockExplorerForRpc(rpcTarget, frequentRpcList);
+      const blockExplorer = findBlockExplorerForRpc(
+        rpcTarget,
+        networkConfigurations,
+      );
       if (blockExplorer) {
         return true;
       }
@@ -857,11 +861,11 @@ class DrawerView extends PureComponent {
   getSections = () => {
     const {
       providerConfig: { type, rpcTarget },
-      frequentRpcList,
+      networkConfigurations,
     } = this.props;
     let blockExplorer, blockExplorerName;
     if (type === RPC) {
-      blockExplorer = findBlockExplorerForRpc(rpcTarget, frequentRpcList);
+      blockExplorer = findBlockExplorerForRpc(rpcTarget, networkConfigurations);
       blockExplorerName = getBlockExplorerName(blockExplorer);
     }
     return [
@@ -1250,7 +1254,7 @@ const mapStateToProps = (state) => ({
   accounts: selectAccounts(state),
   selectedAddress: selectSelectedAddress(state),
   identities: selectIdentities(state),
-  frequentRpcList: selectFrequentRpcList(state),
+  networkConfigurations: selectNetworkConfigurations(state),
   currentCurrency: selectCurrentCurrency(state),
   keyrings: state.engine.backgroundState.KeyringController.keyrings,
   networkModalVisible: state.modals.networkModalVisible,