From f03f774c36ce8ea9ac73476d0bf54be320b48300 Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Thu, 3 Oct 2024 16:12:13 +0200
Subject: [PATCH] fix: add migration ui for network controller v21

---
 app/actions/security/index.ts                 |  16 +-
 .../CellSelectWithMenu/CellSelectWithMenu.tsx |  16 +-
 .../CellSelectWithMenu.test.tsx.snap          |  10 +-
 .../ListItemMultiSelectButton.styles.ts       |   5 +-
 .../ListItemMultiSelectButton.tsx             |  40 +-
 .../ListItemMultiSelectButton.types.ts        |  14 +
 .../ListItemMultiSelectButton.test.tsx.snap   |  10 +-
 app/components/Nav/App/index.js               |  10 +-
 app/components/UI/AssetIcon/index.test.tsx    |   1 +
 .../MultiRpcModal/MultiRpcModal.constants.ts  |  30 +
 .../MultiRpcModal/MultiRpcModal.styles.ts     |  42 +
 .../MultiRpcModal/MultiRpcModal.test.tsx      |  61 ++
 .../Views/MultiRpcModal/MultiRpcModal.tsx     | 138 +++
 .../__snapshots__/MultiRpcModal.test.tsx.snap | 595 +++++++++++
 app/components/Views/MultiRpcModal/index.ts   |   1 +
 app/components/Views/Wallet/index.tsx         |   3 +-
 app/constants/navigation/Routes.ts            |   1 +
 app/core/Analytics/MetaMetrics.events.ts      |   6 +
 app/images/networks1.png                      | Bin 0 -> 5923 bytes
 app/selectors/preferencesController.ts        |   6 +
 app/util/test/initial-background-state.json   |   1 +
 index.js                                      |   1 -
 locales/languages/en.json                     |   5 +
 ...tamask+preferences-controller+11.0.0.patch | 974 ++++++++++++++++--
 yarn.lock                                     |   4 +-
 25 files changed, 1861 insertions(+), 129 deletions(-)
 create mode 100644 app/components/Views/MultiRpcModal/MultiRpcModal.constants.ts
 create mode 100644 app/components/Views/MultiRpcModal/MultiRpcModal.styles.ts
 create mode 100644 app/components/Views/MultiRpcModal/MultiRpcModal.test.tsx
 create mode 100644 app/components/Views/MultiRpcModal/MultiRpcModal.tsx
 create mode 100644 app/components/Views/MultiRpcModal/__snapshots__/MultiRpcModal.test.tsx.snap
 create mode 100644 app/components/Views/MultiRpcModal/index.ts
 create mode 100644 app/images/networks1.png

diff --git a/app/actions/security/index.ts b/app/actions/security/index.ts
index e0e87a0ef550..661c1d1119d0 100644
--- a/app/actions/security/index.ts
+++ b/app/actions/security/index.ts
@@ -8,6 +8,7 @@ export enum ActionType {
   SET_AUTOMATIC_SECURITY_CHECKS_MODAL_OPEN = 'SET_AUTOMATIC_SECURITY_CHECKS_MODAL_OPEN',
   SET_DATA_COLLECTION_FOR_MARKETING = 'SET_DATA_COLLECTION_FOR_MARKETING',
   SET_NFT_AUTO_DETECTION_MODAL_OPEN = 'SET_NFT_AUTO_DETECTION_MODAL_OPEN',
+  SET_MULTI_RPC_MIGRATION_MODAL_OPEN = 'SET_MULTI_RPC_MIGRATION_MODAL_OPEN',
 }
 
 export interface AllowLoginWithRememberMeUpdated
@@ -35,6 +36,11 @@ export interface SetNftAutoDetectionModalOpen
   open: boolean;
 }
 
+export interface SetMultiRpcMigrationModalOpen
+  extends ReduxAction<ActionType.SET_MULTI_RPC_MIGRATION_MODAL_OPEN> {
+  open: boolean;
+}
+
 export interface SetDataCollectionForMarketing
   extends ReduxAction<ActionType.SET_DATA_COLLECTION_FOR_MARKETING> {
   enabled: boolean;
@@ -46,7 +52,8 @@ export type Action =
   | UserSelectedAutomaticSecurityChecksOptions
   | SetAutomaticSecurityChecksModalOpen
   | SetDataCollectionForMarketing
-  | SetNftAutoDetectionModalOpen;
+  | SetNftAutoDetectionModalOpen
+  | SetMultiRpcMigrationModalOpen;
 
 export const setAllowLoginWithRememberMe = (
   enabled: boolean,
@@ -82,6 +89,13 @@ export const setNftAutoDetectionModalOpen = (
   open,
 });
 
+export const setMultiRpcMigrationModalOpen = (
+  open: boolean,
+): SetMultiRpcMigrationModalOpen => ({
+  type: ActionType.SET_MULTI_RPC_MIGRATION_MODAL_OPEN,
+  open,
+});
+
 export const setDataCollectionForMarketing = (enabled: boolean) => ({
   type: ActionType.SET_DATA_COLLECTION_FOR_MARKETING,
   enabled,
diff --git a/app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx b/app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx
index ff8df60913ae..e18ed0465956 100644
--- a/app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx
+++ b/app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx
@@ -33,6 +33,7 @@ const CellSelectWithMenu = ({
   tagLabel,
   isSelected = false,
   children,
+  withAvatar = true,
   ...props
 }: CellSelectWithMenuProps) => {
   const { styles } = useStyles(styleSheet, { style });
@@ -46,12 +47,15 @@ const CellSelectWithMenu = ({
     >
       <View style={styles.cellBase}>
         {/* DEV Note: Account Avatar should be replaced with Avatar with Badge whenever available */}
-        <Avatar
-          style={styles.avatar}
-          testID={CellModalSelectorsIDs.BASE_AVATAR}
-          size={DEFAULT_CELLBASE_AVATAR_SIZE}
-          {...avatarProps}
-        />
+        {withAvatar ? (
+          <Avatar
+            style={styles.avatar}
+            testID={CellModalSelectorsIDs.BASE_AVATAR}
+            size={DEFAULT_CELLBASE_AVATAR_SIZE}
+            {...avatarProps}
+          />
+        ) : null}
+
         <View style={styles.cellBaseInfo}>
           <Text
             numberOfLines={1}
diff --git a/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap b/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
index 3e2ad44c55f9..f86327146856 100644
--- a/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
+++ b/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
         "opacity": 1,
         "padding": 16,
         "position": "relative",
-        "width": "95%",
+        "width": "90%",
         "zIndex": 1,
       }
     }
@@ -287,7 +287,13 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
       </View>
     </View>
   </TouchableOpacity>
-  <View>
+  <View
+    style={
+      {
+        "paddingHorizontal": 20,
+      }
+    }
+  >
     <TouchableOpacity
       accessibilityRole="button"
       accessible={true}
diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts
index b3a9a9bde27b..d3ff43c9cb2a 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts
@@ -28,7 +28,7 @@ const styleSheet = (params: {
         position: 'relative',
         opacity: isDisabled ? 0.5 : 1,
         padding: 16,
-        width: '95%',
+        width: '90%',
         zIndex: 1,
       } as ViewStyle,
       style,
@@ -86,6 +86,9 @@ const styleSheet = (params: {
       paddingLeft: 8,
       paddingTop: 32,
     },
+    buttonIcon: {
+      paddingHorizontal: 20,
+    },
   });
 };
 
diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
index e8610e457352..3860990db0f4 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
@@ -20,6 +20,12 @@ import {
   IconColor,
   IconName,
 } from '../../../component-library/components/Icons/Icon';
+import Button, {
+  ButtonSize,
+  ButtonVariants,
+  ButtonWidthTypes,
+} from '../../../component-library/components/Buttons/Button';
+import { TextVariant } from '../../../component-library/components/Texts/Text';
 
 const ListItemMultiSelectButton: React.FC<ListItemMultiSelectButtonProps> = ({
   style,
@@ -27,7 +33,9 @@ const ListItemMultiSelectButton: React.FC<ListItemMultiSelectButtonProps> = ({
   isDisabled = false,
   children,
   gap = DEFAULT_LISTITEMMULTISELECT_GAP,
+  showButtonIcon = true,
   buttonIcon = IconName.MoreVertical,
+  textButton = null,
   ...props
 }) => {
   const { styles } = useStyles(styleSheet, {
@@ -55,15 +63,29 @@ const ListItemMultiSelectButton: React.FC<ListItemMultiSelectButtonProps> = ({
           </View>
         )}
       </TouchableOpacity>
-      <View>
-        <ButtonIcon
-          iconName={buttonIcon}
-          iconColor={IconColor.Default}
-          testID={BUTTON_TEST_ID}
-          onPress={props.onButtonClick}
-          accessibilityRole="button"
-        />
-      </View>
+      {showButtonIcon ? (
+        <View style={styles.buttonIcon}>
+          <ButtonIcon
+            iconName={buttonIcon}
+            iconColor={IconColor.Default}
+            testID={BUTTON_TEST_ID}
+            onPress={props.onButtonClick}
+            accessibilityRole="button"
+          />
+        </View>
+      ) : null}
+      {textButton ? (
+        <View>
+          <Button
+            variant={ButtonVariants.Link}
+            onPress={props.onButtonClick as () => void}
+            labelTextVariant={TextVariant.BodyMD}
+            size={ButtonSize.Lg}
+            width={ButtonWidthTypes.Auto}
+            label={textButton}
+          />
+        </View>
+      ) : null}
     </View>
   );
 };
diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.types.ts b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.types.ts
index 7178221c24cc..7c5742e1d510 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.types.ts
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.types.ts
@@ -35,6 +35,20 @@ export interface ListItemMultiSelectButtonProps
    * Optional button onClick rpc modal function
    */
   onTextClick?: (() => void) | undefined;
+
+  /**
+   * Optional property to add avatar
+   */
+  withAvatar?: boolean;
+
+  /**
+   * Optional property to show icon
+   */
+  showButtonIcon?: boolean;
+  /**
+   * Optional property to show text button
+   */
+  textButton?: string | null;
 }
 
 /**
diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap b/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
index 0baaf1dd60bb..a1a0b239ae69 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`ListItemMultiSelectButton should render correctly with default props 1`
         "opacity": 1,
         "padding": 16,
         "position": "relative",
-        "width": "95%",
+        "width": "90%",
         "zIndex": 1,
       }
     }
@@ -52,7 +52,13 @@ exports[`ListItemMultiSelectButton should render correctly with default props 1`
       </View>
     </View>
   </TouchableOpacity>
-  <View>
+  <View
+    style={
+      {
+        "paddingHorizontal": 20,
+      }
+    }
+  >
     <TouchableOpacity
       accessibilityRole="button"
       accessible={true}
diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
index 27bc4c34d8d0..fd14e13f8579 100644
--- a/app/components/Nav/App/index.js
+++ b/app/components/Nav/App/index.js
@@ -127,6 +127,7 @@ import { SnapsExecutionWebView } from '../../../lib/snaps';
 import OptionsSheet from '../../UI/SelectOptionSheet/OptionsSheet';
 import FoxLoader from '../../../components/UI/FoxLoader';
 import { AppStateEventProcessor } from '../../../core/AppStateEventListener';
+import MultiRpcModal from '../../../components/Views/MultiRpcModal/MultiRpcModal';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -396,7 +397,6 @@ const App = (props) => {
       });
   }, [handleDeeplink]);
 
-
   useEffect(() => {
     if (navigator) {
       // Initialize deep link manager
@@ -687,11 +687,17 @@ const App = (props) => {
         name={Routes.MODAL.NFT_AUTO_DETECTION_MODAL}
         component={NFTAutoDetectionModal}
       />
+      {isNetworkUiRedesignEnabled() ? (
+        <Stack.Screen
+          name={Routes.MODAL.MULTI_RPC_MIGRATION_MODAL}
+          component={MultiRpcModal}
+        />
+      ) : null}
+
       <Stack.Screen
         name={Routes.SHEET.SHOW_TOKEN_ID}
         component={ShowTokenIdSheet}
       />
-
       <Stack.Screen
         name={Routes.SHEET.ORIGIN_SPAM_MODAL}
         component={OriginSpamModal}
diff --git a/app/components/UI/AssetIcon/index.test.tsx b/app/components/UI/AssetIcon/index.test.tsx
index f0451a2a5f5a..84c0941722a7 100644
--- a/app/components/UI/AssetIcon/index.test.tsx
+++ b/app/components/UI/AssetIcon/index.test.tsx
@@ -15,6 +15,7 @@ const mockInitialState = {
         selectedAddress: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
         useTokenDetection: true,
         useNftDetection: false,
+        showMultiRpcModal: false,
         displayNftMedia: true,
         useSafeChainsListValidation: false,
         isMultiAccountBalancesEnabled: true,
diff --git a/app/components/Views/MultiRpcModal/MultiRpcModal.constants.ts b/app/components/Views/MultiRpcModal/MultiRpcModal.constants.ts
new file mode 100644
index 000000000000..8746e74f4dd7
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/MultiRpcModal.constants.ts
@@ -0,0 +1,30 @@
+export const SAMPLE_NETWORK_CONFIGURATIONS = {
+  '0x1': {
+    blockExplorerUrls: [],
+    chainId: '0x1',
+    defaultRpcEndpointIndex: 0,
+    name: 'Mainnet',
+    nativeCurrency: 'ETH',
+    rpcEndpoints: [
+      {
+        networkClientId: 'mainnet',
+        type: 'infura',
+        url: 'https://mainnet.infura.io/v3/{infuraProjectId}',
+      },
+    ],
+  },
+  '0x5': {
+    blockExplorerUrls: [],
+    chainId: '0x5',
+    defaultRpcEndpointIndex: 0,
+    name: 'Goerli',
+    nativeCurrency: 'GoerliETH',
+    rpcEndpoints: [
+      {
+        networkClientId: 'goerli',
+        type: 'infura',
+        url: 'https://goerli.infura.io/v3/{infuraProjectId}',
+      },
+    ],
+  },
+};
diff --git a/app/components/Views/MultiRpcModal/MultiRpcModal.styles.ts b/app/components/Views/MultiRpcModal/MultiRpcModal.styles.ts
new file mode 100644
index 000000000000..eef668ccb386
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/MultiRpcModal.styles.ts
@@ -0,0 +1,42 @@
+import { StyleSheet } from 'react-native';
+
+/**
+ * Style sheet function for NFT auto detection modal component.
+ *
+ * @returns StyleSheet object.
+ */
+const styleSheet = () =>
+  StyleSheet.create({
+    container: {
+      alignItems: 'center',
+    },
+    image: {
+      width: 102.64,
+      height: 102.64,
+    },
+    description: {
+      marginLeft: 32,
+      marginRight: 32,
+    },
+    content: {
+      height: '80%',
+    },
+    textDescription: {
+      textAlign: 'center',
+    },
+    textContainer: {
+      // paddingTop: 24,
+      marginLeft: 16,
+      marginRight: 16,
+      paddingVertical: 16,
+    },
+    buttonsContainer: {
+      // paddingTop: 24,
+      marginLeft: 16,
+      marginRight: 16,
+      paddingVertical: 16,
+    },
+    spacer: { height: 8 },
+  });
+
+export default styleSheet;
diff --git a/app/components/Views/MultiRpcModal/MultiRpcModal.test.tsx b/app/components/Views/MultiRpcModal/MultiRpcModal.test.tsx
new file mode 100644
index 000000000000..60d6cc8789aa
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/MultiRpcModal.test.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import MultiRpcModal from './MultiRpcModal';
+import renderWithProvider, {
+  DeepPartial,
+} from '../../../util/test/renderWithProvider';
+import { createStackNavigator } from '@react-navigation/stack';
+import Routes from '../../../constants/navigation/Routes';
+import Engine from '../../../core/Engine';
+import { fireEvent } from '@testing-library/react-native';
+import { RootState } from 'app/reducers';
+import { backgroundState } from '../../../util/test/initial-root-state';
+
+const setShowMultiRpcModalSpy = jest.spyOn(
+  Engine.context.PreferencesController,
+  'setShowMultiRpcModal',
+);
+
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    PreferencesController: {
+      setShowMultiRpcModal: jest.fn(),
+    },
+  },
+}));
+
+const initialState = {
+  engine: {
+    backgroundState,
+  },
+};
+
+const Stack = createStackNavigator();
+
+const renderComponent = (state: DeepPartial<RootState> = {}) =>
+  renderWithProvider(
+    <Stack.Navigator>
+      <Stack.Screen name={Routes.MODAL.MULTI_RPC_MIGRATION_MODAL}>
+        {() => <MultiRpcModal />}
+      </Stack.Screen>
+    </Stack.Navigator>,
+    { state },
+  );
+
+describe('MultiRpcModal', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('render matches snapshot', () => {
+    const { toJSON } = renderComponent(initialState);
+    expect(toJSON()).toMatchSnapshot();
+  });
+
+  it('calls setShowMultiRpcModal and trackEvent when clicking on allow button', () => {
+    const { getByTestId } = renderComponent(initialState);
+    const allowButton = getByTestId('allow');
+
+    fireEvent.press(allowButton);
+    expect(setShowMultiRpcModalSpy).toHaveBeenCalledWith(false);
+  });
+});
diff --git a/app/components/Views/MultiRpcModal/MultiRpcModal.tsx b/app/components/Views/MultiRpcModal/MultiRpcModal.tsx
new file mode 100644
index 000000000000..ac303e3a8666
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/MultiRpcModal.tsx
@@ -0,0 +1,138 @@
+import React, { useRef, useCallback } from 'react';
+import { ScrollView } from 'react-native-gesture-handler';
+import BottomSheet, {
+  BottomSheetRef,
+} from '../../../component-library/components/BottomSheets/BottomSheet';
+import { strings } from '../../../../locales/i18n';
+import { useStyles } from '../../../component-library/hooks';
+import styleSheet from './MultiRpcModal.styles';
+import SheetHeader from '../../../component-library/components/Sheet/SheetHeader';
+import Text from '../../../component-library/components/Texts/Text';
+import { View, Image } from 'react-native';
+import { NftDetectionModalSelectorsIDs } from '../../../../e2e/selectors/Modals/NftDetectionModal.selectors';
+
+import Button, {
+  ButtonSize,
+  ButtonVariants,
+  ButtonWidthTypes,
+} from '../../../component-library/components/Buttons/Button';
+import { useNavigation } from '@react-navigation/native';
+import Engine from '../../../core/Engine';
+import { useMetrics } from '../../../components/hooks/useMetrics';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+import {
+  selectChainId,
+  selectNetworkConfigurations,
+} from '../../../selectors/networkController';
+import { useSelector } from 'react-redux';
+import Cell, {
+  CellVariant,
+} from '../../../component-library/components/Cells/Cell';
+import { NetworkConfiguration } from '@metamask/network-controller';
+import {
+  AvatarSize,
+  AvatarVariant,
+} from '../../../component-library/components/Avatars/Avatar';
+import { IconName } from '../../../component-library/components/Icons/Icon';
+import { getNetworkImageSource } from '../../../util/networks';
+import Routes from '../../../constants/navigation/Routes';
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires, import/no-commonjs
+const networkImage = require('../../../images/networks1.png');
+
+const MultiRpcModal = () => {
+  const { styles } = useStyles(styleSheet, {});
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const chainId = useSelector(selectChainId);
+  const networkConfigurations = useSelector(selectNetworkConfigurations);
+  const { trackEvent } = useMetrics();
+  const { navigate } = useNavigation();
+
+  const dismissMultiRpcModalMigration = useCallback(() => {
+    const { PreferencesController } = Engine.context;
+    PreferencesController.setShowMultiRpcModal(false);
+    trackEvent(MetaMetricsEvents.MULTI_RPC_MIGRATION_MODAL_ACCEPTED, {
+      chainId,
+    });
+
+    if (sheetRef?.current) {
+      sheetRef.current.onCloseBottomSheet();
+    } else {
+      navigation.goBack();
+    }
+  }, [trackEvent, chainId, navigation]);
+
+  return (
+    <BottomSheet ref={sheetRef}>
+      <SheetHeader title={'Network RPCs Updated'} />
+      <View
+        testID={NftDetectionModalSelectorsIDs.CONTAINER}
+        style={styles.textContainer}
+      >
+        <ScrollView style={styles.content}>
+          <View style={styles.description}>
+            <Text style={styles.textDescription}>
+              {strings('multi_rpc_migration_modal.description')}
+            </Text>
+          </View>
+          <View style={styles.container}>
+            <Image source={networkImage} style={styles.image} />
+          </View>
+
+          <View>
+            {Object.values(networkConfigurations).map(
+              (networkConfiguration, index) => (
+                <Cell
+                  key={index}
+                  variant={CellVariant.SelectWithMenu}
+                  title={
+                    networkConfiguration.nickname ||
+                    networkConfiguration.chainId
+                  }
+                  secondaryText={networkConfiguration.rpcUrl}
+                  avatarProps={{
+                    variant: AvatarVariant.Network,
+                    name:
+                      networkConfiguration.nickname ||
+                      networkConfiguration.chainId,
+                    //@ts-expect-error - The utils/network file is still JS and this function expects a networkType, and should be optional
+                    imageSource: getNetworkImageSource({
+                      chainId: networkConfiguration.chainId,
+                    }),
+                    size: AvatarSize.Sm,
+                  }}
+                  isSelected={false}
+                  buttonIcon={IconName.MoreVertical}
+                  showButtonIcon={false}
+                  textButton={strings('transaction.edit')}
+                  onButtonClick={() => {
+                    sheetRef.current?.onCloseBottomSheet(() => {
+                      navigate(Routes.ADD_NETWORK, {
+                        shouldNetworkSwitchPopToWallet: false,
+                        shouldShowPopularNetworks: false,
+                        network: networkConfiguration.rpcUrl,
+                      });
+                    });
+                  }}
+                />
+              ),
+            )}
+          </View>
+        </ScrollView>
+        <View style={styles.buttonsContainer}>
+          <Button
+            testID={NftDetectionModalSelectorsIDs.ALLOW_BUTTON}
+            variant={ButtonVariants.Primary}
+            size={ButtonSize.Lg}
+            width={ButtonWidthTypes.Full}
+            label={strings('multi_rpc_migration_modal.accept')}
+            onPress={() => dismissMultiRpcModalMigration()}
+          />
+        </View>
+      </View>
+    </BottomSheet>
+  );
+};
+
+export default MultiRpcModal;
diff --git a/app/components/Views/MultiRpcModal/__snapshots__/MultiRpcModal.test.tsx.snap b/app/components/Views/MultiRpcModal/__snapshots__/MultiRpcModal.test.tsx.snap
new file mode 100644
index 000000000000..7d48d5e290ad
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/__snapshots__/MultiRpcModal.test.tsx.snap
@@ -0,0 +1,595 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MultiRpcModal render matches snapshot 1`] = `
+<View
+  style={
+    {
+      "flex": 1,
+    }
+  }
+>
+  <RNCSafeAreaProvider
+    onInsetsChange={[Function]}
+    style={
+      [
+        {
+          "flex": 1,
+        },
+        undefined,
+      ]
+    }
+  >
+    <View
+      collapsable={false}
+      pointerEvents="box-none"
+      style={
+        {
+          "zIndex": 1,
+        }
+      }
+    >
+      <View
+        accessibilityElementsHidden={false}
+        importantForAccessibility="auto"
+        onLayout={[Function]}
+        pointerEvents="box-none"
+        style={null}
+      >
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "bottom": 0,
+              "left": 0,
+              "opacity": 1,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+              "zIndex": 0,
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            style={
+              {
+                "backgroundColor": "rgb(255, 255, 255)",
+                "borderBottomColor": "rgb(216, 216, 216)",
+                "flex": 1,
+                "shadowColor": "rgb(216, 216, 216)",
+                "shadowOffset": {
+                  "height": 0.5,
+                  "width": 0,
+                },
+                "shadowOpacity": 0.85,
+                "shadowRadius": 0,
+              }
+            }
+          />
+        </View>
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "height": 64,
+              "maxHeight": undefined,
+              "minHeight": undefined,
+              "opacity": undefined,
+              "transform": undefined,
+            }
+          }
+        >
+          <View
+            pointerEvents="none"
+            style={
+              {
+                "height": 20,
+              }
+            }
+          />
+          <View
+            pointerEvents="box-none"
+            style={
+              {
+                "alignItems": "center",
+                "flex": 1,
+                "flexDirection": "row",
+                "justifyContent": "center",
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              pointerEvents="box-none"
+              style={
+                {
+                  "marginHorizontal": 16,
+                  "opacity": 1,
+                }
+              }
+            >
+              <Text
+                accessibilityRole="header"
+                aria-level="1"
+                collapsable={false}
+                numberOfLines={1}
+                onLayout={[Function]}
+                style={
+                  {
+                    "color": "rgb(28, 28, 30)",
+                    "fontSize": 17,
+                    "fontWeight": "600",
+                  }
+                }
+              >
+                MultiRPcMigrationModal
+              </Text>
+            </View>
+          </View>
+        </View>
+      </View>
+    </View>
+    <RNSScreenContainer
+      onLayout={[Function]}
+      style={
+        {
+          "flex": 1,
+        }
+      }
+    >
+      <RNSScreen
+        activityState={2}
+        collapsable={false}
+        gestureResponseDistance={
+          {
+            "bottom": -1,
+            "end": -1,
+            "start": -1,
+            "top": -1,
+          }
+        }
+        pointerEvents="box-none"
+        style={
+          {
+            "bottom": 0,
+            "left": 0,
+            "position": "absolute",
+            "right": 0,
+            "top": 0,
+          }
+        }
+      >
+        <View
+          collapsable={false}
+          style={
+            {
+              "opacity": 1,
+            }
+          }
+        />
+        <View
+          accessibilityElementsHidden={false}
+          closing={false}
+          gestureVelocityImpact={0.3}
+          importantForAccessibility="auto"
+          onClose={[Function]}
+          onGestureBegin={[Function]}
+          onGestureCanceled={[Function]}
+          onGestureEnd={[Function]}
+          onOpen={[Function]}
+          onTransition={[Function]}
+          pointerEvents="box-none"
+          style={
+            [
+              {
+                "overflow": undefined,
+              },
+              {
+                "bottom": 0,
+                "left": 0,
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+              },
+            ]
+          }
+          transitionSpec={
+            {
+              "close": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+              "open": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            needsOffscreenAlphaCompositing={false}
+            pointerEvents="box-none"
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              onGestureHandlerEvent={[Function]}
+              onGestureHandlerStateChange={[Function]}
+              style={
+                {
+                  "flex": 1,
+                  "transform": [
+                    {
+                      "translateX": 0,
+                    },
+                    {
+                      "translateX": 0,
+                    },
+                  ],
+                }
+              }
+            >
+              <View
+                collapsable={false}
+                pointerEvents="none"
+                style={
+                  {
+                    "backgroundColor": "rgb(242, 242, 242)",
+                    "bottom": 0,
+                    "left": 0,
+                    "position": "absolute",
+                    "shadowColor": "#000",
+                    "shadowOffset": {
+                      "height": 1,
+                      "width": -1,
+                    },
+                    "shadowOpacity": 0.3,
+                    "shadowRadius": 5,
+                    "top": 0,
+                    "width": 3,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "flex": 1,
+                      "overflow": "hidden",
+                    },
+                    [
+                      {
+                        "backgroundColor": "rgb(242, 242, 242)",
+                      },
+                      undefined,
+                    ],
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "flexDirection": "column-reverse",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      {
+                        "flex": 1,
+                      }
+                    }
+                  >
+                    <View
+                      onLayout={[Function]}
+                      style={
+                        [
+                          {
+                            "bottom": 0,
+                            "justifyContent": "flex-end",
+                            "left": 0,
+                            "position": "absolute",
+                            "right": 0,
+                            "top": 0,
+                          },
+                          {
+                            "paddingBottom": 0,
+                          },
+                        ]
+                      }
+                    >
+                      <View
+                        style={
+                          [
+                            {
+                              "backgroundColor": "#00000099",
+                              "bottom": 0,
+                              "left": 0,
+                              "position": "absolute",
+                              "right": 0,
+                              "top": 0,
+                            },
+                            {
+                              "opacity": 0,
+                            },
+                          ]
+                        }
+                      >
+                        <TouchableOpacity
+                          onPress={[Function]}
+                          style={
+                            {
+                              "flex": 1,
+                            }
+                          }
+                        />
+                      </View>
+                      <View
+                        onLayout={[Function]}
+                        style={
+                          [
+                            {
+                              "bottom": 0,
+                              "left": 0,
+                              "position": "absolute",
+                              "right": 0,
+                            },
+                            {
+                              "paddingBottom": 0,
+                            },
+                          ]
+                        }
+                      >
+                        <View
+                          collapsable={false}
+                          onGestureHandlerEvent={[Function]}
+                          onGestureHandlerStateChange={[Function]}
+                          onLayout={[Function]}
+                          style={
+                            [
+                              {
+                                "backgroundColor": "#ffffff",
+                                "borderColor": "#bbc0c566",
+                                "borderTopLeftRadius": 8,
+                                "borderTopRightRadius": 8,
+                                "borderWidth": 1,
+                                "maxHeight": 1314,
+                                "overflow": "hidden",
+                                "paddingBottom": 0,
+                                "shadowColor": "#0000001a",
+                                "shadowOffset": {
+                                  "height": 2,
+                                  "width": 0,
+                                },
+                                "shadowOpacity": 1,
+                                "shadowRadius": 40,
+                              },
+                              {
+                                "transform": [
+                                  {
+                                    "translateY": 1334,
+                                  },
+                                ],
+                              },
+                            ]
+                          }
+                        >
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "alignSelf": "stretch",
+                                "padding": 4,
+                              }
+                            }
+                          >
+                            <View
+                              style={
+                                {
+                                  "backgroundColor": "#bbc0c566",
+                                  "borderRadius": 2,
+                                  "height": 4,
+                                  "width": 40,
+                                }
+                              }
+                            />
+                          </View>
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "backgroundColor": "#ffffff",
+                                "flexDirection": "row",
+                                "height": 32,
+                                "justifyContent": "space-between",
+                                "margin": 16,
+                              }
+                            }
+                          >
+                            <View
+                              style={
+                                {
+                                  "flex": 1,
+                                }
+                              }
+                            />
+                            <Text
+                              accessibilityRole="text"
+                              style={
+                                {
+                                  "color": "#141618",
+                                  "fontFamily": "EuclidCircularB-Bold",
+                                  "fontSize": 18,
+                                  "fontWeight": "700",
+                                  "letterSpacing": 0,
+                                  "lineHeight": 24,
+                                }
+                              }
+                            >
+                              Network RPCs Updated
+                            </Text>
+                            <View
+                              style={
+                                {
+                                  "alignItems": "flex-end",
+                                  "flex": 1,
+                                }
+                              }
+                            />
+                          </View>
+                          <View
+                            style={
+                              {
+                                "marginLeft": 16,
+                                "marginRight": 16,
+                                "paddingVertical": 16,
+                              }
+                            }
+                            testID="nft-detection-modal"
+                          >
+                            <RCTScrollView
+                              collapsable={false}
+                              onGestureHandlerEvent={[Function]}
+                              onGestureHandlerStateChange={[Function]}
+                              style={
+                                {
+                                  "height": "80%",
+                                }
+                              }
+                            >
+                              <View>
+                                <View
+                                  style={
+                                    {
+                                      "marginLeft": 32,
+                                      "marginRight": 32,
+                                    }
+                                  }
+                                >
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#141618",
+                                        "fontFamily": "EuclidCircularB-Regular",
+                                        "fontSize": 14,
+                                        "fontWeight": "400",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 22,
+                                        "textAlign": "center",
+                                      }
+                                    }
+                                  >
+                                    We now support multiple RPCs for a single network. Your most recent RPC has been selected as the default one to resolve conflicting information
+                                  </Text>
+                                </View>
+                                <View
+                                  style={
+                                    {
+                                      "alignItems": "center",
+                                    }
+                                  }
+                                >
+                                  <Image
+                                    source={
+                                      {
+                                        "default": {
+                                          "uri": "MockImage",
+                                        },
+                                      }
+                                    }
+                                    style={
+                                      {
+                                        "height": 102.64,
+                                        "width": 102.64,
+                                      }
+                                    }
+                                  />
+                                </View>
+                                <View />
+                              </View>
+                            </RCTScrollView>
+                            <View
+                              style={
+                                {
+                                  "marginLeft": 16,
+                                  "marginRight": 16,
+                                  "paddingVertical": 16,
+                                }
+                              }
+                            >
+                              <TouchableOpacity
+                                accessibilityRole="button"
+                                accessible={true}
+                                activeOpacity={1}
+                                onPress={[Function]}
+                                onPressIn={[Function]}
+                                onPressOut={[Function]}
+                                style={
+                                  {
+                                    "alignItems": "center",
+                                    "alignSelf": "stretch",
+                                    "backgroundColor": "#0376c9",
+                                    "borderRadius": 24,
+                                    "flexDirection": "row",
+                                    "height": 48,
+                                    "justifyContent": "center",
+                                    "paddingHorizontal": 16,
+                                  }
+                                }
+                                testID="allow"
+                              >
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#ffffff",
+                                      "fontFamily": "EuclidCircularB-Regular",
+                                      "fontSize": 14,
+                                      "fontWeight": "400",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 22,
+                                    }
+                                  }
+                                >
+                                  Accept
+                                </Text>
+                              </TouchableOpacity>
+                            </View>
+                          </View>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </RNSScreen>
+    </RNSScreenContainer>
+  </RNCSafeAreaProvider>
+</View>
+`;
diff --git a/app/components/Views/MultiRpcModal/index.ts b/app/components/Views/MultiRpcModal/index.ts
new file mode 100644
index 000000000000..5da9eeeddaa8
--- /dev/null
+++ b/app/components/Views/MultiRpcModal/index.ts
@@ -0,0 +1 @@
+export { default } from './MultiRpcModal';
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index 886a36d645af..88a4be334bb6 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -406,8 +406,7 @@ const Wallet = ({
   useEffect(
     () => {
       requestAnimationFrame(async () => {
-        const { AccountTrackerController } =
-          Engine.context;
+        const { AccountTrackerController } = Engine.context;
         AccountTrackerController.refresh();
       });
     },
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index 75d0fcdd28d4..acfa58343545 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -51,6 +51,7 @@ const Routes = {
     SRP_REVEAL_QUIZ: 'SRPRevealQuiz',
     WALLET_ACTIONS: 'WalletActions',
     NFT_AUTO_DETECTION_MODAL: 'NFTAutoDetectionModal',
+    MULTI_RPC_MIGRATION_MODAL: 'MultiRPcMigrationModal',
   },
   ONBOARDING: {
     ROOT_NAV: 'OnboardingRootNav',
diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts
index 9752f08c64d5..d15622a6aac1 100644
--- a/app/core/Analytics/MetaMetrics.events.ts
+++ b/app/core/Analytics/MetaMetrics.events.ts
@@ -368,6 +368,9 @@ enum EVENT_NAME {
   NFT_AUTO_DETECTION_ENABLED = 'nft_autodetection_enabled',
   PRIMARY_CURRENCY_TOGGLE = 'primary_currency_toggle',
   LOGIN_DOWNLOAD_LOGS = 'Download State Logs Button Clicked',
+
+  // network
+  MULTI_RPC_MIGRATION_MODAL_ACCEPTED = 'multi_rpc_migration_modal_accepted',
 }
 
 enum ACTIONS {
@@ -839,6 +842,9 @@ const events = {
   NFT_AUTO_DETECTION_MODAL_ENABLE: generateOpt(
     EVENT_NAME.NFT_AUTO_DETECTION_ENABLED_MODAL,
   ),
+  MULTI_RPC_MIGRATION_MODAL_ACCEPTED: generateOpt(
+    EVENT_NAME.MULTI_RPC_MIGRATION_MODAL_ACCEPTED,
+  ),
   NFT_AUTO_DETECTION_MODAL_DISABLE: generateOpt(
     EVENT_NAME.NFT_AUTO_DETECTION_DISBLED_MODAL,
   ),
diff --git a/app/images/networks1.png b/app/images/networks1.png
new file mode 100644
index 0000000000000000000000000000000000000000..780470e87810c91b5e531e635e89229bf8406aae
GIT binary patch
literal 5923
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
ZqRf+lv7bhf{xNL?C3!WuS{XC&{{TXuTB-m5

literal 0
HcmV?d00001

diff --git a/app/selectors/preferencesController.ts b/app/selectors/preferencesController.ts
index 65f06c8399b3..ee7893d1d4bf 100644
--- a/app/selectors/preferencesController.ts
+++ b/app/selectors/preferencesController.ts
@@ -17,6 +17,12 @@ export const selectUseNftDetection = createSelector(
     preferencesControllerState.useNftDetection,
 );
 
+export const selectShowMultiRpcModal = createSelector(
+  selectPreferencesControllerState,
+  (preferencesControllerState: PreferencesState) =>
+    preferencesControllerState.showMultiRpcModal,
+);
+
 export const selectUseTokenDetection = createSelector(
   selectPreferencesControllerState,
   (preferencesControllerState: PreferencesState) =>
diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
index 43b772a055b7..885d1465c252 100644
--- a/app/util/test/initial-background-state.json
+++ b/app/util/test/initial-background-state.json
@@ -88,6 +88,7 @@
     "disabledRpcMethodPreferences": {
       "eth_sign": false
     },
+    "showMultiRpcModal": false,
     "showTestNetworks": false,
     "showIncomingTransactions": {
       "0x1": true,
diff --git a/index.js b/index.js
index ece1f59ea50a..50460ab3fe0b 100644
--- a/index.js
+++ b/index.js
@@ -19,7 +19,6 @@ import Root from './app/components/Views/Root';
 import { name } from './app.json';
 import { isTest } from './app/util/test/utils.js';
 
-
 import { Performance } from './app/core/Performance';
 Performance.setupPerformanceObservers();
 
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 96bfdfb4bd14..4f2b8cb06e59 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -375,6 +375,10 @@
     "accept": "I agree",
     "cancel": "No thanks"
   },
+  "multi_rpc_migration_modal": {
+    "description": "We now support multiple RPCs for a single network. Your most recent RPC has been selected as the default one to resolve conflicting information",
+    "accept": "Accept"
+  },
   "nft_details": {
     "bought_for": "Bought for",
     "highest_floor_price": "Highest floor price",
@@ -724,6 +728,7 @@
   "toast": {
     "connected_and_active": "connected and active.",
     "now_active": "now active.",
+    "network_added": "was successfully added",
     "revoked": "revoked.",
     "revoked_all": "All accounts revoked.",
     "accounts_connected": "accounts connected.",
diff --git a/patches/@metamask+preferences-controller+11.0.0.patch b/patches/@metamask+preferences-controller+11.0.0.patch
index 234fd7dcf7ee..3bc39dcee0e7 100644
--- a/patches/@metamask+preferences-controller+11.0.0.patch
+++ b/patches/@metamask+preferences-controller+11.0.0.patch
@@ -1,8 +1,125 @@
+diff --git a/node_modules/@metamask/preferences-controller/.idea/.gitignore b/node_modules/@metamask/preferences-controller/.idea/.gitignore
+new file mode 100644
+index 0000000..b58b603
+--- /dev/null
++++ b/node_modules/@metamask/preferences-controller/.idea/.gitignore
+@@ -0,0 +1,5 @@
++# Default ignored files
++/shelf/
++/workspace.xml
++# Editor-based HTTP Client requests
++/httpRequests/
+diff --git a/node_modules/@metamask/preferences-controller/.idea/modules.xml b/node_modules/@metamask/preferences-controller/.idea/modules.xml
+new file mode 100644
+index 0000000..ecac035
+--- /dev/null
++++ b/node_modules/@metamask/preferences-controller/.idea/modules.xml
+@@ -0,0 +1,8 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="ProjectModuleManager">
++    <modules>
++      <module fileurl="file://$PROJECT_DIR$/.idea/preferences-controller.iml" filepath="$PROJECT_DIR$/.idea/preferences-controller.iml" />
++    </modules>
++  </component>
++</project>
+\ No newline at end of file
+diff --git a/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml b/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml
+new file mode 100644
+index 0000000..24643cc
+--- /dev/null
++++ b/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml
+@@ -0,0 +1,12 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<module type="WEB_MODULE" version="4">
++  <component name="NewModuleRootManager">
++    <content url="file://$MODULE_DIR$">
++      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
++      <excludeFolder url="file://$MODULE_DIR$/temp" />
++      <excludeFolder url="file://$MODULE_DIR$/tmp" />
++    </content>
++    <orderEntry type="inheritedJdk" />
++    <orderEntry type="sourceFolder" forTests="false" />
++  </component>
++</module>
+\ No newline at end of file
+diff --git a/node_modules/@metamask/preferences-controller/.idea/workspace.xml b/node_modules/@metamask/preferences-controller/.idea/workspace.xml
+new file mode 100644
+index 0000000..dbf94fd
+--- /dev/null
++++ b/node_modules/@metamask/preferences-controller/.idea/workspace.xml
+@@ -0,0 +1,50 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="ChangeListManager">
++    <list default="true" id="605ad92a-3a3b-409b-aace-8d3cf5420af6" name="Changes" comment="" />
++    <option name="SHOW_DIALOG" value="false" />
++    <option name="HIGHLIGHT_CONFLICTS" value="true" />
++    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
++    <option name="LAST_RESOLUTION" value="IGNORE" />
++  </component>
++  <component name="ProjectColorInfo"><![CDATA[{
++  "customColor": "",
++  "associatedIndex": 6
++}]]></component>
++  <component name="ProjectId" id="2mZDhfDgVzYvTMobnnTEx2OWDXx" />
++  <component name="ProjectViewState">
++    <option name="autoscrollToSource" value="true" />
++    <option name="hideEmptyMiddlePackages" value="true" />
++    <option name="showLibraryContents" value="true" />
++  </component>
++  <component name="PropertiesComponent"><![CDATA[{
++  "keyToString": {
++    "RunOnceActivity.ShowReadmeOnStart": "true",
++    "nodejs_package_manager_path": "npm",
++    "ts.external.directory.path": "/Users/salim/Applications/JetBrains Toolbox/IntelliJ IDEA Ultimate.app/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
++    "vue.rearranger.settings.migration": "true"
++  }
++}]]></component>
++  <component name="SharedIndexes">
++    <attachedChunks>
++      <set>
++        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-WS-241.17011.90" />
++      </set>
++    </attachedChunks>
++  </component>
++  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
++  <component name="TaskManager">
++    <task active="true" id="Default" summary="Default task">
++      <changelist id="605ad92a-3a3b-409b-aace-8d3cf5420af6" name="Changes" comment="" />
++      <created>1727275325414</created>
++      <option name="number" value="Default" />
++      <option name="presentableId" value="Default" />
++      <updated>1727275325414</updated>
++      <workItem from="1727275327335" duration="201000" />
++    </task>
++    <servers />
++  </component>
++  <component name="TypeScriptGeneratedFilesManager">
++    <option name="version" value="3" />
++  </component>
++</project>
+\ No newline at end of file
 diff --git a/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js b/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js
-index 30e985c..41106f3 100644
+index 30e985c..db94bbf 100644
 --- a/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js
 +++ b/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js
-@@ -17,13 +17,16 @@ var metadata = {
+@@ -1,12 +1,10 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+-
+-
++'use strict';
++Object.defineProperty(exports, '__esModule', { value: true });
+
+ var _chunkPOA2PUW4js = require('./chunk-POA2PUW4.js');
+
+ // src/PreferencesController.ts
+
+-
+ var _basecontroller = require('@metamask/base-controller');
+ var _controllerutils = require('@metamask/controller-utils');
+ var metadata = {
+@@ -17,29 +15,33 @@ var metadata = {
    isIpfsGatewayEnabled: { persist: true, anonymous: true },
    isMultiAccountBalancesEnabled: { persist: true, anonymous: true },
    lostIdentities: { persist: true, anonymous: false },
@@ -18,19 +135,37 @@ index 30e985c..41106f3 100644
 +  useTokenDetection: { persist: true, anonymous: true },
 +  smartTransactionsOptInStatus: { persist: true, anonymous: true },
 +  useTransactionSimulations: { persist: true, anonymous: true },
++  showMultiRpcModal: { persist: false, anonymous: false },
  };
- var name = "PreferencesController";
+-var name = "PreferencesController";
++var name = 'PreferencesController';
  function getDefaultPreferencesState() {
-@@ -37,7 +40,7 @@ function getDefaultPreferencesState() {
+   return {
+     disabledRpcMethodPreferences: {
+-      eth_sign: false
++      eth_sign: false,
+     },
+     featureFlags: {},
+     identities: {},
+-    ipfsGateway: "https://ipfs.io/ipfs/",
++    ipfsGateway: 'https://ipfs.io/ipfs/',
      isIpfsGatewayEnabled: true,
      isMultiAccountBalancesEnabled: true,
      lostIdentities: {},
 -    openSeaEnabled: false,
 +    displayNftMedia: false,
      securityAlertsEnabled: false,
-     selectedAddress: "",
+-    selectedAddress: "",
++    selectedAddress: '',
      showIncomingTransactions: {
-@@ -64,7 +67,10 @@ function getDefaultPreferencesState() {
+       [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.MAINNET]: true,
+       [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.GOERLI]: true,
+@@ -60,11 +62,15 @@ function getDefaultPreferencesState() {
+       [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.MOONBEAM]: true,
+       [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.MOONBEAM_TESTNET]: true,
+       [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.MOONRIVER]: true,
+-      [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.GNOSIS]: true
++      [_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS.GNOSIS]: true,
      },
      showTestNetworks: false,
      useNftDetection: false,
@@ -39,10 +174,97 @@ index 30e985c..41106f3 100644
 +    useSafeChainsListValidation: true,
 +    smartTransactionsOptInStatus: false,
 +    useTransactionSimulations: true,
++    showMultiRpcModal: false,
    };
  }
  var _syncIdentities, syncIdentities_fn;
-@@ -213,9 +219,9 @@ var PreferencesController = class extends _basecontroller.BaseController {
+@@ -76,18 +82,15 @@ var PreferencesController = class extends _basecontroller.BaseController {
+    * @param args.messenger - The preferences controller messenger.
+    * @param args.state - Preferences controller state.
+    */
+-  constructor({
+-    messenger,
+-    state
+-  }) {
++  constructor({ messenger, state }) {
+     super({
+       name,
+       metadata,
+       messenger,
+       state: {
+         ...getDefaultPreferencesState(),
+-        ...state
+-      }
++        ...state,
++      },
+     });
+     /**
+      * Synchronizes the current identity list with new identities.
+@@ -95,20 +98,19 @@ var PreferencesController = class extends _basecontroller.BaseController {
+      * @param addresses - List of addresses corresponding to identities to sync.
+      */
+     _chunkPOA2PUW4js.__privateAdd.call(void 0, this, _syncIdentities);
+-    messenger.subscribe(
+-      "KeyringController:stateChange",
+-      (keyringState) => {
+-        const accounts = /* @__PURE__ */ new Set();
+-        for (const keyring of keyringState.keyrings) {
+-          for (const account of keyring.accounts) {
+-            accounts.add(account);
+-          }
+-        }
+-        if (accounts.size > 0) {
+-          _chunkPOA2PUW4js.__privateMethod.call(void 0, this, _syncIdentities, syncIdentities_fn).call(this, Array.from(accounts));
++    messenger.subscribe('KeyringController:stateChange', (keyringState) => {
++      const accounts = /* @__PURE__ */ new Set();
++      for (const keyring of keyringState.keyrings) {
++        for (const account of keyring.accounts) {
++          accounts.add(account);
+         }
+       }
+-    );
++      if (accounts.size > 0) {
++        _chunkPOA2PUW4js.__privateMethod
++          .call(void 0, this, _syncIdentities, syncIdentities_fn)
++          .call(this, Array.from(accounts));
++      }
++    });
+   }
+   /**
+    * Adds identities to state.
+@@ -116,8 +118,8 @@ var PreferencesController = class extends _basecontroller.BaseController {
+    * @param addresses - List of addresses to use to generate new identities.
+    */
+   addIdentities(addresses) {
+-    const checksummedAddresses = addresses.map(
+-      (address) => _controllerutils.toChecksumHexAddress.call(void 0, address)
++    const checksummedAddresses = addresses.map((address) =>
++      _controllerutils.toChecksumHexAddress.call(void 0, address),
+     );
+     this.update((state) => {
+       const { identities } = state;
+@@ -129,7 +131,7 @@ var PreferencesController = class extends _basecontroller.BaseController {
+         identities[address] = {
+           name: `Account ${identityCount + 1}`,
+           address,
+-          importTime: Date.now()
++          importTime: Date.now(),
+         };
+       }
+     });
+@@ -184,7 +186,10 @@ var PreferencesController = class extends _basecontroller.BaseController {
+    */
+   setSelectedAddress(selectedAddress) {
+     this.update((state) => {
+-      state.selectedAddress = _controllerutils.toChecksumHexAddress.call(void 0, selectedAddress);
++      state.selectedAddress = _controllerutils.toChecksumHexAddress.call(
++        void 0,
++        selectedAddress,
++      );
+     });
+   }
+   /**
+@@ -213,9 +218,9 @@ var PreferencesController = class extends _basecontroller.BaseController {
     * @param useNftDetection - Boolean indicating user preference on NFT detection.
     */
    setUseNftDetection(useNftDetection) {
@@ -50,11 +272,11 @@ index 30e985c..41106f3 100644
 +    if (useNftDetection && !this.state.displayNftMedia) {
        throw new Error(
 -        "useNftDetection cannot be enabled if openSeaEnabled is false"
-+        "useNftDetection cannot be enabled if displayNftMedia is false"
++        'useNftDetection cannot be enabled if displayNftMedia is false',
        );
      }
      this.update((state) => {
-@@ -223,18 +229,33 @@ var PreferencesController = class extends _basecontroller.BaseController {
+@@ -223,18 +228,33 @@ var PreferencesController = class extends _basecontroller.BaseController {
      });
    }
    /**
@@ -75,141 +297,691 @@ index 30e985c..41106f3 100644
        }
      });
    }
-+  
++
 +  /**
 +   * Toggle the use safe chains list validation.
 +   *
 +   * @param useSafeChainsListValidation - Boolean indicating user preference on using chainid.network third part to check safe networks.
 +   */
 +  setUseSafeChainsListValidation(useSafeChainsListValidation) {
-+      this.update((state) => {
-+          state.useSafeChainsListValidation = useSafeChainsListValidation;
-+          if (!useSafeChainsListValidation) {
-+              state.useSafeChainsListValidation = false;
-+          }
-+      })    
++    this.update((state) => {
++      state.useSafeChainsListValidation = useSafeChainsListValidation;
++      if (!useSafeChainsListValidation) {
++        state.useSafeChainsListValidation = false;
++      }
++    });
 +  }
 +
    /**
     * Toggle the security alert enabled setting.
     *
-@@ -245,6 +266,29 @@ var PreferencesController = class extends _basecontroller.BaseController {
+@@ -245,6 +265,43 @@ var PreferencesController = class extends _basecontroller.BaseController {
        state.securityAlertsEnabled = securityAlertsEnabled;
      });
    }
 +
 +  /**
++   * Toggle multi rpc migration modal.
++   *
++   * @param showMultiRpcModal - Boolean indicating if the multi rpc modal will be displayed or not.
++   */
++  setShowMultiRpcModal(showMultiRpcModal) {
++    this.update((state) => {
++      state.showMultiRpcModal = showMultiRpcModal;
++      if (showMultiRpcModal) {
++        state.showMultiRpcModal = false;
++      }
++    });
++  }
++
++  /**
 +   * A setter for the user to opt into smart transactions
 +   *
 +   * @param smartTransactionsOptInStatus - true to opt into smart transactions
 +   */
 +  setSmartTransactionsOptInStatus(smartTransactionsOptInStatus) {
-+      this.update((state) => {
-+          state.smartTransactionsOptInStatus = smartTransactionsOptInStatus;
-+      });
++    this.update((state) => {
++      state.smartTransactionsOptInStatus = smartTransactionsOptInStatus;
++    });
 +  }
 +
 +  /**
-+  * A setter for the user to opt into transaction simulations
-+  *
-+  * @param useTransactionSimulations - true to opt into transaction simulations
-+  */
++   * A setter for the user to opt into transaction simulations
++   *
++   * @param useTransactionSimulations - true to opt into transaction simulations
++   */
 +  setUseTransactionSimulations(useTransactionSimulations) {
-+      this.update((state) => {
-+          state.useTransactionSimulations = useTransactionSimulations;
-+      });
++    this.update((state) => {
++      state.useTransactionSimulations = useTransactionSimulations;
++    });
 +  }
 +
    /**
     * A setter for the user preferences to enable/disable rpc methods.
     *
+@@ -255,7 +312,7 @@ var PreferencesController = class extends _basecontroller.BaseController {
+     const { disabledRpcMethodPreferences } = this.state;
+     const newDisabledRpcMethods = {
+       ...disabledRpcMethodPreferences,
+-      [methodName]: isEnabled
++      [methodName]: isEnabled,
+     };
+     this.update((state) => {
+       state.disabledRpcMethodPreferences = newDisabledRpcMethods;
+@@ -297,21 +354,28 @@ var PreferencesController = class extends _basecontroller.BaseController {
+    * @param chainId - On hexadecimal format to enable the incoming transaction network
+    * @param isIncomingTransactionNetworkEnable - true to enable incoming transactions
+    */
+-  setEnableNetworkIncomingTransactions(chainId, isIncomingTransactionNetworkEnable) {
+-    if (Object.values(_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS).includes(chainId)) {
++  setEnableNetworkIncomingTransactions(
++    chainId,
++    isIncomingTransactionNetworkEnable,
++  ) {
++    if (
++      Object.values(_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS).includes(
++        chainId,
++      )
++    ) {
+       this.update((state) => {
+         state.showIncomingTransactions = {
+           ...this.state.showIncomingTransactions,
+-          [chainId]: isIncomingTransactionNetworkEnable
++          [chainId]: isIncomingTransactionNetworkEnable,
+         };
+       });
+     }
+   }
+ };
+ _syncIdentities = new WeakSet();
+-syncIdentities_fn = function(addresses) {
+-  addresses = addresses.map(
+-    (address) => _controllerutils.toChecksumHexAddress.call(void 0, address)
++syncIdentities_fn = function (addresses) {
++  addresses = addresses.map((address) =>
++    _controllerutils.toChecksumHexAddress.call(void 0, address),
+   );
+   this.update((state) => {
+     const { identities } = state;
+@@ -335,9 +399,7 @@ syncIdentities_fn = function(addresses) {
+ };
+ var PreferencesController_default = PreferencesController;
+
+-
+-
+-
+-
+-exports.getDefaultPreferencesState = getDefaultPreferencesState; exports.PreferencesController = PreferencesController; exports.PreferencesController_default = PreferencesController_default;
++exports.getDefaultPreferencesState = getDefaultPreferencesState;
++exports.PreferencesController = PreferencesController;
++exports.PreferencesController_default = PreferencesController_default;
+ //# sourceMappingURL=chunk-FSWGV6H6.js.map
 diff --git a/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts b/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts
-index 7e3ba15..6fe9c9e 100644
+index 7e3ba15..a15d67e 100644
 --- a/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts
 +++ b/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts
-@@ -69,9 +69,10 @@ export type PreferencesState = {
-         [address: string]: Identity;
-     };
-     /**
+@@ -1,265 +1,335 @@
+-import { BaseController, type ControllerStateChangeEvent, type ControllerGetStateAction, type RestrictedControllerMessenger } from '@metamask/base-controller';
++import {
++  BaseController,
++  type ControllerStateChangeEvent,
++  type ControllerGetStateAction,
++  type RestrictedControllerMessenger,
++} from '@metamask/base-controller';
+ import type { KeyringControllerStateChangeEvent } from '@metamask/keyring-controller';
+ import { ETHERSCAN_SUPPORTED_CHAIN_IDS } from './constants';
+ /**
+  * A representation of a MetaMask identity
+  */
+ export type Identity = {
+-    /**
+-     * The address of the identity
+-     */
+-    address: string;
+-    /**
+-     * The timestamp for when this identity was first added
+-     */
+-    importTime?: number;
+-    /**
+-     * The name of the identity
+-     */
+-    name: string;
++  /**
++   * The address of the identity
++   */
++  address: string;
++  /**
++   * The timestamp for when this identity was first added
++   */
++  importTime?: number;
++  /**
++   * The name of the identity
++   */
++  name: string;
+ };
+ /**
+  * A type union of the name for each chain that is supported by Etherscan or
+  * an Etherscan-compatible service.
+  */
+-export type EtherscanSupportedChains = keyof typeof ETHERSCAN_SUPPORTED_CHAIN_IDS;
++export type EtherscanSupportedChains =
++  keyof typeof ETHERSCAN_SUPPORTED_CHAIN_IDS;
+ /**
+  * A type union of the chain ID for each chain that is supported by Etherscan
+  * or an Etherscan-compatible service.
+  */
+-export type EtherscanSupportedHexChainId = (typeof ETHERSCAN_SUPPORTED_CHAIN_IDS)[EtherscanSupportedChains];
++export type EtherscanSupportedHexChainId =
++  (typeof ETHERSCAN_SUPPORTED_CHAIN_IDS)[EtherscanSupportedChains];
+ /**
+  * Preferences controller state
+  */
+ export type PreferencesState = {
+-    /**
+-     * A map of RPC method names to enabled state (true is enabled, false is disabled)
+-     */
+-    disabledRpcMethodPreferences: {
+-        [methodName: string]: boolean;
+-    };
+-    /**
+-     * Map of specific features to enable or disable
+-     */
+-    featureFlags: {
+-        [feature: string]: boolean;
+-    };
+-    /**
+-     * Map of addresses to Identity objects
+-     */
+-    identities: {
+-        [address: string]: Identity;
+-    };
+-    /**
+-     * The configured IPFS gateway
+-     */
+-    ipfsGateway: string;
+-    /**
+-     * Controls whether IPFS is enabled or not
+-     */
+-    isIpfsGatewayEnabled: boolean;
+-    /**
+-     * Controls whether multi-account balances are enabled or not
+-     */
+-    isMultiAccountBalancesEnabled: boolean;
+-    /**
+-     * Map of lost addresses to Identity objects
+-     */
+-    lostIdentities: {
+-        [address: string]: Identity;
+-    };
+-    /**
 -     * Controls whether the OpenSea API is used
-+     * Controls whether the web2 third parties are used
-      */
+-     */
 -    openSeaEnabled: boolean;
-+    displayNftMedia: boolean;
-+    useSafeChainsListValidation: boolean,
-     /**
-      * Controls whether "security alerts" are enabled
-      */
-@@ -98,6 +99,14 @@ export type PreferencesState = {
-      * Controls whether token detection is enabled
-      */
-     useTokenDetection: boolean;
-+    /**
-+     * Controls whether smart transactions are opted into
-+     */
-+    smartTransactionsOptInStatus: boolean;
-+    /**
-+     * Controls whether transaction simulations are opted into
-+     */
-+    useTransactionSimulations: boolean;
+-    /**
+-     * Controls whether "security alerts" are enabled
+-     */
+-    securityAlertsEnabled: boolean;
+-    /**
+-     * The current selected address
+-     */
+-    selectedAddress: string;
+-    /**
+-     * Controls whether incoming transactions are enabled, per-chain (for Etherscan-supported chains)
+-     */
+-    showIncomingTransactions: {
+-        [chainId in EtherscanSupportedHexChainId]: boolean;
+-    };
+-    /**
+-     * Controls whether test networks are shown in the wallet
+-     */
+-    showTestNetworks: boolean;
+-    /**
+-     * Controls whether NFT detection is enabled
+-     */
+-    useNftDetection: boolean;
+-    /**
+-     * Controls whether token detection is enabled
+-     */
+-    useTokenDetection: boolean;
++  /**
++   * A map of RPC method names to enabled state (true is enabled, false is disabled)
++   */
++  disabledRpcMethodPreferences: {
++    [methodName: string]: boolean;
++  };
++  /**
++   * Map of specific features to enable or disable
++   */
++  featureFlags: {
++    [feature: string]: boolean;
++  };
++  /**
++   * Map of addresses to Identity objects
++   */
++  identities: {
++    [address: string]: Identity;
++  };
++  /**
++   * The configured IPFS gateway
++   */
++  ipfsGateway: string;
++  /**
++   * Controls whether IPFS is enabled or not
++   */
++  isIpfsGatewayEnabled: boolean;
++  /**
++   * Controls whether multi-account balances are enabled or not
++   */
++  isMultiAccountBalancesEnabled: boolean;
++  /**
++   * Map of lost addresses to Identity objects
++   */
++  lostIdentities: {
++    [address: string]: Identity;
++  };
++  /**
++   * Controls whether the web2 third parties are used
++   */
++  displayNftMedia: boolean;
++  useSafeChainsListValidation: boolean;
++  /**
++   * Controls whether "security alerts" are enabled
++   */
++  securityAlertsEnabled: boolean;
++  /**
++   * The current selected address
++   */
++  selectedAddress: string;
++  /**
++   * Controls whether incoming transactions are enabled, per-chain (for Etherscan-supported chains)
++   */
++  showIncomingTransactions: {
++    [chainId in EtherscanSupportedHexChainId]: boolean;
++  };
++  /**
++   * Controls whether test networks are shown in the wallet
++   */
++  showTestNetworks: boolean;
++  /**
++   * Controls whether NFT detection is enabled
++   */
++  useNftDetection: boolean;
++  /**
++   * Controls whether token detection is enabled
++   */
++  useTokenDetection: boolean;
++  /**
++   * Controls whether smart transactions are opted into
++   */
++  smartTransactionsOptInStatus: boolean;
++  /**
++   * Controls whether transaction simulations are opted into
++   */
++  useTransactionSimulations: boolean;
++  /**
++   * Controls whether Multi rpc modal is displayed or not
++   */
++  showMultiRpcModal: boolean;
  };
- declare const name = "PreferencesController";
- export type PreferencesControllerGetStateAction = ControllerGetStateAction<typeof name, PreferencesState>;
-@@ -121,7 +130,7 @@ export declare function getDefaultPreferencesState(): {
-     isIpfsGatewayEnabled: boolean;
-     isMultiAccountBalancesEnabled: boolean;
-     lostIdentities: {};
+-declare const name = "PreferencesController";
+-export type PreferencesControllerGetStateAction = ControllerGetStateAction<typeof name, PreferencesState>;
+-export type PreferencesControllerStateChangeEvent = ControllerStateChangeEvent<typeof name, PreferencesState>;
++declare const name = 'PreferencesController';
++export type PreferencesControllerGetStateAction = ControllerGetStateAction<
++  typeof name,
++  PreferencesState
++>;
++export type PreferencesControllerStateChangeEvent = ControllerStateChangeEvent<
++  typeof name,
++  PreferencesState
++>;
+ export type PreferencesControllerActions = PreferencesControllerGetStateAction;
+ export type PreferencesControllerEvents = PreferencesControllerStateChangeEvent;
+ export type AllowedEvents = KeyringControllerStateChangeEvent;
+-export type PreferencesControllerMessenger = RestrictedControllerMessenger<typeof name, PreferencesControllerActions, PreferencesControllerEvents | AllowedEvents, never, AllowedEvents['type']>;
++export type PreferencesControllerMessenger = RestrictedControllerMessenger<
++  typeof name,
++  PreferencesControllerActions,
++  PreferencesControllerEvents | AllowedEvents,
++  never,
++  AllowedEvents['type']
++>;
+ /**
+  * Get the default PreferencesController state.
+  *
+  * @returns The default PreferencesController state.
+  */
+ export declare function getDefaultPreferencesState(): {
+-    disabledRpcMethodPreferences: {
+-        eth_sign: boolean;
+-    };
+-    featureFlags: {};
+-    identities: {};
+-    ipfsGateway: string;
+-    isIpfsGatewayEnabled: boolean;
+-    isMultiAccountBalancesEnabled: boolean;
+-    lostIdentities: {};
 -    openSeaEnabled: boolean;
-+    displayNftMedia: boolean;
-     securityAlertsEnabled: boolean;
-     selectedAddress: string;
-     showIncomingTransactions: {
-@@ -149,6 +158,8 @@ export declare function getDefaultPreferencesState(): {
-     showTestNetworks: boolean;
-     useNftDetection: boolean;
-     useTokenDetection: boolean;
-+    smartTransactionsOptInStatus: boolean;
-+    useTransactionSimulations: boolean;
+-    securityAlertsEnabled: boolean;
+-    selectedAddress: string;
+-    showIncomingTransactions: {
+-        "0x1": boolean;
+-        "0x5": boolean;
+-        "0x38": boolean;
+-        "0x61": boolean;
+-        "0xa": boolean;
+-        "0xaa37dc": boolean;
+-        "0x89": boolean;
+-        "0x13881": boolean;
+-        "0xa86a": boolean;
+-        "0xa869": boolean;
+-        "0xfa": boolean;
+-        "0xfa2": boolean;
+-        "0xaa36a7": boolean;
+-        "0xe704": boolean;
+-        "0xe705": boolean;
+-        "0xe708": boolean;
+-        "0x504": boolean;
+-        "0x507": boolean;
+-        "0x505": boolean;
+-        "0x64": boolean;
+-    };
+-    showTestNetworks: boolean;
+-    useNftDetection: boolean;
+-    useTokenDetection: boolean;
++  disabledRpcMethodPreferences: {
++    eth_sign: boolean;
++  };
++  featureFlags: {};
++  identities: {};
++  ipfsGateway: string;
++  isIpfsGatewayEnabled: boolean;
++  isMultiAccountBalancesEnabled: boolean;
++  lostIdentities: {};
++  displayNftMedia: boolean;
++  securityAlertsEnabled: boolean;
++  selectedAddress: string;
++  showIncomingTransactions: {
++    '0x1': boolean;
++    '0x5': boolean;
++    '0x38': boolean;
++    '0x61': boolean;
++    '0xa': boolean;
++    '0xaa37dc': boolean;
++    '0x89': boolean;
++    '0x13881': boolean;
++    '0xa86a': boolean;
++    '0xa869': boolean;
++    '0xfa': boolean;
++    '0xfa2': boolean;
++    '0xaa36a7': boolean;
++    '0xe704': boolean;
++    '0xe705': boolean;
++    '0xe708': boolean;
++    '0x504': boolean;
++    '0x507': boolean;
++    '0x505': boolean;
++    '0x64': boolean;
++  };
++  showTestNetworks: boolean;
++  useNftDetection: boolean;
++  useTokenDetection: boolean;
++  smartTransactionsOptInStatus: boolean;
++  useTransactionSimulations: boolean;
++  showMultiRpcModal: boolean;
  };
  /**
   * Controller that stores shared settings and exposes convenience methods
-@@ -217,11 +228,16 @@ export declare class PreferencesController extends BaseController<typeof name, P
-      */
-     setUseNftDetection(useNftDetection: boolean): void;
-     /**
+  */
+-export declare class PreferencesController extends BaseController<typeof name, PreferencesState, PreferencesControllerMessenger> {
+-    #private;
+-    /**
+-     * Creates a PreferencesController instance.
+-     *
+-     * @param args - Arguments
+-     * @param args.messenger - The preferences controller messenger.
+-     * @param args.state - Preferences controller state.
+-     */
+-    constructor({ messenger, state, }: {
+-        messenger: PreferencesControllerMessenger;
+-        state?: Partial<PreferencesState>;
+-    });
+-    /**
+-     * Adds identities to state.
+-     *
+-     * @param addresses - List of addresses to use to generate new identities.
+-     */
+-    addIdentities(addresses: string[]): void;
+-    /**
+-     * Removes an identity from state.
+-     *
+-     * @param address - Address of the identity to remove.
+-     */
+-    removeIdentity(address: string): void;
+-    /**
+-     * Associates a new label with an identity.
+-     *
+-     * @param address - Address of the identity to associate.
+-     * @param label - New label to assign.
+-     */
+-    setAccountLabel(address: string, label: string): void;
+-    /**
+-     * Enable or disable a specific feature flag.
+-     *
+-     * @param feature - Feature to toggle.
+-     * @param activated - Value to assign.
+-     */
+-    setFeatureFlag(feature: string, activated: boolean): void;
+-    /**
+-     * Sets selected address.
+-     *
+-     * @param selectedAddress - Ethereum address.
+-     */
+-    setSelectedAddress(selectedAddress: string): void;
+-    /**
+-     * Sets new IPFS gateway.
+-     *
+-     * @param ipfsGateway - IPFS gateway string.
+-     */
+-    setIpfsGateway(ipfsGateway: string): void;
+-    /**
+-     * Toggle the token detection setting.
+-     *
+-     * @param useTokenDetection - Boolean indicating user preference on token detection.
+-     */
+-    setUseTokenDetection(useTokenDetection: boolean): void;
+-    /**
+-     * Toggle the NFT detection setting.
+-     *
+-     * @param useNftDetection - Boolean indicating user preference on NFT detection.
+-     */
+-    setUseNftDetection(useNftDetection: boolean): void;
+-    /**
 -     * Toggle the opensea enabled setting.
-+     * Toggle the display nft media enabled setting.
-      *
+-     *
 -     * @param openSeaEnabled - Boolean indicating user preference on using OpenSea's API.
-+     * @param displayNftMedia - Boolean indicating user preference on using web2 third parties.
-      */
+-     */
 -    setOpenSeaEnabled(openSeaEnabled: boolean): void;
-+    setDisplayNftMedia(displayNftMedia: boolean): void;
-+    /**
-+    * Toggle the use safe chains list validation.
-+    * @param useSafeChainsListValidation - Boolean indicating user preference on using chainid.network third part to check safe networks.
-+    */
-+    setUseSafeChainsListValidation(useSafeChainsListValidation: boolean): void;
-     /**
-      * Toggle the security alert enabled setting.
-      *
-@@ -260,6 +276,18 @@ export declare class PreferencesController extends BaseController<typeof name, P
-      * @param isIncomingTransactionNetworkEnable - true to enable incoming transactions
-      */
-     setEnableNetworkIncomingTransactions(chainId: EtherscanSupportedHexChainId, isIncomingTransactionNetworkEnable: boolean): void;
-+    /**
-+     * A setter for the user to opt into smart transactions
-+     *
-+     * @param smartTransactionsOptInStatus - true to opt into smart transactions
-+     */
-+    setSmartTransactionsOptInStatus(smartTransactionsOptInStatus: boolean): void;
-+    /**
-+     * A setter for the user to opt into transaction simulations
-+     *
-+     * @param useTransactionSimulations - true to opt into transaction simulations
-+     */
-+    setUseTransactionSimulations(useTransactionSimulations: boolean): void;
+-    /**
+-     * Toggle the security alert enabled setting.
+-     *
+-     * @param securityAlertsEnabled - Boolean indicating user preference on using security alerts.
+-     */
+-    setSecurityAlertsEnabled(securityAlertsEnabled: boolean): void;
+-    /**
+-     * A setter for the user preferences to enable/disable rpc methods.
+-     *
+-     * @param methodName - The RPC method name to change the setting of.
+-     * @param isEnabled - true to enable the rpc method, false to disable it.
+-     */
+-    setDisabledRpcMethodPreference(methodName: string, isEnabled: boolean): void;
+-    /**
+-     * A setter for the user preferences to enable/disable fetch of multiple accounts balance.
+-     *
+-     * @param isMultiAccountBalancesEnabled - true to enable multiple accounts balance fetch, false to fetch only selectedAddress.
+-     */
+-    setIsMultiAccountBalancesEnabled(isMultiAccountBalancesEnabled: boolean): void;
+-    /**
+-     * A setter for the user have the test networks visible/hidden.
+-     *
+-     * @param showTestNetworks - true to show test networks, false to hidden.
+-     */
+-    setShowTestNetworks(showTestNetworks: boolean): void;
+-    /**
+-     * A setter for the user allow to be fetched IPFS content
+-     *
+-     * @param isIpfsGatewayEnabled - true to enable ipfs source
+-     */
+-    setIsIpfsGatewayEnabled(isIpfsGatewayEnabled: boolean): void;
+-    /**
+-     * A setter for the user allow to be fetched IPFS content
+-     *
+-     * @param chainId - On hexadecimal format to enable the incoming transaction network
+-     * @param isIncomingTransactionNetworkEnable - true to enable incoming transactions
+-     */
+-    setEnableNetworkIncomingTransactions(chainId: EtherscanSupportedHexChainId, isIncomingTransactionNetworkEnable: boolean): void;
++export declare class PreferencesController extends BaseController<
++  typeof name,
++  PreferencesState,
++  PreferencesControllerMessenger
++> {
++  #private;
++  /**
++   * Creates a PreferencesController instance.
++   *
++   * @param args - Arguments
++   * @param args.messenger - The preferences controller messenger.
++   * @param args.state - Preferences controller state.
++   */
++  constructor({
++    messenger,
++    state,
++  }: {
++    messenger: PreferencesControllerMessenger;
++    state?: Partial<PreferencesState>;
++  });
++  /**
++   * Adds identities to state.
++   *
++   * @param addresses - List of addresses to use to generate new identities.
++   */
++  addIdentities(addresses: string[]): void;
++  /**
++   * Removes an identity from state.
++   *
++   * @param address - Address of the identity to remove.
++   */
++  removeIdentity(address: string): void;
++  /**
++   * Associates a new label with an identity.
++   *
++   * @param address - Address of the identity to associate.
++   * @param label - New label to assign.
++   */
++  setAccountLabel(address: string, label: string): void;
++  /**
++   * Enable or disable a specific feature flag.
++   *
++   * @param feature - Feature to toggle.
++   * @param activated - Value to assign.
++   */
++  setFeatureFlag(feature: string, activated: boolean): void;
++  /**
++   * Sets selected address.
++   *
++   * @param selectedAddress - Ethereum address.
++   */
++  setSelectedAddress(selectedAddress: string): void;
++  /**
++   * Sets new IPFS gateway.
++   *
++   * @param ipfsGateway - IPFS gateway string.
++   */
++  setIpfsGateway(ipfsGateway: string): void;
++  /**
++   * Toggle the token detection setting.
++   *
++   * @param useTokenDetection - Boolean indicating user preference on token detection.
++   */
++  setUseTokenDetection(useTokenDetection: boolean): void;
++  /**
++   * Toggle the NFT detection setting.
++   *
++   * @param useNftDetection - Boolean indicating user preference on NFT detection.
++   */
++  setUseNftDetection(useNftDetection: boolean): void;
++  /**
++   * Toggle the display nft media enabled setting.
++   *
++   * @param displayNftMedia - Boolean indicating user preference on using web2 third parties.
++   */
++  setDisplayNftMedia(displayNftMedia: boolean): void;
++  /**
++   * Toggle the use safe chains list validation.
++   * @param useSafeChainsListValidation - Boolean indicating user preference on using chainid.network third part to check safe networks.
++   */
++  setUseSafeChainsListValidation(useSafeChainsListValidation: boolean): void;
++  /**
++   * Toggle the security alert enabled setting.
++   *
++   * @param securityAlertsEnabled - Boolean indicating user preference on using security alerts.
++   */
++  setSecurityAlertsEnabled(securityAlertsEnabled: boolean): void;
++  /**
++   * A setter for the user preferences to enable/disable rpc methods.
++   *
++   * @param methodName - The RPC method name to change the setting of.
++   * @param isEnabled - true to enable the rpc method, false to disable it.
++   */
++  setDisabledRpcMethodPreference(methodName: string, isEnabled: boolean): void;
++  /**
++   * A setter for the user preferences to enable/disable fetch of multiple accounts balance.
++   *
++   * @param isMultiAccountBalancesEnabled - true to enable multiple accounts balance fetch, false to fetch only selectedAddress.
++   */
++  setIsMultiAccountBalancesEnabled(
++    isMultiAccountBalancesEnabled: boolean,
++  ): void;
++  /**
++   * A setter for the user have the test networks visible/hidden.
++   *
++   * @param showTestNetworks - true to show test networks, false to hidden.
++   */
++  setShowTestNetworks(showTestNetworks: boolean): void;
++  /**
++   * A setter for the user allow to be fetched IPFS content
++   *
++   * @param isIpfsGatewayEnabled - true to enable ipfs source
++   */
++  setIsIpfsGatewayEnabled(isIpfsGatewayEnabled: boolean): void;
++  /**
++   * A setter for the user allow to be fetched IPFS content
++   *
++   * @param chainId - On hexadecimal format to enable the incoming transaction network
++   * @param isIncomingTransactionNetworkEnable - true to enable incoming transactions
++   */
++  setEnableNetworkIncomingTransactions(
++    chainId: EtherscanSupportedHexChainId,
++    isIncomingTransactionNetworkEnable: boolean,
++  ): void;
++  /**
++   * A setter for the user to opt into smart transactions
++   *
++   * @param smartTransactionsOptInStatus - true to opt into smart transactions
++   */
++  setSmartTransactionsOptInStatus(smartTransactionsOptInStatus: boolean): void;
++  /**
++   * A setter for the user to opt into transaction simulations
++   *
++   * @param useTransactionSimulations - true to opt into transaction simulations
++   */
++  setUseTransactionSimulations(useTransactionSimulations: boolean): void;
++  /**
++   * Toggle multi rpc migration modal.
++   *
++   * @param showMultiRpcModal - Boolean indicating if the multi rpc modal will be displayed or not.
++   * * */
++  setShowMultiRpcModal(showMultiRpcModal: boolean): void;
  }
  export default PreferencesController;
  //# sourceMappingURL=PreferencesController.d.ts.map
-\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 076fd1816f4b..c2c4a2074441 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7235,7 +7235,7 @@
   integrity sha512-7boYb0PjrwWy3amevP1DVqhT2LdVla8WEF4HV7Nrs55ZO8jQ2Pymsj4WinxTokXQ45YvdWVOLdqMhtYGJgRDTQ==
   dependencies:
     "@sentry/babel-plugin-component-annotate" "2.20.1"
-    "@sentry/browser" "7.119.1"
+    "@sentry/browser" "7.119.0"
     "@sentry/cli" "2.36.1"
     "@sentry/core" "7.119.0"
     "@sentry/hub" "7.119.0"
@@ -7249,7 +7249,7 @@
   resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.119.0.tgz#79f2c9d94322a3afbfa8af9f5b872f7c2e9b0820"
   integrity sha512-cf8Cei+qdSA26gx+IMAuc/k44PeBImNzIpXi3930SLhUe44ypT5OZ/44L6xTODHZzTIyMSJPduf59vT2+eW9yg==
   dependencies:
-    "@sentry/browser" "7.119.1"
+    "@sentry/browser" "7.119.0"
     "@sentry/core" "7.119.0"
     "@sentry/types" "7.119.0"
     "@sentry/utils" "7.119.0"