Merge branch 'main' into bump-swaps-controller

.js.env.example

@@ -1,16 +1,15 @@
 # Sign up and generate your own keys at pubnub.com
 # Then rename this file to ".js.env" and rebuild the app
-#
+# 
 # In order for this feature to work properly, you need to
 # build metamask-extension from source (https://github.com/MetaMask/metamask-extension)
 # and set your the same values there.
-#
+# 
 # For more info take a look at https://github.com/MetaMask/metamask-extension/pull/5955
 
 export MM_PUBNUB_SUB_KEY=""
 export MM_PUBNUB_PUB_KEY=""
 export MM_OPENSEA_KEY=""
-export MM_ETHERSCAN_KEY=""
 export MM_FOX_CODE="EXAMPLE_FOX_CODE"
 
 # NOTE: Non-MetaMask only, will need to create an account and generate
@@ -70,6 +69,10 @@ export SEGMENT_FLUSH_EVENT_LIMIT="1"
 # URL of security alerts API used to validate dApp requests.
 export SECURITY_ALERTS_API_URL="https://security-alerts.api.cx.metamask.io"
 
+# Enable Portfolio View
+export PORTFOLIO_VIEW="true"
+
+
 # Temporary mechanism to enable security alerts API prior to release.
 export MM_SECURITY_ALERTS_API_ENABLED="true"
 # Firebase
@@ -81,7 +84,7 @@ export FCM_CONFIG_MESSAGING_SENDER_ID=""
 export FCM_CONFIG_APP_ID=""
 export GOOGLE_SERVICES_B64_ANDROID=""
 export GOOGLE_SERVICES_B64_IOS=""
-#Notifications Feature Announcements
+# Notifications Feature Announcements
 export FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN=
 export FEATURES_ANNOUNCEMENTS_SPACE_ID=
 
@@ -96,8 +99,8 @@ export MM_PER_DAPP_SELECTED_NETWORK=""
 
 export MM_CHAIN_PERMISSIONS=""
 
-#Multichain feature flag specific to UI changes
+# Multichain feature flag specific to UI changes
 export MM_MULTICHAIN_V1_ENABLED=""
 
-#Permissions Settings feature flag specific to UI changes
+# Permissions Settings feature flag specific to UI changes
 export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""

app/components/Nav/Main/index.js

@@ -133,7 +133,7 @@ const Main = (props) => {
     stopIncomingTransactionPolling();
 
     if (showIncomingTransactionsNetworks[chainId]) {
-      startIncomingTransactionPolling([networkClientId]);
+      startIncomingTransactionPolling([chainId]);
     }
   }, [chainId, networkClientId, showIncomingTransactionsNetworks]);
 
@@ -178,11 +178,11 @@ const Main = (props) => {
         removeNotVisibleNotifications();
 
         BackgroundTimer.runBackgroundTimer(async () => {
-          await updateIncomingTransactions([props.networkClientId]);
+          await updateIncomingTransactions([props.chainId]);
         }, AppConstants.TX_CHECK_BACKGROUND_FREQUENCY);
       }
     },
-    [backgroundMode, removeNotVisibleNotifications, props.networkClientId],
+    [backgroundMode, removeNotVisibleNotifications, props.chainId],
   );
 
   const initForceReload = () => {

app/components/UI/AccountSelectorList/AccountSelector.test.tsx

@@ -18,6 +18,9 @@ import { mockNetworkState } from '../../../util/test/network';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { AccountSelectorListProps } from './AccountSelectorList.types';
 
+// eslint-disable-next-line import/no-namespace
+import * as Utils from '../../hooks/useAccounts/utils';
+
 const BUSINESS_ACCOUNT = '0xC4955C0d639D99699Bfd7Ec54d9FaFEe40e4D272';
 const PERSONAL_ACCOUNT = '0xd018538C87232FF95acbCe4870629b75640a78E7';
 
@@ -125,6 +128,16 @@ const renderComponent = (
 
 describe('AccountSelectorList', () => {
   beforeEach(() => {
+    jest.spyOn(Utils, 'getAccountBalances').mockReturnValueOnce({
+      balanceETH: '1',
+      balanceFiat: '$3200.00',
+      balanceWeiHex: '',
+    });
+    jest.spyOn(Utils, 'getAccountBalances').mockReturnValueOnce({
+      balanceETH: '2',
+      balanceFiat: '$6400.00',
+      balanceWeiHex: '',
+    });
     onSelectAccount.mockClear();
     onRemoveImportedAccount.mockClear();
   });

app/components/UI/AssetOverview/AssetOverview.tsx

@@ -385,7 +385,7 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
         : `${balance} ${asset.symbol}`;
     }
   } else {
-    mainBalance = `${balance} ${asset.ticker}`;
+    mainBalance = `${balance} ${asset.isETH ? asset.ticker : asset.symbol}`;
     secondaryBalance = exchangeRate ? asset.balanceFiat : '';
   }
 

app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap

@@ -2253,7 +2253,7 @@ exports[`AssetOverview should render correctly when portfolio view is enabled 1`
             }
             testID="main-balance-test-id"
           >
-            0 undefined
+            0 ETH
           </Text>
         </View>
       </TouchableOpacity>

app/components/UI/NetworkCell/NetworkCell.tsx

@@ -1,23 +1,21 @@
 import React from 'react';
 import { Switch, ImageSourcePropType } from 'react-native';
-import { ETHERSCAN_SUPPORTED_NETWORKS } from '@metamask/transaction-controller';
 import { useStyles } from '../../../component-library/hooks';
 import Cell from '../../../component-library/components/Cells/Cell/Cell';
 import { CellVariant } from '../../../component-library/components/Cells/Cell';
 import { AvatarVariant } from '../../../component-library/components/Avatars/Avatar/Avatar.types';
 import { useTheme } from '../../../util/theme';
-import { EtherscanSupportedHexChainId } from '@metamask/preferences-controller';
 import styleSheet from './NetworkCell.styles';
+import { Hex } from '@metamask/utils';
 
-const supportedNetworks = ETHERSCAN_SUPPORTED_NETWORKS;
 interface NetworkCellProps {
   name: string;
-  chainId: EtherscanSupportedHexChainId | keyof typeof supportedNetworks;
+  chainId: Hex;
   imageSource: ImageSourcePropType;
-  secondaryText: string;
+  secondaryText?: string;
   showIncomingTransactionsNetworks: Record<string, boolean>;
   toggleEnableIncomingTransactions: (
-    chainId: EtherscanSupportedHexChainId,
+    chainId: Hex,
     value: boolean,
   ) => void;
   testID?: string;

app/components/UI/Notification/BaseNotification/index.js

@@ -154,7 +154,7 @@ const getTitle = (status, { nonce, amount, assetType }) => {
 };
 
 export const getDescription = (status, { amount = null, type = null }) => {
-  if (amount && typeof amount !== 'object') {
+  if (amount && typeof amount !== 'object' && type) {
     return strings(`notifications.${type}_${status}_message`, { amount });
   }
   return strings(`notifications.${status}_message`);