fix: add test for migration

Author: salimtb

app/components/UI/AssetIcon/index.test.tsx

@@ -15,7 +15,7 @@ const mockInitialState = {
         selectedAddress: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
         useTokenDetection: true,
         useNftDetection: false,
-        useMultiRpcMigration: false,
+        showMultiRpcModal: false,
         displayNftMedia: true,
         useSafeChainsListValidation: false,
         isMultiAccountBalancesEnabled: true,

app/components/Views/MultiRpcModal/MultiRpcModal.test.tsx

@@ -12,15 +12,15 @@ import { backgroundState } from '../../../util/test/initial-root-state';
 import { NetworkStatus, RpcEndpointType } from '@metamask/network-controller';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 
-const setUseMultiRpcMigrationSpy = jest.spyOn(
+const setShowMultiRpcModalSpy = jest.spyOn(
   Engine.context.PreferencesController,
-  'setUseMultiRpcMigration',
+  'setShowMultiRpcModal',
 );
 
 jest.mock('../../../core/Engine', () => ({
   context: {
     PreferencesController: {
-      setUseMultiRpcMigration: jest.fn(),
+      setShowMultiRpcModal: jest.fn(),
     },
   },
 }));
@@ -30,7 +30,7 @@ const initialState: DeepPartial<RootState> = {
     backgroundState: {
       ...backgroundState,
       PreferencesController: {
-        useMultiRpcMigration: false,
+        showMultiRpcModal: false,
       },
       NetworkController: {
         selectedNetworkClientId: 'mainnet',
@@ -91,11 +91,11 @@ describe('MultiRpcModal', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
-  it('calls setUseMultiRpcMigration and trackEvent when clicking on allow button', () => {
+  it('calls setShowMultiRpcModal and trackEvent when clicking on allow button', () => {
     const { getByTestId } = renderComponent(initialState);
     const allowButton = getByTestId('allow');
 
     fireEvent.press(allowButton);
-    expect(setUseMultiRpcMigrationSpy).toHaveBeenCalledWith(true);
+    expect(setShowMultiRpcModalSpy).toHaveBeenCalledWith(true);
   });
 });

app/components/Views/MultiRpcModal/MultiRpcModal.tsx

@@ -51,7 +51,7 @@ const MultiRpcModal = () => {
 
   const dismissMultiRpcModalMigration = useCallback(() => {
     const { PreferencesController } = Engine.context;
-    PreferencesController.setUseMultiRpcMigration(false);
+    PreferencesController.setShowMultiRpcModal(false);
     trackEvent(MetaMetricsEvents.MULTI_RPC_MIGRATION_MODAL_ACCEPTED, {
       chainId,
     });

app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js

@@ -2227,7 +2227,9 @@ export class NetworkSettings extends PureComponent {
                     await this.onRpcUrlChangeWithName(url, name, type);
                     this.closeRpcModal();
                   }}
-                  showButtonIcon={rpcUrl !== url}
+                  showButtonIcon={
+                    rpcUrl !== url && type !== RpcEndpointType.Infura
+                  }
                   buttonIcon={IconName.Trash}
                   onButtonClick={async () => {
                     await this.onRpcUrlDelete(url);

app/components/Views/Wallet/index.tsx

@@ -81,7 +81,7 @@ import usePrevious from '../../hooks/usePrevious';
 import { selectSelectedInternalAccountChecksummedAddress } from '../../../selectors/accountsController';
 import { selectAccountBalanceByChainId } from '../../../selectors/accountTrackerController';
 import {
-  selectUseMultiRpcMigration,
+  selectShowMultiRpcModal,
   selectUseNftDetection,
 } from '../../../selectors/preferencesController';
 import {
@@ -306,7 +306,7 @@ const Wallet = ({
 
   const networkImageSource = useSelector(selectNetworkImageSource);
   const useNftDetection = useSelector(selectUseNftDetection);
-  const useMultiRpcMigration = useSelector(selectUseMultiRpcMigration);
+  const showMultiRpcModal = useSelector(selectShowMultiRpcModal);
   const isNFTAutoDetectionModalViewed = useSelector(
     (state: RootState) => state.security.isNFTAutoDetectionModalViewed,
   );
@@ -343,15 +343,15 @@ const Wallet = ({
     // navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
     //   screen: Routes.MODAL.MULTI_RPC_MIGRATION_MODAL,
     // });
-    console.log('useMultiRpcMigration ======', useMultiRpcMigration);
+    console.log('showMultiRpcModal ======', showMultiRpcModal);
 
-    if (useMultiRpcMigration) {
+    if (showMultiRpcModal) {
       navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
         screen: Routes.MODAL.MULTI_RPC_MIGRATION_MODAL,
       });
       dispatch(setMultiRpcMigrationModalOpen(true));
     }
-  }, [dispatch, useMultiRpcMigration, navigation]);
+  }, [dispatch, showMultiRpcModal, navigation]);
 
   useEffect(() => {
     if (

app/core/Engine.ts

@@ -543,7 +543,7 @@ class Engine {
         useNftDetection: true, // set this to true to enable nft detection by default to new users
         displayNftMedia: true,
         securityAlertsEnabled: true,
-        useMultiRpcMigration: true,
+        showMultiRpcModal: true,
         ...initialState.PreferencesController,
       },
     });

app/selectors/preferencesController.ts

@@ -17,10 +17,10 @@ export const selectUseNftDetection = createSelector(
     preferencesControllerState.useNftDetection,
 );
 
-export const selectUseMultiRpcMigration = createSelector(
+export const selectShowMultiRpcModal = createSelector(
   selectPreferencesControllerState,
   (preferencesControllerState: PreferencesState) =>
-    preferencesControllerState.useMultiRpcMigration,
+    preferencesControllerState.showMultiRpcModal,
 );
 
 export const selectUseTokenDetection = createSelector(