From 01c67245fe67ffc634aaef64359f598a695f5214 Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Tue, 27 Feb 2024 12:02:28 +0100
Subject: [PATCH 1/7] fix: fix hex to BN conversion (#8734)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

conversion from hex to BN doesn't work for very large numbers, because
the convertHexToDecimal function uses parseInt to convert from hex to
decimal, but for numbers greater than 54 digits this may send an
incorrect result.

the fix was to use `toHexBN` function

## **Related issues**

Fixes: #8703

## **Manual testing steps**

1. Click on any token where you hold a large amount
2.Go to the received/sen activity

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [x] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/components/UI/TransactionElement/utils.js |  5 +-
 .../UI/TransactionElement/utils.test.js       | 57 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/app/components/UI/TransactionElement/utils.js b/app/components/UI/TransactionElement/utils.js
index 3e36ad8f714..c09cff46d73 100644
--- a/app/components/UI/TransactionElement/utils.js
+++ b/app/components/UI/TransactionElement/utils.js
@@ -10,7 +10,6 @@ import {
   balanceToFiatNumber,
   weiToFiatNumber,
   addCurrencySymbol,
-  toBN,
   BNToHex,
   limitToMaximumDecimalPlaces,
 } from '../../../util/number';
@@ -34,7 +33,6 @@ import { isSwapsNativeAsset } from '../Swaps/utils';
 import { toLowerCaseEquals } from '../../../util/general';
 import Engine from '../../../core/Engine';
 import { isEIP1559Transaction } from '@metamask/transaction-controller';
-import { convertHexToDecimal } from '@metamask/controller-utils';
 
 const { getSwapsContractAddress } = swapsUtils;
 
@@ -282,8 +280,7 @@ export function decodeIncomingTransfer(args) {
     selectedAddress,
   } = args;
 
-  const decimalAmount = convertHexToDecimal(value);
-  const amount = toBN(decimalAmount);
+  const amount = hexToBN(value);
   const token = { symbol, decimals, address: contractAddress };
 
   const renderTokenAmount = token
diff --git a/app/components/UI/TransactionElement/utils.test.js b/app/components/UI/TransactionElement/utils.test.js
index c0eab53f9d1..480582eb7d7 100644
--- a/app/components/UI/TransactionElement/utils.test.js
+++ b/app/components/UI/TransactionElement/utils.test.js
@@ -7,7 +7,7 @@ describe('decodeIncomingTransfer', () => {
         transaction: {
           to: '0x77648f1407986479fb1fa5cc3597084b5dbdb057',
           from: '0x1440ec793ae50fa046b95bfeca5af475b6003f9e',
-          value: '0x52daf0',
+          value: '52daf0',
         },
         transferInformation: {
           symbol: 'USDT',
@@ -54,4 +54,59 @@ describe('decodeIncomingTransfer', () => {
       summarySecondaryTotalAmount: undefined,
     });
   });
+
+  it('should decode an incoming transfer with big number with 10 digits', () => {
+    // Arrange
+    const args = {
+      tx: {
+        transaction: {
+          to: '0x77648f1407986479fb1fa5cc3597084b5dbdb057',
+          from: '0x1440ec793ae50fa046b95bfeca5af475b6003f9e',
+          value: '3B9ACA00', // 1000000000 in decimal
+        },
+        transferInformation: {
+          symbol: 'USDT',
+          decimals: 6,
+          contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+        },
+        transactionHash:
+          '0x942d7843454266b81bf631022aa5f3f944691731b62d67c4e80c4bb5740058bb',
+      },
+      currentCurrency: 'usd',
+      contractExchangeRates: {},
+      totalGas: '0x64',
+      actionKey: 'key',
+      primaryCurrency: 'ETH',
+      selectedAddress: '0x77648f1407986479fb1fa5cc3597084b5dbdb057',
+      ticker: 'ETH',
+    };
+
+    // Act
+    const [transactionElement, transactionDetails] =
+      decodeIncomingTransfer(args);
+
+    // Assert
+    expect(transactionElement).toEqual({
+      actionKey: 'key',
+      renderFrom: '0x1440ec793aE50fA046B95bFeCa5aF475b6003f9e',
+      renderTo: '0x77648F1407986479fb1fA5Cc3597084B5dbDB057',
+      value: '1000 USDT',
+      fiatValue: undefined,
+      isIncomingTransfer: true,
+      transactionType: 'transaction_received_token',
+    });
+    expect(transactionDetails).toEqual({
+      renderTotalGas: '< 0.00001 ETH',
+      renderValue: '1000 USDT',
+      renderFrom: '0x1440ec793aE50fA046B95bFeCa5aF475b6003f9e',
+      renderTo: '0x77648F1407986479fb1fA5Cc3597084B5dbDB057',
+      transactionHash:
+        '0x942d7843454266b81bf631022aa5f3f944691731b62d67c4e80c4bb5740058bb',
+      transactionType: 'transaction_received_token',
+      summaryAmount: '1000 USDT',
+      summaryFee: '< 0.00001 ETH',
+      summaryTotalAmount: '1000 USDT / < 0.00001 ETH',
+      summarySecondaryTotalAmount: undefined,
+    });
+  });
 });

From 23ba8b1476f39c58eb40d1c8c56f6fae4cd51ebe Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Tue, 27 Feb 2024 13:58:53 +0100
Subject: [PATCH 2/7] fix: deprecate goerli network (#8567)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Pr to deprecate goerli network.
- Removes instances of goerli network. (From network dropdown and
setting)
- Updates e2e tests to use Sepolia instead.
- Creates a new component
(https://www.figma.com/file/KXgbxFucvk3FM5VULGZmzk/Assets%3A-Bug-Fixes?node-id=449%3A2210&mode=dev)
for the scenario when a user clicks on a deepling for goerli.

## **Related issues**

Fixes: https://github.com/MetaMask/mobile-planning/issues/1368

## **Manual testing steps**

1. Click on network dropdown list (you should not see Goerli)
2. Click on settings, then network list (you should not see Goerli)
3. Click on a deeplink that is supposed to switch to goerli :
https://metamask.app.link/send/0x4701Aa9471d7bfAc765D87dcb1Ea6BB23AD32733@5/approve?address=0x178e3e6c9f547A00E33150F7104427ea02cfc747&uint256=5e8.
You should see a modal saying that the network is deprecated.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


https://github.com/MetaMask/metamask-mobile/assets/10994169/d748b713-5157-4d00-8b85-558c1e0164a7


### **After**

When you try to click on a deeplink with goerli


https://github.com/MetaMask/metamask-mobile/assets/10994169/622a47c3-5223-4420-84d8-a2aa3274973d

When you try to add goerli network as custom network


https://github.com/MetaMask/metamask-mobile/assets/10994169/0591d2b9-3299-44aa-9e6b-463ff66cd693

Android:


https://github.com/MetaMask/metamask-mobile/assets/10994169/13f4ef7f-adcc-4967-8036-1ceffbf0653a



https://github.com/MetaMask/metamask-mobile/assets/10994169/aa6028b1-5ab0-4063-b00f-6c47f941880f



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/components/Nav/Main/MainNavigator.js      |  14 +++
 .../DeprecatedNetworkModal.styles.ts          |  40 ++++++
 .../DeprecatedNetworkModal.tsx                |  72 +++++++++++
 .../UI/DeprecatedNetworkModal/index.ts        |   1 +
 .../NetworkSelector/NetworkSelector.test.tsx  |   5 +-
 .../NetworksSettings/NetworkSettings/index.js |   9 ++
 app/constants/navigation/Routes.ts            |   1 +
 app/constants/urls.ts                         |   6 +-
 app/core/Analytics/MetaMetrics.events.ts      |   2 +
 .../Handlers/handleEthereumUrl.test.ts        |  25 ++++
 .../Handlers/handleEthereumUrl.ts             |  12 +-
 app/images/image-icons.js                     |   2 -
 app/lib/ens-ipfs/resolver.js                  |   3 -
 app/reducers/collectibles/index.test.ts       |  10 +-
 app/store/migrations/030.test.ts              | 119 ++++++++++++++++++
 app/store/migrations/030.ts                   |  66 ++++++++++
 app/store/migrations/index.ts                 |   2 +
 app/util/blockaid/index.test.ts               |   2 +-
 app/util/networks/index.js                    |  21 +---
 app/util/networks/index.test.ts               |  25 ++--
 e2e/resources/networks.json                   |  10 +-
 e2e/specs/assets/import-nft.spec.js           |  97 +++++++-------
 e2e/specs/networks/add-custom-rpc.spec.js     |   6 +-
 .../networks/connect-test-network.spec.js     |  10 +-
 .../quarantine/contract-nickname.failing.js   |   8 +-
 e2e/specs/swaps/token-details.spec.js         |   8 +-
 e2e/viewHelper.js                             |   8 +-
 locales/languages/en.json                     |   5 +-
 28 files changed, 464 insertions(+), 125 deletions(-)
 create mode 100644 app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.styles.ts
 create mode 100644 app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.tsx
 create mode 100644 app/components/UI/DeprecatedNetworkModal/index.ts
 create mode 100644 app/store/migrations/030.test.ts
 create mode 100644 app/store/migrations/030.ts

diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index eb9f1dff629..ac740ed1cfe 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -74,6 +74,7 @@ import URL from 'url-parse';
 import Logger from '../../../util/Logger';
 import { getDecimalChainId } from '../../../util/networks';
 import { useMetrics } from '../../../components/hooks/useMetrics';
+import DeprecatedNetworkDetails from '../../UI/DeprecatedNetworkModal';
 
 const Stack = createStackNavigator();
 const Tab = createBottomTabNavigator();
@@ -624,6 +625,19 @@ const MainNavigator = () => (
         }),
       }}
     />
+    <Stack.Screen
+      name={Routes.DEPRECATED_NETWORK_DETAILS}
+      component={DeprecatedNetworkDetails}
+      options={{
+        //Refer to - https://reactnavigation.org/docs/stack-navigator/#animations
+        cardStyle: { backgroundColor: importedColors.transparent },
+        cardStyleInterpolator: () => ({
+          overlayStyle: {
+            opacity: 0,
+          },
+        }),
+      }}
+    />
     <Stack.Screen name="Home" component={HomeTabs} />
     <Stack.Screen name="Asset" component={AssetModalFlow} />
     <Stack.Screen name="Webview" component={Webview} />
diff --git a/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.styles.ts b/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.styles.ts
new file mode 100644
index 00000000000..7a6f2cb1305
--- /dev/null
+++ b/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.styles.ts
@@ -0,0 +1,40 @@
+import Device from '../../../util/device';
+import { StyleSheet, TextStyle } from 'react-native';
+import { Theme } from '../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) => {
+  const { theme } = params;
+  const { typography } = theme;
+
+  return StyleSheet.create({
+    centeredTitle: {
+      marginTop: 16,
+      marginBottom: 8,
+      fontSize: 18,
+      textAlign: 'center',
+    },
+    centeredDescription: {
+      fontSize: 14,
+      textAlign: 'center',
+      paddingRight: 16,
+      paddingLeft: 16,
+    },
+    footer: {
+      flexDirection: 'row',
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    button: {
+      flex: 1,
+      marginLeft: 16,
+      marginRight: 16,
+      marginTop: 24,
+      marginBottom: Device.isAndroid() ? 21 : 0,
+    },
+    buttonLabel: {
+      ...typography.lBodySMMedium,
+    } as TextStyle,
+  });
+};
+
+export default styleSheet;
diff --git a/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.tsx b/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.tsx
new file mode 100644
index 00000000000..e1917cade59
--- /dev/null
+++ b/app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.tsx
@@ -0,0 +1,72 @@
+import { useNavigation } from '@react-navigation/native';
+import React, { useRef } from 'react';
+import { Linking, View } from 'react-native';
+import { useStyles } from '../../../component-library/hooks';
+import { strings } from '../../../../locales/i18n';
+import styleSheet from './DeprecatedNetworkModal.styles';
+import Text, {
+  TextColor,
+  TextVariant,
+} from '../../../component-library/components/Texts/Text';
+import Button, {
+  ButtonSize,
+  ButtonVariants,
+} from '../../../component-library/components/Buttons/Button';
+import { CONNECTING_TO_DEPRECATED_NETWORK } from '../../../constants/urls';
+import BottomSheet from '../../../component-library/components/BottomSheets/BottomSheet';
+import { useMetrics } from '../../../components/hooks/useMetrics';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+
+const DeprecatedNetworkModal = () => {
+  const { styles } = useStyles(styleSheet, {});
+  const { trackEvent } = useMetrics();
+  const navigation = useNavigation();
+
+  const dismissModal = (): void => {
+    navigation.goBack();
+  };
+
+  const goToLearnMore = () => {
+    Linking.openURL(CONNECTING_TO_DEPRECATED_NETWORK);
+    trackEvent(MetaMetricsEvents.EXTERNAL_LINK_CLICKED, {
+      location: 'dapp_connection_request',
+      text: 'Learn More',
+      url_domain: CONNECTING_TO_DEPRECATED_NETWORK,
+    });
+  };
+
+  const sheetRef = useRef(null);
+
+  return (
+    <BottomSheet ref={sheetRef}>
+      <Text variant={TextVariant.HeadingMD} style={styles.centeredTitle}>
+        {strings('networks.network_deprecated_title')}
+      </Text>
+      <Text variant={TextVariant.BodyMD} style={styles.centeredDescription}>
+        {strings('networks.network_deprecated_description')}{' '}
+        <Text color={TextColor.Info} onPress={goToLearnMore}>
+          {strings('accounts.learn_more')}
+        </Text>
+      </Text>
+      <View style={{ ...styles.footer }}>
+        <Button
+          variant={ButtonVariants.Primary}
+          size={ButtonSize.Lg}
+          onPress={dismissModal}
+          style={styles.button}
+          label={
+            <Text
+              variant={TextVariant.BodyMD}
+              color={TextColor.Default}
+              style={styles.buttonLabel}
+            >
+              {strings('network_information.got_it')}
+            </Text>
+          }
+        />
+      </View>
+    </BottomSheet>
+  );
+};
+
+export default DeprecatedNetworkModal;
diff --git a/app/components/UI/DeprecatedNetworkModal/index.ts b/app/components/UI/DeprecatedNetworkModal/index.ts
new file mode 100644
index 00000000000..1e67c4f23f3
--- /dev/null
+++ b/app/components/UI/DeprecatedNetworkModal/index.ts
@@ -0,0 +1 @@
+export { default } from './DeprecatedNetworkModal';
diff --git a/app/components/Views/NetworkSelector/NetworkSelector.test.tsx b/app/components/Views/NetworkSelector/NetworkSelector.test.tsx
index 6c8f9df227f..7afe0537930 100644
--- a/app/components/Views/NetworkSelector/NetworkSelector.test.tsx
+++ b/app/components/Views/NetworkSelector/NetworkSelector.test.tsx
@@ -9,6 +9,7 @@ import initialBackgroundState from '../../../util/test/initial-background-state.
 
 // Internal dependencies
 import NetworkSelector from './NetworkSelector';
+import { CHAIN_IDS } from '@metamask/transaction-controller/dist/constants';
 
 const mockEngine = Engine;
 
@@ -158,9 +159,9 @@ describe('Network Selector', () => {
             ...initialState.engine.backgroundState.NetworkController,
             providerConfig: {
               type: 'mainnet',
-              nickname: 'Goerli mainnet',
+              nickname: 'Sepolia mainnet',
               ticket: 'eth',
-              chainId: '0x5',
+              chainId: CHAIN_IDS.SEPOLIA,
             },
           },
         },
diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 1476db4257d..0c130b1793b 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -67,6 +67,8 @@ import { regex } from '../../../../../../app/util/regex';
 import { NetworksViewSelectorsIDs } from '../../../../../../e2e/selectors/Settings/NetworksView.selectors';
 import { updateIncomingTransactions } from '../../../../../util/transaction-controller';
 import { withMetricsAwareness } from '../../../../../components/hooks/useMetrics';
+import { CHAIN_IDS } from '@metamask/transaction-controller/dist/constants';
+import Routes from '../../../../../constants/navigation/Routes';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -1088,6 +1090,7 @@ class NetworkSettings extends PureComponent {
 
   toggleNetworkDetailsModal = async () => {
     const { rpcUrl, chainId: stateChainId } = this.state;
+    const { navigation } = this.props;
     const formChainId = stateChainId.trim().toLowerCase();
 
     // Ensure chainId is a 0x-prefixed, lowercase hex string
@@ -1096,6 +1099,12 @@ class NetworkSettings extends PureComponent {
       chainId = `0x${parseInt(chainId, 10).toString(16)}`;
     }
 
+    // if chainId is goerli, show deprecation modal
+    if (chainId === CHAIN_IDS.GOERLI) {
+      navigation.navigate(Routes.DEPRECATED_NETWORK_DETAILS);
+      return;
+    }
+
     if (!(await this.validateChainIdOnSubmit(formChainId, chainId, rpcUrl))) {
       return;
     }
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index f08cb321c27..ba020840e6f 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -4,6 +4,7 @@ const Routes = {
   BROWSER_URL_MODAL: 'BrowserUrlModal',
   BROWSER_VIEW: 'BrowserView',
   SETTINGS_VIEW: 'SettingsView',
+  DEPRECATED_NETWORK_DETAILS: 'DeprecatedNetworkDetails',
   RAMP: {
     ID: 'Ramp',
     BUY: 'RampBuy',
diff --git a/app/constants/urls.ts b/app/constants/urls.ts
index 13812a85e1e..1b6b4d882e5 100644
--- a/app/constants/urls.ts
+++ b/app/constants/urls.ts
@@ -16,6 +16,9 @@ export const TOKEN_APPROVAL_SPENDING_CAP = `https://support.metamask.io/hc/en-us
 export const CONNECTING_TO_A_DECEPTIVE_SITE =
   'https://support.metamask.io/hc/en-us/articles/4428045875483--Deceptive-site-ahead-when-trying-to-connect-to-a-site';
 
+export const CONNECTING_TO_DEPRECATED_NETWORK =
+  'https://support.metamask.io/hc/en-us/articles/360059213492-ETH-on-Sepolia-and-Goerli-networks-testnets';
+
 // Policies
 export const CONSENSYS_PRIVACY_POLICY = 'https://consensys.net/privacy-policy/';
 
@@ -76,8 +79,5 @@ export const LINEA_FAUCET = 'https://www.infura.io/faucet/linea';
 export const ADD_CUSTOM_NETWORK_ARTCILE =
   'https://support.metamask.io/hc/en-us/articles/360057142392-Verifying-custom-network-information';
 
-export const GOERLI_DEPRECATED_ARTICLE =
-  'https://github.com/eth-clients/goerli#goerli-goerlitzer-testnet';
-
 export const LEDGER_SUPPORT_LINK =
   'https://support.ledger.com/hc/en-us/articles/360009576554-Ethereum-ETH-?docs=true';
diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts
index 75ae6b91d52..3f3b3abdb54 100644
--- a/app/core/Analytics/MetaMetrics.events.ts
+++ b/app/core/Analytics/MetaMetrics.events.ts
@@ -195,6 +195,7 @@ enum EVENT_NAME {
   TOKEN_IMPORT_CLICKED = 'Token Import Clicked',
   TOKEN_IMPORT_CANCELED = 'Token Import Canceled',
   TOKENS_HIDDEN = 'Tokens Hidden',
+  EXTERNAL_LINK_CLICKED = 'External Link Clicked',
 
   // On Ramp
   BUY_BUTTON_CLICKED = 'Buy Button Clicked',
@@ -438,6 +439,7 @@ const events = {
   SEND_TRANSACTION_COMPLETED: generateOpt(
     EVENT_NAME.SEND_TRANSACTION_COMPLETED,
   ),
+  EXTERNAL_LINK_CLICKED: generateOpt(EVENT_NAME.EXTERNAL_LINK_CLICKED),
   ONRAMP_OPENED: generateOpt(EVENT_NAME.ONRAMP_OPENED),
   ONRAMP_CLOSED: generateOpt(EVENT_NAME.ONRAMP_CLOSED),
   ONRAMP_PURCHASE_EXITED: generateOpt(EVENT_NAME.ONRAMP_PURCHASE_EXITED),
diff --git a/app/core/DeeplinkManager/Handlers/handleEthereumUrl.test.ts b/app/core/DeeplinkManager/Handlers/handleEthereumUrl.test.ts
index 5fbc55b97f1..d0e41c0f27b 100644
--- a/app/core/DeeplinkManager/Handlers/handleEthereumUrl.test.ts
+++ b/app/core/DeeplinkManager/Handlers/handleEthereumUrl.test.ts
@@ -4,6 +4,7 @@ import { ETH_ACTIONS } from '../../../constants/deeplinks';
 import { NetworkSwitchErrorType } from '../../../constants/error';
 import DeeplinkManager from '../DeeplinkManager';
 import handleEthereumUrl from './handleEthereumUrl';
+import { getDecimalChainId } from '../../../util/networks';
 
 jest.mock('react-native');
 
@@ -11,6 +12,10 @@ jest.mock('eth-url-parser', () => ({
   parse: jest.fn(),
 }));
 
+jest.mock('../../../util/networks', () => ({
+  getDecimalChainId: jest.fn(),
+}));
+
 jest.mock('../../../../locales/i18n', () => ({
   strings: jest.fn((key) => key),
 }));
@@ -18,6 +23,7 @@ jest.mock('../../../../locales/i18n', () => ({
 describe('handleEthereumUrl', () => {
   let deeplinkManager: DeeplinkManager;
   const mockParse = parse as jest.Mock;
+  const mockGetDecimalChainId = getDecimalChainId as jest.Mock;
 
   const mockHandleNetworkSwitch = jest.fn();
   const mockNavigate = jest.fn();
@@ -66,6 +72,25 @@ describe('handleEthereumUrl', () => {
     );
   });
 
+  it('Should show deprecation modal if url is a goerli url', () => {
+    const url = 'ethereum:transfer';
+    const origin = 'test_origin';
+    mockParse.mockReturnValue({
+      function_name: ETH_ACTIONS.TRANSFER,
+      chain_id: 5,
+    });
+
+    mockGetDecimalChainId.mockReturnValue(5);
+
+    handleEthereumUrl({ deeplinkManager, url, origin });
+
+    expect(deeplinkManager.navigation.navigate).toHaveBeenCalledWith(
+      'DeprecatedNetworkDetails',
+      {},
+    );
+    expect(deeplinkManager._handleNetworkSwitch).toHaveBeenCalledTimes(0);
+  });
+
   it('should navigates to SendView for TRANSFER action', () => {
     const url = 'ethereum:transfer';
     const origin = 'test_origin';
diff --git a/app/core/DeeplinkManager/Handlers/handleEthereumUrl.ts b/app/core/DeeplinkManager/Handlers/handleEthereumUrl.ts
index c601d962fed..b35dab99b71 100644
--- a/app/core/DeeplinkManager/Handlers/handleEthereumUrl.ts
+++ b/app/core/DeeplinkManager/Handlers/handleEthereumUrl.ts
@@ -1,10 +1,11 @@
 import { ETH_ACTIONS } from '../../../constants/deeplinks';
-import { NetworkSwitchErrorType } from '../../../constants/error';
 import { ParseOutput, parse } from 'eth-url-parser';
 import { Alert } from 'react-native';
 import { strings } from '../../../../locales/i18n';
 import DeeplinkManager from '../DeeplinkManager';
 import formattedDeeplinkParsedValue from '../../../util/formattedDeeplinkParsedValue';
+import { NetworkSwitchErrorType } from '../../../constants/error';
+import { CHAIN_IDS } from '@metamask/transaction-controller/dist/constants';
 import { getDecimalChainId } from '../../../util/networks';
 
 async function handleEthereumUrl({
@@ -27,6 +28,15 @@ async function handleEthereumUrl({
   const txMeta = { ...ethUrl, source: url };
 
   try {
+    // If the deeplink has a goerli chainId, show deprecation modal and return
+    if (
+      ethUrl.chain_id === getDecimalChainId(CHAIN_IDS.GOERLI) ||
+      ethUrl.chain_id === CHAIN_IDS.GOERLI
+    ) {
+      deeplinkManager.navigation.navigate('DeprecatedNetworkDetails', {});
+      return;
+    }
+
     /**
      * Validate and switch network before performing any other action
      */
diff --git a/app/images/image-icons.js b/app/images/image-icons.js
index 5a71b1bf95e..33369e0a995 100644
--- a/app/images/image-icons.js
+++ b/app/images/image-icons.js
@@ -7,7 +7,6 @@ import FTM from './fantom.png';
 import ETHEREUM from './eth-logo-new.png';
 import BNB from './binance.png';
 import AVAX from './avalanche.png';
-import GOERLI from './goerli-logo-dark.png';
 import LINEA_GOERLI from './linea-testnet-logo.png';
 import SEPOLIA from './sepolia-logo-dark.png';
 import LINEA_MAINNET from './linea-mainnet-logo.png';
@@ -22,7 +21,6 @@ export default {
   BNB,
   AETH,
   AVAX,
-  GOERLI,
   'LINEA-GOERLI': LINEA_GOERLI,
   SEPOLIA,
   'LINEA-MAINNET': LINEA_MAINNET,
diff --git a/app/lib/ens-ipfs/resolver.js b/app/lib/ens-ipfs/resolver.js
index 5c03c26bdaa..2eb3b24944a 100644
--- a/app/lib/ens-ipfs/resolver.js
+++ b/app/lib/ens-ipfs/resolver.js
@@ -85,9 +85,6 @@ function getRegistryForChainId(chainId) {
     // mainnet
     case '1':
       return '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e';
-    // goerli
-    case '5':
-      return '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e';
     // sepolia
     case '11155111':
       return '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e';
diff --git a/app/reducers/collectibles/index.test.ts b/app/reducers/collectibles/index.test.ts
index 146f0e67619..924f8ad6d53 100644
--- a/app/reducers/collectibles/index.test.ts
+++ b/app/reducers/collectibles/index.test.ts
@@ -66,14 +66,14 @@ describe('swaps reducer', () => {
     const secondState = reducer(firstState, {
       type: ADD_FAVORITE_COLLECTIBLE,
       selectedAddress: selectedAddressA,
-      chainId: ChainId.goerli,
+      chainId: ChainId.sepolia,
       collectible: collectibleA2,
     });
     expect(secondState).toEqual({
       favorites: {
         [selectedAddressA]: {
           [ChainId.mainnet]: [collectibleA1],
-          [ChainId.goerli]: [collectibleA2],
+          [ChainId.sepolia]: [collectibleA2],
         },
       },
     });
@@ -128,21 +128,21 @@ describe('swaps reducer', () => {
       favorites: {
         [selectedAddressA]: {
           [ChainId.mainnet]: [collectibleA1, collectibleA2],
-          [ChainId.goerli]: [collectibleA1],
+          [ChainId.sepolia]: [collectibleA1],
         },
       },
     };
     const secondState = reducer(firstState, {
       type: REMOVE_FAVORITE_COLLECTIBLE,
       selectedAddress: selectedAddressA,
-      chainId: ChainId.goerli,
+      chainId: ChainId.sepolia,
       collectible: collectibleA1,
     });
     expect(secondState).toEqual({
       favorites: {
         [selectedAddressA]: {
           [ChainId.mainnet]: [collectibleA1, collectibleA2],
-          [ChainId.goerli]: [],
+          [ChainId.sepolia]: [],
         },
       },
     });
diff --git a/app/store/migrations/030.test.ts b/app/store/migrations/030.test.ts
new file mode 100644
index 00000000000..da1e5792586
--- /dev/null
+++ b/app/store/migrations/030.test.ts
@@ -0,0 +1,119 @@
+import migration from './030';
+import { merge } from 'lodash';
+import initialRootState from '../../util/test/initial-root-state';
+import { captureException } from '@sentry/react-native';
+import { CHAIN_IDS } from '@metamask/transaction-controller/dist/constants';
+import { GOERLI, SEPOLIA } from '../../../app/constants/network';
+import NetworkList from '../../../app/util/networks';
+
+const oldState = {
+  engine: {
+    backgroundState: {
+      NetworkController: {
+        isCustomNetwork: true,
+        networkConfigurations: {},
+        networkDetails: { EIPS: { '1559': true } },
+        networkId: '5',
+        networkStatus: 'available',
+        providerConfig: {
+          chainId: CHAIN_IDS.GOERLI,
+          rpcPrefs: { blockExplorerUrl: 'https://goerli.etherscan.io' },
+          ticker: 'GoerliETH',
+          type: GOERLI,
+        },
+      },
+    },
+  },
+};
+
+const expectedNewState = {
+  engine: {
+    backgroundState: {
+      NetworkController: {
+        isCustomNetwork: true,
+        networkConfigurations: {},
+        networkDetails: { EIPS: { '1559': true } },
+        networkId: `${NetworkList[SEPOLIA].networkId}`,
+        networkStatus: 'available',
+        providerConfig: {
+          chainId: CHAIN_IDS.SEPOLIA,
+          ticker: 'SepoliaETH',
+          type: SEPOLIA,
+        },
+      },
+    },
+  },
+};
+
+jest.mock('@sentry/react-native', () => ({
+  captureException: jest.fn(),
+}));
+const mockedCaptureException = jest.mocked(captureException);
+
+describe('Migration #30', () => {
+  beforeEach(() => {
+    jest.restoreAllMocks();
+    jest.resetAllMocks();
+  });
+
+  const invalidStates = [
+    {
+      state: merge({}, initialRootState, {
+        engine: null,
+      }),
+      errorMessage: "Migration 30: Invalid engine state error: 'object'",
+      scenario: 'engine state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: null,
+        },
+      }),
+      errorMessage:
+        "Migration 30: Invalid engine backgroundState error: 'object'",
+      scenario: 'backgroundState is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: {
+            NetworkController: null,
+          },
+        },
+      }),
+      errorMessage:
+        "Migration 30: Invalid NetworkController state error: 'object'",
+      scenario: 'NetworkController state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: {
+            NetworkController: { providerConfig: { chainId: null } },
+          },
+        },
+      }),
+      errorMessage:
+        "Migration 30: NetworkController providerConfig chainId not found: 'null'",
+      scenario: 'chainId is invalid',
+    },
+  ];
+
+  for (const { errorMessage, scenario, state } of invalidStates) {
+    it(`should capture exception if ${scenario}`, () => {
+      const newState = migration(state);
+
+      expect(newState).toStrictEqual(state);
+      expect(mockedCaptureException).toHaveBeenCalledWith(expect.any(Error));
+      expect(mockedCaptureException.mock.calls[0][0].message).toBe(
+        errorMessage,
+      );
+    });
+  }
+
+  it('All states changing as expected', () => {
+    const newState = migration(oldState);
+    expect(newState).toStrictEqual(expectedNewState);
+  });
+});
diff --git a/app/store/migrations/030.ts b/app/store/migrations/030.ts
new file mode 100644
index 00000000000..54871d162e8
--- /dev/null
+++ b/app/store/migrations/030.ts
@@ -0,0 +1,66 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller/dist/constants';
+import { SEPOLIA } from '../../../app/constants/network';
+import { captureException } from '@sentry/react-native';
+import { isObject } from '@metamask/utils';
+import { NetworkState } from '@metamask/network-controller';
+import NetworkList from '../../../app/util/networks';
+
+export default function migrate(state: unknown) {
+  if (!isObject(state)) {
+    captureException(
+      new Error(`Migration 30: Invalid state error: '${typeof state}'`),
+    );
+    return state;
+  }
+
+  if (!isObject(state.engine)) {
+    captureException(
+      new Error(
+        `Migration 30: Invalid engine state error: '${typeof state.engine}'`,
+      ),
+    );
+    return state;
+  }
+
+  if (!isObject(state.engine.backgroundState)) {
+    captureException(
+      new Error(
+        `Migration 30: Invalid engine backgroundState error: '${typeof state
+          .engine.backgroundState}'`,
+      ),
+    );
+    return state;
+  }
+  const networkControllerState = state.engine.backgroundState
+    .NetworkController as NetworkState;
+  if (!isObject(networkControllerState)) {
+    captureException(
+      new Error(
+        `Migration 30: Invalid NetworkController state error: '${typeof networkControllerState}'`,
+      ),
+    );
+    return state;
+  }
+
+  if (!networkControllerState.providerConfig.chainId) {
+    captureException(
+      new Error(
+        `Migration 30: NetworkController providerConfig chainId not found: '${JSON.stringify(
+          networkControllerState.providerConfig.chainId,
+        )}'`,
+      ),
+    );
+    return state;
+  }
+  const chainId = networkControllerState.providerConfig.chainId;
+  // If user on goerli, fallback to Sepolia
+  if (chainId === CHAIN_IDS.GOERLI) {
+    networkControllerState.providerConfig = {
+      chainId: CHAIN_IDS.SEPOLIA,
+      ticker: 'SepoliaETH',
+      type: SEPOLIA,
+    };
+    networkControllerState.networkId = `${NetworkList[SEPOLIA].networkId}`;
+  }
+  return state;
+}
diff --git a/app/store/migrations/index.ts b/app/store/migrations/index.ts
index 9e599fa3e50..de194ea95db 100644
--- a/app/store/migrations/index.ts
+++ b/app/store/migrations/index.ts
@@ -30,6 +30,7 @@ import migration26 from './026';
 import migration27 from './027';
 import migration28 from './028';
 import migration29 from './029';
+import migration30 from './030';
 
 // We do not keep track of the old state
 // We create this type for better readability
@@ -66,6 +67,7 @@ export const migrations: MigrationManifest = {
   27: migration27,
   28: migration28 as unknown as (state: PersistedState) => PersistedState,
   29: migration29 as unknown as (state: OldState) => PersistedState,
+  30: migration30 as unknown as (state: OldState) => PersistedState,
 };
 
 // The latest (i.e. highest) version number.
diff --git a/app/util/blockaid/index.test.ts b/app/util/blockaid/index.test.ts
index 1e8aecd8803..f0873ad8bdd 100644
--- a/app/util/blockaid/index.test.ts
+++ b/app/util/blockaid/index.test.ts
@@ -102,7 +102,7 @@ describe('Blockaid util', () => {
     it('return false if blockaid is not on current network', () => {
       jest
         .spyOn(NetworkControllerMock, 'selectChainId')
-        .mockReturnValue(NETWORKS_CHAIN_ID.GOERLI);
+        .mockReturnValue(NETWORKS_CHAIN_ID.SEPOLIA);
       const result = isBlockaidSupportedOnCurrentChain();
       expect(result).toEqual(false);
     });
diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index 1358af754a9..b9a9c151aa8 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -5,7 +5,6 @@ import { getContractFactory } from '@eth-optimism/contracts/dist/contract-defs';
 import { predeploys } from '@eth-optimism/contracts/dist/predeploys';
 import networksWithImages from 'images/image-icons';
 import {
-  GOERLI,
   MAINNET,
   NETWORKS_CHAIN_ID,
   SEPOLIA,
@@ -26,7 +25,6 @@ export { handleNetworkSwitch };
 
 /* eslint-disable */
 const ethLogo = require('../../images/eth-logo-new.png');
-const goerliLogo = require('../../images/goerli-logo-dark.png');
 const sepoliaLogo = require('../../images/sepolia-logo-dark.png');
 const lineaGoerliLogo = require('../../images/linea-testnet-logo.png');
 const lineaMainnetLogo = require('../../images/linea-mainnet-logo.png');
@@ -68,15 +66,6 @@ const NetworkList = {
     networkType: 'linea-mainnet',
     imageSource: lineaMainnetLogo,
   },
-  [GOERLI]: {
-    name: 'Goerli Test Network',
-    shortName: 'Goerli',
-    networkId: 5,
-    chainId: toHex('5'),
-    color: '#3099f2',
-    networkType: 'goerli',
-    imageSource: goerliLogo,
-  },
   [SEPOLIA]: {
     name: 'Sepolia Test Network',
     shortName: 'Sepolia',
@@ -170,19 +159,12 @@ export const isMultiLayerFeeNetwork = (chainId) =>
  * @returns - Image of test network or undefined.
  */
 export const getTestNetImage = (networkType) => {
-  if (
-    networkType === GOERLI ||
-    networkType === SEPOLIA ||
-    networkType === LINEA_GOERLI
-  ) {
+  if (networkType === SEPOLIA || networkType === LINEA_GOERLI) {
     return networksWithImages?.[networkType.toUpperCase()];
   }
 };
 
 export const getTestNetImageByChainId = (chainId) => {
-  if (NETWORKS_CHAIN_ID.GOERLI === chainId) {
-    return networksWithImages?.GOERLI;
-  }
   if (NETWORKS_CHAIN_ID.SEPOLIA === chainId) {
     return networksWithImages?.SEPOLIA;
   }
@@ -195,7 +177,6 @@ export const getTestNetImageByChainId = (chainId) => {
  * A list of chain IDs for known testnets
  */
 const TESTNET_CHAIN_IDS = [
-  ChainId[NetworkType.goerli],
   ChainId[NetworkType.sepolia],
   ChainId[NetworkType['linea-goerli']],
 ];
diff --git a/app/util/networks/index.test.ts b/app/util/networks/index.test.ts
index 2da9d2076e0..429b85f4fbd 100644
--- a/app/util/networks/index.test.ts
+++ b/app/util/networks/index.test.ts
@@ -12,7 +12,6 @@ import {
 } from '.';
 import {
   MAINNET,
-  GOERLI,
   RPC,
   SEPOLIA,
   LINEA_GOERLI,
@@ -53,7 +52,6 @@ describe('network-utils', () => {
     it('should get all networks', () => {
       expect(allNetworks.includes(MAINNET)).toEqual(true);
       expect(allNetworks.includes(SEPOLIA)).toEqual(true);
-      expect(allNetworks.includes(GOERLI)).toEqual(true);
       expect(allNetworks.includes(LINEA_GOERLI)).toEqual(true);
       expect(allNetworks.includes(LINEA_MAINNET)).toEqual(true);
     });
@@ -72,11 +70,7 @@ describe('network-utils', () => {
   });
 
   describe('isTestNet', () => {
-    const testnets = [
-      NetworkType.goerli,
-      NetworkType.sepolia,
-      NetworkType['linea-goerli'],
-    ];
+    const testnets = [NetworkType.sepolia, NetworkType['linea-goerli']];
 
     for (const networkType of testnets) {
       it(`should return true if the given chain ID is for '${networkType}'`, () => {
@@ -196,14 +190,14 @@ describe('network-utils', () => {
 
     it('should return etherscan block explorer address url when network type !== "rpc"', () => {
       const { url, title } = getBlockExplorerAddressUrl(
-        GOERLI,
+        SEPOLIA,
         mockEthereumAddress,
       );
 
       expect(url).toBe(
-        `https://goerli.etherscan.io/address/${mockEthereumAddress}`,
+        `https://sepolia.etherscan.io/address/${mockEthereumAddress}`,
       );
-      expect(title).toBe(`goerli.etherscan.io`);
+      expect(title).toBe(`sepolia.etherscan.io`);
     });
 
     it('should return custom block explorer address url when network type === "linea-goerli"', () => {
@@ -254,10 +248,15 @@ describe('network-utils', () => {
     });
 
     it('should return etherscan block explorer tx url when network type !== "rpc"', () => {
-      const { url, title } = getBlockExplorerTxUrl(GOERLI, mockTransactionHash);
+      const { url, title } = getBlockExplorerTxUrl(
+        SEPOLIA,
+        mockTransactionHash,
+      );
 
-      expect(url).toBe(`https://goerli.etherscan.io/tx/${mockTransactionHash}`);
-      expect(title).toBe(`goerli.etherscan.io`);
+      expect(url).toBe(
+        `https://sepolia.etherscan.io/tx/${mockTransactionHash}`,
+      );
+      expect(title).toBe(`sepolia.etherscan.io`);
     });
 
     it('should return custom block explorer tx url when network type === "linea-goerli"', () => {
diff --git a/e2e/resources/networks.json b/e2e/resources/networks.json
index de07e65a416..9b8278ae68d 100644
--- a/e2e/resources/networks.json
+++ b/e2e/resources/networks.json
@@ -1,11 +1,11 @@
 {
-  "Goerli": {
+  "Sepolia": {
     "providerConfig": {
       "type": "mainnet",
-      "chainId": "0x5",
-      "rpcUrl": "https://goerli.infura.io/v3/",
-      "nickname": "Goerli Test Network",
-      "ticker": "GoerliETH"
+      "chainId": "11155111",
+      "rpcTarget": "https://sepolia.infura.io/v3/",
+      "nickname": "Sepolia Test Network",
+      "ticker": "SepoliaETH"
     }
   },
   "Avalanche": {
diff --git a/e2e/specs/assets/import-nft.spec.js b/e2e/specs/assets/import-nft.spec.js
index f8327f3b0a4..eca3a886faf 100644
--- a/e2e/specs/assets/import-nft.spec.js
+++ b/e2e/specs/assets/import-nft.spec.js
@@ -3,62 +3,61 @@ import { SmokeCore } from '../../tags';
 import TestHelpers from '../../helpers';
 import WalletView from '../../pages/WalletView';
 import AddCustomTokenView from '../../pages/AddCustomTokenView';
-import NetworkListModal from '../../pages/modals/NetworkListModal';
-import NetworkEducationModal from '../../pages/modals/NetworkEducationModal';
-import { importWalletWithRecoveryPhrase } from '../../viewHelper';
-import Collectibles from '../../resources/collectibles.json';
+import { loginToApp } from '../../viewHelper';
+import {
+  withFixtures,
+  defaultGanacheOptions,
+} from '../../fixtures/fixture-helper';
+import { SMART_CONTRACTS } from '../../../app/util/test/smart-contracts';
+import FixtureBuilder from '../../fixtures/fixture-builder';
 
 describe(SmokeCore('Import NFT'), () => {
-  const GOERLI = 'Goerli Test Network';
-
   beforeAll(async () => {
     jest.setTimeout(150000);
     await device.launchApp();
   });
 
-  it('should import wallet and go to the wallet view', async () => {
-    await importWalletWithRecoveryPhrase();
-  });
-
-  it('should switch to Goerli network', async () => {
-    await WalletView.tapNetworksButtonOnNavBar();
-    await NetworkListModal.isVisible();
-    await NetworkListModal.tapTestNetworkSwitch();
-    await NetworkListModal.isTestNetworkToggleOn();
-    await NetworkListModal.changeNetwork(GOERLI);
-    await WalletView.isNetworkNameVisible(GOERLI);
-  });
-
-  it('should dismiss network education modal', async () => {
-    await NetworkEducationModal.isVisible();
-    await NetworkEducationModal.tapGotItButton();
-    await NetworkEducationModal.isNotVisible();
-  });
-
   it('should add a collectible', async () => {
-    await WalletView.isVisible();
-    // Tap on COLLECTIBLES tab
-    await WalletView.tapNftTab();
-    await WalletView.scrollDownOnNFTsTab();
-    // Tap on the add collectibles button
-    await WalletView.tapImportNFTButton();
-    await AddCustomTokenView.isVisible();
-    // Input incorrect contract address
-    await AddCustomTokenView.typeInNFTAddress('1234');
-    await AddCustomTokenView.typeInNFTIdentifier('');
-    await AddCustomTokenView.isNFTAddressWarningVisible();
-    await AddCustomTokenView.tapBackButton();
-    await WalletView.tapImportNFTButton();
-    await AddCustomTokenView.isVisible();
-    await AddCustomTokenView.typeInNFTAddress(Collectibles.erc1155tokenAddress);
-    await AddCustomTokenView.typeInNFTIdentifier(Collectibles.erc1155tokenID);
-    await WalletView.isVisible();
-    // Wait for asset to load
-    await TestHelpers.delay(3000);
-    await WalletView.isNFTVisibleInWallet(Collectibles.erc1155collectionName);
-    // Tap on Collectible
-    await WalletView.tapOnNFTInWallet(Collectibles.erc1155collectionName);
-    await WalletView.isNFTNameVisible(Collectibles.erc1155tokenName);
-    await WalletView.scrollUpOnNFTsTab();
+    const SMART_CONTRACT = SMART_CONTRACTS.NFTS;
+    await withFixtures(
+      {
+        dapp: true,
+        fixture: new FixtureBuilder()
+          .withGanacheNetwork()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        restartDevice: true,
+        ganacheOptions: defaultGanacheOptions,
+        smartContract: SMART_CONTRACT,
+      },
+      async ({ contractRegistry }) => {
+        const erc1155ContractAddress =
+          await contractRegistry.getContractAddress(SMART_CONTRACT);
+        await loginToApp();
+        // Tap on COLLECTIBLES tab
+        await WalletView.tapNftTab();
+        await WalletView.scrollDownOnNFTsTab();
+        // Tap on the add collectibles button
+        await WalletView.tapImportNFTButton();
+        await AddCustomTokenView.isVisible();
+        // Input incorrect contract address
+        await AddCustomTokenView.typeInNFTAddress('1234');
+        await AddCustomTokenView.typeInNFTIdentifier('');
+        await AddCustomTokenView.isNFTAddressWarningVisible();
+        await AddCustomTokenView.tapBackButton();
+        await WalletView.tapImportNFTButton();
+        await AddCustomTokenView.isVisible();
+        await AddCustomTokenView.typeInNFTAddress(erc1155ContractAddress);
+        await AddCustomTokenView.typeInNFTIdentifier('1');
+        await WalletView.isVisible();
+        // Wait for asset to load
+        await TestHelpers.delay(3000);
+        await WalletView.isNFTVisibleInWallet('TestDappNFTs');
+        // Tap on Collectible
+        await WalletView.tapOnNFTInWallet('TestDappNFTs');
+        await WalletView.isNFTNameVisible('TestDappNFTs #1');
+        await WalletView.scrollUpOnNFTsTab();
+      },
+    );
   });
 });
diff --git a/e2e/specs/networks/add-custom-rpc.spec.js b/e2e/specs/networks/add-custom-rpc.spec.js
index fbdd16bfd21..454e11af87f 100644
--- a/e2e/specs/networks/add-custom-rpc.spec.js
+++ b/e2e/specs/networks/add-custom-rpc.spec.js
@@ -22,7 +22,7 @@ import Assertions from '../../utils/Assertions';
 import Networks from '../../resources/networks.json';
 
 const fixtureServer = new FixtureServer();
-const GORELI = 'Goerli Test Network';
+const SEPOLIA = 'Sepolia Test Network';
 const MAINNET = 'Ethereum Main Network';
 
 describe(Regression('Custom RPC Tests'), () => {
@@ -107,7 +107,7 @@ describe(Regression('Custom RPC Tests'), () => {
 
   it('should switch to Sepolia then dismiss the network education modal', async () => {
     await NetworkListModal.isTestNetworkToggleOn();
-    await NetworkListModal.changeNetwork(GORELI);
+    await NetworkListModal.changeNetwork(SEPOLIA);
     await NetworkEducationModal.isVisible();
     await NetworkEducationModal.isNetworkNameCorrect('Goreli Test Network');
     await NetworkEducationModal.tapGotItButton();
@@ -116,7 +116,7 @@ describe(Regression('Custom RPC Tests'), () => {
   });
 
   it('should switch back to xDAI', async () => {
-    await WalletView.isNetworkNameVisible(GORELI);
+    await WalletView.isNetworkNameVisible(SEPOLIA);
     await WalletView.tapNetworksButtonOnNavBar();
     await NetworkListModal.isVisible();
     await NetworkListModal.scrollToBottomOfNetworkList();
diff --git a/e2e/specs/networks/connect-test-network.spec.js b/e2e/specs/networks/connect-test-network.spec.js
index 26dfc05d40e..e5a516dfde3 100644
--- a/e2e/specs/networks/connect-test-network.spec.js
+++ b/e2e/specs/networks/connect-test-network.spec.js
@@ -4,7 +4,7 @@ import WalletView from '../../pages/WalletView';
 import NetworkListModal from '../../pages/modals/NetworkListModal';
 import NetworkEducationModal from '../../pages/modals/NetworkEducationModal';
 
-const GORELI = 'Goerli Test Network';
+const SEPOLIA = 'Sepolia Test Network';
 const ETHEREUM = 'Ethereum Main Network';
 
 describe(Regression('Connect to a Test Network'), () => {
@@ -23,13 +23,13 @@ describe(Regression('Connect to a Test Network'), () => {
     await NetworkListModal.isVisible();
     await NetworkListModal.tapTestNetworkSwitch();
     await NetworkListModal.isTestNetworkToggleOn();
-    await NetworkListModal.changeNetwork(GORELI);
+    await NetworkListModal.changeNetwork(SEPOLIA);
     await NetworkEducationModal.isVisible();
-    await NetworkEducationModal.isNetworkNameCorrect(GORELI);
+    await NetworkEducationModal.isNetworkNameCorrect(SEPOLIA);
     await NetworkEducationModal.tapGotItButton();
     await NetworkEducationModal.isNotVisible();
     await WalletView.isVisible();
-    await WalletView.isConnectedNetwork(GORELI);
+    await WalletView.isConnectedNetwork(SEPOLIA);
   });
 
   it('should not toggle off the Test Network switch while connected to test network', async () => {
@@ -54,6 +54,6 @@ describe(Regression('Connect to a Test Network'), () => {
     await NetworkListModal.isVisible();
     await NetworkListModal.tapTestNetworkSwitch();
     await NetworkListModal.isTestNetworkToggleOff();
-    await NetworkListModal.isTestNetworkDisplayed(GORELI);
+    await NetworkListModal.isTestNetworkDisplayed(SEPOLIA);
   });
 });
diff --git a/e2e/specs/quarantine/contract-nickname.failing.js b/e2e/specs/quarantine/contract-nickname.failing.js
index d9c85a1af95..6f0027086f3 100644
--- a/e2e/specs/quarantine/contract-nickname.failing.js
+++ b/e2e/specs/quarantine/contract-nickname.failing.js
@@ -33,7 +33,7 @@ describe('Adding Contract Nickname', () => {
   const APPROVAL_DEEPLINK_URL =
     'https://metamask.app.link/send/0x326C977E6efc84E512bB9C30f76E30c160eD06FB@5/approve?address=0x178e3e6c9f547A00E33150F7104427ea02cfc747&uint256=5e8';
   const CONTRACT_NICK_NAME_TEXT = 'Ace RoMaIn';
-  const GOERLI = 'Goerli Test Network';
+  const SEPOLIA = 'Sepolia Test Network';
 
   //FIXME Deep linking to a contract address does not work on a sim.
 
@@ -97,11 +97,11 @@ describe('Adding Contract Nickname', () => {
     }
   });
 
-  it('should switch to GOERLI', async () => {
+  it('should switch to SEPOLIA', async () => {
     await WalletView.tapNetworksButtonOnNavBar();
-    await NetworkListModal.changeNetwork(GOERLI);
+    await NetworkListModal.changeNetwork(SEPOLIA);
 
-    await WalletView.isNetworkNameVisible(GOERLI);
+    await WalletView.isNetworkNameVisible(SEPOLIA);
     await TestHelpers.delay(1500);
   });
 
diff --git a/e2e/specs/swaps/token-details.spec.js b/e2e/specs/swaps/token-details.spec.js
index b05dce27cf7..4132160483c 100644
--- a/e2e/specs/swaps/token-details.spec.js
+++ b/e2e/specs/swaps/token-details.spec.js
@@ -3,8 +3,8 @@ import { SmokeSwaps } from '../../tags';
 import WalletView from '../../pages/WalletView';
 import TokenOverview from '../../pages/TokenOverview';
 import {
-  switchToGoreliNetwork,
   importWalletWithRecoveryPhrase,
+  switchToSepoliaNetwork,
 } from '../../viewHelper';
 import Networks from '../../resources/networks.json';
 
@@ -30,9 +30,9 @@ describe(SmokeSwaps('Token Chart Tests'), () => {
     await TokenOverview.tapBackButton();
   });
 
-  it('should not display the chart when using Goerli test network', async () => {
-    await switchToGoreliNetwork();
-    await WalletView.tapOnToken(Networks.Goerli.providerConfig.ticker);
+  it('should not display the chart when using Sepolia test network', async () => {
+    await switchToSepoliaNetwork();
+    await WalletView.tapOnToken(Networks.Sepolia.providerConfig.ticker);
     await TokenOverview.isVisible();
     await TokenOverview.ChartNotVisible();
     await TokenOverview.TokenQuoteIsNotZero();
diff --git a/e2e/viewHelper.js b/e2e/viewHelper.js
index 08e9e0b380b..129072edad4 100644
--- a/e2e/viewHelper.js
+++ b/e2e/viewHelper.js
@@ -26,7 +26,7 @@ import LoginView from './pages/LoginView';
 import { getGanachePort } from './fixtures/utils';
 import Assertions from './utils/Assertions';
 
-const GOERLI = 'Goerli Test Network';
+const SEPOLIA = 'Sepolia Test Network';
 
 const LOCALHOST_URL = `http://localhost:${getGanachePort()}/`;
 
@@ -175,12 +175,12 @@ export const addLocalhostNetwork = async () => {
   await NetworkEducationModal.isNotVisible();
 };
 
-export const switchToGoreliNetwork = async () => {
+export const switchToSepoliaNetwork = async () => {
   await WalletView.tapNetworksButtonOnNavBar();
   await NetworkListModal.tapTestNetworkSwitch();
   await NetworkListModal.isTestNetworkToggleOn();
-  await NetworkListModal.changeNetwork(GOERLI);
-  await WalletView.isNetworkNameVisible(GOERLI);
+  await NetworkListModal.changeNetwork(SEPOLIA);
+  await WalletView.isNetworkNameVisible(SEPOLIA);
   await NetworkEducationModal.tapGotItButton();
 };
 
diff --git a/locales/languages/en.json b/locales/languages/en.json
index fb11d34d4af..c0e9e8c8519 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -1508,7 +1508,10 @@
     "add_network": "add more networks manually.",
     "select_network": "Select a network",
     "show_test_networks": "Show test networks",
-    "deprecated_goerli": "Due to the protocol changes of Ethereum: Goerli test network may not work as reliably and will be deprecated soon."
+    "deprecated_goerli": "Due to the protocol changes of Ethereum: Goerli test network may not work as reliably and will be deprecated soon.",
+    "network_deprecated_title": "This network is deprecated",
+    "network_deprecated_description": "The network you're trying to connect to is no longer supported on Metamask."
+
   },
   "select": {
     "cancel": "Cancel",

From ebf7c1ceaa2f92de1672c9b066d09813a4970fc5 Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Tue, 27 Feb 2024 15:35:30 +0100
Subject: [PATCH 3/7] fix: migration to enable Blockaid by default (#8727)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Migrating from a previous version to v7.17.0 should enable Blockaid by
default in the same way it's done with 7.17.0 fresh installs.

## **Related issues**

Fixes: #8669

## **Manual testing steps**

1. Install v7.16
2. Update to v7.17
3. Check settings --> see Blockaid is enabled


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [x] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/store/migrations/031.test.ts | 92 ++++++++++++++++++++++++++++++++
 app/store/migrations/031.ts      | 54 +++++++++++++++++++
 app/store/migrations/index.ts    |  2 +
 3 files changed, 148 insertions(+)
 create mode 100644 app/store/migrations/031.test.ts
 create mode 100644 app/store/migrations/031.ts

diff --git a/app/store/migrations/031.test.ts b/app/store/migrations/031.test.ts
new file mode 100644
index 00000000000..0388d65ac13
--- /dev/null
+++ b/app/store/migrations/031.test.ts
@@ -0,0 +1,92 @@
+import migrate from './031';
+import { merge } from 'lodash';
+import { captureException } from '@sentry/react-native';
+import initialRootState from '../../util/test/initial-root-state';
+
+const expectedState = {
+  engine: {
+    backgroundState: {
+      PreferencesController: {
+        securityAlertsEnabled: true,
+      },
+    },
+  },
+};
+
+jest.mock('@sentry/react-native', () => ({
+  captureException: jest.fn(),
+}));
+const mockedCaptureException = jest.mocked(captureException);
+
+describe('Migration #31', () => {
+  beforeEach(() => {
+    jest.restoreAllMocks();
+    jest.resetAllMocks();
+  });
+
+  const invalidStates = [
+    {
+      state: null,
+      errorMessage: "Migration 31: Invalid root state: 'object'",
+      scenario: 'state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: null,
+      }),
+      errorMessage: "Migration 31: Invalid root engine state: 'object'",
+      scenario: 'engine state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: null,
+        },
+      }),
+      errorMessage:
+        "Migration 31: Invalid root engine backgroundState: 'object'",
+      scenario: 'backgroundState is invalid',
+    },
+  ];
+
+  for (const { errorMessage, scenario, state } of invalidStates) {
+    it(`should capture exception if ${scenario}`, () => {
+      const newState = migrate(state);
+
+      expect(newState).toStrictEqual(state);
+      expect(mockedCaptureException).toHaveBeenCalledWith(expect.any(Error));
+      expect(mockedCaptureException.mock.calls[0][0].message).toBe(
+        errorMessage,
+      );
+    });
+  }
+
+  it('should not change anything if security alert is already enabled', () => {
+    const oldState = {
+      engine: {
+        backgroundState: {
+          PreferencesController: {
+            securityAlertsEnabled: true,
+          },
+        },
+      },
+    };
+
+    const migratedState = migrate(oldState);
+    expect(migratedState).toStrictEqual(expectedState);
+  });
+
+  it('should enable security alert if it is not enabled', () => {
+    const oldState = {
+      engine: {
+        backgroundState: {
+          PreferencesController: {
+            securityAlertsEnabled: false,
+          },
+        },
+      },
+    };
+    const migratedState = migrate(oldState);
+    expect(migratedState).toStrictEqual(expectedState);
+  });
+});
diff --git a/app/store/migrations/031.ts b/app/store/migrations/031.ts
new file mode 100644
index 00000000000..7deb2216deb
--- /dev/null
+++ b/app/store/migrations/031.ts
@@ -0,0 +1,54 @@
+import { PreferencesState } from '@metamask/preferences-controller';
+import { captureException } from '@sentry/react-native';
+import { isObject } from '@metamask/utils';
+
+/**
+ * Enable security alerts by default.
+ * @param {any} state - Redux state.
+ * @returns Migrated Redux state.
+ */
+export default function migrate(state: unknown) {
+  if (!isObject(state)) {
+    captureException(
+      new Error(`Migration 31: Invalid root state: '${typeof state}'`),
+    );
+    return state;
+  }
+
+  if (!isObject(state.engine)) {
+    captureException(
+      new Error(
+        `Migration 31: Invalid root engine state: '${typeof state.engine}'`,
+      ),
+    );
+    return state;
+  }
+
+  if (!isObject(state.engine.backgroundState)) {
+    captureException(
+      new Error(
+        `Migration 31: Invalid root engine backgroundState: '${typeof state
+          .engine.backgroundState}'`,
+      ),
+    );
+    return state;
+  }
+
+  const preferencesControllerState = state.engine.backgroundState
+    .PreferencesController as PreferencesState;
+
+  if (!isObject(preferencesControllerState)) {
+    captureException(
+      new Error(
+        `Migration 31: Invalid PreferencesController state: '${typeof preferencesControllerState}'`,
+      ),
+    );
+    return state;
+  }
+
+  if (!preferencesControllerState.securityAlertsEnabled) {
+    preferencesControllerState.securityAlertsEnabled = true;
+  }
+
+  return state;
+}
diff --git a/app/store/migrations/index.ts b/app/store/migrations/index.ts
index de194ea95db..71fbe714fc0 100644
--- a/app/store/migrations/index.ts
+++ b/app/store/migrations/index.ts
@@ -31,6 +31,7 @@ import migration27 from './027';
 import migration28 from './028';
 import migration29 from './029';
 import migration30 from './030';
+import migration31 from './031';
 
 // We do not keep track of the old state
 // We create this type for better readability
@@ -68,6 +69,7 @@ export const migrations: MigrationManifest = {
   28: migration28 as unknown as (state: PersistedState) => PersistedState,
   29: migration29 as unknown as (state: OldState) => PersistedState,
   30: migration30 as unknown as (state: OldState) => PersistedState,
+  31: migration31 as unknown as (state: OldState) => PersistedState,
 };
 
 // The latest (i.e. highest) version number.

From 6ddffcfbe281cae9725467ee641186e174796171 Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Tue, 27 Feb 2024 15:36:03 +0100
Subject: [PATCH 4/7] fix: update origin passed to ppom for send transactions
 (#8742)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Context:
https://consensys.slack.com/archives/C05HZHDS89Z/p1708946195217929
Pass origin as `metamask` for ppom validate request


## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/components/Views/confirmations/SendFlow/Confirm/index.js | 2 +-
 app/core/TransactionTypes.js                                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/components/Views/confirmations/SendFlow/Confirm/index.js b/app/components/Views/confirmations/SendFlow/Confirm/index.js
index cda0b937a53..759a03241a2 100644
--- a/app/components/Views/confirmations/SendFlow/Confirm/index.js
+++ b/app/components/Views/confirmations/SendFlow/Confirm/index.js
@@ -444,7 +444,7 @@ class Confirm extends PureComponent {
         id,
         jsonrpc: '2.0',
         method: 'eth_sendTransaction',
-        origin: TransactionTypes.MMM,
+        origin: TransactionTypes.MM,
         params: [
           {
             from,
diff --git a/app/core/TransactionTypes.js b/app/core/TransactionTypes.js
index 10883e44a9a..0aa9bcd753d 100644
--- a/app/core/TransactionTypes.js
+++ b/app/core/TransactionTypes.js
@@ -12,4 +12,5 @@ export default {
     ERC1155: 'ERC1155',
   },
   MMM: 'MetaMask Mobile',
+  MM: 'metamask',
 };

From f11f359b9ef3f242ff5d1a69c8bb6bb250604e79 Mon Sep 17 00:00:00 2001
From: Nico MASSART <NicolasMassart@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:27:40 +0100
Subject: [PATCH 5/7] fix: fix metrics trackEvent compatibility with legacy
 events (#8678)

Add handling of legacy events that have properties inside the event

Realted to https://github.com/MetaMask/mobile-planning/issues/1129
---
 app/core/Analytics/MetaMetrics.test.ts | 57 ++++++++++++++++++++++++++
 app/core/Analytics/MetaMetrics.ts      |  5 ++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/app/core/Analytics/MetaMetrics.test.ts b/app/core/Analytics/MetaMetrics.test.ts
index e1d18d007d3..0fa4a479629 100644
--- a/app/core/Analytics/MetaMetrics.test.ts
+++ b/app/core/Analytics/MetaMetrics.test.ts
@@ -237,6 +237,63 @@ describe('MetaMetrics', () => {
       });
       expect(metaMetrics.isDataRecorded()).toBeFalsy();
     });
+
+    describe('Legacy events', () => {
+      it('tracks legacy properties', async () => {
+        const metaMetrics = TestMetaMetrics.getInstance();
+        expect(await metaMetrics.configure()).toBeTruthy();
+        await metaMetrics.enable();
+        const event: IMetaMetricsEvent = {
+          category: 'event1',
+          properties: { action: 'action1', name: 'description1' },
+        };
+
+        metaMetrics.trackEvent(event);
+
+        const { segmentMockClient } = global as any;
+        expect(segmentMockClient.track).toHaveBeenCalledWith(event.category, {
+          anonymous: false,
+          ...event.properties,
+        });
+      });
+
+      it('overrides legacy properties', async () => {
+        const metaMetrics = TestMetaMetrics.getInstance();
+        expect(await metaMetrics.configure()).toBeTruthy();
+        await metaMetrics.enable();
+        const event: IMetaMetricsEvent = {
+          category: 'event1',
+          properties: { action: 'action1', name: 'description1' },
+        };
+        const properties = { action: 'action2', name: 'description2' };
+
+        metaMetrics.trackEvent(event, properties);
+
+        const { segmentMockClient } = global as any;
+        expect(segmentMockClient.track).toHaveBeenCalledWith(event.category, {
+          anonymous: false,
+          ...properties,
+        });
+      });
+
+      it('does not break on JS legacy call', async () => {
+        const metaMetrics = TestMetaMetrics.getInstance();
+        expect(await metaMetrics.configure()).toBeTruthy();
+        await metaMetrics.enable();
+
+        const event = undefined;
+
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error: Testing untyped legacy JS call with undefined event
+        metaMetrics.trackEvent(event);
+
+        const { segmentMockClient } = global as any;
+        expect(segmentMockClient.track).toHaveBeenCalledWith(undefined, {
+          anonymous: false,
+          undefined,
+        });
+      });
+    });
   });
 
   describe('Grouping', () => {
diff --git a/app/core/Analytics/MetaMetrics.ts b/app/core/Analytics/MetaMetrics.ts
index 44856228981..a2b0e36d17f 100644
--- a/app/core/Analytics/MetaMetrics.ts
+++ b/app/core/Analytics/MetaMetrics.ts
@@ -600,8 +600,9 @@ class MetaMetrics implements IMetaMetrics {
   ): void => {
     if (this.enabled) {
       this.#trackEvent(
-        event.category,
-        { anonymous: false, ...properties },
+        // NOTE: we use optional event to avoid undefined error in case of legacy untyped call form JS
+        event?.category,
+        { anonymous: false, ...event?.properties, ...properties },
         saveDataRecording,
       );
     }

From 5fe71b897ff8693ef39be46ce191e430015a550b Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Tue, 27 Feb 2024 20:28:22 +0100
Subject: [PATCH 6/7] fix: fix infura key displayed (#8744)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

We are exposing our network API keys in the network verification
details. Exposing API keys should be avoided due to their significant
security risks.

To reproduce:
Go to networks view
Proceed to add any infura supported network from the popular network
list. Polygon is a good example.
Notice in the network approval modal the Infura API key is exposed in
the Network URL field.

## **Related issues**

Fixes: [#1574](https://github.com/MetaMask/mobile-planning/issues/1574)

## **Manual testing steps**

1. Go to the add network page
2. Choose polygon and click on add
3. A modal will be displayed, scroll down to see the RPC Url
4. Infura url should not display the api key

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


![before](https://github.com/MetaMask/metamask-mobile/assets/26223211/1faf9b53-9a2c-4a73-96c4-8273ac899b59)

### **After**
<img width="439" alt="Screenshot 2024-02-27 at 13 18 42"
src="https://github.com/MetaMask/metamask-mobile/assets/26223211/4987d957-161f-47f0-81e2-76b8b28e11f8">


## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [x] I've included screenshots/recordings if applicable
- [x] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../__snapshots__/index.test.tsx.snap         | 27 +++++++++++--------
 .../NetworkVerificationInfo.tsx               | 24 ++++++++++++++---
 .../NetworkVerificationInfo.test.tsx.snap     | 27 +++++++++++--------
 .../NetworkSwitcher.test.tsx.snap             | 27 +++++++++++--------
 app/core/RPCMethods/networkChecker.test.ts    | 26 ++++++++++++++++++
 app/core/RPCMethods/networkChecker.util.ts    | 10 ++++++-
 6 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
index 84e5c22fe23..648a484d48f 100644
--- a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
@@ -234,27 +234,32 @@ exports[`NetworkDetails renders correctly 1`] = `
                   <View
                     style={
                       Object {
-                        "backgroundColor": "#FFFFFF",
+                        "alignItems": "center",
+                        "backgroundColor": "#F2F4F6",
                         "borderRadius": 8,
+                        "borderWidth": 1,
                         "height": 16,
+                        "justifyContent": "center",
                         "overflow": "hidden",
                         "width": 16,
                       }
                     }
                   >
-                    <Image
-                      onError={[Function]}
-                      resizeMode="contain"
-                      source="image"
+                    <Text
+                      accessibilityRole="text"
                       style={
                         Object {
-                          "flex": 1,
-                          "height": undefined,
-                          "width": undefined,
+                          "color": "#24272A",
+                          "fontFamily": "Euclid Circular B",
+                          "fontSize": 10,
+                          "fontWeight": "400",
+                          "letterSpacing": 0,
+                          "lineHeight": undefined,
                         }
                       }
-                      testID="network-avatar-image"
-                    />
+                    >
+                      T
+                    </Text>
                   </View>
                   <Text
                     accessibilityRole="text"
@@ -420,7 +425,7 @@ exports[`NetworkDetails renders correctly 1`] = `
                         }
                       }
                     >
-                      https://localhost:8545
+                      https:/
                     </Text>
                     <TouchableOpacity
                       activeOpacity={0.5}
diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
index 0e5ff5b6bdd..31eb57ecfbc 100644
--- a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
+++ b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/prop-types */
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { View, Linking } from 'react-native';
 import { strings } from '../../../../locales/i18n';
 import { CommonSelectorsIDs } from '../../../../e2e/selectors/Common.selectors';
@@ -28,8 +28,12 @@ import BottomSheetFooter, {
   ButtonsAlignment,
 } from '../../../component-library/components/BottomSheets/BottomSheetFooter';
 import BottomSheetHeader from '../../../component-library/components/BottomSheets/BottomSheetHeader';
-import { toggleUseSafeChainsListValidation } from '../../../util/networks';
+import {
+  getNetworkImageSource,
+  toggleUseSafeChainsListValidation,
+} from '../../../util/networks';
 import { NetworkApprovalModalSelectorsIDs } from '../../../../e2e/selectors/Modals/NetworkApprovalModal.selectors';
+import hideKeyFromUrl from '../../../util/hideKeyFromUrl';
 
 interface Alert {
   alertError: string;
@@ -67,6 +71,15 @@ const NetworkVerificationInfo = ({
 
   useEffect(() => setAlerts(alertsFromProps), [alertsFromProps]);
 
+  const networkImageSource = useMemo(
+    () =>
+      //@ts-expect-error - The utils/network file is still JS and this function expects a networkType, and should be optional
+      getNetworkImageSource({
+        chainId: customNetworkInformation.chainId,
+      }),
+    [customNetworkInformation],
+  );
+
   const renderNetworkInfo = () => (
     <ScrollView
       nestedScrollEnabled
@@ -98,7 +111,9 @@ const NetworkVerificationInfo = ({
       <Text variant={TextVariant.BodyMDBold}>
         {strings('add_custom_network.network_url')}
       </Text>
-      <Text style={styles.textSection}>{customNetworkInformation.rpcUrl}</Text>
+      <Text style={styles.textSection}>
+        {hideKeyFromUrl(customNetworkInformation.rpcUrl)}
+      </Text>
 
       <Accordion
         title={strings('spend_limit_edition.view_details')}
@@ -149,6 +164,7 @@ const NetworkVerificationInfo = ({
   const renderAlerts = useCallback(() => {
     if (!safeChainsListValidationEnabled) return null;
     if (!alerts.length) return null;
+
     return alerts.map(
       (
         networkAlert: {
@@ -229,7 +245,7 @@ const NetworkVerificationInfo = ({
       </BottomSheetHeader>
       <ScrollView style={styles.root}>
         <PickerNetwork
-          imageSource={customNetworkInformation.icon}
+          imageSource={networkImageSource}
           label={customNetworkInformation.chainName}
           style={styles.networkSection}
           disabled
diff --git a/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap b/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
index a9f05c62c14..a77b33f0cd7 100644
--- a/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
+++ b/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
@@ -93,27 +93,32 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
         <View
           style={
             Object {
-              "backgroundColor": "#FFFFFF",
+              "alignItems": "center",
+              "backgroundColor": "#F2F4F6",
               "borderRadius": 8,
+              "borderWidth": 1,
               "height": 16,
+              "justifyContent": "center",
               "overflow": "hidden",
               "width": 16,
             }
           }
         >
-          <Image
-            onError={[Function]}
-            resizeMode="contain"
-            source="test-icon"
+          <Text
+            accessibilityRole="text"
             style={
               Object {
-                "flex": 1,
-                "height": undefined,
-                "width": undefined,
+                "color": "#24272A",
+                "fontFamily": "Euclid Circular B",
+                "fontSize": 10,
+                "fontWeight": "400",
+                "letterSpacing": 0,
+                "lineHeight": undefined,
               }
             }
-            testID="network-avatar-image"
-          />
+          >
+            T
+          </Text>
         </View>
         <Text
           accessibilityRole="text"
@@ -379,7 +384,7 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
               }
             }
           >
-            http://test.com
+            http:/
           </Text>
           <TouchableOpacity
             activeOpacity={0.5}
diff --git a/app/components/UI/Ramp/Views/NetworkSwitcher/__snapshots__/NetworkSwitcher.test.tsx.snap b/app/components/UI/Ramp/Views/NetworkSwitcher/__snapshots__/NetworkSwitcher.test.tsx.snap
index c612a3b46e7..9ca4bee8ffc 100644
--- a/app/components/UI/Ramp/Views/NetworkSwitcher/__snapshots__/NetworkSwitcher.test.tsx.snap
+++ b/app/components/UI/Ramp/Views/NetworkSwitcher/__snapshots__/NetworkSwitcher.test.tsx.snap
@@ -1062,27 +1062,32 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                   <View
                                                     style={
                                                       Object {
-                                                        "backgroundColor": "#FFFFFF",
+                                                        "alignItems": "center",
+                                                        "backgroundColor": "#F2F4F6",
                                                         "borderRadius": 8,
+                                                        "borderWidth": 1,
                                                         "height": 16,
+                                                        "justifyContent": "center",
                                                         "overflow": "hidden",
                                                         "width": 16,
                                                       }
                                                     }
                                                   >
-                                                    <Image
-                                                      onError={[Function]}
-                                                      resizeMode="contain"
-                                                      source="https://static.metafi.codefi.network/api/v1/tokenIcons/42220/0x471ece3750da237f93b8e339c536989b8978a438.png"
+                                                    <Text
+                                                      accessibilityRole="text"
                                                       style={
                                                         Object {
-                                                          "flex": 1,
-                                                          "height": undefined,
-                                                          "width": undefined,
+                                                          "color": "#24272A",
+                                                          "fontFamily": "Euclid Circular B",
+                                                          "fontSize": 10,
+                                                          "fontWeight": "400",
+                                                          "letterSpacing": 0,
+                                                          "lineHeight": undefined,
                                                         }
                                                       }
-                                                      testID="network-avatar-image"
-                                                    />
+                                                    >
+                                                      C
+                                                    </Text>
                                                   </View>
                                                   <Text
                                                     accessibilityRole="text"
@@ -1248,7 +1253,7 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                         }
                                                       }
                                                     >
-                                                      https://evm.cronos.org
+                                                      https:/
                                                     </Text>
                                                     <TouchableOpacity
                                                       activeOpacity={0.5}
diff --git a/app/core/RPCMethods/networkChecker.test.ts b/app/core/RPCMethods/networkChecker.test.ts
index a4bef4a7e10..4478678560c 100644
--- a/app/core/RPCMethods/networkChecker.test.ts
+++ b/app/core/RPCMethods/networkChecker.test.ts
@@ -62,6 +62,32 @@ describe('checkSafeNetwork', () => {
     ]);
   });
 
+  it('should not return an error if the rpcUrl is not matched but its infura', async () => {
+    mockedAxios.get.mockImplementation(() =>
+      Promise.resolve({
+        data: [
+          {
+            chainId: '137',
+            rpc: ['http://localhost:8545'],
+            name: 'Test',
+            nativeCurrency: {
+              symbol: 'MATIC',
+              decimals: 18,
+            },
+          },
+        ],
+      }),
+    );
+
+    const alerts = await checkSafeNetwork(
+      '137',
+      'https://polygon-mainnet.infura.io/v3/test',
+      'Test',
+      'MATIC',
+    );
+    expect(alerts).toEqual([]);
+  });
+
   it('should return a warning if the decimals is not matched', async () => {
     mockedAxios.get.mockImplementation(() =>
       Promise.resolve({
diff --git a/app/core/RPCMethods/networkChecker.util.ts b/app/core/RPCMethods/networkChecker.util.ts
index 17129a1cb91..8342d0d210a 100644
--- a/app/core/RPCMethods/networkChecker.util.ts
+++ b/app/core/RPCMethods/networkChecker.util.ts
@@ -1,6 +1,13 @@
 import axios from 'axios';
 import { BannerAlertSeverity } from '../../component-library/components/Banners/Banner';
 import { strings } from '../../../locales/i18n';
+import PopularList from '../../util/networks/customNetworks';
+
+const findPopularNetwork = (rpcUrl: string) =>
+  PopularList.some((network) => {
+    const { origin } = new URL(network.rpcUrl);
+    return origin === rpcUrl;
+  });
 
 const checkSafeNetwork = async (
   chainIdDecimal: string,
@@ -23,7 +30,8 @@ const checkSafeNetwork = async (
     if (
       !matchedChain.rpc
         ?.map((rpc: string) => new URL(rpc).origin)
-        .includes(origin)
+        .includes(origin) &&
+      !findPopularNetwork(origin)
     ) {
       alerts.push({
         alertError: strings('add_custom_network.invalid_rpc_url'),

From b536b9648b3a2b7dff2fab2bf7dae48b68f2d8e7 Mon Sep 17 00:00:00 2001
From: Brian August Nguyen <brianacnguyen@gmail.com>
Date: Tue, 27 Feb 2024 12:51:17 -0800
Subject: [PATCH 7/7] fix: Fixed underline issue with ButtonLink's pressed
 state (#8752)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
- Currently when the ButtonLink is pressed, the underline style is added
but it also affected the Button's alignment. This PR fixes that issue

## **Related issues**

Fixes: #8596

## **Manual testing steps**

1. Go to any page with a ButtonLink
2. Press on it
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

https://github.com/MetaMask/metamask-mobile/assets/14355083/3ff116eb-9a21-448f-babd-abf0bd4017b2

<!-- [screenshots/recordings] -->

### **After**

https://github.com/MetaMask/metamask-mobile/assets/14355083/7dce6a7b-1f00-4d76-b854-5b8930874391

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [x] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../Button/variants/ButtonLink/ButtonLink.styles.ts        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.styles.ts b/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.styles.ts
index 51da3251ede..061617555b0 100644
--- a/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.styles.ts
+++ b/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.styles.ts
@@ -1,5 +1,5 @@
 // Third party dependencies.
-import { StyleSheet, TextStyle, ViewStyle } from 'react-native';
+import { StyleSheet, ViewStyle } from 'react-native';
 
 // External dependencies.
 import { colors } from '../../../../../../styles/common';
@@ -24,10 +24,7 @@ const styleSheet = (params: { vars: ButtonLinkStyleSheetVars }) => {
       { backgroundColor: colors.transparent },
       style,
     ) as ViewStyle,
-    pressedText: Object.assign(
-      { textDecorationLine: 'underline' } as TextStyle,
-      style,
-    ) as TextStyle,
+    pressedText: { textDecorationLine: 'underline' },
   });
 };