Merge branch 'develop' into update-txn-status-to-non-anonymous

CHANGELOG.md

@@ -6,6 +6,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.34.0]
+### Added
+- Add a security quiz to the SRP reveal ([#19283](https://github.com/MetaMask/metamask-extension/pull/19283))
+- [FLASK] Add Snaps keyring and new snap accounts related pages ([#19710](https://github.com/MetaMask/metamask-extension/pull/19710))
+
+
+### Changed
+- Decrease boldness of text in some labels ([#19731](https://github.com/MetaMask/metamask-extension/pull/19731))
+
+### Fixed
+- Fix design inconsistencies in the connect flow ([#19800](https://github.com/MetaMask/metamask-extension/pull/19800))
+- Fix connection issues on some dapps, and ensure that `eth_requestAccount` returns accounts when opening multiple tabs for the same dapp ([#19727](https://github.com/MetaMask/metamask-extension/pull/19727))
+- Fix UI bugs in contacts page ([#19646](https://github.com/MetaMask/metamask-extension/pull/19646))
+- Ensure correct logo shown on Linea ([#19717](https://github.com/MetaMask/metamask-extension/pull/19717))
+- Fix the autolock field in settings on firefox ([#19653](https://github.com/MetaMask/metamask-extension/pull/19653))
+- Prevent duplicate account names that only differ by letter casing ([#19616](https://github.com/MetaMask/metamask-extension/pull/19616))
+- Ensure token details stay within asset dropdown border ([#19626](https://github.com/MetaMask/metamask-extension/pull/19626))
+- Prevent rounded corners in account menu ([#19615](https://github.com/MetaMask/metamask-extension/pull/19615))
+- Ensure network changes before the user accepts a wallet_watchAsset request add the NFT to pre-change chain ID and address ([#19629](https://github.com/MetaMask/metamask-extension/pull/19629))
+- Fix performance degradations noticable on Firefox builds ([#19993](https://github.com/MetaMask/metamask-extension/pull/19993))
+- Fix copy to clipboard of public address, so that it is only cleared from the clipboard after 60 seconds ([#19948](https://github.com/MetaMask/metamask-extension/pull/19948))
+- Fix overlapping text, in some language, in home screen buttons ([#19920](https://github.com/MetaMask/metamask-extension/pull/19920))
+
+
 ## [10.33.1]
 ### Fixed
 - Fix to bug causing users to see an infinite spinner when signing typed messages. ([#19894](https://github.com/MetaMask/metamask-extension/pull/19894))
@@ -3829,7 +3853,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.33.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.34.0...HEAD
+[10.34.0]: https://github.com/MetaMask/metamask-extension/compare/v10.33.1...v10.34.0
 [10.33.1]: https://github.com/MetaMask/metamask-extension/compare/v10.33.0...v10.33.1
 [10.33.0]: https://github.com/MetaMask/metamask-extension/compare/v10.32.0...v10.33.0
 [10.32.0]: https://github.com/MetaMask/metamask-extension/compare/v10.31.1...v10.32.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.33.1",
+  "version": "10.34.0",
   "private": true,
   "repository": {
     "type": "git",

shared/constants/metametrics.ts

@@ -583,10 +583,19 @@ export enum MetaMetricsEventName {
   WalletSetupFailed = 'Wallet Setup Failed',
   WalletCreated = 'Wallet Created',
   ///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
-  UserClickedDeepLink = 'User Clicked Deeplink',
-  UserClickedConnectCustodialAccount = 'Clicked Connect Custodial Account',
-  UserClickedPortfolioButton = 'Clicked Portfolio Button',
-  UserClickedCompliance = 'Clicked Compliance',
+  DeeplinkClicked = 'Deeplink Clicked',
+  ConnectCustodialAccountClicked = 'Connect Custodial Account Clicked',
+  MMIPortfolioButtonClicked = 'MMI Portfolio Button Clicked',
+  StakeButtonClicked = 'Stake Button Clicked',
+  ComplianceButtonClicked = 'Compliance Button Clicked',
+  RefreshTokenListClicked = 'Refresh Token List Clicked',
+  SignatureDeeplinkDisplayed = 'Signature Deeplink Displayed',
+  InstitutionalFeatureConnected = 'Institutional Feature Connected',
+  CustodianSelected = 'Custodian Selected',
+  CustodianConnected = 'Custodian Connected',
+  CustodianConnectionCanceled = 'Custodian Connection Canceled',
+  CustodianConnectionFailed = 'Custodian Connection Failed',
+  CustodialAccountsConnected = 'Custodial Accounts Connected',
   ///: END:ONLY_INCLUDE_IN
   AccountDetailMenuOpened = 'Account Details Menu Opened',
   BlockExplorerLinkClicked = 'Block Explorer Clicked',

ui/components/app/signature-request/signature-request.component.js

@@ -11,7 +11,12 @@ import {
   shortenAddress,
   ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/utils/util';
-import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  ///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
+  MetaMetricsEventName,
+  ///: END:ONLY_INCLUDE_IN
+} from '../../../../shared/constants/metametrics';
 import SiteOrigin from '../../ui/site-origin';
 import Button from '../../ui/button';
 import ContractDetailsModal from '../modals/contract-details-modal/contract-details-modal';
@@ -121,8 +126,8 @@ export default class SignatureRequest extends PureComponent {
         onDeepLinkFetched: () => undefined,
         onDeepLinkShown: () => {
           this.context.trackEvent({
-            category: 'MMI',
-            event: 'Show deeplink for signature',
+            category: MetaMetricsEventCategory.MMI,
+            event: MetaMetricsEventName.SignatureDeeplinkDisplayed,
           });
         },
       });

ui/components/app/transaction-list-item/transaction-list-item.component.js

@@ -51,6 +51,7 @@ import {
 import {
   checkNetworkAndAccountSupports1559,
   getCurrentNetwork,
+  getTestNetworkBackgroundColor,
 } from '../../../selectors';
 import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
 import { formatDateWithYearContext } from '../../../helpers/utils/util';
@@ -77,6 +78,7 @@ function TransactionListItemInner({
   const [showRetryEditGasPopover, setShowRetryEditGasPopover] = useState(false);
   const { supportsEIP1559 } = useGasFeeContext();
   const { openModal } = useTransactionModalContext();
+  const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
 
   const {
     initialTransaction: { id },
@@ -276,6 +278,7 @@ function TransactionListItemInner({
                   src={currentChain?.rpcPrefs?.imageUrl}
                   borderWidth={1}
                   borderColor={BackgroundColor.backgroundDefault}
+                  backgroundColor={testNetworkBackgroundColor}
                 />
               }
             >

ui/components/app/wallet-overview/eth-overview.js

@@ -73,15 +73,15 @@ const EthOverview = ({ className, showAddress }) => {
 
   const portfolioEvent = () => {
     trackEvent({
-      category: 'Navigation',
-      event: 'Clicked Portfolio Button',
+      category: MetaMetricsEventCategory.Navigation,
+      event: MetaMetricsEventName.MMIPortfolioButtonClicked,
     });
   };
 
   const stakingEvent = () => {
     trackEvent({
-      category: 'Navigation',
-      event: 'Clicked Stake Button',
+      category: MetaMetricsEventCategory.Navigation,
+      event: MetaMetricsEventName.MMIPortfolioButtonClicked,
     });
   };
 

ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js

@@ -70,7 +70,7 @@ const CustodyConfirmLink = ({ hideModal }) => {
 
     trackEvent({
       category: MetaMetricsEventCategory.MMI,
-      event: MetaMetricsEventName.UserClickedDeepLink,
+      event: MetaMetricsEventName.DeeplinkClicked,
     });
     dispatch(mmiActions.setWaitForConfirmDeepLinkDialog(false));
     dispatch(hideModal());

ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.js

@@ -26,6 +26,10 @@ import {
   TextAlign,
   AlignItems,
 } from '../../../helpers/constants/design-system';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 const InteractiveReplacementTokenModal = () => {
   const t = useI18nContext();
@@ -55,8 +59,8 @@ const InteractiveReplacementTokenModal = () => {
     });
 
     trackEvent({
-      category: 'MMI',
-      event: 'User clicked refresh token link',
+      category: MetaMetricsEventCategory.MMI,
+      event: MetaMetricsEventName.ComplianceButtonClicked,
     });
   };
 

ui/components/multichain/account-list-menu/account-list-menu.js

@@ -298,7 +298,7 @@ export const AccountListMenu = ({ onClose }) => {
                       trackEvent({
                         category: MetaMetricsEventCategory.Navigation,
                         event:
-                          MetaMetricsEventName.UserClickedConnectCustodialAccount,
+                          MetaMetricsEventName.ConnectCustodialAccountClicked,
                       });
                       if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
                         global.platform.openExtensionInBrowser(

ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap

@@ -7,7 +7,7 @@ exports[`App Header should match snapshot 1`] = `
     data-testid="app-header-logo"
   >
     <button
-      class="box app-header__logo-container app-header__logo-container--clickable box--flex-direction-row box--background-color-transparent"
+      class="mm-box app-header__logo-container app-header__logo-container--clickable mm-box--background-color-transparent"
       data-testid="app-header-logo"
     >
       <svg

ui/components/multichain/app-header/app-header.scss

@@ -73,6 +73,7 @@
   flex: 0 0 auto;
 }
 
+///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
 .custody-logo {
   @media screen and (max-width: $break-small) {
     display: none;
@@ -84,6 +85,19 @@
   }
 }
 
+.app-header__custody-logo {
+  &--icon {
+    height: 16px;
+    margin-left: 15px;
+    margin-top: 4px;
+
+    @media screen and (min-width: $break-large) {
+      display: none;
+    }
+  }
+}
+///: END:ONLY_INCLUDE_IN
+
 .app-header__metafox-logo {
   &--icon {
     height: 32px;

ui/components/multichain/global-menu/global-menu.js

@@ -113,7 +113,7 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
             onClick={() => {
               trackEvent({
                 category: MetaMetricsEventCategory.Navigation,
-                event: MetaMetricsEventName.UserClickedPortfolioButton,
+                event: MetaMetricsEventName.MMIPortfolioButtonClicked,
               });
               window.open(mmiPortfolioUrl, '_blank');
               closeMenu();

ui/components/multichain/network-list-menu/network-list-menu.js

@@ -95,7 +95,7 @@ export const NetworkListMenu = ({ onClose }) => {
           iconSrc={network?.rpcPrefs?.imageUrl}
           key={`${network.id || network.chainId}-${index}`}
           selected={isCurrentNetwork}
-          onClick={async () => {
+          onClick={() => {
             dispatch(toggleNetworkMenu());
             if (network.providerType) {
               dispatch(setProviderType(network.providerType));

ui/components/ui/metafox-logo/__snapshots__/metafox-logo.component.test.js.snap

@@ -3,7 +3,7 @@
 exports[`MetaFoxLogo does match snapshot with custodyImgSrc 1`] = `
 <div>
   <button
-    class="box app-header__logo-container box--flex-direction-row box--background-color-transparent"
+    class="mm-box app-header__logo-container mm-box--background-color-transparent"
     data-testid="app-header-logo"
   >
     <div />
@@ -28,7 +28,7 @@ exports[`MetaFoxLogo does match snapshot with custodyImgSrc 1`] = `
 exports[`MetaFoxLogo does not set icon height and width when unsetIconHeight is true 1`] = `
 <div>
   <button
-    class="box app-header__logo-container box--flex-direction-row box--background-color-transparent"
+    class="mm-box app-header__logo-container mm-box--background-color-transparent"
     data-testid="app-header-logo"
   >
     <div />
@@ -44,7 +44,7 @@ exports[`MetaFoxLogo does not set icon height and width when unsetIconHeight is
 exports[`MetaFoxLogo should match snapshot with img width and height default set to 42 1`] = `
 <div>
   <button
-    class="box app-header__logo-container box--flex-direction-row box--background-color-transparent"
+    class="mm-box app-header__logo-container mm-box--background-color-transparent"
     data-testid="app-header-logo"
   >
     <div />

ui/components/ui/metafox-logo/metafox-logo.component.js

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import Box from '../box/box';
+import { Box } from '../../component-library';
 import { BackgroundColor } from '../../../helpers/constants/design-system';
 import MetaFoxHorizontalLogo from './horizontal-logo';
 

ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js

@@ -26,6 +26,10 @@ import {
   Box,
 } from '../../../components/component-library';
 import { Text } from '../../../components/component-library/text/deprecated';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   complianceActivated,
   getInstitutionalConnectRequests,
@@ -59,8 +63,8 @@ const ConfirmAddCustodianToken = () => {
   }
 
   trackEvent({
-    category: 'MMI',
-    event: 'Custodian onboarding',
+    category: MetaMetricsEventCategory.MMI,
+    event: MetaMetricsEventName.TokenAdded,
     properties: {
       actions: 'Custodian RPC request',
       custodian: connectRequest.custodian,
@@ -184,8 +188,8 @@ const ConfirmAddCustodianToken = () => {
                 );
 
                 trackEvent({
-                  category: 'MMI',
-                  event: 'Custodian onboarding',
+                  category: MetaMetricsEventCategory.MMI,
+                  event: MetaMetricsEventName.TokenAdded,
                   properties: {
                     actions: 'Custodian RPC cancel',
                     custodian: connectRequest.custodian,
@@ -238,8 +242,8 @@ const ConfirmAddCustodianToken = () => {
                   );
 
                   trackEvent({
-                    category: 'MMI',
-                    event: 'Custodian onboarding',
+                    category: MetaMetricsEventCategory.MMI,
+                    event: MetaMetricsEventName.TokenAdded,
                     properties: {
                       actions: 'Custodian RPC confirm',
                       custodian: connectRequest.custodian,

ui/pages/institutional/confirm-add-institutional-feature/confirm-add-institutional-feature.js

@@ -21,6 +21,10 @@ import {
 } from '../../../helpers/constants/design-system';
 import Box from '../../../components/ui/box';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 export default function ConfirmAddInstitutionalFeature({ history }) {
   const t = useI18nContext();
@@ -52,8 +56,8 @@ export default function ConfirmAddInstitutionalFeature({ history }) {
 
   const sendEvent = ({ actions, service }) => {
     trackEvent({
-      category: 'MMI',
-      event: 'Institutional feature connection',
+      category: MetaMetricsEventCategory.MMI,
+      event: MetaMetricsEventName.InstitutionalFeatureConnected,
       properties: {
         actions,
         service,