From f90182158a15305177031683e2a4409ed55ba568 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:10:37 +0300
Subject: [PATCH 01/25] chore: toggling the chain permissions feature flags so
 they are always true, to check CI

---
 app/util/networks/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index 461f8ea6b87..a7ac9605916 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -488,11 +488,9 @@ export const getBlockExplorerTxUrl = (
 export const getIsNetworkOnboarded = (chainId, networkOnboardedState) =>
   networkOnboardedState[chainId];
 
-export const isMultichainVersion1Enabled =
-  process.env.MM_MULTICHAIN_V1_ENABLED === 'true';
+export const isMultichainVersion1Enabled = true;
 
-export const isChainPermissionsFeatureEnabled =
-  process.env.MM_CHAIN_PERMISSIONS === 'true';
+export const isChainPermissionsFeatureEnabled = true;
 
 export const isPermissionsSettingsV1Enabled =
   process.env.MM_PERMISSIONS_SETTINGS_V1_ENABLED === 'true';

From 294e637182cffb59eefc92b9cf3cf39c8b1172dd Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:16:00 +0300
Subject: [PATCH 02/25] chore: remove MC FF OFF code (dead code) from
 NetworkVerificationInfo component

---
 .../NetworkVerificationInfo.tsx               | 46 ++-----------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
index 7595f71cb85..11a59b7eb5f 100644
--- a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
+++ b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
@@ -116,13 +116,7 @@ const NetworkVerificationInfo = ({
 
   const renderCurrencySymbol = () => (
     <>
-      <Text
-        variant={
-          !isMultichainVersion1Enabled
-            ? TextVariant.BodyMDBold
-            : TextVariant.BodyMDMedium
-        }
-      >
+      <Text variant={TextVariant.BodyMDMedium}>
         {strings('add_custom_network.currency_symbol')}
       </Text>
       <Text style={styles.textSection}>{customNetworkInformation.ticker}</Text>
@@ -131,13 +125,7 @@ const NetworkVerificationInfo = ({
 
   const renderChainId = () => (
     <>
-      <Text
-        variant={
-          !isMultichainVersion1Enabled
-            ? TextVariant.BodyMDBold
-            : TextVariant.BodyMDMedium
-        }
-      >
+      <Text variant={TextVariant.BodyMDMedium}>
         {strings('add_custom_network.chain_id')}
       </Text>
       <Text style={styles.textSection}>
@@ -148,13 +136,7 @@ const NetworkVerificationInfo = ({
 
   const renderNetworkDisplayName = () => (
     <>
-      <Text
-        variant={
-          !isMultichainVersion1Enabled
-            ? TextVariant.BodyMDBold
-            : TextVariant.BodyMDMedium
-        }
-      >
+      <Text variant={TextVariant.BodyMDMedium}>
         {strings('add_custom_network.display_name')}
       </Text>
       <Text style={styles.textSection}>
@@ -215,22 +197,12 @@ const NetworkVerificationInfo = ({
         networkDetailsExpanded ? styles.nestedScrollContent : undefined
       }
     >
-      {!isMultichainVersion1Enabled && renderNetworkDisplayName()}
-
       {isMultichainVersion1Enabled && renderCurrencySymbol()}
 
-      {!isMultichainVersion1Enabled && renderChainId()}
-
       {isMultichainVersion1Enabled ? (
         renderNetworkRpcUrlLabel()
       ) : (
-        <Text
-          variant={
-            !isMultichainVersion1Enabled
-              ? TextVariant.BodyMDBold
-              : TextVariant.BodyMDMedium
-          }
-        >
+        <Text variant={TextVariant.BodyMDMedium}>
           {isMultichainVersion1Enabled
             ? strings('networks.network_rpc_url_label')
             : strings('add_custom_network.network_url')}
@@ -248,15 +220,7 @@ const NetworkVerificationInfo = ({
 
         {isMultichainVersion1Enabled && renderNetworkDisplayName()}
 
-        {!isMultichainVersion1Enabled && renderCurrencySymbol()}
-
-        <Text
-          variant={
-            !isMultichainVersion1Enabled
-              ? TextVariant.BodyMDBold
-              : TextVariant.BodyMDMedium
-          }
-        >
+        <Text variant={TextVariant.BodyMDMedium}>
           {strings('add_custom_network.block_explorer_url')}
         </Text>
         <Text>{customNetworkInformation.blockExplorerUrl}</Text>

From 243fa36a49fe3bd85b067d71402cc05244778630 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:21:10 +0300
Subject: [PATCH 03/25] chore: remove MC FF OFF code (dead code) from
 AccountConnectMultiSelector component

---
 .../AccountConnectMultiSelector.tsx           | 80 ++-----------------
 1 file changed, 6 insertions(+), 74 deletions(-)

diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
index 2a7992fba0c..eaf5fffa039 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
@@ -105,50 +105,6 @@ const AccountConnectMultiSelector = ({
     });
   }, [navigate, urlWithProtocol, isRenderedAsBottomSheet, onRevokeAllHandler]);
 
-  const renderSelectAllButton = useCallback(
-    () =>
-      Boolean(accounts.length) &&
-      !isMultichainVersion1Enabled && (
-        <Button
-          variant={ButtonVariants.Link}
-          onPress={() => {
-            if (isLoading) return;
-            const allSelectedAccountAddresses = accounts.map(
-              ({ address }) => address,
-            );
-            onSelectAddress(allSelectedAccountAddresses);
-          }}
-          style={{
-            ...styles.selectAllButton,
-            ...(isLoading && styles.disabled),
-          }}
-          label={strings('accounts.select_all')}
-          testID={ConnectAccountBottomSheetSelectorsIDs.SELECT_MULTI_BUTTON}
-        />
-      ),
-    [accounts, isLoading, onSelectAddress, styles],
-  );
-
-  const renderUnselectAllButton = useCallback(
-    () =>
-      Boolean(accounts.length) &&
-      !isMultichainVersion1Enabled && (
-        <Button
-          variant={ButtonVariants.Link}
-          onPress={() => {
-            if (isLoading) return;
-            onSelectAddress([]);
-          }}
-          style={{
-            ...styles.selectAllButton,
-            ...(isLoading && styles.disabled),
-          }}
-          label={strings('accounts.unselect_all')}
-        />
-      ),
-    [accounts, isLoading, onSelectAddress, styles],
-  );
-
   const areAllAccountsSelected = accounts
     .map(({ address }) => address)
     .every((address) => selectedAddresses.includes(address));
@@ -207,18 +163,6 @@ const AccountConnectMultiSelector = ({
     return (
       <View style={styles.ctaButtonsContainer}>
         <View style={styles.connectOrUpdateButtonContainer}>
-          {!isMultichainVersion1Enabled && (
-            <Button
-              variant={ButtonVariants.Secondary}
-              label={strings('accounts.cancel')}
-              onPress={() => onUserAction(USER_INTENT.Cancel)}
-              size={ButtonSize.Lg}
-              style={styles.button}
-            />
-          )}
-          {!isMultichainVersion1Enabled && (
-            <View style={styles.buttonSeparator} />
-          )}
           {areAnyAccountsSelected && (
             <Button
               variant={ButtonVariants.Primary}
@@ -233,13 +177,9 @@ const AccountConnectMultiSelector = ({
                 },
               )}
               onPress={() => {
-                if (!isMultichainVersion1Enabled) {
-                  onUserAction(USER_INTENT.Confirm);
-                } else {
-                  onPrimaryActionButtonPress
-                    ? onPrimaryActionButtonPress()
-                    : onUserAction(USER_INTENT.Confirm);
-                }
+                onPrimaryActionButtonPress
+                  ? onPrimaryActionButtonPress()
+                  : onUserAction(USER_INTENT.Confirm);
               }}
               size={ButtonSize.Lg}
               style={{
@@ -307,13 +247,6 @@ const AccountConnectMultiSelector = ({
             onBack={onBack}
           />
           <View style={styles.body}>
-            {!isMultichainVersion1Enabled && (
-              <TagUrl
-                imageSource={favicon}
-                label={urlWithProtocol}
-                iconName={secureIcon}
-              />
-            )}
             <Text style={styles.description}>
               {isMultichainVersion1Enabled
                 ? accounts?.length > 0 &&
@@ -323,9 +256,6 @@ const AccountConnectMultiSelector = ({
             {isMultichainVersion1Enabled &&
               accounts?.length > 0 &&
               renderSelectAllCheckbox()}
-            {areAllAccountsSelected
-              ? renderUnselectAllButton()
-              : renderSelectAllButton()}
           </View>
           <AccountSelectorList
             onSelectAccount={onSelectAccount}
@@ -355,7 +285,9 @@ const AccountConnectMultiSelector = ({
               onPress={() =>
                 setScreen(AccountConnectMultiSelectorScreens.AddAccountActions)
               }
-              testID={AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
+              testID={
+                AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID
+              }
             />
           </View>
           <View style={styles.body}>{renderCtaButtons()}</View>

From 45d843b1571562dfc287bb4dcc5c2a3c8674c3d3 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:23:49 +0300
Subject: [PATCH 04/25] chore: remove MC FF OFF code (dead code) from
 AccountPermissions component

---
 .../AccountPermissions/AccountPermissions.tsx | 87 ++++++++-----------
 1 file changed, 38 insertions(+), 49 deletions(-)

diff --git a/app/components/Views/AccountPermissions/AccountPermissions.tsx b/app/components/Views/AccountPermissions/AccountPermissions.tsx
index 90e535c3442..430a045606e 100755
--- a/app/components/Views/AccountPermissions/AccountPermissions.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissions.tsx
@@ -318,60 +318,53 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
       let connectedAccountLength = 0;
       let removedAccountCount = 0;
 
-      if (!isMultichainVersion1Enabled) {
-        newActiveAddress = addPermittedAccounts(hostname, selectedAddresses);
-        connectedAccountLength = selectedAddresses.length;
-      } else {
-        // Function to normalize Ethereum addresses using checksum
-        const normalizeAddresses = (addresses: string[]) =>
-          addresses.map((address) => toChecksumHexAddress(address));
+      // Function to normalize Ethereum addresses using checksum
+      const normalizeAddresses = (addresses: string[]) =>
+        addresses.map((address) => toChecksumHexAddress(address));
 
-        // Retrieve the list of permitted accounts for the given hostname
-        const permittedAccounts = getPermittedAccountsByHostname(
-          permittedAccountsList,
-          hostname,
-        );
-
-        // Normalize permitted accounts and selected addresses to checksummed format
-        const normalizedPermittedAccounts =
-          normalizeAddresses(permittedAccounts);
-        const normalizedSelectedAddresses =
-          normalizeAddresses(selectedAddresses);
+      // Retrieve the list of permitted accounts for the given hostname
+      const permittedAccounts = getPermittedAccountsByHostname(
+        permittedAccountsList,
+        hostname,
+      );
 
-        let accountsToRemove: string[] = [];
-        let accountsToAdd: string[] = [];
+      // Normalize permitted accounts and selected addresses to checksummed format
+      const normalizedPermittedAccounts = normalizeAddresses(permittedAccounts);
+      const normalizedSelectedAddresses = normalizeAddresses(selectedAddresses);
 
-        // Identify accounts to be added
-        accountsToAdd = normalizedSelectedAddresses.filter(
-          (account) => !normalizedPermittedAccounts.includes(account),
-        );
+      let accountsToRemove: string[] = [];
+      let accountsToAdd: string[] = [];
 
-        // Add newly selected accounts
-        if (accountsToAdd.length > 0) {
-          newActiveAddress = addPermittedAccounts(hostname, accountsToAdd);
-        } else {
-          // If no new accounts were added, set the first selected address as active
-          newActiveAddress = normalizedSelectedAddresses[0];
-        }
+      // Identify accounts to be added
+      accountsToAdd = normalizedSelectedAddresses.filter(
+        (account) => !normalizedPermittedAccounts.includes(account),
+      );
 
-        // Identify accounts to be removed
-        accountsToRemove = normalizedPermittedAccounts.filter(
-          (account) => !normalizedSelectedAddresses.includes(account),
-        );
-        removedAccountCount = accountsToRemove.length;
+      // Add newly selected accounts
+      if (accountsToAdd.length > 0) {
+        newActiveAddress = addPermittedAccounts(hostname, accountsToAdd);
+      } else {
+        // If no new accounts were added, set the first selected address as active
+        newActiveAddress = normalizedSelectedAddresses[0];
+      }
 
-        // Remove accounts that are no longer selected
-        if (accountsToRemove.length > 0) {
-          removePermittedAccounts(hostname, accountsToRemove);
-        }
+      // Identify accounts to be removed
+      accountsToRemove = normalizedPermittedAccounts.filter(
+        (account) => !normalizedSelectedAddresses.includes(account),
+      );
+      removedAccountCount = accountsToRemove.length;
 
-        // Calculate the number of connected accounts after changes
-        connectedAccountLength =
-          normalizedPermittedAccounts.length +
-          accountsToAdd.length -
-          accountsToRemove.length;
+      // Remove accounts that are no longer selected
+      if (accountsToRemove.length > 0) {
+        removePermittedAccounts(hostname, accountsToRemove);
       }
 
+      // Calculate the number of connected accounts after changes
+      connectedAccountLength =
+        normalizedPermittedAccounts.length +
+        accountsToAdd.length -
+        accountsToRemove.length;
+
       const activeAccountName = getAccountNameWithENS({
         accountAddress: newActiveAddress,
         accounts,
@@ -430,10 +423,6 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
   ]);
 
   useEffect(() => {
-    if (!isMultichainVersion1Enabled) {
-      return;
-    }
-
     if (networkSelectorUserIntent === USER_INTENT.Confirm) {
       if (isNonDappNetworkSwitch) {
         setPermissionsScreen(

From b4f89f783029c819e40a21a9aa62d43cc4ad72cd Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:24:32 +0300
Subject: [PATCH 05/25] chore: remove MC FF OFF code (dead code) from
 AccountPermissionsConnected component

---
 .../AccountPermissionsConnected.tsx           | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
index 79c27718318..ad787f3fd2f 100644
--- a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
@@ -152,9 +152,6 @@ const AccountPermissionsConnected = ({
 
   return (
     <>
-      {!isMultichainVersion1Enabled && (
-        <SheetHeader title={strings('accounts.connected_accounts_title')} />
-      )}
       {isMultichainVersion1Enabled && (
         <View style={styles.header}>
           <Avatar
@@ -167,31 +164,11 @@ const AccountPermissionsConnected = ({
         </View>
       )}
       <View style={styles.body}>
-        {!isMultichainVersion1Enabled && (
-          <TagUrl
-            imageSource={favicon}
-            label={urlWithProtocol}
-            cta={{
-              label: strings('accounts.permissions'),
-              onPress: openRevokePermissions,
-            }}
-            iconName={secureIcon}
-          />
-        )}
         {isMultichainVersion1Enabled && (
           <Text style={styles.sectionTitle} variant={TextVariant.BodyMDMedium}>
             {strings('accounts.connected_accounts_title')}
           </Text>
         )}
-        {!isMultichainVersion1Enabled && (
-          <PickerNetwork
-            label={providerConfig?.nickname || networkName}
-            imageSource={networkImageSource}
-            onPress={switchNetwork}
-            style={styles.networkPicker}
-            testID={ConnectedAccountsSelectorsIDs.NETWORK_PICKER}
-          />
-        )}
       </View>
       <AccountSelectorList
         onSelectAccount={switchActiveAccount}

From ef811185c60a9d2cf612fc4df0489074d9691dcd Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 13:25:38 +0300
Subject: [PATCH 06/25] chore: remove MC FF OFF code (dead code) from
 NetworkPermissionsConnected component

---
 .../NetworkPermissionsConnected.tsx           | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
index acdd40c7f1f..9b5cbae9dbf 100644
--- a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
@@ -56,7 +56,7 @@ import Button, {
 import { NetworkNonPemittedBottomSheetSelectorsIDs } from '../../../../../e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors';
 import { handleNetworkSwitch } from '../../../../util/networks/handleNetworkSwitch';
 
-const AccountPermissionsConnected = ({
+const NetworkPermissionsConnected = ({
   onSetPermissionsScreen,
   onDismissSheet,
   hostname,
@@ -128,9 +128,6 @@ const AccountPermissionsConnected = ({
 
   return (
     <>
-      {!isMultichainVersion1Enabled && (
-        <SheetHeader title={strings('accounts.connected_accounts_title')} />
-      )}
       {isMultichainVersion1Enabled && (
         <View style={styles.header}>
           <Avatar
@@ -141,17 +138,6 @@ const AccountPermissionsConnected = ({
         </View>
       )}
       <View style={styles.body}>
-        {!isMultichainVersion1Enabled && (
-          <TagUrl
-            imageSource={favicon}
-            label={urlWithProtocol}
-            cta={{
-              label: strings('accounts.permissions'),
-              onPress: openRevokePermissions,
-            }}
-            iconName={secureIcon}
-          />
-        )}
         {isMultichainVersion1Enabled && (
           <View style={styles.sectionTitleContainer}>
             <Text style={styles.sectionTitle} variant={TextVariant.HeadingSM}>
@@ -171,15 +157,6 @@ const AccountPermissionsConnected = ({
             </View>
           </View>
         )}
-        {!isMultichainVersion1Enabled && (
-          <PickerNetwork
-            label={providerConfig?.nickname || networkName}
-            imageSource={networkImageSource}
-            onPress={switchNetwork}
-            style={styles.networkPicker}
-            testID={ConnectedAccountsSelectorsIDs.NETWORK_PICKER}
-          />
-        )}
       </View>
       <View style={styles.networkSelectorListContainer}>
         <NetworkSelectorList
@@ -232,4 +209,4 @@ const AccountPermissionsConnected = ({
   );
 };
 
-export default AccountPermissionsConnected;
+export default NetworkPermissionsConnected;

From 91d0626bdd231a160385dc6685f3e5cc1b0d5e8d Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 25 Dec 2024 15:23:56 +0300
Subject: [PATCH 07/25] chore: remove MC FF ON check and when applicatable FF
 OFF Code (dead code) from NetworkVerificationInfo component

---
 .../NetworkVerificationInfo.tsx               | 61 ++++++-------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
index 11a59b7eb5f..608c2e7c40a 100644
--- a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
+++ b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
@@ -35,10 +35,7 @@ import BottomSheetFooter, {
   ButtonsAlignment,
 } from '../../../component-library/components/BottomSheets/BottomSheetFooter';
 import BottomSheetHeader from '../../../component-library/components/BottomSheets/BottomSheetHeader';
-import {
-  getNetworkImageSource,
-  isMultichainVersion1Enabled,
-} from '../../../util/networks';
+import { getNetworkImageSource } from '../../../util/networks';
 import { toggleUseSafeChainsListValidation } from '../../../util/networks/engineNetworkUtils';
 import { NetworkApprovalBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Network/NetworkApprovalBottomSheet.selectors';
 import hideKeyFromUrl from '../../../util/hideKeyFromUrl';
@@ -197,17 +194,8 @@ const NetworkVerificationInfo = ({
         networkDetailsExpanded ? styles.nestedScrollContent : undefined
       }
     >
-      {isMultichainVersion1Enabled && renderCurrencySymbol()}
-
-      {isMultichainVersion1Enabled ? (
-        renderNetworkRpcUrlLabel()
-      ) : (
-        <Text variant={TextVariant.BodyMDMedium}>
-          {isMultichainVersion1Enabled
-            ? strings('networks.network_rpc_url_label')
-            : strings('add_custom_network.network_url')}
-        </Text>
-      )}
+      {renderCurrencySymbol()}
+      {renderNetworkRpcUrlLabel()}
       <Text style={styles.textSection}>
         {hideKeyFromUrl(customNetworkInformation.rpcUrl)}
       </Text>
@@ -216,10 +204,8 @@ const NetworkVerificationInfo = ({
         title={strings('spend_limit_edition.view_details')}
         onPress={() => setNetworkDetailsExpanded(!networkDetailsExpanded)}
       >
-        {isMultichainVersion1Enabled && renderChainId()}
-
-        {isMultichainVersion1Enabled && renderNetworkDisplayName()}
-
+        {renderChainId()}
+        {renderNetworkDisplayName()}
         <Text variant={TextVariant.BodyMDMedium}>
           {strings('add_custom_network.block_explorer_url')}
         </Text>
@@ -339,7 +325,7 @@ const NetworkVerificationInfo = ({
     );
   }, [alerts, styles.textSection, safeChainsListValidationEnabled]);
 
-  return isMultichainVersion1Enabled && showReviewDefaultRpcUrlChanges ? (
+  return showReviewDefaultRpcUrlChanges ? (
     renderReviewDefaultNetworkRpcUrlChange()
   ) : showCheckNetwork ? (
     <View>
@@ -390,11 +376,9 @@ const NetworkVerificationInfo = ({
         <Text variant={TextVariant.HeadingMD}>
           {isCustomNetwork
             ? strings('networks.add_custom_network')
-            : isMultichainVersion1Enabled
-            ? strings('networks.add_specific_network', {
+            : strings('networks.add_specific_network', {
                 network_name: customNetworkInformation.chainName,
-              })
-            : strings('app_settings.network_add_network')}
+              })}
         </Text>
       </BottomSheetHeader>
       <ScrollView style={styles.root}>
@@ -406,27 +390,16 @@ const NetworkVerificationInfo = ({
         />
         {renderAlerts()}
         {renderBanner()}
-        {isMultichainVersion1Enabled &&
-          isCustomNetwork &&
-          renderCustomNetworkBanner()}
+        {isCustomNetwork && renderCustomNetworkBanner()}
         <Text style={styles.textCentred}>
-          {isMultichainVersion1Enabled ? (
-            <Text>
-              {strings(
-                'switch_custom_network.add_network_and_give_dapp_permission_warning',
-                {
-                  dapp_origin: dappOrigin,
-                },
-              )}
-            </Text>
-          ) : (
-            <>
-              {strings('add_custom_network.warning_subtext_new.1')}{' '}
-              <Text onPress={openHowToUseCustomNetworks}>
-                {strings('add_custom_network.warning_subtext_new.2')}
-              </Text>
-            </>
-          )}
+          <Text>
+            {strings(
+              'switch_custom_network.add_network_and_give_dapp_permission_warning',
+              {
+                dapp_origin: dappOrigin,
+              },
+            )}
+          </Text>
         </Text>
         {renderNetworkInfo()}
       </ScrollView>

From 63ce7099b550648a076e9063f6200f52d5a4786d Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Thu, 26 Dec 2024 14:37:12 +0300
Subject: [PATCH 08/25] refactor(3663): AccountConnect remove checks on feature
 flag, remove code that ran when feature flag was off (which was now dead
 code)

---
 .../Views/AccountConnect/AccountConnect.tsx   |  27 +-
 .../AccountConnect.test.tsx.snap              | 855 +++++++++++++-----
 ...untConnect.test.tsx.snap-dead-code-removed | 789 ++++++++++++++++
 .../AccountConnect.test.tsx.snap.backup       | 434 +++++++++
 .../AccountConnect.test.tsx.snap.ff-off       | 434 +++++++++
 .../AccountConnect.test.tsx.snap.ff-on        | 789 ++++++++++++++++
 6 files changed, 3064 insertions(+), 264 deletions(-)
 create mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
 create mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
 create mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
 create mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on

diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
index a7fa98c770f..ef8c521070f 100644
--- a/app/components/Views/AccountConnect/AccountConnect.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -46,7 +46,12 @@ import { Account, useAccounts } from '../../hooks/useAccounts';
 
 // Internal dependencies.
 import { PermissionsRequest } from '@metamask/permission-controller';
-import { ImageURISource, ImageSourcePropType, StyleSheet } from 'react-native';
+import {
+  ImageURISource,
+  ImageSourcePropType,
+  StyleSheet,
+  View,
+} from 'react-native';
 import URLParse from 'url-parse';
 import PhishingModal from '../../../components/UI/PhishingModal';
 import { useMetrics } from '../../../components/hooks/useMetrics';
@@ -72,13 +77,12 @@ import AccountConnectSingle from './AccountConnectSingle';
 import AccountConnectSingleSelector from './AccountConnectSingleSelector';
 import { PermissionsSummaryProps } from '../../../components/UI/PermissionsSummary/PermissionsSummary.types';
 import PermissionsSummary from '../../../components/UI/PermissionsSummary';
-import {
-  isMultichainVersion1Enabled,
-  getNetworkImageSource,
-} from '../../../util/networks';
+import { getNetworkImageSource } from '../../../util/networks';
 import NetworkConnectMultiSelector from '../NetworkConnect/NetworkConnectMultiSelector';
-import { PermissionKeys } from '../../../core/Permissions/specifications';
-import { CaveatTypes } from '../../../core/Permissions/constants';
+import {
+  PermissionKeys,
+  CaveatTypes,
+} from '../../../core/Permissions/specifications';
 import { useNetworkInfo } from '../../../selectors/selectedNetworkController';
 import { AvatarSize } from '../../../component-library/components/Avatars/Avatar';
 import { selectNetworkConfigurations } from '../../../selectors/networkController';
@@ -212,7 +216,6 @@ const AccountConnect = (props: AccountConnectProps) => {
       const initialNetworkAvatar = {
         size: AvatarSize.Xs,
         name: networkConfigurations[chainId]?.name || '',
-        // @ts-expect-error getNetworkImageSourcenot yet typed
         imageSource: getNetworkImageSource({ chainId }),
       };
       setSelectedNetworkAvatars([initialNetworkAvatar]);
@@ -724,9 +727,7 @@ const AccountConnect = (props: AccountConnectProps) => {
         hostname={hostname}
         onPrimaryActionButtonPress={() => {
           setConfirmedAddresses(selectedAddresses);
-          return isMultichainVersion1Enabled
-            ? setScreen(AccountConnectScreens.SingleConnect)
-            : undefined;
+          return undefined;
         }}
         screenTitle={strings('accounts.edit_accounts_title')}
       />
@@ -810,9 +811,7 @@ const AccountConnect = (props: AccountConnectProps) => {
       case AccountConnectScreens.SingleConnect:
         return isSdkUrlUnknown
           ? renderSingleConnectScreen()
-          : isMultichainVersion1Enabled
-          ? renderPermissionsSummaryScreen()
-          : renderSingleConnectScreen();
+          : renderPermissionsSummaryScreen();
       case AccountConnectScreens.SingleConnectSelector:
         return renderSingleConnectSelectorScreen();
       case AccountConnectScreens.MultiConnectSelector:
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
index 6ec45071a29..6df027cc236 100644
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
@@ -115,292 +115,647 @@ exports[`AccountConnect renders correctly 1`] = `
           }
         />
       </View>
-      <View
+      <RCTSafeAreaView
         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,
-            }
-          }
-        >
-          Connect account
-        </Text>
-        <View
-          style={
-            {
-              "alignItems": "flex-end",
-              "flex": 1,
-            }
-          }
-        />
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-        testID="connect-account-modal"
-      >
-        <View
-          iconName="LockSlash"
-          style={
-            {
-              "alignItems": "center",
-              "alignSelf": "center",
               "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 99,
-              "borderWidth": 1,
-              "flexDirection": "row",
-              "paddingLeft": 8,
-              "paddingRight": 16,
-              "paddingVertical": 8,
+              "borderTopLeftRadius": 20,
+              "borderTopRightRadius": 20,
+              "height": undefined,
+              "justifyContent": "flex-start",
+              "minHeight": 200,
+              "paddingTop": 8,
             }
           }
         >
-          <View
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderRadius": 16,
-                "height": 24,
-                "marginRight": 8,
-                "overflow": "hidden",
-                "width": 24,
-              }
-            }
-          >
-            <Image
-              onError={[Function]}
-              resizeMode="contain"
-              source={
-                {
-                  "uri": "",
-                }
-              }
+          <View>
+            <View
               style={
                 {
-                  "flex": 1,
-                  "height": undefined,
-                  "width": undefined,
+                  "alignItems": "center",
+                  "flexDirection": "row",
+                  "justifyContent": "space-between",
                 }
               }
-              testID="favicon-avatar-image"
-            />
-          </View>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#6a737d",
-                "flexShrink": 1,
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            https://mockOrigin
-          </Text>
-        </View>
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#6a737d",
-              "fontFamily": "EuclidCircularB-Regular",
-              "fontSize": 14,
-              "fontWeight": "400",
-              "letterSpacing": 0,
-              "lineHeight": 22,
-              "marginVertical": 16,
-              "textAlign": "center",
-            }
-          }
-        >
-          Share your account address, balance, activity, and allow site to initiate transactions.
-        </Text>
-      </View>
-      <View
-        style={
-          {
-            "marginTop": 16,
-          }
-        }
-      >
-        <View>
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "stretch",
-                "backgroundColor": "transparent",
-                "borderRadius": 24,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "opacity": 1,
-                "paddingHorizontal": 16,
-              }
-            }
-          >
-            <Text
-              accessibilityRole="text"
+            >
+              <View
+                style={
+                  {
+                    "flex": 1,
+                    "paddingLeft": 16,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "alignItems": "center",
+                      "flex": 1,
+                      "justifyContent": "center",
+                    },
+                    false,
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "borderRadius": 10,
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      [
+                        {
+                          "alignContent": "center",
+                          "backgroundColor": "#ffffff",
+                          "borderRadius": 27,
+                          "height": 54,
+                          "justifyContent": "center",
+                          "width": 54,
+                        },
+                        {
+                          "borderRadius": 16,
+                          "height": 32,
+                          "width": 32,
+                        },
+                      ]
+                    }
+                  >
+                    <Text
+                      style={
+                        [
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 24,
+                            "fontWeight": "400",
+                            "textAlign": "center",
+                            "textTransform": "uppercase",
+                          },
+                          undefined,
+                        ]
+                      }
+                    >
+                      h
+                    </Text>
+                  </View>
+                </View>
+              </View>
+              <View
+                style={
+                  {
+                    "alignItems": "flex-end",
+                    "flex": 1,
+                    "paddingRight": 16,
+                  }
+                }
+              />
+            </View>
+            <View
               style={
                 {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
+                  "alignSelf": "center",
+                  "marginBottom": 16,
+                  "marginLeft": 24,
+                  "marginRight": 24,
+                  "marginTop": 8,
                 }
               }
+              testID="permission-network-permissions-container"
             >
-              Connect multiple accounts
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-      >
-        <View
-          style={
-            [
-              {
-                "flexDirection": "row",
-                "marginBottom": 16,
-                "marginTop": 24,
-              },
-              false,
-            ]
-          }
-        >
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "transparent",
-                "borderColor": "#0376c9",
-                "borderRadius": 24,
-                "borderWidth": 1,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
-              }
-            }
-            testID="cancel-button"
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
+              <Text
+                accessibilityRole="text"
+                style={
+                  {
+                    "color": "#141618",
+                    "fontFamily": "EuclidCircularB-Bold",
+                    "fontSize": 16,
+                    "fontWeight": "700",
+                    "letterSpacing": 0,
+                    "lineHeight": 24,
+                  }
                 }
-              }
+              >
+                mockorigin wants to:
+              </Text>
+            </View>
+            <TouchableOpacity
+              onPress={[Function]}
             >
-              Cancel
-            </Text>
-          </TouchableOpacity>
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 12,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+                testID="permission-summary-container"
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Wallet"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    See your accounts and suggest transactions
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                        "gap": 2,
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for 0 accounts
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    />
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+            <TouchableOpacity
+              onPress={[Function]}
+              testID="navigate_to_edit_networks_permissions_button"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 16,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Data"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    Use your enabled networks
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "marginRight": 4,
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for Ethereum Mainnet
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    >
+                      <View
+                        style={
+                          {
+                            "alignItems": "center",
+                            "flexDirection": "row",
+                          }
+                        }
+                      >
+                        <View
+                          style={
+                            {
+                              "marginLeft": 0,
+                            }
+                          }
+                          testID="avatargroup-avatar-container-0"
+                        >
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "backgroundColor": "#ffffff",
+                                "borderColor": "#ffffff",
+                                "borderRadius": 8,
+                                "borderWidth": 1.5,
+                                "height": 16,
+                                "justifyContent": "center",
+                                "overflow": "hidden",
+                                "width": 16,
+                              }
+                            }
+                            testID="avatargroup-avatar"
+                          >
+                            <Image
+                              onError={[Function]}
+                              resizeMode="contain"
+                              source={
+                                {
+                                  "default": {
+                                    "uri": "MockImage",
+                                  },
+                                }
+                              }
+                              style={
+                                {
+                                  "height": 16,
+                                  "width": 16,
+                                }
+                              }
+                              testID="network-avatar-image"
+                            />
+                          </View>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+          </View>
           <View
             style={
               {
-                "width": 16,
-              }
-            }
-          />
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "#0376c9",
-                "borderRadius": 24,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
+                "marginTop": 8,
               }
             }
-            testID="connect-button"
           >
-            <Text
-              accessibilityRole="text"
+            <View
               style={
                 {
-                  "color": "#ffffff",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
+                  "flex": 0,
+                  "flexDirection": "row",
+                  "marginTop": 8,
+                  "paddingHorizontal": 24,
                 }
               }
             >
-              Connect
-            </Text>
-          </TouchableOpacity>
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#ffffff",
+                        "borderColor": "#6a737d",
+                        "borderWidth": 1,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginRight": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="cancel-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#6a737d",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Cancel
+                </Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#0376c9",
+                        "minHeight": 50,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginLeft": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="connect-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#ffffff",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Connect
+                </Text>
+              </TouchableOpacity>
+            </View>
+          </View>
         </View>
-      </View>
+      </RCTSafeAreaView>
       <Modal
         animationType="none"
         deviceHeight={null}
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
new file mode 100644
index 00000000000..6df027cc236
--- /dev/null
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
@@ -0,0 +1,789 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountConnect renders correctly 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": 1334,
+            "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>
+      <RCTSafeAreaView
+        style={
+          {
+            "backgroundColor": "#ffffff",
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "backgroundColor": "#ffffff",
+              "borderTopLeftRadius": 20,
+              "borderTopRightRadius": 20,
+              "height": undefined,
+              "justifyContent": "flex-start",
+              "minHeight": 200,
+              "paddingTop": 8,
+            }
+          }
+        >
+          <View>
+            <View
+              style={
+                {
+                  "alignItems": "center",
+                  "flexDirection": "row",
+                  "justifyContent": "space-between",
+                }
+              }
+            >
+              <View
+                style={
+                  {
+                    "flex": 1,
+                    "paddingLeft": 16,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "alignItems": "center",
+                      "flex": 1,
+                      "justifyContent": "center",
+                    },
+                    false,
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "borderRadius": 10,
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      [
+                        {
+                          "alignContent": "center",
+                          "backgroundColor": "#ffffff",
+                          "borderRadius": 27,
+                          "height": 54,
+                          "justifyContent": "center",
+                          "width": 54,
+                        },
+                        {
+                          "borderRadius": 16,
+                          "height": 32,
+                          "width": 32,
+                        },
+                      ]
+                    }
+                  >
+                    <Text
+                      style={
+                        [
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 24,
+                            "fontWeight": "400",
+                            "textAlign": "center",
+                            "textTransform": "uppercase",
+                          },
+                          undefined,
+                        ]
+                      }
+                    >
+                      h
+                    </Text>
+                  </View>
+                </View>
+              </View>
+              <View
+                style={
+                  {
+                    "alignItems": "flex-end",
+                    "flex": 1,
+                    "paddingRight": 16,
+                  }
+                }
+              />
+            </View>
+            <View
+              style={
+                {
+                  "alignSelf": "center",
+                  "marginBottom": 16,
+                  "marginLeft": 24,
+                  "marginRight": 24,
+                  "marginTop": 8,
+                }
+              }
+              testID="permission-network-permissions-container"
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  {
+                    "color": "#141618",
+                    "fontFamily": "EuclidCircularB-Bold",
+                    "fontSize": 16,
+                    "fontWeight": "700",
+                    "letterSpacing": 0,
+                    "lineHeight": 24,
+                  }
+                }
+              >
+                mockorigin wants to:
+              </Text>
+            </View>
+            <TouchableOpacity
+              onPress={[Function]}
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 12,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+                testID="permission-summary-container"
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Wallet"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    See your accounts and suggest transactions
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                        "gap": 2,
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for 0 accounts
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    />
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+            <TouchableOpacity
+              onPress={[Function]}
+              testID="navigate_to_edit_networks_permissions_button"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 16,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Data"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    Use your enabled networks
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "marginRight": 4,
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for Ethereum Mainnet
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    >
+                      <View
+                        style={
+                          {
+                            "alignItems": "center",
+                            "flexDirection": "row",
+                          }
+                        }
+                      >
+                        <View
+                          style={
+                            {
+                              "marginLeft": 0,
+                            }
+                          }
+                          testID="avatargroup-avatar-container-0"
+                        >
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "backgroundColor": "#ffffff",
+                                "borderColor": "#ffffff",
+                                "borderRadius": 8,
+                                "borderWidth": 1.5,
+                                "height": 16,
+                                "justifyContent": "center",
+                                "overflow": "hidden",
+                                "width": 16,
+                              }
+                            }
+                            testID="avatargroup-avatar"
+                          >
+                            <Image
+                              onError={[Function]}
+                              resizeMode="contain"
+                              source={
+                                {
+                                  "default": {
+                                    "uri": "MockImage",
+                                  },
+                                }
+                              }
+                              style={
+                                {
+                                  "height": 16,
+                                  "width": 16,
+                                }
+                              }
+                              testID="network-avatar-image"
+                            />
+                          </View>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+          </View>
+          <View
+            style={
+              {
+                "marginTop": 8,
+              }
+            }
+          >
+            <View
+              style={
+                {
+                  "flex": 0,
+                  "flexDirection": "row",
+                  "marginTop": 8,
+                  "paddingHorizontal": 24,
+                }
+              }
+            >
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#ffffff",
+                        "borderColor": "#6a737d",
+                        "borderWidth": 1,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginRight": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="cancel-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#6a737d",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Cancel
+                </Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#0376c9",
+                        "minHeight": 50,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginLeft": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="connect-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#ffffff",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Connect
+                </Text>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      </RCTSafeAreaView>
+      <Modal
+        animationType="none"
+        deviceHeight={null}
+        deviceWidth={null}
+        hardwareAccelerated={false}
+        hideModalContentWhileAnimating={false}
+        onBackdropPress={[Function]}
+        onModalHide={[Function]}
+        onModalWillHide={[Function]}
+        onModalWillShow={[Function]}
+        onRequestClose={[Function]}
+        panResponderThreshold={4}
+        scrollHorizontal={false}
+        scrollOffset={0}
+        scrollOffsetMax={0}
+        scrollTo={null}
+        statusBarTranslucent={false}
+        supportedOrientations={
+          [
+            "portrait",
+            "landscape",
+          ]
+        }
+        swipeThreshold={100}
+        transparent={true}
+        visible={false}
+      />
+    </View>
+  </View>
+</View>
+`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
new file mode 100644
index 00000000000..6ec45071a29
--- /dev/null
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
@@ -0,0 +1,434 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountConnect renders correctly 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": 1334,
+            "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,
+            }
+          }
+        >
+          Connect account
+        </Text>
+        <View
+          style={
+            {
+              "alignItems": "flex-end",
+              "flex": 1,
+            }
+          }
+        />
+      </View>
+      <View
+        style={
+          {
+            "paddingHorizontal": 16,
+          }
+        }
+        testID="connect-account-modal"
+      >
+        <View
+          iconName="LockSlash"
+          style={
+            {
+              "alignItems": "center",
+              "alignSelf": "center",
+              "backgroundColor": "#ffffff",
+              "borderColor": "#bbc0c5",
+              "borderRadius": 99,
+              "borderWidth": 1,
+              "flexDirection": "row",
+              "paddingLeft": 8,
+              "paddingRight": 16,
+              "paddingVertical": 8,
+            }
+          }
+        >
+          <View
+            style={
+              {
+                "backgroundColor": "#ffffff",
+                "borderRadius": 16,
+                "height": 24,
+                "marginRight": 8,
+                "overflow": "hidden",
+                "width": 24,
+              }
+            }
+          >
+            <Image
+              onError={[Function]}
+              resizeMode="contain"
+              source={
+                {
+                  "uri": "",
+                }
+              }
+              style={
+                {
+                  "flex": 1,
+                  "height": undefined,
+                  "width": undefined,
+                }
+              }
+              testID="favicon-avatar-image"
+            />
+          </View>
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#6a737d",
+                "flexShrink": 1,
+                "fontFamily": "EuclidCircularB-Regular",
+                "fontSize": 14,
+                "fontWeight": "400",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+              }
+            }
+          >
+            https://mockOrigin
+          </Text>
+        </View>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+              "marginVertical": 16,
+              "textAlign": "center",
+            }
+          }
+        >
+          Share your account address, balance, activity, and allow site to initiate transactions.
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "marginTop": 16,
+          }
+        }
+      >
+        <View>
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "stretch",
+                "backgroundColor": "transparent",
+                "borderRadius": 24,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "opacity": 1,
+                "paddingHorizontal": 16,
+              }
+            }
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Connect multiple accounts
+            </Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <View
+          style={
+            [
+              {
+                "flexDirection": "row",
+                "marginBottom": 16,
+                "marginTop": 24,
+              },
+              false,
+            ]
+          }
+        >
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "flex-start",
+                "backgroundColor": "transparent",
+                "borderColor": "#0376c9",
+                "borderRadius": 24,
+                "borderWidth": 1,
+                "flex": 1,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "paddingHorizontal": 16,
+              }
+            }
+            testID="cancel-button"
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Cancel
+            </Text>
+          </TouchableOpacity>
+          <View
+            style={
+              {
+                "width": 16,
+              }
+            }
+          />
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "flex-start",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 24,
+                "flex": 1,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "paddingHorizontal": 16,
+              }
+            }
+            testID="connect-button"
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#ffffff",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Connect
+            </Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      <Modal
+        animationType="none"
+        deviceHeight={null}
+        deviceWidth={null}
+        hardwareAccelerated={false}
+        hideModalContentWhileAnimating={false}
+        onBackdropPress={[Function]}
+        onModalHide={[Function]}
+        onModalWillHide={[Function]}
+        onModalWillShow={[Function]}
+        onRequestClose={[Function]}
+        panResponderThreshold={4}
+        scrollHorizontal={false}
+        scrollOffset={0}
+        scrollOffsetMax={0}
+        scrollTo={null}
+        statusBarTranslucent={false}
+        supportedOrientations={
+          [
+            "portrait",
+            "landscape",
+          ]
+        }
+        swipeThreshold={100}
+        transparent={true}
+        visible={false}
+      />
+    </View>
+  </View>
+</View>
+`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
new file mode 100644
index 00000000000..6ec45071a29
--- /dev/null
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
@@ -0,0 +1,434 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountConnect renders correctly 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": 1334,
+            "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,
+            }
+          }
+        >
+          Connect account
+        </Text>
+        <View
+          style={
+            {
+              "alignItems": "flex-end",
+              "flex": 1,
+            }
+          }
+        />
+      </View>
+      <View
+        style={
+          {
+            "paddingHorizontal": 16,
+          }
+        }
+        testID="connect-account-modal"
+      >
+        <View
+          iconName="LockSlash"
+          style={
+            {
+              "alignItems": "center",
+              "alignSelf": "center",
+              "backgroundColor": "#ffffff",
+              "borderColor": "#bbc0c5",
+              "borderRadius": 99,
+              "borderWidth": 1,
+              "flexDirection": "row",
+              "paddingLeft": 8,
+              "paddingRight": 16,
+              "paddingVertical": 8,
+            }
+          }
+        >
+          <View
+            style={
+              {
+                "backgroundColor": "#ffffff",
+                "borderRadius": 16,
+                "height": 24,
+                "marginRight": 8,
+                "overflow": "hidden",
+                "width": 24,
+              }
+            }
+          >
+            <Image
+              onError={[Function]}
+              resizeMode="contain"
+              source={
+                {
+                  "uri": "",
+                }
+              }
+              style={
+                {
+                  "flex": 1,
+                  "height": undefined,
+                  "width": undefined,
+                }
+              }
+              testID="favicon-avatar-image"
+            />
+          </View>
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#6a737d",
+                "flexShrink": 1,
+                "fontFamily": "EuclidCircularB-Regular",
+                "fontSize": 14,
+                "fontWeight": "400",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+              }
+            }
+          >
+            https://mockOrigin
+          </Text>
+        </View>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+              "marginVertical": 16,
+              "textAlign": "center",
+            }
+          }
+        >
+          Share your account address, balance, activity, and allow site to initiate transactions.
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "marginTop": 16,
+          }
+        }
+      >
+        <View>
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "stretch",
+                "backgroundColor": "transparent",
+                "borderRadius": 24,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "opacity": 1,
+                "paddingHorizontal": 16,
+              }
+            }
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Connect multiple accounts
+            </Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <View
+          style={
+            [
+              {
+                "flexDirection": "row",
+                "marginBottom": 16,
+                "marginTop": 24,
+              },
+              false,
+            ]
+          }
+        >
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "flex-start",
+                "backgroundColor": "transparent",
+                "borderColor": "#0376c9",
+                "borderRadius": 24,
+                "borderWidth": 1,
+                "flex": 1,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "paddingHorizontal": 16,
+              }
+            }
+            testID="cancel-button"
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Cancel
+            </Text>
+          </TouchableOpacity>
+          <View
+            style={
+              {
+                "width": 16,
+              }
+            }
+          />
+          <TouchableOpacity
+            accessibilityRole="button"
+            accessible={true}
+            activeOpacity={1}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "alignSelf": "flex-start",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 24,
+                "flex": 1,
+                "flexDirection": "row",
+                "height": 48,
+                "justifyContent": "center",
+                "paddingHorizontal": 16,
+              }
+            }
+            testID="connect-button"
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#ffffff",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Connect
+            </Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      <Modal
+        animationType="none"
+        deviceHeight={null}
+        deviceWidth={null}
+        hardwareAccelerated={false}
+        hideModalContentWhileAnimating={false}
+        onBackdropPress={[Function]}
+        onModalHide={[Function]}
+        onModalWillHide={[Function]}
+        onModalWillShow={[Function]}
+        onRequestClose={[Function]}
+        panResponderThreshold={4}
+        scrollHorizontal={false}
+        scrollOffset={0}
+        scrollOffsetMax={0}
+        scrollTo={null}
+        statusBarTranslucent={false}
+        supportedOrientations={
+          [
+            "portrait",
+            "landscape",
+          ]
+        }
+        swipeThreshold={100}
+        transparent={true}
+        visible={false}
+      />
+    </View>
+  </View>
+</View>
+`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on
new file mode 100644
index 00000000000..6df027cc236
--- /dev/null
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on
@@ -0,0 +1,789 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountConnect renders correctly 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": 1334,
+            "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>
+      <RCTSafeAreaView
+        style={
+          {
+            "backgroundColor": "#ffffff",
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "backgroundColor": "#ffffff",
+              "borderTopLeftRadius": 20,
+              "borderTopRightRadius": 20,
+              "height": undefined,
+              "justifyContent": "flex-start",
+              "minHeight": 200,
+              "paddingTop": 8,
+            }
+          }
+        >
+          <View>
+            <View
+              style={
+                {
+                  "alignItems": "center",
+                  "flexDirection": "row",
+                  "justifyContent": "space-between",
+                }
+              }
+            >
+              <View
+                style={
+                  {
+                    "flex": 1,
+                    "paddingLeft": 16,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "alignItems": "center",
+                      "flex": 1,
+                      "justifyContent": "center",
+                    },
+                    false,
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "borderRadius": 10,
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      [
+                        {
+                          "alignContent": "center",
+                          "backgroundColor": "#ffffff",
+                          "borderRadius": 27,
+                          "height": 54,
+                          "justifyContent": "center",
+                          "width": 54,
+                        },
+                        {
+                          "borderRadius": 16,
+                          "height": 32,
+                          "width": 32,
+                        },
+                      ]
+                    }
+                  >
+                    <Text
+                      style={
+                        [
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 24,
+                            "fontWeight": "400",
+                            "textAlign": "center",
+                            "textTransform": "uppercase",
+                          },
+                          undefined,
+                        ]
+                      }
+                    >
+                      h
+                    </Text>
+                  </View>
+                </View>
+              </View>
+              <View
+                style={
+                  {
+                    "alignItems": "flex-end",
+                    "flex": 1,
+                    "paddingRight": 16,
+                  }
+                }
+              />
+            </View>
+            <View
+              style={
+                {
+                  "alignSelf": "center",
+                  "marginBottom": 16,
+                  "marginLeft": 24,
+                  "marginRight": 24,
+                  "marginTop": 8,
+                }
+              }
+              testID="permission-network-permissions-container"
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  {
+                    "color": "#141618",
+                    "fontFamily": "EuclidCircularB-Bold",
+                    "fontSize": 16,
+                    "fontWeight": "700",
+                    "letterSpacing": 0,
+                    "lineHeight": 24,
+                  }
+                }
+              >
+                mockorigin wants to:
+              </Text>
+            </View>
+            <TouchableOpacity
+              onPress={[Function]}
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 12,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+                testID="permission-summary-container"
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Wallet"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    See your accounts and suggest transactions
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                        "gap": 2,
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for 0 accounts
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    />
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+            <TouchableOpacity
+              onPress={[Function]}
+              testID="navigate_to_edit_networks_permissions_button"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "marginBottom": 16,
+                    "marginHorizontal": 24,
+                    "marginTop": 8,
+                  }
+                }
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "alignSelf": "flex-start",
+                      "backgroundColor": "#0000001a",
+                      "borderRadius": 16,
+                      "height": 32,
+                      "justifyContent": "center",
+                      "overflow": "hidden",
+                      "width": 32,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#6a737d"
+                    height={20}
+                    name="Data"
+                    style={
+                      {
+                        "height": 20,
+                        "width": 20,
+                      }
+                    }
+                    width={20}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "marginLeft": 12,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 14,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    Use your enabled networks
+                  </Text>
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "marginRight": 4,
+                          "maxWidth": "75%",
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        ellipsizeMode="tail"
+                        numberOfLines={1}
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 12,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 20,
+                            }
+                          }
+                        >
+                          Requesting for Ethereum Mainnet
+                        </Text>
+                      </Text>
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flexGrow": 1,
+                          "marginLeft": 2,
+                          "minWidth": "25%",
+                        }
+                      }
+                    >
+                      <View
+                        style={
+                          {
+                            "alignItems": "center",
+                            "flexDirection": "row",
+                          }
+                        }
+                      >
+                        <View
+                          style={
+                            {
+                              "marginLeft": 0,
+                            }
+                          }
+                          testID="avatargroup-avatar-container-0"
+                        >
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "backgroundColor": "#ffffff",
+                                "borderColor": "#ffffff",
+                                "borderRadius": 8,
+                                "borderWidth": 1.5,
+                                "height": 16,
+                                "justifyContent": "center",
+                                "overflow": "hidden",
+                                "width": 16,
+                              }
+                            }
+                            testID="avatargroup-avatar"
+                          >
+                            <Image
+                              onError={[Function]}
+                              resizeMode="contain"
+                              source={
+                                {
+                                  "default": {
+                                    "uri": "MockImage",
+                                  },
+                                }
+                              }
+                              style={
+                                {
+                                  "height": 16,
+                                  "width": 16,
+                                }
+                              }
+                              testID="network-avatar-image"
+                            />
+                          </View>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+                <View
+                  testID="connection-details-button"
+                >
+                  <View
+                    style={
+                      {
+                        "alignItems": "center",
+                        "width": 56,
+                      }
+                    }
+                  >
+                    <Text
+                      accessibilityRole="text"
+                      style={
+                        {
+                          "color": "#0376c9",
+                          "fontFamily": "EuclidCircularB-Medium",
+                          "fontSize": 14,
+                          "fontWeight": "500",
+                          "letterSpacing": 0,
+                          "lineHeight": 22,
+                        }
+                      }
+                    >
+                      Edit
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            </TouchableOpacity>
+          </View>
+          <View
+            style={
+              {
+                "marginTop": 8,
+              }
+            }
+          >
+            <View
+              style={
+                {
+                  "flex": 0,
+                  "flexDirection": "row",
+                  "marginTop": 8,
+                  "paddingHorizontal": 24,
+                }
+              }
+            >
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#ffffff",
+                        "borderColor": "#6a737d",
+                        "borderWidth": 1,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginRight": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="cancel-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#6a737d",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Cancel
+                </Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
+                activeOpacity={0.2}
+                onPress={[Function]}
+                style={
+                  [
+                    [
+                      {
+                        "borderRadius": 100,
+                        "justifyContent": "center",
+                        "padding": 15,
+                      },
+                      {
+                        "backgroundColor": "#0376c9",
+                        "minHeight": 50,
+                      },
+                      [
+                        {
+                          "flex": 1,
+                        },
+                        {
+                          "marginLeft": 8,
+                        },
+                      ],
+                    ],
+                    null,
+                  ]
+                }
+                testID="connect-button"
+              >
+                <Text
+                  style={
+                    [
+                      {
+                        "color": "#007aff",
+                        "fontSize": 17,
+                        "fontWeight": "500",
+                        "textAlign": "center",
+                      },
+                      null,
+                      [
+                        {
+                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontSize": 14,
+                          "fontWeight": "600",
+                          "textAlign": "center",
+                        },
+                        {
+                          "color": "#ffffff",
+                        },
+                        undefined,
+                      ],
+                      null,
+                    ]
+                  }
+                >
+                  Connect
+                </Text>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      </RCTSafeAreaView>
+      <Modal
+        animationType="none"
+        deviceHeight={null}
+        deviceWidth={null}
+        hardwareAccelerated={false}
+        hideModalContentWhileAnimating={false}
+        onBackdropPress={[Function]}
+        onModalHide={[Function]}
+        onModalWillHide={[Function]}
+        onModalWillShow={[Function]}
+        onRequestClose={[Function]}
+        panResponderThreshold={4}
+        scrollHorizontal={false}
+        scrollOffset={0}
+        scrollOffsetMax={0}
+        scrollTo={null}
+        statusBarTranslucent={false}
+        supportedOrientations={
+          [
+            "portrait",
+            "landscape",
+          ]
+        }
+        swipeThreshold={100}
+        transparent={true}
+        visible={false}
+      />
+    </View>
+  </View>
+</View>
+`;

From a09f72f9d054f424518a5619a97878340f9fd19d Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Thu, 26 Dec 2024 15:08:51 +0300
Subject: [PATCH 09/25] refactor(3663): for AccountPermissions component remove
 checks on feature flag, remove code that ran when feature flag was off (which
 was now dead code)

---
 .../AccountPermissions.test.tsx               |  10 +-
 .../AccountPermissions/AccountPermissions.tsx |  34 +--
 .../AccountPermissions.test.tsx.snap          | 265 +++++-------------
 3 files changed, 87 insertions(+), 222 deletions(-)

diff --git a/app/components/Views/AccountPermissions/AccountPermissions.test.tsx b/app/components/Views/AccountPermissions/AccountPermissions.test.tsx
index 13073b9ce52..5c3a6dc682c 100644
--- a/app/components/Views/AccountPermissions/AccountPermissions.test.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissions.test.tsx
@@ -27,11 +27,11 @@ jest.mock('../../../components/hooks/useMetrics', () => ({
   }),
 }));
 
-jest.mock('../../../util/networks/index.js', () => ({
-  ...jest.requireActual('../../../util/networks/index.js'),
-  isMultichainVersion1Enabled: false,
-  isChainPermissionsFeatureEnabled: false,
-}));
+// jest.mock('../../../util/networks/index.js', () => ({
+//   ...jest.requireActual('../../../util/networks/index.js'),
+//   isMultichainVersion1Enabled: false,
+//   isChainPermissionsFeatureEnabled: false,
+// }));
 
 jest.mock('react-native-safe-area-context', () => {
   const inset = { top: 0, right: 0, bottom: 0, left: 0 };
diff --git a/app/components/Views/AccountPermissions/AccountPermissions.tsx b/app/components/Views/AccountPermissions/AccountPermissions.tsx
index 430a045606e..8c3f5dc3d1f 100755
--- a/app/components/Views/AccountPermissions/AccountPermissions.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissions.tsx
@@ -54,10 +54,7 @@ import { useMetrics } from '../../../components/hooks/useMetrics';
 import { selectInternalAccounts } from '../../../selectors/accountsController';
 import { selectPermissionControllerState } from '../../../selectors/snaps/permissionController';
 import { RootState } from '../../../reducers';
-import {
-  isMultichainVersion1Enabled,
-  getNetworkImageSource,
-} from '../../../util/networks';
+import { getNetworkImageSource } from '../../../util/networks';
 import PermissionsSummary from '../../../components/UI/PermissionsSummary';
 import { PermissionsSummaryProps } from '../../../components/UI/PermissionsSummary/PermissionsSummary.types';
 import { toChecksumHexAddress } from '@metamask/controller-utils';
@@ -122,7 +119,7 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
   const sheetRef = useRef<BottomSheetRef>(null);
   const [permissionsScreen, setPermissionsScreen] =
     useState<AccountPermissionsScreens>(
-      isNonDappNetworkSwitch && isMultichainVersion1Enabled
+      isNonDappNetworkSwitch
         ? AccountPermissionsScreens.PermissionsSummary
         : initialScreen,
     );
@@ -207,15 +204,8 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
       previousPermittedAccounts.current === undefined &&
       permittedAccountsByHostname.length === 0
     ) {
-      // TODO - Figure out better UX instead of auto dismissing. However, we cannot be in this state as long as accounts are not connected.
       hideSheet();
 
-      const plainToastProps: ToastOptions = {
-        variant: ToastVariants.Plain,
-        labelOptions: [{ label: strings('toast.disconnected_all') }],
-        hasNoTimeout: false,
-      };
-
       const networkToastProps: ToastOptions = {
         variant: ToastVariants.Network,
         labelOptions: [
@@ -229,9 +219,7 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
         networkImageSource: faviconSource,
       };
 
-      toastRef?.current?.showToast(
-        isMultichainVersion1Enabled ? networkToastProps : plainToastProps,
-      );
+      toastRef?.current?.showToast(networkToastProps);
 
       previousPermittedAccounts.current = permittedAccountsByHostname.length;
     }
@@ -645,16 +633,12 @@ const AccountPermissions = (props: AccountPermissionsProps) => {
         accounts={accountsFilteredByPermissions.unpermitted}
         ensByAccountAddress={ensByAccountAddress}
         selectedAddresses={selectedAddresses}
-        onSelectAddress={
-          isMultichainVersion1Enabled
-            ? (checkedAddresses) => {
-                setSelectedAddresses([
-                  ...checkedAddresses,
-                  ...permittedAccountsByHostname,
-                ]);
-              }
-            : setSelectedAddresses
-        }
+        onSelectAddress={(checkedAddresses) => {
+          setSelectedAddresses([
+            ...checkedAddresses,
+            ...permittedAccountsByHostname,
+          ]);
+        }}
         isLoading={isLoading}
         onUserAction={setUserIntent}
         favicon={faviconSource}
diff --git a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap b/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
index 7deacbad4c2..2f9359c5652 100644
--- a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
+++ b/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
@@ -119,10 +119,8 @@ exports[`AccountPermissions renders correctly 1`] = `
         style={
           {
             "alignItems": "center",
-            "backgroundColor": "#ffffff",
             "flexDirection": "row",
-            "height": 32,
-            "justifyContent": "space-between",
+            "justifyContent": "center",
             "margin": 16,
           }
         }
@@ -130,10 +128,29 @@ exports[`AccountPermissions renders correctly 1`] = `
         <View
           style={
             {
-              "flex": 1,
+              "backgroundColor": "#ffffff",
+              "borderRadius": 16,
+              "height": 16,
+              "marginRight": 8,
+              "overflow": "hidden",
+              "width": 16,
             }
           }
-        />
+        >
+          <Image
+            onError={[Function]}
+            resizeMode="contain"
+            source={{}}
+            style={
+              {
+                "flex": 1,
+                "height": undefined,
+                "width": undefined,
+              }
+            }
+            testID="favicon-avatar-image"
+          />
+        </View>
         <Text
           accessibilityRole="text"
           style={
@@ -147,16 +164,8 @@ exports[`AccountPermissions renders correctly 1`] = `
             }
           }
         >
-          Connected accounts
+          test
         </Text>
-        <View
-          style={
-            {
-              "alignItems": "flex-end",
-              "flex": 1,
-            }
-          }
-        />
       </View>
       <View
         style={
@@ -165,190 +174,22 @@ exports[`AccountPermissions renders correctly 1`] = `
           }
         }
       >
-        <View
-          iconName="LockSlash"
-          style={
-            {
-              "alignItems": "center",
-              "alignSelf": "center",
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 99,
-              "borderWidth": 1,
-              "flexDirection": "row",
-              "paddingLeft": 8,
-              "paddingRight": 16,
-              "paddingVertical": 8,
-            }
-          }
-        >
-          <View
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderRadius": 16,
-                "height": 24,
-                "marginRight": 8,
-                "overflow": "hidden",
-                "width": 24,
-              }
-            }
-          >
-            <Image
-              onError={[Function]}
-              resizeMode="contain"
-              source={{}}
-              style={
-                {
-                  "flex": 1,
-                  "height": undefined,
-                  "width": undefined,
-                }
-              }
-              testID="favicon-avatar-image"
-            />
-          </View>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#6a737d",
-                "flexShrink": 1,
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            https://test
-          </Text>
-          <Text
-            accessibilityRole="link"
-            accessible={true}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "backgroundColor": "transparent",
-                "color": "#141618",
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-                "marginLeft": 16,
-              }
-            }
-            suppressHighlighting={true}
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Permissions
-            </Text>
-          </Text>
-        </View>
-        <TouchableOpacity
-          disabled={false}
-          onPress={[Function]}
+        <Text
+          accessibilityRole="text"
           style={
             {
-              "alignItems": "center",
-              "alignSelf": "center",
-              "backgroundColor": "#f2f4f6",
-              "borderRadius": 16,
-              "flexDirection": "row",
-              "height": 32,
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Medium",
+              "fontSize": 14,
+              "fontWeight": "500",
+              "letterSpacing": 0,
+              "lineHeight": 22,
               "marginVertical": 16,
-              "paddingHorizontal": 8,
             }
           }
-          testID="accounts-connected-network-picker"
         >
-          <View
-            style={null}
-          >
-            <View
-              accessibilityLabel="Ethereum Main Network"
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#ffffff",
-                  "borderRadius": 8,
-                  "height": 16,
-                  "justifyContent": "center",
-                  "overflow": "hidden",
-                  "width": 16,
-                }
-              }
-              testID="network-avatar-picker"
-            >
-              <Image
-                onError={[Function]}
-                resizeMode="contain"
-                source={
-                  {
-                    "default": {
-                      "uri": "MockImage",
-                    },
-                  }
-                }
-                style={
-                  {
-                    "height": 16,
-                    "width": 16,
-                  }
-                }
-                testID="network-avatar-image"
-              />
-            </View>
-          </View>
-          <Text
-            accessibilityRole="text"
-            numberOfLines={1}
-            style={
-              {
-                "color": "#141618",
-                "flexShrink": 1,
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-                "marginHorizontal": 8,
-              }
-            }
-            testID="open-networks-text"
-          >
-            Ethereum Main Network
-          </Text>
-          <SvgMock
-            color="#141618"
-            height={12}
-            name="ArrowDown"
-            style={
-              {
-                "height": 12,
-                "width": 12,
-              }
-            }
-            testID="pickernetwork-arrow"
-            width={12}
-          />
-        </TouchableOpacity>
+          Connected accounts
+        </Text>
       </View>
       <RCTScrollView
         collapsable={false}
@@ -423,6 +264,46 @@ exports[`AccountPermissions renders correctly 1`] = `
           </TouchableOpacity>
         </View>
       </View>
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "alignSelf": "stretch",
+            "backgroundColor": "transparent",
+            "borderColor": "#0376c9",
+            "borderRadius": 24,
+            "borderWidth": 1,
+            "flexDirection": "row",
+            "height": 48,
+            "justifyContent": "center",
+            "marginHorizontal": 16,
+            "paddingHorizontal": 16,
+          }
+        }
+        testID="manage_permissions"
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#0376c9",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Manage Permissions
+        </Text>
+      </TouchableOpacity>
     </View>
   </View>
 </View>

From 389f36b2e335323f1e47ba9f4d197cbf21abbf89 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Fri, 27 Dec 2024 13:15:59 +0300
Subject: [PATCH 10/25] fix: previous commit on this AccountConnect file
 introduced bugs, this is now fixed

---
 app/components/Views/AccountConnect/AccountConnect.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
index ef8c521070f..62e272b6356 100644
--- a/app/components/Views/AccountConnect/AccountConnect.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -79,10 +79,8 @@ import { PermissionsSummaryProps } from '../../../components/UI/PermissionsSumma
 import PermissionsSummary from '../../../components/UI/PermissionsSummary';
 import { getNetworkImageSource } from '../../../util/networks';
 import NetworkConnectMultiSelector from '../NetworkConnect/NetworkConnectMultiSelector';
-import {
-  PermissionKeys,
-  CaveatTypes,
-} from '../../../core/Permissions/specifications';
+import { PermissionKeys } from '../../../core/Permissions/specifications';
+import { CaveatTypes } from '../../../core/Permissions/constants';
 import { useNetworkInfo } from '../../../selectors/selectedNetworkController';
 import { AvatarSize } from '../../../component-library/components/Avatars/Avatar';
 import { selectNetworkConfigurations } from '../../../selectors/networkController';
@@ -727,7 +725,7 @@ const AccountConnect = (props: AccountConnectProps) => {
         hostname={hostname}
         onPrimaryActionButtonPress={() => {
           setConfirmedAddresses(selectedAddresses);
-          return undefined;
+          setScreen(AccountConnectScreens.SingleConnect);
         }}
         screenTitle={strings('accounts.edit_accounts_title')}
       />

From c42a109083412f85efd427cbdd60f9a4c4872d4d Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Fri, 27 Dec 2024 13:23:57 +0300
Subject: [PATCH 11/25] refactor(3663): for AccountConnectMultiSelector
 component remove checks on feature flag, remove code that ran when feature
 flag was off (which was now dead code)

---
 .../AccountConnectMultiSelector.styles.ts     | 13 ++--
 .../AccountConnectMultiSelector.tsx           | 78 +++++++------------
 2 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
index 880ae2e75c0..7f3877a1171 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
@@ -3,7 +3,6 @@ import { StyleSheet } from 'react-native';
 
 // External dependencies.
 import { Theme } from '../../../../util/theme/models';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
 import Device from '../../../../util/device';
 
 /**
@@ -26,15 +25,19 @@ const styleSheet = (params: {
     },
     description: {
       textAlign: 'center',
-      marginVertical: isMultichainVersion1Enabled ? 8 : 16,
+      marginVertical: 8,
       color: colors.text.alternative,
     },
     ctaButtonsContainer: {
-      marginTop: isMultichainVersion1Enabled ? 0 : 24,
+      marginTop: 0,
       marginBottom: vars.isRenderedAsBottomSheet ? 0 : 16,
     },
-    connectOrUpdateButtonContainer: { flexDirection: 'row' },
-    button: { flex: 1 },
+    connectOrUpdateButtonContainer: {
+      flexDirection: 'row',
+    },
+    button: {
+      flex: 1,
+    },
     buttonSeparator: {
       width: 16,
     },
diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
index eaf5fffa039..8ba227295ed 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
@@ -34,7 +34,6 @@ import {
 } from './AccountConnectMultiSelector.types';
 import { useNavigation } from '@react-navigation/native';
 import Routes from '../../../../constants/navigation/Routes';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
 import Checkbox from '../../../../component-library/components/Checkbox';
 import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 
@@ -166,16 +165,7 @@ const AccountConnectMultiSelector = ({
           {areAnyAccountsSelected && (
             <Button
               variant={ButtonVariants.Primary}
-              label={strings(
-                isMultichainVersion1Enabled
-                  ? 'networks.update'
-                  : 'accounts.connect_with_count',
-                {
-                  countLabel: selectedAddresses.length
-                    ? ` (${selectedAddresses.length})`
-                    : '',
-                },
-              )}
+              label={strings('networks.update')}
               onPress={() => {
                 onPrimaryActionButtonPress
                   ? onPrimaryActionButtonPress()
@@ -192,32 +182,30 @@ const AccountConnectMultiSelector = ({
             />
           )}
         </View>
-        {isMultichainVersion1Enabled &&
-          areNoAccountsSelected &&
-          showDisconnectAllButton && (
-            <View style={styles.disconnectAllContainer}>
-              <View style={styles.helpTextContainer}>
-                <HelpText severity={HelpTextSeverity.Error}>
-                  {strings('common.disconnect_you_from', {
-                    dappUrl: hostname,
-                  })}
-                </HelpText>
-              </View>
-              <View style={styles.disconnectAllButtonContainer}>
-                <Button
-                  variant={ButtonVariants.Primary}
-                  label={strings('accounts.disconnect')}
-                  testID={ConnectedAccountsSelectorsIDs.DISCONNECT}
-                  onPress={toggleRevokeAllAccountPermissionsModal}
-                  isDanger
-                  size={ButtonSize.Lg}
-                  style={{
-                    ...styles.button,
-                  }}
-                />
-              </View>
+        {areNoAccountsSelected && showDisconnectAllButton && (
+          <View style={styles.disconnectAllContainer}>
+            <View style={styles.helpTextContainer}>
+              <HelpText severity={HelpTextSeverity.Error}>
+                {strings('common.disconnect_you_from', {
+                  dappUrl: hostname,
+                })}
+              </HelpText>
             </View>
-          )}
+            <View style={styles.disconnectAllButtonContainer}>
+              <Button
+                variant={ButtonVariants.Primary}
+                label={strings('accounts.disconnect')}
+                testID={ConnectedAccountsSelectorsIDs.DISCONNECT}
+                onPress={toggleRevokeAllAccountPermissionsModal}
+                isDanger
+                size={ButtonSize.Lg}
+                style={{
+                  ...styles.button,
+                }}
+              />
+            </View>
+          </View>
+        )}
       </View>
     );
   }, [
@@ -239,23 +227,15 @@ const AccountConnectMultiSelector = ({
       <SafeAreaView>
         <View style={styles.container}>
           <SheetHeader
-            title={
-              isMultichainVersion1Enabled
-                ? screenTitle
-                : strings('accounts.connect_accounts_title')
-            }
+            title={screenTitle || strings('accounts.connect_accounts_title')}
             onBack={onBack}
           />
           <View style={styles.body}>
             <Text style={styles.description}>
-              {isMultichainVersion1Enabled
-                ? accounts?.length > 0 &&
-                  strings('accounts.select_accounts_description')
-                : strings('accounts.connect_description')}
+              {accounts?.length > 0 &&
+                strings('accounts.select_accounts_description')}
             </Text>
-            {isMultichainVersion1Enabled &&
-              accounts?.length > 0 &&
-              renderSelectAllCheckbox()}
+            {accounts?.length > 0 && renderSelectAllCheckbox()}
           </View>
           <AccountSelectorList
             onSelectAccount={onSelectAccount}
@@ -303,8 +283,6 @@ const AccountConnectMultiSelector = ({
       isLoading,
       onSelectAccount,
       renderCtaButtons,
-      renderSelectAllButton,
-      renderUnselectAllButton,
       secureIcon,
       selectedAddresses,
       styles.addAccountButtonContainer,

From ea373570b06d4927358b3c884ea706fb42a3a26a Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Mon, 13 Jan 2025 17:42:50 +0300
Subject: [PATCH 12/25] chore(test): remove feature flag-off code, since it is
 to be dead code. Update the test to mock nav, and snapshot expected to be
 updated too.

---
 .../__snapshots__/index.test.tsx.snap         | 750 ++++++++++--------
 .../UI/SwitchCustomNetwork/index.js           | 171 +---
 .../UI/SwitchCustomNetwork/index.test.tsx     |  10 +
 3 files changed, 421 insertions(+), 510 deletions(-)

diff --git a/app/components/UI/SwitchCustomNetwork/__snapshots__/index.test.tsx.snap b/app/components/UI/SwitchCustomNetwork/__snapshots__/index.test.tsx.snap
index 35bd474aa89..cc0f5e2eda0 100644
--- a/app/components/UI/SwitchCustomNetwork/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/SwitchCustomNetwork/__snapshots__/index.test.tsx.snap
@@ -1,377 +1,443 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SwitchCustomNetwork should render correctly 1`] = `
-<View
+<RCTSafeAreaView
   style={
     {
       "backgroundColor": "#ffffff",
-      "borderTopLeftRadius": 20,
-      "borderTopRightRadius": 20,
-      "minHeight": 200,
-      "paddingBottom": 20,
-      "paddingTop": 24,
     }
   }
 >
-  <Text
-    style={
-      [
-        {
-          "color": "#141618",
-          "fontFamily": "EuclidCircularB-Regular",
-          "fontSize": 30,
-          "fontWeight": "400",
-          "marginVertical": 2,
-        },
-        {
-          "textAlign": "center",
-        },
-        undefined,
-        {
-          "fontFamily": "EuclidCircularB-Bold",
-          "fontWeight": "600",
-        },
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        {
-          "color": "#141618",
-        },
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        {
-          "marginVertical": 0,
-        },
-        {
-          "fontSize": 24,
-          "marginBottom": 16,
-          "marginLeft": 24,
-          "marginRight": 24,
-          "marginTop": 16,
-        },
-      ]
-    }
-  >
-    New network added
-  </Text>
-  <Text
-    style={
-      [
-        {
-          "color": "#141618",
-          "fontFamily": "EuclidCircularB-Regular",
-          "fontSize": 30,
-          "fontWeight": "400",
-          "marginVertical": 2,
-        },
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        {
-          "color": "#141618",
-        },
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        {
-          "marginVertical": 0,
-        },
-        {
-          "fontSize": 13,
-          "paddingBottom": 16,
-          "paddingHorizontal": 24,
-          "textAlign": "center",
-          "width": "100%",
-        },
-      ]
-    }
-  >
-    <Text
-      style={
-        [
-          {
-            "color": "#141618",
-            "fontFamily": "EuclidCircularB-Regular",
-            "fontSize": 30,
-            "fontWeight": "400",
-            "marginVertical": 2,
-          },
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-        ]
-      }
-    >
-      <Text
-        style={
-          [
-            {
-              "color": "#141618",
-              "fontFamily": "EuclidCircularB-Regular",
-              "fontSize": 30,
-              "fontWeight": "400",
-              "marginVertical": 2,
-            },
-            undefined,
-            undefined,
-            {
-              "fontFamily": "EuclidCircularB-Bold",
-              "fontWeight": "600",
-            },
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            {
-              "color": "#141618",
-            },
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            {
-              "marginVertical": 0,
-            },
-            undefined,
-          ]
-        }
-      >
-        ""
-      </Text>
-      <Text
-        style={
-          [
-            {
-              "color": "#141618",
-              "fontFamily": "EuclidCircularB-Regular",
-              "fontSize": 30,
-              "fontWeight": "400",
-              "marginVertical": 2,
-            },
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            {
-              "marginVertical": 0,
-            },
-            undefined,
-          ]
-        }
-      >
-         
-        is now available in the network selector.
-      </Text>
-    </Text>
-  </Text>
   <View
     style={
       {
-        "flex": 0,
-        "flexDirection": "row",
-        "marginTop": 20,
-        "padding": 24,
+        "backgroundColor": "#ffffff",
+        "borderTopLeftRadius": 20,
+        "borderTopRightRadius": 20,
+        "height": undefined,
+        "justifyContent": "flex-start",
+        "minHeight": 200,
+        "paddingTop": 8,
       }
     }
   >
-    <TouchableOpacity
-      accessibilityRole="button"
-      accessible={true}
-      activeOpacity={0.2}
-      onPress={[Function]}
-      style={
-        [
-          [
-            {
-              "borderRadius": 100,
-              "justifyContent": "center",
-              "padding": 15,
-            },
+    <View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "space-between",
+          }
+        }
+      >
+        <View
+          style={
             {
-              "backgroundColor": "#ffffff",
-              "borderColor": "#6a737d",
-              "borderWidth": 1,
-            },
+              "flex": 1,
+              "paddingLeft": 16,
+            }
+          }
+        />
+        <View
+          style={
             [
               {
+                "alignItems": "center",
                 "flex": 1,
+                "justifyContent": "center",
               },
+              false,
+            ]
+          }
+        >
+          <View
+            style={
               {
-                "marginRight": 8,
-              },
-            ],
-          ],
-          null,
-        ]
-      }
-      testID="cancel-button"
-    >
-      <Text
-        style={
-          [
+                "alignItems": "center",
+                "borderRadius": 10,
+                "justifyContent": "center",
+              }
+            }
+          >
+            <View
+              style={
+                [
+                  {
+                    "alignContent": "center",
+                    "backgroundColor": "#ffffff",
+                    "borderRadius": 27,
+                    "height": 54,
+                    "justifyContent": "center",
+                    "width": 54,
+                  },
+                  {
+                    "borderRadius": 16,
+                    "height": 32,
+                    "width": 32,
+                  },
+                ]
+              }
+            >
+              <Text
+                style={
+                  [
+                    {
+                      "color": "#141618",
+                      "fontFamily": "EuclidCircularB-Regular",
+                      "fontSize": 24,
+                      "fontWeight": "400",
+                      "textAlign": "center",
+                      "textTransform": "uppercase",
+                    },
+                    undefined,
+                  ]
+                }
+              >
+                a
+              </Text>
+            </View>
+          </View>
+        </View>
+        <View
+          style={
             {
-              "color": "#007aff",
-              "fontSize": 17,
-              "fontWeight": "500",
-              "textAlign": "center",
-            },
-            null,
-            [
-              {
-                "fontFamily": "EuclidCircularB-Bold",
-                "fontSize": 14,
-                "fontWeight": "600",
-                "textAlign": "center",
-              },
-              {
-                "color": "#6a737d",
-              },
-              undefined,
-            ],
-            null,
-          ]
+              "alignItems": "flex-end",
+              "flex": 1,
+              "paddingRight": 16,
+            }
+          }
+        />
+      </View>
+      <View
+        style={
+          {
+            "alignSelf": "center",
+            "marginBottom": 16,
+            "marginLeft": 24,
+            "marginRight": 24,
+            "marginTop": 8,
+          }
         }
+        testID="permission-network-permissions-container"
       >
-        Cancel
-      </Text>
-    </TouchableOpacity>
-    <TouchableOpacity
-      accessibilityRole="button"
-      accessible={true}
-      activeOpacity={0.2}
-      onPress={[Function]}
-      style={
-        [
-          [
+        <Text
+          accessibilityRole="text"
+          style={
             {
-              "borderRadius": 100,
-              "justifyContent": "center",
-              "padding": 15,
-            },
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Bold",
+              "fontSize": 16,
+              "fontWeight": "700",
+              "letterSpacing": 0,
+              "lineHeight": 24,
+            }
+          }
+        >
+          app.uniswap.org wants to:
+        </Text>
+      </View>
+      <TouchableOpacity
+        onPress={[Function]}
+        testID="navigate_to_edit_networks_permissions_button"
+      >
+        <View
+          style={
             {
-              "backgroundColor": "#0376c9",
-              "minHeight": 50,
-            },
-            [
+              "alignItems": "center",
+              "flexDirection": "row",
+              "marginBottom": 16,
+              "marginHorizontal": 24,
+              "marginTop": 8,
+            }
+          }
+        >
+          <View
+            style={
               {
-                "flex": 1,
-              },
+                "alignItems": "center",
+                "alignSelf": "flex-start",
+                "backgroundColor": "#0000001a",
+                "borderRadius": 16,
+                "height": 32,
+                "justifyContent": "center",
+                "overflow": "hidden",
+                "width": 32,
+              }
+            }
+          >
+            <SvgMock
+              color="#6a737d"
+              height={20}
+              name="Data"
+              style={
+                {
+                  "height": 20,
+                  "width": 20,
+                }
+              }
+              width={20}
+            />
+          </View>
+          <View
+            style={
               {
-                "marginLeft": 8,
-              },
-            ],
-          ],
-          null,
-        ]
+                "flex": 1,
+                "marginLeft": 12,
+              }
+            }
+          >
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Use your enabled networks
+            </Text>
+            <View
+              style={
+                {
+                  "alignItems": "center",
+                  "flexDirection": "row",
+                }
+              }
+            >
+              <View
+                style={
+                  {
+                    "marginRight": 4,
+                    "maxWidth": "75%",
+                  }
+                }
+              >
+                <Text
+                  accessibilityRole="text"
+                  ellipsizeMode="tail"
+                  numberOfLines={1}
+                  style={
+                    {
+                      "color": "#141618",
+                      "fontFamily": "EuclidCircularB-Regular",
+                      "fontSize": 14,
+                      "fontWeight": "400",
+                      "letterSpacing": 0,
+                      "lineHeight": 22,
+                    }
+                  }
+                >
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 12,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 20,
+                      }
+                    }
+                  >
+                    Requesting for 
+                  </Text>
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#141618",
+                        "fontFamily": "EuclidCircularB-Medium",
+                        "fontSize": 12,
+                        "fontWeight": "500",
+                        "letterSpacing": 0,
+                        "lineHeight": 20,
+                      }
+                    }
+                  />
+                </Text>
+              </View>
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "backgroundColor": "#f2f4f6",
+                    "borderRadius": 8,
+                    "borderWidth": 1,
+                    "height": 16,
+                    "justifyContent": "center",
+                    "overflow": "hidden",
+                    "width": 16,
+                  }
+                }
+              >
+                <Text
+                  accessibilityRole="text"
+                  style={
+                    {
+                      "color": "#141618",
+                      "fontFamily": "EuclidCircularB-Regular",
+                      "fontSize": 10,
+                      "fontWeight": "400",
+                      "letterSpacing": 0,
+                      "lineHeight": undefined,
+                    }
+                  }
+                >
+                  ?
+                </Text>
+              </View>
+            </View>
+          </View>
+        </View>
+      </TouchableOpacity>
+    </View>
+    <View
+      style={
+        {
+          "marginTop": 8,
+        }
       }
-      testID="connect-button"
     >
-      <Text
+      <View
         style={
-          [
-            {
-              "color": "#007aff",
-              "fontSize": 17,
-              "fontWeight": "500",
-              "textAlign": "center",
-            },
-            null,
-            [
-              {
-                "fontFamily": "EuclidCircularB-Bold",
-                "fontSize": 14,
-                "fontWeight": "600",
-                "textAlign": "center",
-              },
-              {
-                "color": "#ffffff",
-              },
-              undefined,
-            ],
-            null,
-          ]
+          {
+            "flex": 0,
+            "flexDirection": "row",
+            "marginTop": 8,
+            "paddingHorizontal": 24,
+          }
         }
       >
-        Switch Network
-      </Text>
-    </TouchableOpacity>
+        <TouchableOpacity
+          accessibilityRole="button"
+          accessible={true}
+          activeOpacity={0.2}
+          onPress={[Function]}
+          style={
+            [
+              [
+                {
+                  "borderRadius": 100,
+                  "justifyContent": "center",
+                  "padding": 15,
+                },
+                {
+                  "backgroundColor": "#ffffff",
+                  "borderColor": "#6a737d",
+                  "borderWidth": 1,
+                },
+                [
+                  {
+                    "flex": 1,
+                  },
+                  {
+                    "marginRight": 8,
+                  },
+                ],
+              ],
+              null,
+            ]
+          }
+          testID="cancel-button"
+        >
+          <Text
+            style={
+              [
+                {
+                  "color": "#007aff",
+                  "fontSize": 17,
+                  "fontWeight": "500",
+                  "textAlign": "center",
+                },
+                null,
+                [
+                  {
+                    "fontFamily": "EuclidCircularB-Bold",
+                    "fontSize": 14,
+                    "fontWeight": "600",
+                    "textAlign": "center",
+                  },
+                  {
+                    "color": "#6a737d",
+                  },
+                  undefined,
+                ],
+                null,
+              ]
+            }
+          >
+            Cancel
+          </Text>
+        </TouchableOpacity>
+        <TouchableOpacity
+          accessibilityRole="button"
+          accessible={true}
+          activeOpacity={0.2}
+          onPress={[Function]}
+          style={
+            [
+              [
+                {
+                  "borderRadius": 100,
+                  "justifyContent": "center",
+                  "padding": 15,
+                },
+                {
+                  "backgroundColor": "#0376c9",
+                  "minHeight": 50,
+                },
+                [
+                  {
+                    "flex": 1,
+                  },
+                  {
+                    "marginLeft": 8,
+                  },
+                ],
+              ],
+              null,
+            ]
+          }
+          testID="connect-button"
+        >
+          <Text
+            style={
+              [
+                {
+                  "color": "#007aff",
+                  "fontSize": 17,
+                  "fontWeight": "500",
+                  "textAlign": "center",
+                },
+                null,
+                [
+                  {
+                    "fontFamily": "EuclidCircularB-Bold",
+                    "fontSize": 14,
+                    "fontWeight": "600",
+                    "textAlign": "center",
+                  },
+                  {
+                    "color": "#ffffff",
+                  },
+                  undefined,
+                ],
+                null,
+              ]
+            }
+          >
+            Confirm
+          </Text>
+        </TouchableOpacity>
+      </View>
+    </View>
   </View>
-</View>
+</RCTSafeAreaView>
 `;
diff --git a/app/components/UI/SwitchCustomNetwork/index.js b/app/components/UI/SwitchCustomNetwork/index.js
index eef8a1729c1..6192ea316b0 100644
--- a/app/components/UI/SwitchCustomNetwork/index.js
+++ b/app/components/UI/SwitchCustomNetwork/index.js
@@ -1,89 +1,11 @@
 import React, { useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
-import StyledButton from '../StyledButton';
-import { StyleSheet, View } from 'react-native';
-import TransactionHeader from '../TransactionHeader';
-import { strings } from '../../../../locales/i18n';
-import Device from '../../../util/device';
-import Text from '../../Base/Text';
-import { useTheme } from '../../../util/theme';
-import { CommonSelectorsIDs } from '../../../../e2e/selectors/Common.selectors';
-import {
-  isMultichainVersion1Enabled,
-  getDecimalChainId,
-} from '../../../util/networks';
+import { getDecimalChainId } from '../../../util/networks';
 import PermissionSummary from '../PermissionsSummary';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { useNetworkInfo } from '../../../selectors/selectedNetworkController';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 
-const createStyles = (colors) =>
-  StyleSheet.create({
-    root: {
-      backgroundColor: colors.background.default,
-      paddingTop: 24,
-      borderTopLeftRadius: 20,
-      borderTopRightRadius: 20,
-      minHeight: 200,
-      paddingBottom: Device.isIphoneX() ? 20 : 0,
-    },
-    intro: {
-      fontSize: Device.isSmallDevice() ? 18 : 24,
-      marginBottom: 16,
-      marginTop: 16,
-      marginRight: 24,
-      marginLeft: 24,
-    },
-    warning: {
-      paddingHorizontal: 24,
-      fontSize: 13,
-      width: '100%',
-      textAlign: 'center',
-      paddingBottom: 16,
-    },
-    actionContainer: (noMargin) => ({
-      flex: 0,
-      flexDirection: 'row',
-      padding: 24,
-      marginTop: noMargin ? 0 : 20,
-    }),
-    button: {
-      flex: 1,
-    },
-    cancel: {
-      marginRight: 8,
-    },
-    confirm: {
-      marginLeft: 8,
-    },
-    networkIcon: {
-      width: 13,
-      height: 13,
-      borderRadius: 100,
-      marginRight: 10,
-      marginTop: 1,
-    },
-    otherNetworkIcon: {
-      backgroundColor: colors.border.muted,
-      borderColor: colors.border.muted,
-      borderWidth: 2,
-    },
-    networkContainer: {
-      alignItems: 'center',
-    },
-    networkBadge: {
-      flexDirection: 'row',
-      borderColor: colors.border.default,
-      borderRadius: 100,
-      borderWidth: 1,
-      padding: 10,
-    },
-    networkText: {
-      fontSize: 12,
-      color: colors.text.default,
-    },
-  });
-
 /**
  * Account access approval component
  */
@@ -94,13 +16,10 @@ const SwitchCustomNetwork = ({
   onConfirm,
   type,
 }) => {
-  const { colors } = useTheme();
-  const styles = createStyles(colors);
-  const { trackEvent, createEventBuilder } = useMetrics();
-
   const { networkName } = useNetworkInfo(
     new URL(currentPageInformation.url).hostname,
   );
+  const { trackEvent, createEventBuilder } = useMetrics();
 
   const trackingData = useMemo(
     () => ({
@@ -121,87 +40,7 @@ const SwitchCustomNetwork = ({
     );
   }, [trackEvent, trackingData, createEventBuilder]);
 
-  /**
-   * Calls onConfirm callback and analytics to track connect confirmed event
-   */
-  const confirm = () => {
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.NETWORK_SWITCH_CONFIRM_PRESSED)
-        .addProperties(trackingData)
-        .build(),
-    );
-    onConfirm && onConfirm();
-  };
-
-  /**
-   * Calls onConfirm callback and analytics to track connect canceled event
-   */
-  const cancel = () => {
-    onCancel && onCancel();
-  };
-  const renderNetworkSwitchingNotice = () => (
-    <View style={styles.root}>
-      {type === 'switch' ? (
-        <TransactionHeader currentPageInformation={currentPageInformation} />
-      ) : null}
-      <Text bold centered primary noMargin style={styles.intro}>
-        {type === 'switch'
-          ? strings('switch_custom_network.title_existing_network')
-          : strings('switch_custom_network.title_new_network')}
-      </Text>
-      <Text primary noMargin style={styles.warning}>
-        {type === 'switch' ? (
-          strings('switch_custom_network.switch_warning')
-        ) : (
-          <Text>
-            <Text
-              bold
-              primary
-              noMargin
-            >{`"${customNetworkInformation.chainName}"`}</Text>
-            <Text noMargin> {strings('switch_custom_network.available')}</Text>
-          </Text>
-        )}
-      </Text>
-      {type === 'switch' ? (
-        <View style={styles.networkContainer}>
-          <View style={styles.networkBadge}>
-            <View
-              style={[
-                styles.networkIcon,
-                customNetworkInformation.chainColor
-                  ? { backgroundColor: customNetworkInformation.chainColor }
-                  : styles.otherNetworkIcon,
-              ]}
-            />
-            <Text primary noMargin style={styles.networkText}>
-              {customNetworkInformation.chainName}
-            </Text>
-          </View>
-        </View>
-      ) : null}
-      <View style={styles.actionContainer(type === 'new')}>
-        <StyledButton
-          type={'cancel'}
-          onPress={cancel}
-          containerStyle={[styles.button, styles.cancel]}
-          testID={CommonSelectorsIDs.CANCEL_BUTTON}
-        >
-          {strings('switch_custom_network.cancel')}
-        </StyledButton>
-        <StyledButton
-          type={'confirm'}
-          onPress={confirm}
-          containerStyle={[styles.button, styles.confirm]}
-          testID={CommonSelectorsIDs.CONNECT_BUTTON}
-        >
-          {strings('switch_custom_network.switch')}
-        </StyledButton>
-      </View>
-    </View>
-  );
-
-  const renderPermissionSummary = () => (
+  return (
     <PermissionSummary
       customNetworkInformation={customNetworkInformation}
       currentPageInformation={currentPageInformation}
@@ -211,10 +50,6 @@ const SwitchCustomNetwork = ({
       isNetworkSwitch
     />
   );
-
-  return isMultichainVersion1Enabled
-    ? renderPermissionSummary()
-    : renderNetworkSwitchingNotice();
 };
 
 SwitchCustomNetwork.propTypes = {
diff --git a/app/components/UI/SwitchCustomNetwork/index.test.tsx b/app/components/UI/SwitchCustomNetwork/index.test.tsx
index 4a338b39b96..eca85d5732c 100644
--- a/app/components/UI/SwitchCustomNetwork/index.test.tsx
+++ b/app/components/UI/SwitchCustomNetwork/index.test.tsx
@@ -4,6 +4,16 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsControllerTestUtils';
 
+jest.mock('@react-navigation/native', () => {
+  const actualNav = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualNav,
+    useNavigation: () => ({
+      navigate: jest.fn(),
+    }),
+  };
+});
+
 const mockInitialState = {
   wizard: {
     step: 1,

From cc2571eb2bcc9a838c8ecc13a00a23b676bc7ac8 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Mon, 13 Jan 2025 17:44:29 +0300
Subject: [PATCH 13/25] style: lint

---
 app/components/UI/SwitchCustomNetwork/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/components/UI/SwitchCustomNetwork/index.js b/app/components/UI/SwitchCustomNetwork/index.js
index 6192ea316b0..2a1e3db22b1 100644
--- a/app/components/UI/SwitchCustomNetwork/index.js
+++ b/app/components/UI/SwitchCustomNetwork/index.js
@@ -14,7 +14,6 @@ const SwitchCustomNetwork = ({
   currentPageInformation,
   onCancel,
   onConfirm,
-  type,
 }) => {
   const { networkName } = useNetworkInfo(
     new URL(currentPageInformation.url).hostname,

From f96e5cce77e1ddb44d2ee5c5ed7257d46211b8b0 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Tue, 14 Jan 2025 16:29:24 +0300
Subject: [PATCH 14/25] chore(test): for NetworkVerification component, update
 existing unit tests.

In more detail, after removal of feature flag and corresponding dead code of ff-off, test now runs on ff-on and required update to show content of accordion before asserting, and update snapshot to match new expected rendering.
---
 .../NetworkVerificationInfo.test.tsx          |  10 +-
 .../NetworkVerificationInfo.test.tsx.snap     | 142 ++++++++++++------
 2 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx
index 7b50dfa7bf0..3d607f9025e 100644
--- a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx
+++ b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import NetworkVerificationInfo from './NetworkVerificationInfo';
-import { render } from '@testing-library/react-native';
+import { render, fireEvent } from '@testing-library/react-native';
 import { BannerAlertSeverity } from '../../../component-library/components/Banners/Banner';
 import { strings } from '../../../../locales/i18n';
 import { useSelector } from 'react-redux';
@@ -85,7 +85,7 @@ describe('NetworkVerificationInfo', () => {
     ).toThrow('Unable to find an element with text');
   });
 
-  it('should render chainId on decimal', () => {
+  it('should render chainId as a decimal', () => {
     (useSelector as jest.Mock).mockReturnValue(true);
     const { getByText } = render(
       <NetworkVerificationInfo
@@ -95,6 +95,12 @@ describe('NetworkVerificationInfo', () => {
       />,
     );
 
+    // Accordion content is hidden by default, so we need to expand it
+    const accordionButton = getByText(
+      strings('spend_limit_edition.view_details'),
+    );
+    fireEvent.press(accordionButton);
+
     expect(getByText('10')).toBeTruthy();
   });
 });
diff --git a/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap b/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
index 70c08524725..1e53d430ef4 100644
--- a/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
+++ b/app/components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
           }
         }
       >
-        Add Network
+        Add Test Chain
       </Text>
     </View>
     <View
@@ -261,11 +261,8 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
           }
         }
       >
-        MetaMask doesn’t verify custom networks, so only approve networks you trust.
-         
         <Text
           accessibilityRole="text"
-          onPress={[Function]}
           style={
             {
               "color": "#141618",
@@ -277,7 +274,7 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
             }
           }
         >
-          Learn more about network security risks and scams.
+          You're adding this network to MetaMask and giving Undefined dapp origin permission to use it.
         </Text>
       </Text>
       <RCTScrollView
@@ -305,15 +302,15 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
             style={
               {
                 "color": "#141618",
-                "fontFamily": "EuclidCircularB-Bold",
+                "fontFamily": "EuclidCircularB-Medium",
                 "fontSize": 14,
-                "fontWeight": "700",
+                "fontWeight": "500",
                 "letterSpacing": 0,
                 "lineHeight": 22,
               }
             }
           >
-            Display name
+            Currency symbol
           </Text>
           <Text
             accessibilityRole="text"
@@ -329,54 +326,101 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
               }
             }
           >
-            Test Chain
+            TEST
           </Text>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#141618",
-                "fontFamily": "EuclidCircularB-Bold",
-                "fontSize": 14,
-                "fontWeight": "700",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            Chain ID
-          </Text>
-          <Text
-            accessibilityRole="text"
+          <View
             style={
               {
-                "color": "#141618",
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-                "marginBottom": 8,
+                "alignItems": "center",
+                "flexDirection": "row",
+                "gap": 8,
               }
             }
           >
-            10
-          </Text>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#141618",
-                "fontFamily": "EuclidCircularB-Bold",
-                "fontSize": 14,
-                "fontWeight": "700",
-                "letterSpacing": 0,
-                "lineHeight": 22,
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 14,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
               }
-            }
-          >
-            Network URL
-          </Text>
+            >
+              Network RPC URL
+            </Text>
+            <TouchableOpacity
+              onPress={[Function]}
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "alignSelf": "flex-start",
+                    "backgroundColor": "#0376c91a",
+                    "borderRadius": 4,
+                    "height": 20,
+                    "justifyContent": "center",
+                    "paddingHorizontal": 8,
+                  }
+                }
+                testID="tagcolored"
+              >
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "flexDirection": "row",
+                      "gap": 4,
+                    }
+                  }
+                >
+                  <SvgMock
+                    color="#0376c9"
+                    height={16}
+                    name="Info"
+                    style={
+                      {
+                        "height": 16,
+                        "width": 16,
+                      }
+                    }
+                    width={16}
+                  />
+                  <Text
+                    accessibilityRole="text"
+                    style={
+                      {
+                        "color": "#0376c9",
+                        "fontFamily": "EuclidCircularB-Regular",
+                        "fontSize": 12,
+                        "fontWeight": "400",
+                        "letterSpacing": 0,
+                        "lineHeight": 20,
+                      }
+                    }
+                  >
+                    Review
+                  </Text>
+                  <SvgMock
+                    color="#0376c9"
+                    height={12}
+                    name="ArrowRight"
+                    style={
+                      {
+                        "height": 12,
+                        "width": 12,
+                      }
+                    }
+                    width={12}
+                  />
+                </View>
+              </View>
+            </TouchableOpacity>
+          </View>
           <Text
             accessibilityRole="text"
             style={

From 990f893cd242905930b8a0fc63086f0c5c774693 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 16:47:56 +0300
Subject: [PATCH 15/25] test: updating snapshot of account permissions since
 button label text component default style was changed in main

---
 .../__snapshots__/AccountPermissions.test.tsx.snap            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap b/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
index 2463596d58b..f041177c1bc 100644
--- a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
+++ b/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.test.tsx.snap
@@ -293,9 +293,9 @@ exports[`AccountPermissions renders correctly 1`] = `
           style={
             {
               "color": "#0376c9",
-              "fontFamily": "EuclidCircularB-Regular",
+              "fontFamily": "EuclidCircularB-Medium",
               "fontSize": 14,
-              "fontWeight": "400",
+              "fontWeight": "500",
               "letterSpacing": 0,
               "lineHeight": 22,
             }

From 01c5b3f5c634f26e1305a017c9f271799e492b0b Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 17:00:56 +0300
Subject: [PATCH 16/25] chore(test): update snapshot after having removed the
 feature flag for multichain and the deadcode behind it.

In the case of this component, it didn't directly have multichain code in it but was rendering a component which did (NetworkVerificationInfo)
---
 .../__snapshots__/index.test.tsx.snap         | 243 ++++++++++++++----
 1 file changed, 195 insertions(+), 48 deletions(-)

diff --git a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
index 39fba53e6c6..96b8cb4da74 100644
--- a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
@@ -286,6 +286,109 @@ exports[`NetworkDetails renders correctly 1`] = `
                     Test Network
                   </Text>
                 </TouchableOpacity>
+                <View
+                  style={
+                    {
+                      "marginBottom": 15,
+                      "width": "100%",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      {
+                        "backgroundColor": "#bf52081a",
+                        "borderColor": "#bf5208",
+                        "borderLeftWidth": 4,
+                        "borderRadius": 4,
+                        "flexDirection": "row",
+                        "padding": 12,
+                        "paddingLeft": 8,
+                      }
+                    }
+                    testID="banneralert"
+                    variant="Alert"
+                  >
+                    <View
+                      style={
+                        {
+                          "marginRight": 8,
+                        }
+                      }
+                    >
+                      <SvgMock
+                        color="#bf5208"
+                        height={24}
+                        name="Danger"
+                        style={
+                          {
+                            "height": 24,
+                            "width": 24,
+                          }
+                        }
+                        width={24}
+                      />
+                    </View>
+                    <View
+                      style={
+                        {
+                          "flex": 1,
+                        }
+                      }
+                    >
+                      <Text
+                        accessibilityRole="text"
+                        style={
+                          {
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                      >
+                        We can’t verify custom networks. To avoid malicious providers from recording your network activity, only add networks you trust.
+                      </Text>
+                      <Text
+                        accessibilityRole="link"
+                        accessible={true}
+                        onPress={[Function]}
+                        onPressIn={[Function]}
+                        onPressOut={[Function]}
+                        style={
+                          {
+                            "backgroundColor": "transparent",
+                            "color": "#141618",
+                            "fontFamily": "EuclidCircularB-Regular",
+                            "fontSize": 14,
+                            "fontWeight": "400",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
+                        }
+                        suppressHighlighting={true}
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#0376c9",
+                              "fontFamily": "EuclidCircularB-Medium",
+                              "fontSize": 14,
+                              "fontWeight": "500",
+                              "letterSpacing": 0,
+                              "lineHeight": 22,
+                            }
+                          }
+                        >
+                          Learn more
+                        </Text>
+                      </Text>
+                    </View>
+                  </View>
+                </View>
                 <Text
                   accessibilityRole="text"
                   style={
@@ -300,11 +403,8 @@ exports[`NetworkDetails renders correctly 1`] = `
                     }
                   }
                 >
-                  MetaMask doesn’t verify custom networks, so only approve networks you trust.
-                   
                   <Text
                     accessibilityRole="text"
-                    onPress={[Function]}
                     style={
                       {
                         "color": "#141618",
@@ -316,7 +416,7 @@ exports[`NetworkDetails renders correctly 1`] = `
                       }
                     }
                   >
-                    Learn more about network security risks and scams.
+                    You're adding this network to MetaMask and giving Undefined dapp origin permission to use it.
                   </Text>
                 </Text>
                 <RCTScrollView
@@ -344,15 +444,15 @@ exports[`NetworkDetails renders correctly 1`] = `
                       style={
                         {
                           "color": "#141618",
-                          "fontFamily": "EuclidCircularB-Bold",
+                          "fontFamily": "EuclidCircularB-Medium",
                           "fontSize": 14,
-                          "fontWeight": "700",
+                          "fontWeight": "500",
                           "letterSpacing": 0,
                           "lineHeight": 22,
                         }
                       }
                     >
-                      Display name
+                      Currency symbol
                     </Text>
                     <Text
                       accessibilityRole="text"
@@ -368,54 +468,101 @@ exports[`NetworkDetails renders correctly 1`] = `
                         }
                       }
                     >
-                      Test Network
+                      TEST
                     </Text>
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#141618",
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "700",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                        }
-                      }
-                    >
-                      Chain ID
-                    </Text>
-                    <Text
-                      accessibilityRole="text"
+                    <View
                       style={
                         {
-                          "color": "#141618",
-                          "fontFamily": "EuclidCircularB-Regular",
-                          "fontSize": 14,
-                          "fontWeight": "400",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                          "marginBottom": 8,
+                          "alignItems": "center",
+                          "flexDirection": "row",
+                          "gap": 8,
                         }
                       }
                     >
-                      1
-                    </Text>
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#141618",
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "700",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
+                      <Text
+                        accessibilityRole="text"
+                        style={
+                          {
+                            "color": "#0376c9",
+                            "fontFamily": "EuclidCircularB-Medium",
+                            "fontSize": 14,
+                            "fontWeight": "500",
+                            "letterSpacing": 0,
+                            "lineHeight": 22,
+                          }
                         }
-                      }
-                    >
-                      Network URL
-                    </Text>
+                      >
+                        Network RPC URL
+                      </Text>
+                      <TouchableOpacity
+                        onPress={[Function]}
+                      >
+                        <View
+                          style={
+                            {
+                              "alignItems": "center",
+                              "alignSelf": "flex-start",
+                              "backgroundColor": "#0376c91a",
+                              "borderRadius": 4,
+                              "height": 20,
+                              "justifyContent": "center",
+                              "paddingHorizontal": 8,
+                            }
+                          }
+                          testID="tagcolored"
+                        >
+                          <View
+                            style={
+                              {
+                                "alignItems": "center",
+                                "flexDirection": "row",
+                                "gap": 4,
+                              }
+                            }
+                          >
+                            <SvgMock
+                              color="#0376c9"
+                              height={16}
+                              name="Info"
+                              style={
+                                {
+                                  "height": 16,
+                                  "width": 16,
+                                }
+                              }
+                              width={16}
+                            />
+                            <Text
+                              accessibilityRole="text"
+                              style={
+                                {
+                                  "color": "#0376c9",
+                                  "fontFamily": "EuclidCircularB-Regular",
+                                  "fontSize": 12,
+                                  "fontWeight": "400",
+                                  "letterSpacing": 0,
+                                  "lineHeight": 20,
+                                }
+                              }
+                            >
+                              Review
+                            </Text>
+                            <SvgMock
+                              color="#0376c9"
+                              height={12}
+                              name="ArrowRight"
+                              style={
+                                {
+                                  "height": 12,
+                                  "width": 12,
+                                }
+                              }
+                              width={12}
+                            />
+                          </View>
+                        </View>
+                      </TouchableOpacity>
+                    </View>
                     <Text
                       accessibilityRole="text"
                       style={

From 5341f74e15c8bea9191e129ba1d7911d3d9400ef Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 18:03:15 +0300
Subject: [PATCH 17/25] chore(test): update NetworkSwitcher snapshot after
 having removed the feature flag for multichain and the deadcode behind it.

It needs this since it uses components than end up using NetworkVerificationInfo which had some code toggled on and off based on the multichain feature flag which is being removed in this PR.
---
 .../NetworkSwitcher.test.tsx.snap             | 243 ++++++++++++++----
 1 file changed, 195 insertions(+), 48 deletions(-)

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 bb6a19b863d..9d34460c002 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
@@ -1100,6 +1100,109 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                     Cronos Mainnet
                                                   </Text>
                                                 </TouchableOpacity>
+                                                <View
+                                                  style={
+                                                    {
+                                                      "marginBottom": 15,
+                                                      "width": "100%",
+                                                    }
+                                                  }
+                                                >
+                                                  <View
+                                                    style={
+                                                      {
+                                                        "backgroundColor": "#bf52081a",
+                                                        "borderColor": "#bf5208",
+                                                        "borderLeftWidth": 4,
+                                                        "borderRadius": 4,
+                                                        "flexDirection": "row",
+                                                        "padding": 12,
+                                                        "paddingLeft": 8,
+                                                      }
+                                                    }
+                                                    testID="banneralert"
+                                                    variant="Alert"
+                                                  >
+                                                    <View
+                                                      style={
+                                                        {
+                                                          "marginRight": 8,
+                                                        }
+                                                      }
+                                                    >
+                                                      <SvgMock
+                                                        color="#bf5208"
+                                                        height={24}
+                                                        name="Danger"
+                                                        style={
+                                                          {
+                                                            "height": 24,
+                                                            "width": 24,
+                                                          }
+                                                        }
+                                                        width={24}
+                                                      />
+                                                    </View>
+                                                    <View
+                                                      style={
+                                                        {
+                                                          "flex": 1,
+                                                        }
+                                                      }
+                                                    >
+                                                      <Text
+                                                        accessibilityRole="text"
+                                                        style={
+                                                          {
+                                                            "color": "#141618",
+                                                            "fontFamily": "EuclidCircularB-Regular",
+                                                            "fontSize": 14,
+                                                            "fontWeight": "400",
+                                                            "letterSpacing": 0,
+                                                            "lineHeight": 22,
+                                                          }
+                                                        }
+                                                      >
+                                                        We can’t verify custom networks. To avoid malicious providers from recording your network activity, only add networks you trust.
+                                                      </Text>
+                                                      <Text
+                                                        accessibilityRole="link"
+                                                        accessible={true}
+                                                        onPress={[Function]}
+                                                        onPressIn={[Function]}
+                                                        onPressOut={[Function]}
+                                                        style={
+                                                          {
+                                                            "backgroundColor": "transparent",
+                                                            "color": "#141618",
+                                                            "fontFamily": "EuclidCircularB-Regular",
+                                                            "fontSize": 14,
+                                                            "fontWeight": "400",
+                                                            "letterSpacing": 0,
+                                                            "lineHeight": 22,
+                                                          }
+                                                        }
+                                                        suppressHighlighting={true}
+                                                      >
+                                                        <Text
+                                                          accessibilityRole="text"
+                                                          style={
+                                                            {
+                                                              "color": "#0376c9",
+                                                              "fontFamily": "EuclidCircularB-Medium",
+                                                              "fontSize": 14,
+                                                              "fontWeight": "500",
+                                                              "letterSpacing": 0,
+                                                              "lineHeight": 22,
+                                                            }
+                                                          }
+                                                        >
+                                                          Learn more
+                                                        </Text>
+                                                      </Text>
+                                                    </View>
+                                                  </View>
+                                                </View>
                                                 <Text
                                                   accessibilityRole="text"
                                                   style={
@@ -1114,11 +1217,8 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                     }
                                                   }
                                                 >
-                                                  MetaMask doesn’t verify custom networks, so only approve networks you trust.
-                                                   
                                                   <Text
                                                     accessibilityRole="text"
-                                                    onPress={[Function]}
                                                     style={
                                                       {
                                                         "color": "#141618",
@@ -1130,7 +1230,7 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                       }
                                                     }
                                                   >
-                                                    Learn more about network security risks and scams.
+                                                    You're adding this network to MetaMask and giving Undefined dapp origin permission to use it.
                                                   </Text>
                                                 </Text>
                                                 <RCTScrollView
@@ -1158,15 +1258,15 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                       style={
                                                         {
                                                           "color": "#141618",
-                                                          "fontFamily": "EuclidCircularB-Bold",
+                                                          "fontFamily": "EuclidCircularB-Medium",
                                                           "fontSize": 14,
-                                                          "fontWeight": "700",
+                                                          "fontWeight": "500",
                                                           "letterSpacing": 0,
                                                           "lineHeight": 22,
                                                         }
                                                       }
                                                     >
-                                                      Display name
+                                                      Currency symbol
                                                     </Text>
                                                     <Text
                                                       accessibilityRole="text"
@@ -1182,54 +1282,101 @@ exports[`NetworkSwitcher View renders and dismisses network modal when pressing
                                                         }
                                                       }
                                                     >
-                                                      Cronos Mainnet
+                                                      CRO
                                                     </Text>
-                                                    <Text
-                                                      accessibilityRole="text"
-                                                      style={
-                                                        {
-                                                          "color": "#141618",
-                                                          "fontFamily": "EuclidCircularB-Bold",
-                                                          "fontSize": 14,
-                                                          "fontWeight": "700",
-                                                          "letterSpacing": 0,
-                                                          "lineHeight": 22,
-                                                        }
-                                                      }
-                                                    >
-                                                      Chain ID
-                                                    </Text>
-                                                    <Text
-                                                      accessibilityRole="text"
+                                                    <View
                                                       style={
                                                         {
-                                                          "color": "#141618",
-                                                          "fontFamily": "EuclidCircularB-Regular",
-                                                          "fontSize": 14,
-                                                          "fontWeight": "400",
-                                                          "letterSpacing": 0,
-                                                          "lineHeight": 22,
-                                                          "marginBottom": 8,
+                                                          "alignItems": "center",
+                                                          "flexDirection": "row",
+                                                          "gap": 8,
                                                         }
                                                       }
                                                     >
-                                                      25
-                                                    </Text>
-                                                    <Text
-                                                      accessibilityRole="text"
-                                                      style={
-                                                        {
-                                                          "color": "#141618",
-                                                          "fontFamily": "EuclidCircularB-Bold",
-                                                          "fontSize": 14,
-                                                          "fontWeight": "700",
-                                                          "letterSpacing": 0,
-                                                          "lineHeight": 22,
+                                                      <Text
+                                                        accessibilityRole="text"
+                                                        style={
+                                                          {
+                                                            "color": "#0376c9",
+                                                            "fontFamily": "EuclidCircularB-Medium",
+                                                            "fontSize": 14,
+                                                            "fontWeight": "500",
+                                                            "letterSpacing": 0,
+                                                            "lineHeight": 22,
+                                                          }
                                                         }
-                                                      }
-                                                    >
-                                                      Network URL
-                                                    </Text>
+                                                      >
+                                                        Network RPC URL
+                                                      </Text>
+                                                      <TouchableOpacity
+                                                        onPress={[Function]}
+                                                      >
+                                                        <View
+                                                          style={
+                                                            {
+                                                              "alignItems": "center",
+                                                              "alignSelf": "flex-start",
+                                                              "backgroundColor": "#0376c91a",
+                                                              "borderRadius": 4,
+                                                              "height": 20,
+                                                              "justifyContent": "center",
+                                                              "paddingHorizontal": 8,
+                                                            }
+                                                          }
+                                                          testID="tagcolored"
+                                                        >
+                                                          <View
+                                                            style={
+                                                              {
+                                                                "alignItems": "center",
+                                                                "flexDirection": "row",
+                                                                "gap": 4,
+                                                              }
+                                                            }
+                                                          >
+                                                            <SvgMock
+                                                              color="#0376c9"
+                                                              height={16}
+                                                              name="Info"
+                                                              style={
+                                                                {
+                                                                  "height": 16,
+                                                                  "width": 16,
+                                                                }
+                                                              }
+                                                              width={16}
+                                                            />
+                                                            <Text
+                                                              accessibilityRole="text"
+                                                              style={
+                                                                {
+                                                                  "color": "#0376c9",
+                                                                  "fontFamily": "EuclidCircularB-Regular",
+                                                                  "fontSize": 12,
+                                                                  "fontWeight": "400",
+                                                                  "letterSpacing": 0,
+                                                                  "lineHeight": 20,
+                                                                }
+                                                              }
+                                                            >
+                                                              Review
+                                                            </Text>
+                                                            <SvgMock
+                                                              color="#0376c9"
+                                                              height={12}
+                                                              name="ArrowRight"
+                                                              style={
+                                                                {
+                                                                  "height": 12,
+                                                                  "width": 12,
+                                                                }
+                                                              }
+                                                              width={12}
+                                                            />
+                                                          </View>
+                                                        </View>
+                                                      </TouchableOpacity>
+                                                    </View>
                                                     <Text
                                                       accessibilityRole="text"
                                                       style={

From 8ae08634511c4421e79eb407dfaf921e40c562d9 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 18:23:22 +0300
Subject: [PATCH 18/25] chore: remove the feature flag check that checked if
 the multichain feature flag was ON.

This check on the feature flag was used in some components to render stuff that should render only when the flag was ON.
---
 .../AccountPermissionsConnected.tsx           | 59 ++++++--------
 .../NetworkPermissionsConnected.tsx           | 81 +++++++++----------
 app/components/Views/BrowserTab/index.js      | 13 +--
 .../NetworkConnectMultiSelector.styles.ts     |  3 +-
 .../PermissionsManager.tsx                    | 22 +++--
 app/components/Views/Settings/index.tsx       |  7 +-
 6 files changed, 75 insertions(+), 110 deletions(-)

diff --git a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
index ad787f3fd2f..c292dc9d8f9 100644
--- a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
@@ -10,10 +10,7 @@ import SheetHeader from '../../../../component-library/components/Sheet/SheetHea
 import { strings } from '../../../../../locales/i18n';
 import TagUrl from '../../../../component-library/components/Tags/TagUrl';
 import PickerNetwork from '../../../../component-library/components/Pickers/PickerNetwork';
-import {
-  getDecimalChainId,
-  isMultichainVersion1Enabled,
-} from '../../../../util/networks';
+import { getDecimalChainId } from '../../../../util/networks';
 import AccountSelectorList from '../../../../components/UI/AccountSelectorList';
 import { AccountPermissionsScreens } from '../AccountPermissions.types';
 import { switchActiveAccounts } from '../../../../core/Permissions';
@@ -152,23 +149,19 @@ const AccountPermissionsConnected = ({
 
   return (
     <>
-      {isMultichainVersion1Enabled && (
-        <View style={styles.header}>
-          <Avatar
-            variant={AvatarVariant.Favicon}
-            imageSource={favicon}
-            size={AvatarSize.Md}
-            style={styles.favicon}
-          />
-          <Text variant={TextVariant.HeadingMD}>{hostname}</Text>
-        </View>
-      )}
+      <View style={styles.header}>
+        <Avatar
+          variant={AvatarVariant.Favicon}
+          imageSource={favicon}
+          size={AvatarSize.Md}
+          style={styles.favicon}
+        />
+        <Text variant={TextVariant.HeadingMD}>{hostname}</Text>
+      </View>
       <View style={styles.body}>
-        {isMultichainVersion1Enabled && (
-          <Text style={styles.sectionTitle} variant={TextVariant.BodyMDMedium}>
-            {strings('accounts.connected_accounts_title')}
-          </Text>
-        )}
+        <Text style={styles.sectionTitle} variant={TextVariant.BodyMDMedium}>
+          {strings('accounts.connected_accounts_title')}
+        </Text>
       </View>
       <AccountSelectorList
         onSelectAccount={switchActiveAccount}
@@ -179,21 +172,17 @@ const AccountPermissionsConnected = ({
         isRemoveAccountEnabled
       />
       {renderSheetAction()}
-      {isMultichainVersion1Enabled && (
-        <Button
-          style={styles.managePermissionsButton}
-          variant={ButtonVariants.Secondary}
-          label={strings('permissions.manage_permissions')}
-          size={ButtonSize.Lg}
-          onPress={() => {
-            onSetPermissionsScreen(
-              AccountPermissionsScreens.PermissionsSummary,
-            );
-          }}
-          testID={ConnectedAccountsSelectorsIDs.MANAGE_PERMISSIONS}
-          width={ButtonWidthTypes.Full}
-        />
-      )}
+      <Button
+        style={styles.managePermissionsButton}
+        variant={ButtonVariants.Secondary}
+        label={strings('permissions.manage_permissions')}
+        size={ButtonSize.Lg}
+        onPress={() => {
+          onSetPermissionsScreen(AccountPermissionsScreens.PermissionsSummary);
+        }}
+        testID={ConnectedAccountsSelectorsIDs.MANAGE_PERMISSIONS}
+        width={ButtonWidthTypes.Full}
+      />
     </>
   );
 };
diff --git a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
index 9b5cbae9dbf..074cceafd8b 100644
--- a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
@@ -11,7 +11,6 @@ import TagUrl from '../../../../component-library/components/Tags/TagUrl';
 import PickerNetwork from '../../../../component-library/components/Pickers/PickerNetwork';
 import {
   getDecimalChainId,
-  isMultichainVersion1Enabled,
   getNetworkImageSource,
 } from '../../../../util/networks';
 import { AccountPermissionsScreens } from '../AccountPermissions.types';
@@ -128,35 +127,31 @@ const NetworkPermissionsConnected = ({
 
   return (
     <>
-      {isMultichainVersion1Enabled && (
-        <View style={styles.header}>
-          <Avatar
-            variant={AvatarVariant.Favicon}
-            imageSource={favicon}
-            size={AvatarSize.Md}
-          />
-        </View>
-      )}
+      <View style={styles.header}>
+        <Avatar
+          variant={AvatarVariant.Favicon}
+          imageSource={favicon}
+          size={AvatarSize.Md}
+        />
+      </View>
       <View style={styles.body}>
-        {isMultichainVersion1Enabled && (
-          <View style={styles.sectionTitleContainer}>
-            <Text style={styles.sectionTitle} variant={TextVariant.HeadingSM}>
-              {strings('permissions.permitted_networks')}
-            </Text>
-            <View style={styles.infoButtonContainer}>
-              <ButtonIcon
-                size={ButtonIconSizes.Md}
-                iconName={IconName.Info}
-                iconColor={IconColor.Default}
-                onPress={() => {
-                  navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
-                    screen: Routes.SHEET.PERMITTED_NETWORKS_INFO_SHEET,
-                  });
-                }}
-              />
-            </View>
+        <View style={styles.sectionTitleContainer}>
+          <Text style={styles.sectionTitle} variant={TextVariant.HeadingSM}>
+            {strings('permissions.permitted_networks')}
+          </Text>
+          <View style={styles.infoButtonContainer}>
+            <ButtonIcon
+              size={ButtonIconSizes.Md}
+              iconName={IconName.Info}
+              iconColor={IconColor.Default}
+              onPress={() => {
+                navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
+                  screen: Routes.SHEET.PERMITTED_NETWORKS_INFO_SHEET,
+                });
+              }}
+            />
           </View>
-        )}
+        </View>
       </View>
       <View style={styles.networkSelectorListContainer}>
         <NetworkSelectorList
@@ -188,23 +183,19 @@ const NetworkPermissionsConnected = ({
           isMultiSelect={false}
         />
       </View>
-      {isMultichainVersion1Enabled && (
-        <Button
-          style={styles.managePermissionsButton}
-          variant={ButtonVariants.Secondary}
-          label={strings('permissions.edit_permissions')}
-          testID={
-            NetworkNonPemittedBottomSheetSelectorsIDs.EDIT_PERMISSIONS_BUTTON
-          }
-          size={ButtonSize.Lg}
-          onPress={() => {
-            onSetPermissionsScreen(
-              AccountPermissionsScreens.ConnectMoreNetworks,
-            );
-          }}
-          width={ButtonWidthTypes.Full}
-        />
-      )}
+      <Button
+        style={styles.managePermissionsButton}
+        variant={ButtonVariants.Secondary}
+        label={strings('permissions.edit_permissions')}
+        testID={
+          NetworkNonPemittedBottomSheetSelectorsIDs.EDIT_PERMISSIONS_BUTTON
+        }
+        size={ButtonSize.Lg}
+        onPress={() => {
+          onSetPermissionsScreen(AccountPermissionsScreens.ConnectMoreNetworks);
+        }}
+        width={ButtonWidthTypes.Full}
+      />
     </>
   );
 };
diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js
index b1a1afd93c2..332c89f3d79 100644
--- a/app/components/Views/BrowserTab/index.js
+++ b/app/components/Views/BrowserTab/index.js
@@ -71,9 +71,7 @@ import {
   PHISHFORT_BLOCKLIST_ISSUE_URL,
   MM_ETHERSCAN_URL,
 } from '../../../constants/urls';
-import {
-  MAX_MESSAGE_LENGTH,
-} from '../../../constants/dapp';
+import { MAX_MESSAGE_LENGTH } from '../../../constants/dapp';
 import sanitizeUrlInput from '../../../util/url/sanitizeUrlInput';
 import {
   getPermittedAccounts,
@@ -117,7 +115,6 @@ import { EXTERNAL_LINK_TYPE } from '../../../constants/browser';
 import { PermissionKeys } from '../../../core/Permissions/specifications';
 import { CaveatTypes } from '../../../core/Permissions/constants';
 import { AccountPermissionsScreens } from '../AccountPermissions/AccountPermissions.types';
-import { isMultichainVersion1Enabled } from '../../../util/networks';
 import { useIsFocused } from '@react-navigation/native';
 
 const { HOMEPAGE_URL, NOTIFICATION_NAMES, OLD_HOMEPAGE_URL_HOST } =
@@ -1632,13 +1629,7 @@ export const BrowserTab = (props) => {
   const urlRef = useRef(url.current);
   useEffect(() => {
     urlRef.current = url.current;
-    if (
-      isMultichainVersion1Enabled &&
-      urlRef.current &&
-      isFocused &&
-      !props.isInTabsView &&
-      isTabActive
-    ) {
+    if (urlRef.current && isFocused && !props.isInTabsView && isTabActive) {
       checkTabPermissions();
     }
   }, [checkTabPermissions, isFocused, props.isInTabsView, isTabActive]);
diff --git a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.styles.ts b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.styles.ts
index 5c76cc491e3..70b3e236263 100644
--- a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.styles.ts
+++ b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.styles.ts
@@ -1,5 +1,4 @@
 import { StyleSheet } from 'react-native';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
 import Device from '../../../../util/device';
 
 const styleSheet = (params: {
@@ -15,7 +14,7 @@ const styleSheet = (params: {
       paddingBottom: 4,
     },
     buttonsContainer: {
-      marginTop: isMultichainVersion1Enabled ? 0 : 24,
+      marginTop: 0,
       marginBottom: vars.isRenderedAsBottomSheet ? 0 : 16,
     },
     updateButtonContainer: { flexDirection: 'row' },
diff --git a/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx b/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
index 49da558a078..4b773ed14be 100644
--- a/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
+++ b/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
@@ -17,7 +17,6 @@ import Icon, {
 import Text, {
   TextVariant,
 } from '../../../../component-library/components/Texts/Text';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
 import { getNavigationOptionsTitle } from '../../../UI/Navbar';
 import PermissionItem from './PermissionItem';
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
@@ -140,16 +139,15 @@ const PermissionsManager = (props: SDKSessionsManagerProps) => {
     () => (
       <>
         <ScrollView>
-          {isMultichainVersion1Enabled &&
-            inAppBrowserPermissions.map((permissionItem, index) => (
-              <PermissionItem
-                key={`${index}`}
-                item={permissionItem}
-                onPress={() => {
-                  goToPermissionsDetails(permissionItem);
-                }}
-              />
-            ))}
+          {inAppBrowserPermissions.map((permissionItem, index) => (
+            <PermissionItem
+              key={`${index}`}
+              item={permissionItem}
+              onPress={() => {
+                goToPermissionsDetails(permissionItem);
+              }}
+            />
+          ))}
         </ScrollView>
       </>
     ),
@@ -173,7 +171,7 @@ const PermissionsManager = (props: SDKSessionsManagerProps) => {
       style={styles.perissionsWrapper}
       testID={SDKSelectorsIDs.SESSION_MANAGER_CONTAINER}
     >
-      {isMultichainVersion1Enabled && inAppBrowserPermissions.length
+      {inAppBrowserPermissions.length
         ? renderPermissions()
         : renderEmptyResult()}
     </View>
diff --git a/app/components/Views/Settings/index.tsx b/app/components/Views/Settings/index.tsx
index 16e95a54d25..7f62fd0d1bc 100644
--- a/app/components/Views/Settings/index.tsx
+++ b/app/components/Views/Settings/index.tsx
@@ -18,10 +18,7 @@ import { TextColor } from '../../../component-library/components/Texts/Text';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { isNotificationsFeatureEnabled } from '../../../util/notifications';
 import { isTest } from '../../../util/test/utils';
-import {
-  isMultichainVersion1Enabled,
-  isPermissionsSettingsV1Enabled,
-} from '../../../util/networks';
+import { isPermissionsSettingsV1Enabled } from '../../../util/networks';
 
 const createStyles = (colors: Colors) =>
   StyleSheet.create({
@@ -226,7 +223,7 @@ const Settings = () => {
           testID={SettingsViewSelectorsIDs.NOTIFICATIONS}
         />
       )}
-      {isMultichainVersion1Enabled && isPermissionsSettingsV1Enabled && (
+      {isPermissionsSettingsV1Enabled && (
         <SettingsDrawer
           description={strings('app_settings.permissions_desc')}
           onPress={goToManagePermissions}

From 9436363991ab46b21b8770ed01349be7a95e41b3 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 19:48:26 +0300
Subject: [PATCH 19/25] style: lint

---
 .../NetworkVerificationInfo.tsx               |  5 ---
 .../UI/SwitchCustomNetwork/index.js           |  4 --
 .../Views/AccountConnect/AccountConnect.tsx   |  7 +---
 .../AccountConnectMultiSelector.tsx           |  7 ----
 .../AccountPermissionsConnected.tsx           | 40 -------------------
 .../NetworkPermissionsConnected.tsx           | 28 +------------
 6 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
index ad8efd53974..8dffde57aa6 100644
--- a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
+++ b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
@@ -24,7 +24,6 @@ import { useStyles } from '../../../component-library/hooks';
 import styleSheet from './NetworkVerificationInfo.styles';
 import { CustomNetworkInformation } from './NetworkVerificationInfo.types';
 import { ScrollView } from 'react-native-gesture-handler';
-import { ADD_CUSTOM_NETWORK_ARTCILE } from '../../../constants/urls';
 import { useSelector } from 'react-redux';
 import { selectUseSafeChainsListValidation } from '../../../selectors/preferencesController';
 import {
@@ -217,10 +216,6 @@ const NetworkVerificationInfo = ({
     </ScrollView>
   );
 
-  const openHowToUseCustomNetworks = () => {
-    Linking.openURL(ADD_CUSTOM_NETWORK_ARTCILE);
-  };
-
   const renderBanner = () => {
     if (!safeChainsListValidationEnabled) {
       return (
diff --git a/app/components/UI/SwitchCustomNetwork/index.js b/app/components/UI/SwitchCustomNetwork/index.js
index 2a1e3db22b1..02020bb6551 100644
--- a/app/components/UI/SwitchCustomNetwork/index.js
+++ b/app/components/UI/SwitchCustomNetwork/index.js
@@ -68,10 +68,6 @@ SwitchCustomNetwork.propTypes = {
    * Object containing info of the network to add
    */
   customNetworkInformation: PropTypes.object,
-  /**
-   * String representing if it's an existing or a newly added network
-   */
-  type: PropTypes.string,
 };
 
 export default SwitchCustomNetwork;
diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
index 62e272b6356..b68ceb6aa98 100644
--- a/app/components/Views/AccountConnect/AccountConnect.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -46,12 +46,7 @@ import { Account, useAccounts } from '../../hooks/useAccounts';
 
 // Internal dependencies.
 import { PermissionsRequest } from '@metamask/permission-controller';
-import {
-  ImageURISource,
-  ImageSourcePropType,
-  StyleSheet,
-  View,
-} from 'react-native';
+import { ImageURISource, ImageSourcePropType, StyleSheet } from 'react-native';
 import URLParse from 'url-parse';
 import PhishingModal from '../../../components/UI/PhishingModal';
 import { useMetrics } from '../../../components/hooks/useMetrics';
diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
index 8ba227295ed..2a47cf5a6f5 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
@@ -11,7 +11,6 @@ import Button, {
   ButtonWidthTypes,
 } from '../../../../component-library/components/Buttons/Button';
 import SheetHeader from '../../../../component-library/components/Sheet/SheetHeader';
-import TagUrl from '../../../../component-library/components/Tags/TagUrl';
 import Text, {
   TextColor,
 } from '../../../../component-library/components/Texts/Text';
@@ -44,8 +43,6 @@ const AccountConnectMultiSelector = ({
   onSelectAddress,
   isLoading,
   onUserAction,
-  favicon,
-  secureIcon,
   isAutoScrollEnabled = true,
   urlWithProtocol,
   hostname,
@@ -276,19 +273,15 @@ const AccountConnectMultiSelector = ({
     ),
     [
       accounts,
-      areAllAccountsSelected,
       ensByAccountAddress,
-      favicon,
       isAutoScrollEnabled,
       isLoading,
       onSelectAccount,
       renderCtaButtons,
-      secureIcon,
       selectedAddresses,
       styles.addAccountButtonContainer,
       styles.body,
       styles.description,
-      urlWithProtocol,
       connection,
       styles.sdkInfoContainer,
       styles.container,
diff --git a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
index c292dc9d8f9..e8995183ecd 100644
--- a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
@@ -1,16 +1,10 @@
 // Third party dependencies.
 import React, { useCallback, useContext } from 'react';
 import { View } from 'react-native';
-import { useSelector } from 'react-redux';
-import { useNavigation } from '@react-navigation/native';
 
 // External dependencies.
 import SheetActions from '../../../../component-library/components-temp/SheetActions';
-import SheetHeader from '../../../../component-library/components/Sheet/SheetHeader';
 import { strings } from '../../../../../locales/i18n';
-import TagUrl from '../../../../component-library/components/Tags/TagUrl';
-import PickerNetwork from '../../../../component-library/components/Pickers/PickerNetwork';
-import { getDecimalChainId } from '../../../../util/networks';
 import AccountSelectorList from '../../../../components/UI/AccountSelectorList';
 import { AccountPermissionsScreens } from '../AccountPermissions.types';
 import { switchActiveAccounts } from '../../../../core/Permissions';
@@ -19,19 +13,11 @@ import {
   ToastVariants,
 } from '../../../../component-library/components/Toast';
 import getAccountNameWithENS from '../../../../util/accounts';
-import { MetaMetricsEvents } from '../../../../core/Analytics';
-import Routes from '../../../../constants/navigation/Routes';
-import {
-  selectProviderConfig,
-  ProviderConfig,
-} from '../../../../selectors/networkController';
-import { useNetworkInfo } from '../../../../selectors/selectedNetworkController';
 import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 
 // Internal dependencies.
 import { AccountPermissionsConnectedProps } from './AccountPermissionsConnected.types';
 import styles from './AccountPermissionsConnected.styles';
-import { useMetrics } from '../../../../components/hooks/useMetrics';
 import Text, {
   TextVariant,
 } from '../../../../component-library/components/Texts/Text';
@@ -55,17 +41,8 @@ const AccountPermissionsConnected = ({
   onDismissSheet,
   hostname,
   favicon,
-  secureIcon,
   accountAvatarType,
-  urlWithProtocol,
 }: AccountPermissionsConnectedProps) => {
-  const { navigate } = useNavigation();
-  const { trackEvent, createEventBuilder } = useMetrics();
-
-  const providerConfig: ProviderConfig = useSelector(selectProviderConfig);
-
-  const { networkName, networkImageSource } = useNetworkInfo(hostname);
-
   const activeAddress = selectedAddresses[0];
   const { toastRef } = useContext(ToastContext);
 
@@ -74,9 +51,6 @@ const AccountPermissionsConnected = ({
     onSetPermissionsScreen(AccountPermissionsScreens.ConnectMoreAccounts);
   }, [onSetSelectedAddresses, onSetPermissionsScreen]);
 
-  const openRevokePermissions = () =>
-    onSetPermissionsScreen(AccountPermissionsScreens.Revoke);
-
   const switchActiveAccount = useCallback(
     (address: string) => {
       if (address !== activeAddress) {
@@ -113,20 +87,6 @@ const AccountPermissionsConnected = ({
     ],
   );
 
-  const switchNetwork = useCallback(() => {
-    navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
-      screen: Routes.SHEET.NETWORK_SELECTOR,
-    });
-
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.NETWORK_SELECTOR_PRESSED)
-        .addProperties({
-          chain_id: getDecimalChainId(providerConfig.chainId),
-        })
-        .build(),
-    );
-  }, [providerConfig.chainId, navigate, trackEvent, createEventBuilder]);
-
   const renderSheetAction = useCallback(
     () => (
       <View
diff --git a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
index 074cceafd8b..f078f9ddbf6 100644
--- a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
@@ -1,14 +1,11 @@
 // Third party dependencies.
-import React, { useCallback } from 'react';
+import React from 'react';
 import { View } from 'react-native';
 import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 
 // External dependencies.
-import SheetHeader from '../../../../component-library/components/Sheet/SheetHeader';
 import { strings } from '../../../../../locales/i18n';
-import TagUrl from '../../../../component-library/components/Tags/TagUrl';
-import PickerNetwork from '../../../../component-library/components/Pickers/PickerNetwork';
 import {
   getDecimalChainId,
   getNetworkImageSource,
@@ -21,8 +18,6 @@ import {
   ProviderConfig,
   selectNetworkConfigurations,
 } from '../../../../selectors/networkController';
-import { useNetworkInfo } from '../../../../selectors/selectedNetworkController';
-import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 import {
   IconColor,
   IconName,
@@ -60,33 +55,12 @@ const NetworkPermissionsConnected = ({
   onDismissSheet,
   hostname,
   favicon,
-  secureIcon,
-  urlWithProtocol,
 }: NetworkPermissionsConnectedProps) => {
   const { navigate } = useNavigation();
   const { trackEvent, createEventBuilder } = useMetrics();
 
   const providerConfig: ProviderConfig = useSelector(selectProviderConfig);
 
-  const { networkName, networkImageSource } = useNetworkInfo(hostname);
-
-  const openRevokePermissions = () =>
-    onSetPermissionsScreen(AccountPermissionsScreens.Revoke);
-
-  const switchNetwork = useCallback(() => {
-    navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
-      screen: Routes.SHEET.NETWORK_SELECTOR,
-    });
-
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.NETWORK_SELECTOR_PRESSED)
-        .addProperties({
-          chain_id: getDecimalChainId(providerConfig.chainId),
-        })
-        .build(),
-    );
-  }, [providerConfig.chainId, navigate, trackEvent, createEventBuilder]);
-
   const networkConfigurations = useSelector(selectNetworkConfigurations);
 
   // Get permitted chain IDs

From 87c181549a15a8cf00a3a26c7fb21d4cc3c9395b Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Wed, 15 Jan 2025 19:50:38 +0300
Subject: [PATCH 20/25] chore(test): remove backup snapshots that were used for
 temporary troubleshooting during code cleanup

---
 ...untConnect.test.tsx.snap-dead-code-removed | 789 ------------------
 .../AccountConnect.test.tsx.snap.backup       | 434 ----------
 .../AccountConnect.test.tsx.snap.ff-off       | 434 ----------
 .../AccountConnect.test.tsx.snap.ff-on        | 789 ------------------
 4 files changed, 2446 deletions(-)
 delete mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
 delete mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
 delete mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
 delete mode 100644 app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on

diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
deleted file mode 100644
index 6df027cc236..00000000000
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap-dead-code-removed
+++ /dev/null
@@ -1,789 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountConnect renders correctly 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": 1334,
-            "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>
-      <RCTSafeAreaView
-        style={
-          {
-            "backgroundColor": "#ffffff",
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderTopLeftRadius": 20,
-              "borderTopRightRadius": 20,
-              "height": undefined,
-              "justifyContent": "flex-start",
-              "minHeight": 200,
-              "paddingTop": 8,
-            }
-          }
-        >
-          <View>
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "space-between",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "flex": 1,
-                    "paddingLeft": 16,
-                  }
-                }
-              />
-              <View
-                style={
-                  [
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "justifyContent": "center",
-                    },
-                    false,
-                  ]
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "borderRadius": 10,
-                      "justifyContent": "center",
-                    }
-                  }
-                >
-                  <View
-                    style={
-                      [
-                        {
-                          "alignContent": "center",
-                          "backgroundColor": "#ffffff",
-                          "borderRadius": 27,
-                          "height": 54,
-                          "justifyContent": "center",
-                          "width": 54,
-                        },
-                        {
-                          "borderRadius": 16,
-                          "height": 32,
-                          "width": 32,
-                        },
-                      ]
-                    }
-                  >
-                    <Text
-                      style={
-                        [
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 24,
-                            "fontWeight": "400",
-                            "textAlign": "center",
-                            "textTransform": "uppercase",
-                          },
-                          undefined,
-                        ]
-                      }
-                    >
-                      h
-                    </Text>
-                  </View>
-                </View>
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-end",
-                    "flex": 1,
-                    "paddingRight": 16,
-                  }
-                }
-              />
-            </View>
-            <View
-              style={
-                {
-                  "alignSelf": "center",
-                  "marginBottom": 16,
-                  "marginLeft": 24,
-                  "marginRight": 24,
-                  "marginTop": 8,
-                }
-              }
-              testID="permission-network-permissions-container"
-            >
-              <Text
-                accessibilityRole="text"
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Bold",
-                    "fontSize": 16,
-                    "fontWeight": "700",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                mockorigin wants to:
-              </Text>
-            </View>
-            <TouchableOpacity
-              onPress={[Function]}
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "flexDirection": "row",
-                    "marginBottom": 12,
-                    "marginHorizontal": 24,
-                    "marginTop": 8,
-                  }
-                }
-                testID="permission-summary-container"
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "alignSelf": "flex-start",
-                      "backgroundColor": "#0000001a",
-                      "borderRadius": 16,
-                      "height": 32,
-                      "justifyContent": "center",
-                      "overflow": "hidden",
-                      "width": 32,
-                    }
-                  }
-                >
-                  <SvgMock
-                    color="#6a737d"
-                    height={20}
-                    name="Wallet"
-                    style={
-                      {
-                        "height": 20,
-                        "width": 20,
-                      }
-                    }
-                    width={20}
-                  />
-                </View>
-                <View
-                  style={
-                    {
-                      "flex": 1,
-                      "marginLeft": 12,
-                    }
-                  }
-                >
-                  <Text
-                    accessibilityRole="text"
-                    style={
-                      {
-                        "color": "#141618",
-                        "fontFamily": "EuclidCircularB-Regular",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "letterSpacing": 0,
-                        "lineHeight": 22,
-                      }
-                    }
-                  >
-                    See your accounts and suggest transactions
-                  </Text>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
-                        "gap": 2,
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "maxWidth": "75%",
-                        }
-                      }
-                    >
-                      <Text
-                        accessibilityRole="text"
-                        ellipsizeMode="tail"
-                        numberOfLines={1}
-                        style={
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 14,
-                            "fontWeight": "400",
-                            "letterSpacing": 0,
-                            "lineHeight": 22,
-                          }
-                        }
-                      >
-                        <Text
-                          accessibilityRole="text"
-                          style={
-                            {
-                              "color": "#141618",
-                              "fontFamily": "EuclidCircularB-Regular",
-                              "fontSize": 12,
-                              "fontWeight": "400",
-                              "letterSpacing": 0,
-                              "lineHeight": 20,
-                            }
-                          }
-                        >
-                          Requesting for 0 accounts
-                        </Text>
-                      </Text>
-                    </View>
-                    <View
-                      style={
-                        {
-                          "flexGrow": 1,
-                          "marginLeft": 2,
-                          "minWidth": "25%",
-                        }
-                      }
-                    />
-                  </View>
-                </View>
-                <View
-                  testID="connection-details-button"
-                >
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "width": 56,
-                      }
-                    }
-                  >
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#0376c9",
-                          "fontFamily": "EuclidCircularB-Medium",
-                          "fontSize": 14,
-                          "fontWeight": "500",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                        }
-                      }
-                    >
-                      Edit
-                    </Text>
-                  </View>
-                </View>
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={[Function]}
-              testID="navigate_to_edit_networks_permissions_button"
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "flexDirection": "row",
-                    "marginBottom": 16,
-                    "marginHorizontal": 24,
-                    "marginTop": 8,
-                  }
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "alignSelf": "flex-start",
-                      "backgroundColor": "#0000001a",
-                      "borderRadius": 16,
-                      "height": 32,
-                      "justifyContent": "center",
-                      "overflow": "hidden",
-                      "width": 32,
-                    }
-                  }
-                >
-                  <SvgMock
-                    color="#6a737d"
-                    height={20}
-                    name="Data"
-                    style={
-                      {
-                        "height": 20,
-                        "width": 20,
-                      }
-                    }
-                    width={20}
-                  />
-                </View>
-                <View
-                  style={
-                    {
-                      "flex": 1,
-                      "marginLeft": 12,
-                    }
-                  }
-                >
-                  <Text
-                    accessibilityRole="text"
-                    style={
-                      {
-                        "color": "#141618",
-                        "fontFamily": "EuclidCircularB-Regular",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "letterSpacing": 0,
-                        "lineHeight": 22,
-                      }
-                    }
-                  >
-                    Use your enabled networks
-                  </Text>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "marginRight": 4,
-                          "maxWidth": "75%",
-                        }
-                      }
-                    >
-                      <Text
-                        accessibilityRole="text"
-                        ellipsizeMode="tail"
-                        numberOfLines={1}
-                        style={
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 14,
-                            "fontWeight": "400",
-                            "letterSpacing": 0,
-                            "lineHeight": 22,
-                          }
-                        }
-                      >
-                        <Text
-                          accessibilityRole="text"
-                          style={
-                            {
-                              "color": "#141618",
-                              "fontFamily": "EuclidCircularB-Regular",
-                              "fontSize": 12,
-                              "fontWeight": "400",
-                              "letterSpacing": 0,
-                              "lineHeight": 20,
-                            }
-                          }
-                        >
-                          Requesting for Ethereum Mainnet
-                        </Text>
-                      </Text>
-                    </View>
-                    <View
-                      style={
-                        {
-                          "flexGrow": 1,
-                          "marginLeft": 2,
-                          "minWidth": "25%",
-                        }
-                      }
-                    >
-                      <View
-                        style={
-                          {
-                            "alignItems": "center",
-                            "flexDirection": "row",
-                          }
-                        }
-                      >
-                        <View
-                          style={
-                            {
-                              "marginLeft": 0,
-                            }
-                          }
-                          testID="avatargroup-avatar-container-0"
-                        >
-                          <View
-                            style={
-                              {
-                                "alignItems": "center",
-                                "backgroundColor": "#ffffff",
-                                "borderColor": "#ffffff",
-                                "borderRadius": 8,
-                                "borderWidth": 1.5,
-                                "height": 16,
-                                "justifyContent": "center",
-                                "overflow": "hidden",
-                                "width": 16,
-                              }
-                            }
-                            testID="avatargroup-avatar"
-                          >
-                            <Image
-                              onError={[Function]}
-                              resizeMode="contain"
-                              source={
-                                {
-                                  "default": {
-                                    "uri": "MockImage",
-                                  },
-                                }
-                              }
-                              style={
-                                {
-                                  "height": 16,
-                                  "width": 16,
-                                }
-                              }
-                              testID="network-avatar-image"
-                            />
-                          </View>
-                        </View>
-                      </View>
-                    </View>
-                  </View>
-                </View>
-                <View
-                  testID="connection-details-button"
-                >
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "width": 56,
-                      }
-                    }
-                  >
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#0376c9",
-                          "fontFamily": "EuclidCircularB-Medium",
-                          "fontSize": 14,
-                          "fontWeight": "500",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                        }
-                      }
-                    >
-                      Edit
-                    </Text>
-                  </View>
-                </View>
-              </View>
-            </TouchableOpacity>
-          </View>
-          <View
-            style={
-              {
-                "marginTop": 8,
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "flex": 0,
-                  "flexDirection": "row",
-                  "marginTop": 8,
-                  "paddingHorizontal": 24,
-                }
-              }
-            >
-              <TouchableOpacity
-                accessibilityRole="button"
-                accessible={true}
-                activeOpacity={0.2}
-                onPress={[Function]}
-                style={
-                  [
-                    [
-                      {
-                        "borderRadius": 100,
-                        "justifyContent": "center",
-                        "padding": 15,
-                      },
-                      {
-                        "backgroundColor": "#ffffff",
-                        "borderColor": "#6a737d",
-                        "borderWidth": 1,
-                      },
-                      [
-                        {
-                          "flex": 1,
-                        },
-                        {
-                          "marginRight": 8,
-                        },
-                      ],
-                    ],
-                    null,
-                  ]
-                }
-                testID="cancel-button"
-              >
-                <Text
-                  style={
-                    [
-                      {
-                        "color": "#007aff",
-                        "fontSize": 17,
-                        "fontWeight": "500",
-                        "textAlign": "center",
-                      },
-                      null,
-                      [
-                        {
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "600",
-                          "textAlign": "center",
-                        },
-                        {
-                          "color": "#6a737d",
-                        },
-                        undefined,
-                      ],
-                      null,
-                    ]
-                  }
-                >
-                  Cancel
-                </Text>
-              </TouchableOpacity>
-              <TouchableOpacity
-                accessibilityRole="button"
-                accessible={true}
-                activeOpacity={0.2}
-                onPress={[Function]}
-                style={
-                  [
-                    [
-                      {
-                        "borderRadius": 100,
-                        "justifyContent": "center",
-                        "padding": 15,
-                      },
-                      {
-                        "backgroundColor": "#0376c9",
-                        "minHeight": 50,
-                      },
-                      [
-                        {
-                          "flex": 1,
-                        },
-                        {
-                          "marginLeft": 8,
-                        },
-                      ],
-                    ],
-                    null,
-                  ]
-                }
-                testID="connect-button"
-              >
-                <Text
-                  style={
-                    [
-                      {
-                        "color": "#007aff",
-                        "fontSize": 17,
-                        "fontWeight": "500",
-                        "textAlign": "center",
-                      },
-                      null,
-                      [
-                        {
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "600",
-                          "textAlign": "center",
-                        },
-                        {
-                          "color": "#ffffff",
-                        },
-                        undefined,
-                      ],
-                      null,
-                    ]
-                  }
-                >
-                  Connect
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-        </View>
-      </RCTSafeAreaView>
-      <Modal
-        animationType="none"
-        deviceHeight={null}
-        deviceWidth={null}
-        hardwareAccelerated={false}
-        hideModalContentWhileAnimating={false}
-        onBackdropPress={[Function]}
-        onModalHide={[Function]}
-        onModalWillHide={[Function]}
-        onModalWillShow={[Function]}
-        onRequestClose={[Function]}
-        panResponderThreshold={4}
-        scrollHorizontal={false}
-        scrollOffset={0}
-        scrollOffsetMax={0}
-        scrollTo={null}
-        statusBarTranslucent={false}
-        supportedOrientations={
-          [
-            "portrait",
-            "landscape",
-          ]
-        }
-        swipeThreshold={100}
-        transparent={true}
-        visible={false}
-      />
-    </View>
-  </View>
-</View>
-`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
deleted file mode 100644
index 6ec45071a29..00000000000
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.backup
+++ /dev/null
@@ -1,434 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountConnect renders correctly 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": 1334,
-            "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,
-            }
-          }
-        >
-          Connect account
-        </Text>
-        <View
-          style={
-            {
-              "alignItems": "flex-end",
-              "flex": 1,
-            }
-          }
-        />
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-        testID="connect-account-modal"
-      >
-        <View
-          iconName="LockSlash"
-          style={
-            {
-              "alignItems": "center",
-              "alignSelf": "center",
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 99,
-              "borderWidth": 1,
-              "flexDirection": "row",
-              "paddingLeft": 8,
-              "paddingRight": 16,
-              "paddingVertical": 8,
-            }
-          }
-        >
-          <View
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderRadius": 16,
-                "height": 24,
-                "marginRight": 8,
-                "overflow": "hidden",
-                "width": 24,
-              }
-            }
-          >
-            <Image
-              onError={[Function]}
-              resizeMode="contain"
-              source={
-                {
-                  "uri": "",
-                }
-              }
-              style={
-                {
-                  "flex": 1,
-                  "height": undefined,
-                  "width": undefined,
-                }
-              }
-              testID="favicon-avatar-image"
-            />
-          </View>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#6a737d",
-                "flexShrink": 1,
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            https://mockOrigin
-          </Text>
-        </View>
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#6a737d",
-              "fontFamily": "EuclidCircularB-Regular",
-              "fontSize": 14,
-              "fontWeight": "400",
-              "letterSpacing": 0,
-              "lineHeight": 22,
-              "marginVertical": 16,
-              "textAlign": "center",
-            }
-          }
-        >
-          Share your account address, balance, activity, and allow site to initiate transactions.
-        </Text>
-      </View>
-      <View
-        style={
-          {
-            "marginTop": 16,
-          }
-        }
-      >
-        <View>
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "stretch",
-                "backgroundColor": "transparent",
-                "borderRadius": 24,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "opacity": 1,
-                "paddingHorizontal": 16,
-              }
-            }
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Connect multiple accounts
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-      >
-        <View
-          style={
-            [
-              {
-                "flexDirection": "row",
-                "marginBottom": 16,
-                "marginTop": 24,
-              },
-              false,
-            ]
-          }
-        >
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "transparent",
-                "borderColor": "#0376c9",
-                "borderRadius": 24,
-                "borderWidth": 1,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
-              }
-            }
-            testID="cancel-button"
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Cancel
-            </Text>
-          </TouchableOpacity>
-          <View
-            style={
-              {
-                "width": 16,
-              }
-            }
-          />
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "#0376c9",
-                "borderRadius": 24,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
-              }
-            }
-            testID="connect-button"
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#ffffff",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Connect
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <Modal
-        animationType="none"
-        deviceHeight={null}
-        deviceWidth={null}
-        hardwareAccelerated={false}
-        hideModalContentWhileAnimating={false}
-        onBackdropPress={[Function]}
-        onModalHide={[Function]}
-        onModalWillHide={[Function]}
-        onModalWillShow={[Function]}
-        onRequestClose={[Function]}
-        panResponderThreshold={4}
-        scrollHorizontal={false}
-        scrollOffset={0}
-        scrollOffsetMax={0}
-        scrollTo={null}
-        statusBarTranslucent={false}
-        supportedOrientations={
-          [
-            "portrait",
-            "landscape",
-          ]
-        }
-        swipeThreshold={100}
-        transparent={true}
-        visible={false}
-      />
-    </View>
-  </View>
-</View>
-`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
deleted file mode 100644
index 6ec45071a29..00000000000
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-off
+++ /dev/null
@@ -1,434 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountConnect renders correctly 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": 1334,
-            "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,
-            }
-          }
-        >
-          Connect account
-        </Text>
-        <View
-          style={
-            {
-              "alignItems": "flex-end",
-              "flex": 1,
-            }
-          }
-        />
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-        testID="connect-account-modal"
-      >
-        <View
-          iconName="LockSlash"
-          style={
-            {
-              "alignItems": "center",
-              "alignSelf": "center",
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 99,
-              "borderWidth": 1,
-              "flexDirection": "row",
-              "paddingLeft": 8,
-              "paddingRight": 16,
-              "paddingVertical": 8,
-            }
-          }
-        >
-          <View
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderRadius": 16,
-                "height": 24,
-                "marginRight": 8,
-                "overflow": "hidden",
-                "width": 24,
-              }
-            }
-          >
-            <Image
-              onError={[Function]}
-              resizeMode="contain"
-              source={
-                {
-                  "uri": "",
-                }
-              }
-              style={
-                {
-                  "flex": 1,
-                  "height": undefined,
-                  "width": undefined,
-                }
-              }
-              testID="favicon-avatar-image"
-            />
-          </View>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#6a737d",
-                "flexShrink": 1,
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            https://mockOrigin
-          </Text>
-        </View>
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#6a737d",
-              "fontFamily": "EuclidCircularB-Regular",
-              "fontSize": 14,
-              "fontWeight": "400",
-              "letterSpacing": 0,
-              "lineHeight": 22,
-              "marginVertical": 16,
-              "textAlign": "center",
-            }
-          }
-        >
-          Share your account address, balance, activity, and allow site to initiate transactions.
-        </Text>
-      </View>
-      <View
-        style={
-          {
-            "marginTop": 16,
-          }
-        }
-      >
-        <View>
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "stretch",
-                "backgroundColor": "transparent",
-                "borderRadius": 24,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "opacity": 1,
-                "paddingHorizontal": 16,
-              }
-            }
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Connect multiple accounts
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-      >
-        <View
-          style={
-            [
-              {
-                "flexDirection": "row",
-                "marginBottom": 16,
-                "marginTop": 24,
-              },
-              false,
-            ]
-          }
-        >
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "transparent",
-                "borderColor": "#0376c9",
-                "borderRadius": 24,
-                "borderWidth": 1,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
-              }
-            }
-            testID="cancel-button"
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Cancel
-            </Text>
-          </TouchableOpacity>
-          <View
-            style={
-              {
-                "width": 16,
-              }
-            }
-          />
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "flex-start",
-                "backgroundColor": "#0376c9",
-                "borderRadius": 24,
-                "flex": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "paddingHorizontal": 16,
-              }
-            }
-            testID="connect-button"
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#ffffff",
-                  "fontFamily": "EuclidCircularB-Regular",
-                  "fontSize": 14,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Connect
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <Modal
-        animationType="none"
-        deviceHeight={null}
-        deviceWidth={null}
-        hardwareAccelerated={false}
-        hideModalContentWhileAnimating={false}
-        onBackdropPress={[Function]}
-        onModalHide={[Function]}
-        onModalWillHide={[Function]}
-        onModalWillShow={[Function]}
-        onRequestClose={[Function]}
-        panResponderThreshold={4}
-        scrollHorizontal={false}
-        scrollOffset={0}
-        scrollOffsetMax={0}
-        scrollTo={null}
-        statusBarTranslucent={false}
-        supportedOrientations={
-          [
-            "portrait",
-            "landscape",
-          ]
-        }
-        swipeThreshold={100}
-        transparent={true}
-        visible={false}
-      />
-    </View>
-  </View>
-</View>
-`;
diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on
deleted file mode 100644
index 6df027cc236..00000000000
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap.ff-on
+++ /dev/null
@@ -1,789 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountConnect renders correctly 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": 1334,
-            "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>
-      <RCTSafeAreaView
-        style={
-          {
-            "backgroundColor": "#ffffff",
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderTopLeftRadius": 20,
-              "borderTopRightRadius": 20,
-              "height": undefined,
-              "justifyContent": "flex-start",
-              "minHeight": 200,
-              "paddingTop": 8,
-            }
-          }
-        >
-          <View>
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "space-between",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "flex": 1,
-                    "paddingLeft": 16,
-                  }
-                }
-              />
-              <View
-                style={
-                  [
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "justifyContent": "center",
-                    },
-                    false,
-                  ]
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "borderRadius": 10,
-                      "justifyContent": "center",
-                    }
-                  }
-                >
-                  <View
-                    style={
-                      [
-                        {
-                          "alignContent": "center",
-                          "backgroundColor": "#ffffff",
-                          "borderRadius": 27,
-                          "height": 54,
-                          "justifyContent": "center",
-                          "width": 54,
-                        },
-                        {
-                          "borderRadius": 16,
-                          "height": 32,
-                          "width": 32,
-                        },
-                      ]
-                    }
-                  >
-                    <Text
-                      style={
-                        [
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 24,
-                            "fontWeight": "400",
-                            "textAlign": "center",
-                            "textTransform": "uppercase",
-                          },
-                          undefined,
-                        ]
-                      }
-                    >
-                      h
-                    </Text>
-                  </View>
-                </View>
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-end",
-                    "flex": 1,
-                    "paddingRight": 16,
-                  }
-                }
-              />
-            </View>
-            <View
-              style={
-                {
-                  "alignSelf": "center",
-                  "marginBottom": 16,
-                  "marginLeft": 24,
-                  "marginRight": 24,
-                  "marginTop": 8,
-                }
-              }
-              testID="permission-network-permissions-container"
-            >
-              <Text
-                accessibilityRole="text"
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Bold",
-                    "fontSize": 16,
-                    "fontWeight": "700",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                mockorigin wants to:
-              </Text>
-            </View>
-            <TouchableOpacity
-              onPress={[Function]}
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "flexDirection": "row",
-                    "marginBottom": 12,
-                    "marginHorizontal": 24,
-                    "marginTop": 8,
-                  }
-                }
-                testID="permission-summary-container"
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "alignSelf": "flex-start",
-                      "backgroundColor": "#0000001a",
-                      "borderRadius": 16,
-                      "height": 32,
-                      "justifyContent": "center",
-                      "overflow": "hidden",
-                      "width": 32,
-                    }
-                  }
-                >
-                  <SvgMock
-                    color="#6a737d"
-                    height={20}
-                    name="Wallet"
-                    style={
-                      {
-                        "height": 20,
-                        "width": 20,
-                      }
-                    }
-                    width={20}
-                  />
-                </View>
-                <View
-                  style={
-                    {
-                      "flex": 1,
-                      "marginLeft": 12,
-                    }
-                  }
-                >
-                  <Text
-                    accessibilityRole="text"
-                    style={
-                      {
-                        "color": "#141618",
-                        "fontFamily": "EuclidCircularB-Regular",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "letterSpacing": 0,
-                        "lineHeight": 22,
-                      }
-                    }
-                  >
-                    See your accounts and suggest transactions
-                  </Text>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
-                        "gap": 2,
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "maxWidth": "75%",
-                        }
-                      }
-                    >
-                      <Text
-                        accessibilityRole="text"
-                        ellipsizeMode="tail"
-                        numberOfLines={1}
-                        style={
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 14,
-                            "fontWeight": "400",
-                            "letterSpacing": 0,
-                            "lineHeight": 22,
-                          }
-                        }
-                      >
-                        <Text
-                          accessibilityRole="text"
-                          style={
-                            {
-                              "color": "#141618",
-                              "fontFamily": "EuclidCircularB-Regular",
-                              "fontSize": 12,
-                              "fontWeight": "400",
-                              "letterSpacing": 0,
-                              "lineHeight": 20,
-                            }
-                          }
-                        >
-                          Requesting for 0 accounts
-                        </Text>
-                      </Text>
-                    </View>
-                    <View
-                      style={
-                        {
-                          "flexGrow": 1,
-                          "marginLeft": 2,
-                          "minWidth": "25%",
-                        }
-                      }
-                    />
-                  </View>
-                </View>
-                <View
-                  testID="connection-details-button"
-                >
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "width": 56,
-                      }
-                    }
-                  >
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#0376c9",
-                          "fontFamily": "EuclidCircularB-Medium",
-                          "fontSize": 14,
-                          "fontWeight": "500",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                        }
-                      }
-                    >
-                      Edit
-                    </Text>
-                  </View>
-                </View>
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={[Function]}
-              testID="navigate_to_edit_networks_permissions_button"
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "flexDirection": "row",
-                    "marginBottom": 16,
-                    "marginHorizontal": 24,
-                    "marginTop": 8,
-                  }
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "alignSelf": "flex-start",
-                      "backgroundColor": "#0000001a",
-                      "borderRadius": 16,
-                      "height": 32,
-                      "justifyContent": "center",
-                      "overflow": "hidden",
-                      "width": 32,
-                    }
-                  }
-                >
-                  <SvgMock
-                    color="#6a737d"
-                    height={20}
-                    name="Data"
-                    style={
-                      {
-                        "height": 20,
-                        "width": 20,
-                      }
-                    }
-                    width={20}
-                  />
-                </View>
-                <View
-                  style={
-                    {
-                      "flex": 1,
-                      "marginLeft": 12,
-                    }
-                  }
-                >
-                  <Text
-                    accessibilityRole="text"
-                    style={
-                      {
-                        "color": "#141618",
-                        "fontFamily": "EuclidCircularB-Regular",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "letterSpacing": 0,
-                        "lineHeight": 22,
-                      }
-                    }
-                  >
-                    Use your enabled networks
-                  </Text>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "marginRight": 4,
-                          "maxWidth": "75%",
-                        }
-                      }
-                    >
-                      <Text
-                        accessibilityRole="text"
-                        ellipsizeMode="tail"
-                        numberOfLines={1}
-                        style={
-                          {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 14,
-                            "fontWeight": "400",
-                            "letterSpacing": 0,
-                            "lineHeight": 22,
-                          }
-                        }
-                      >
-                        <Text
-                          accessibilityRole="text"
-                          style={
-                            {
-                              "color": "#141618",
-                              "fontFamily": "EuclidCircularB-Regular",
-                              "fontSize": 12,
-                              "fontWeight": "400",
-                              "letterSpacing": 0,
-                              "lineHeight": 20,
-                            }
-                          }
-                        >
-                          Requesting for Ethereum Mainnet
-                        </Text>
-                      </Text>
-                    </View>
-                    <View
-                      style={
-                        {
-                          "flexGrow": 1,
-                          "marginLeft": 2,
-                          "minWidth": "25%",
-                        }
-                      }
-                    >
-                      <View
-                        style={
-                          {
-                            "alignItems": "center",
-                            "flexDirection": "row",
-                          }
-                        }
-                      >
-                        <View
-                          style={
-                            {
-                              "marginLeft": 0,
-                            }
-                          }
-                          testID="avatargroup-avatar-container-0"
-                        >
-                          <View
-                            style={
-                              {
-                                "alignItems": "center",
-                                "backgroundColor": "#ffffff",
-                                "borderColor": "#ffffff",
-                                "borderRadius": 8,
-                                "borderWidth": 1.5,
-                                "height": 16,
-                                "justifyContent": "center",
-                                "overflow": "hidden",
-                                "width": 16,
-                              }
-                            }
-                            testID="avatargroup-avatar"
-                          >
-                            <Image
-                              onError={[Function]}
-                              resizeMode="contain"
-                              source={
-                                {
-                                  "default": {
-                                    "uri": "MockImage",
-                                  },
-                                }
-                              }
-                              style={
-                                {
-                                  "height": 16,
-                                  "width": 16,
-                                }
-                              }
-                              testID="network-avatar-image"
-                            />
-                          </View>
-                        </View>
-                      </View>
-                    </View>
-                  </View>
-                </View>
-                <View
-                  testID="connection-details-button"
-                >
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "width": 56,
-                      }
-                    }
-                  >
-                    <Text
-                      accessibilityRole="text"
-                      style={
-                        {
-                          "color": "#0376c9",
-                          "fontFamily": "EuclidCircularB-Medium",
-                          "fontSize": 14,
-                          "fontWeight": "500",
-                          "letterSpacing": 0,
-                          "lineHeight": 22,
-                        }
-                      }
-                    >
-                      Edit
-                    </Text>
-                  </View>
-                </View>
-              </View>
-            </TouchableOpacity>
-          </View>
-          <View
-            style={
-              {
-                "marginTop": 8,
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "flex": 0,
-                  "flexDirection": "row",
-                  "marginTop": 8,
-                  "paddingHorizontal": 24,
-                }
-              }
-            >
-              <TouchableOpacity
-                accessibilityRole="button"
-                accessible={true}
-                activeOpacity={0.2}
-                onPress={[Function]}
-                style={
-                  [
-                    [
-                      {
-                        "borderRadius": 100,
-                        "justifyContent": "center",
-                        "padding": 15,
-                      },
-                      {
-                        "backgroundColor": "#ffffff",
-                        "borderColor": "#6a737d",
-                        "borderWidth": 1,
-                      },
-                      [
-                        {
-                          "flex": 1,
-                        },
-                        {
-                          "marginRight": 8,
-                        },
-                      ],
-                    ],
-                    null,
-                  ]
-                }
-                testID="cancel-button"
-              >
-                <Text
-                  style={
-                    [
-                      {
-                        "color": "#007aff",
-                        "fontSize": 17,
-                        "fontWeight": "500",
-                        "textAlign": "center",
-                      },
-                      null,
-                      [
-                        {
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "600",
-                          "textAlign": "center",
-                        },
-                        {
-                          "color": "#6a737d",
-                        },
-                        undefined,
-                      ],
-                      null,
-                    ]
-                  }
-                >
-                  Cancel
-                </Text>
-              </TouchableOpacity>
-              <TouchableOpacity
-                accessibilityRole="button"
-                accessible={true}
-                activeOpacity={0.2}
-                onPress={[Function]}
-                style={
-                  [
-                    [
-                      {
-                        "borderRadius": 100,
-                        "justifyContent": "center",
-                        "padding": 15,
-                      },
-                      {
-                        "backgroundColor": "#0376c9",
-                        "minHeight": 50,
-                      },
-                      [
-                        {
-                          "flex": 1,
-                        },
-                        {
-                          "marginLeft": 8,
-                        },
-                      ],
-                    ],
-                    null,
-                  ]
-                }
-                testID="connect-button"
-              >
-                <Text
-                  style={
-                    [
-                      {
-                        "color": "#007aff",
-                        "fontSize": 17,
-                        "fontWeight": "500",
-                        "textAlign": "center",
-                      },
-                      null,
-                      [
-                        {
-                          "fontFamily": "EuclidCircularB-Bold",
-                          "fontSize": 14,
-                          "fontWeight": "600",
-                          "textAlign": "center",
-                        },
-                        {
-                          "color": "#ffffff",
-                        },
-                        undefined,
-                      ],
-                      null,
-                    ]
-                  }
-                >
-                  Connect
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-        </View>
-      </RCTSafeAreaView>
-      <Modal
-        animationType="none"
-        deviceHeight={null}
-        deviceWidth={null}
-        hardwareAccelerated={false}
-        hideModalContentWhileAnimating={false}
-        onBackdropPress={[Function]}
-        onModalHide={[Function]}
-        onModalWillHide={[Function]}
-        onModalWillShow={[Function]}
-        onRequestClose={[Function]}
-        panResponderThreshold={4}
-        scrollHorizontal={false}
-        scrollOffset={0}
-        scrollOffsetMax={0}
-        scrollTo={null}
-        statusBarTranslucent={false}
-        supportedOrientations={
-          [
-            "portrait",
-            "landscape",
-          ]
-        }
-        swipeThreshold={100}
-        transparent={true}
-        visible={false}
-      />
-    </View>
-  </View>
-</View>
-`;

From 70fbc8f322434d3808f287bd11ae35d31376e04d Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Thu, 16 Jan 2025 12:42:50 +0300
Subject: [PATCH 21/25] style: tsc lint

---
 .../Approvals/SwitchChainApproval/SwitchChainApproval.tsx        | 1 -
 app/components/Views/AccountConnect/AccountConnect.tsx           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx b/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
index ff4a9814ce1..268849e5481 100644
--- a/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
+++ b/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
@@ -58,7 +58,6 @@ const SwitchChainApproval = () => {
         onConfirm={onConfirm}
         currentPageInformation={pageMeta}
         customNetworkInformation={approvalRequest?.requestData}
-        type={approvalRequest?.requestData?.type}
       />
     </ApprovalModal>
   );
diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
index b68ceb6aa98..7e33c272b45 100644
--- a/app/components/Views/AccountConnect/AccountConnect.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -209,6 +209,7 @@ const AccountConnect = (props: AccountConnectProps) => {
       const initialNetworkAvatar = {
         size: AvatarSize.Xs,
         name: networkConfigurations[chainId]?.name || '',
+        // @ts-expect-error getNetworkImageSource is not implemented in typescript
         imageSource: getNetworkImageSource({ chainId }),
       };
       setSelectedNetworkAvatars([initialNetworkAvatar]);

From f4eab916636e31d62620209c671285da0cad3d85 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Thu, 16 Jan 2025 17:24:26 +0300
Subject: [PATCH 22/25] chore(test): update snapshot to match expected and
 cleanup ff-on test since all multichain-permission code is ff-on now

---
 .../AccountConnect.test.tsx.snap              |   9 +-
 .../AccountPermissions.ff-on.test.tsx         |  79 -----
 .../AccountPermissions.ff-on.test.tsx.snap    | 310 ------------------
 3 files changed, 2 insertions(+), 396 deletions(-)
 delete mode 100644 app/components/Views/AccountPermissions/AccountPermissions.ff-on.test.tsx
 delete mode 100644 app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.ff-on.test.tsx.snap

diff --git a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
index 6df027cc236..9c6a0cb2870 100644
--- a/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
+++ b/app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap
@@ -346,6 +346,7 @@ exports[`AccountConnect renders correctly 1`] = `
                             "lineHeight": 22,
                           }
                         }
+                        testID="permission-summary-account-text"
                       >
                         <Text
                           accessibilityRole="text"
@@ -562,13 +563,7 @@ exports[`AccountConnect renders correctly 1`] = `
                             <Image
                               onError={[Function]}
                               resizeMode="contain"
-                              source={
-                                {
-                                  "default": {
-                                    "uri": "MockImage",
-                                  },
-                                }
-                              }
+                              source={1}
                               style={
                                 {
                                   "height": 16,
diff --git a/app/components/Views/AccountPermissions/AccountPermissions.ff-on.test.tsx b/app/components/Views/AccountPermissions/AccountPermissions.ff-on.test.tsx
deleted file mode 100644
index 46932be4bbc..00000000000
--- a/app/components/Views/AccountPermissions/AccountPermissions.ff-on.test.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-// Mock the networks module before any imports
-
-import React from 'react';
-import renderWithProvider, {
-  DeepPartial,
-} from '../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../util/test/initial-root-state';
-import { RootState } from '../../../reducers';
-import AccountPermissions from './AccountPermissions';
-
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-const mockedTrackEvent = jest.fn();
-
-// Mock navigation
-jest.mock('@react-navigation/native', () => {
-  const actualNav = jest.requireActual('@react-navigation/native');
-  return {
-    ...actualNav,
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-      setOptions: jest.fn(),
-    }),
-  };
-});
-
-// Mock safe area context
-jest.mock('react-native-safe-area-context', () => {
-  const inset = { top: 0, right: 0, bottom: 0, left: 0 };
-  const frame = { width: 0, height: 0, x: 0, y: 0 };
-  return {
-    SafeAreaProvider: jest.fn().mockImplementation(({ children }) => children),
-    SafeAreaConsumer: jest
-      .fn()
-      .mockImplementation(({ children }) => children(inset)),
-    useSafeAreaInsets: jest.fn().mockImplementation(() => inset),
-    useSafeAreaFrame: jest.fn().mockImplementation(() => frame),
-  };
-});
-
-// Mock metrics
-jest.mock('../../../components/hooks/useMetrics', () => ({
-  useMetrics: () => ({
-    trackEvent: mockedTrackEvent,
-  }),
-}));
-
-jest.mock('../../../util/networks/index.js', () => ({
-  ...jest.requireActual('../../../util/networks/index.js'),
-  isMultichainVersion1Enabled: true,
-  isChainPermissionsFeatureEnabled: true,
-}));
-
-const mockInitialState: DeepPartial<RootState> = {
-  settings: {},
-  engine: {
-    backgroundState: {
-      ...backgroundState,
-    },
-  },
-};
-
-describe('AccountPermissions with feature flags ON', () => {
-  it('should render AccountPermissions with multichain and chain permissions enabled', () => {
-    const { toJSON } = renderWithProvider(
-      <AccountPermissions
-        route={{
-          params: {
-            hostInfo: { metadata: { origin: 'test' } },
-          },
-        }}
-      />,
-      { state: mockInitialState },
-    );
-
-    expect(toJSON()).toMatchSnapshot('AccountPermissions-FeatureFlagsOn');
-  });
-});
diff --git a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.ff-on.test.tsx.snap b/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.ff-on.test.tsx.snap
deleted file mode 100644
index c69a94b7005..00000000000
--- a/app/components/Views/AccountPermissions/__snapshots__/AccountPermissions.ff-on.test.tsx.snap
+++ /dev/null
@@ -1,310 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountPermissions with feature flags ON should render AccountPermissions with multichain and chain permissions enabled: AccountPermissions-FeatureFlagsOn 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": 1334,
-            "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",
-            "flexDirection": "row",
-            "justifyContent": "center",
-            "margin": 16,
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderRadius": 16,
-              "height": 16,
-              "marginRight": 8,
-              "overflow": "hidden",
-              "width": 16,
-            }
-          }
-        >
-          <Image
-            onError={[Function]}
-            resizeMode="contain"
-            source={{}}
-            style={
-              {
-                "flex": 1,
-                "height": undefined,
-                "width": undefined,
-              }
-            }
-            testID="favicon-avatar-image"
-          />
-        </View>
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#141618",
-              "fontFamily": "EuclidCircularB-Bold",
-              "fontSize": 18,
-              "fontWeight": "700",
-              "letterSpacing": 0,
-              "lineHeight": 24,
-            }
-          }
-        >
-          test
-        </Text>
-      </View>
-      <View
-        style={
-          {
-            "paddingHorizontal": 16,
-          }
-        }
-      >
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#141618",
-              "fontFamily": "EuclidCircularB-Medium",
-              "fontSize": 14,
-              "fontWeight": "500",
-              "letterSpacing": 0,
-              "lineHeight": 22,
-              "marginVertical": 16,
-            }
-          }
-        >
-          Connected accounts
-        </Text>
-      </View>
-      <RCTScrollView
-        collapsable={false}
-        data={[]}
-        getItem={[Function]}
-        getItemCount={[Function]}
-        initialNumToRender={999}
-        keyExtractor={[Function]}
-        onContentSizeChange={[Function]}
-        onGestureHandlerEvent={[Function]}
-        onGestureHandlerStateChange={[Function]}
-        onLayout={[Function]}
-        onMomentumScrollBegin={[Function]}
-        onMomentumScrollEnd={[Function]}
-        onScroll={[Function]}
-        onScrollBeginDrag={[Function]}
-        onScrollEndDrag={[Function]}
-        removeClippedSubviews={false}
-        renderItem={[Function]}
-        renderScrollComponent={[Function]}
-        scrollEventThrottle={50}
-        stickyHeaderIndices={[]}
-        viewabilityConfigCallbackPairs={[]}
-      >
-        <View />
-      </RCTScrollView>
-      <View
-        style={
-          {
-            "marginVertical": 16,
-          }
-        }
-        testID="connect-accounts-buttons"
-      >
-        <View>
-          <TouchableOpacity
-            accessibilityRole="button"
-            accessible={true}
-            activeOpacity={1}
-            onPress={[Function]}
-            onPressIn={[Function]}
-            onPressOut={[Function]}
-            style={
-              {
-                "alignItems": "center",
-                "alignSelf": "stretch",
-                "backgroundColor": "transparent",
-                "borderRadius": 24,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "opacity": 1,
-                "paddingHorizontal": 16,
-              }
-            }
-          >
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#0376c9",
-                  "fontFamily": "EuclidCircularB-Medium",
-                  "fontSize": 14,
-                  "fontWeight": "500",
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Connect more accounts
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      <TouchableOpacity
-        accessibilityRole="button"
-        accessible={true}
-        activeOpacity={1}
-        onPress={[Function]}
-        onPressIn={[Function]}
-        onPressOut={[Function]}
-        style={
-          {
-            "alignItems": "center",
-            "alignSelf": "stretch",
-            "backgroundColor": "transparent",
-            "borderColor": "#0376c9",
-            "borderRadius": 24,
-            "borderWidth": 1,
-            "flexDirection": "row",
-            "height": 48,
-            "justifyContent": "center",
-            "marginHorizontal": 16,
-            "paddingHorizontal": 16,
-          }
-        }
-        testID="manage_permissions"
-      >
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#0376c9",
-              "fontFamily": "EuclidCircularB-Medium",
-              "fontSize": 14,
-              "fontWeight": "500",
-              "letterSpacing": 0,
-              "lineHeight": 22,
-            }
-          }
-        >
-          Manage Permissions
-        </Text>
-      </TouchableOpacity>
-    </View>
-  </View>
-</View>
-`;

From c32d4a65c522858dc2f849b8ba579528f9217dc1 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Thu, 16 Jan 2025 18:22:49 +0300
Subject: [PATCH 23/25] chore: remove files excluded from sonar's coverage on
 new code metrics

---
 sonar-project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonar-project.properties b/sonar-project.properties
index 12e0532c996..a06f5083e87 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -15,7 +15,7 @@ sonar.exclusions=**.stories.**, e2e/**, wdio/**
 sonar.test.inclusions=**.test.**
 
 # Excluded project files from coverage.
-sonar.coverage.exclusions=**AccountConnectMultiSelector**, **AccountPermissionsConfirmRevokeAll**, **PermissionsSettings**, **NetworkConnectMultiSelector**, **NetworkSelectorList**, **PermissionsSummary**, **AccountConnect.tsx,  **util/test**, **AccountPermissions.tsx, **NetworkVerificationInfo.tsx, **ConnectionDetails**, **TabThumbnail**, **PermittedNetworksInfoSheet**, **NetworkPermissionsConnected**, **BrowserTab**,
+sonar.coverage.exclusions=**util/test**,
 
 # Test coverage path in GitHub action
 sonar.javascript.lcov.reportPaths=/coverage/lcov.info

From 935f02cde4c876dcf1c5e20fe4c98fb88ad488ce Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Fri, 17 Jan 2025 17:33:04 +0300
Subject: [PATCH 24/25] test: add test case that covers when the permission
 summary is rendered

---
 .../AccountConnect/AccountConnect.test.tsx    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app/components/Views/AccountConnect/AccountConnect.test.tsx b/app/components/Views/AccountConnect/AccountConnect.test.tsx
index 5af9da6f3a8..08488953a6a 100644
--- a/app/components/Views/AccountConnect/AccountConnect.test.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.test.tsx
@@ -85,4 +85,39 @@ describe('AccountConnect', () => {
 
     expect(toJSON()).toMatchSnapshot();
   });
+
+  describe('Renders PermissionsSummary when expected', () => {
+    const mockConnectProps = {
+      route: {
+        params: {
+          hostInfo: {
+            metadata: {
+              id: 'mockId',
+              origin: 'mockOrigin',
+            },
+            permissions: {
+              eth_accounts: {
+                parentCapability: 'eth_accounts',
+              },
+            },
+          },
+          permissionRequestId: 'test',
+        },
+      },
+    };
+
+    it('should render PermissionsSummary screen when isSdkUrlUnknown is false', () => {
+      // Mock the isUUID function to return false to ensure isSdkUrlUnknown stays false
+      jest.mock('../../../core/SDKConnect/utils/isUUID', () => ({
+        isUUID: () => false,
+      }));
+
+      const { getByTestId } = renderWithProvider(
+        <AccountConnect {...mockConnectProps} />,
+        { state: mockInitialState },
+      );
+
+      expect(getByTestId('permission-summary-container')).toBeDefined();
+    });
+  });
 });

From c9bb996da05a42fc76d8775bc903f7f14f066a97 Mon Sep 17 00:00:00 2001
From: EtherWizard33 <eric.lamontagne@consensys.net>
Date: Mon, 20 Jan 2025 17:30:17 +0300
Subject: [PATCH 25/25] test: covering both cases of sdk url known and unknown

---
 .../AccountConnect/AccountConnect.test.tsx    | 77 ++++++++++++++-----
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/app/components/Views/AccountConnect/AccountConnect.test.tsx b/app/components/Views/AccountConnect/AccountConnect.test.tsx
index 08488953a6a..33cbb9a9124 100644
--- a/app/components/Views/AccountConnect/AccountConnect.test.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.test.tsx
@@ -50,6 +50,18 @@ jest.mock('../../../core/Engine', () => ({
   },
 }));
 
+// Mock SDKConnect
+jest.mock('../../../core/SDKConnect/SDKConnect', () => ({
+  getInstance: () => ({
+    getConnection: () => undefined,
+  }),
+}));
+
+// Mock the isUUID function
+jest.mock('../../../core/SDKConnect/utils/isUUID', () => ({
+  isUUID: () => false,
+}));
+
 const mockInitialState: DeepPartial<RootState> = {
   settings: {},
   engine: {
@@ -86,34 +98,59 @@ describe('AccountConnect', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
-  describe('Renders PermissionsSummary when expected', () => {
-    const mockConnectProps = {
-      route: {
-        params: {
-          hostInfo: {
-            metadata: {
-              id: 'mockId',
-              origin: 'mockOrigin',
-            },
-            permissions: {
-              eth_accounts: {
-                parentCapability: 'eth_accounts',
+  describe('Renders different screens based on SDK URL status', () => {
+    it('should render SingleConnect screen when isSdkUrlUnknown is true', () => {
+      const mockPropsForUnknownUrl = {
+        route: {
+          params: {
+            hostInfo: {
+              metadata: {
+                id: 'mockId',
+                // Using an invalid/unknown format for origin
+                origin: '',
+              },
+              permissions: {
+                eth_accounts: {
+                  parentCapability: 'eth_accounts',
+                },
               },
             },
+            permissionRequestId: 'test',
           },
-          permissionRequestId: 'test',
         },
-      },
-    };
+      };
+
+      const { getByTestId } = renderWithProvider(
+        <AccountConnect {...mockPropsForUnknownUrl} />,
+        { state: mockInitialState },
+      );
+
+      expect(getByTestId('connect-account-modal')).toBeDefined();
+    });
 
     it('should render PermissionsSummary screen when isSdkUrlUnknown is false', () => {
-      // Mock the isUUID function to return false to ensure isSdkUrlUnknown stays false
-      jest.mock('../../../core/SDKConnect/utils/isUUID', () => ({
-        isUUID: () => false,
-      }));
+      const mockPropsForKnownUrl = {
+        route: {
+          params: {
+            hostInfo: {
+              metadata: {
+                id: 'mockId',
+                // Using a valid URL format
+                origin: 'https://example.com',
+              },
+              permissions: {
+                eth_accounts: {
+                  parentCapability: 'eth_accounts',
+                },
+              },
+            },
+            permissionRequestId: 'test',
+          },
+        },
+      };
 
       const { getByTestId } = renderWithProvider(
-        <AccountConnect {...mockConnectProps} />,
+        <AccountConnect {...mockPropsForKnownUrl} />,
         { state: mockInitialState },
       );