Merge pull request #27541 from MetaMask/resolve-conflict-12.4.0

chore: Resolve conflict v12.4.0

CHANGELOG.md

@@ -110,6 +110,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix: Remove double padding on Snap home page ([#26462](https://github.com/MetaMask/metamask-extension/pull/26462))
 - chore(webpack): update `html-bundler-webpack-plugin` from `v3.6.5` to `v3.17.3` ([#26371](https://github.com/MetaMask/metamask-extension/pull/26371))
 
+## [12.3.1]
+### Fixed
+- Fix duplicate network validation ([#27463](https://github.com/MetaMask/metamask-extension/pull/27463))
+- Fix notification metrics ([#27435](https://github.com/MetaMask/metamask-extension/pull/27435))
+- Fix transaction metrics ([#27457](https://github.com/MetaMask/metamask-extension/pull/27457))
+
 ## [12.3.0]
 ### Added
 - Added the ability to name accounts during the snap account creation flow ([#25191](https://github.com/MetaMask/metamask-extension/pull/25191))
@@ -5573,7 +5579,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.4.0...HEAD
-[12.4.0]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...v12.4.0
+[12.4.0]: https://github.com/MetaMask/metamask-extension/compare/v12.3.1...v12.4.0
+[12.3.1]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...v12.3.1
 [12.3.0]: https://github.com/MetaMask/metamask-extension/compare/v12.2.4...v12.3.0
 [12.2.4]: https://github.com/MetaMask/metamask-extension/compare/v12.2.3...v12.2.4
 [12.2.3]: https://github.com/MetaMask/metamask-extension/compare/v12.2.2...v12.2.3

app/scripts/lib/transaction/metrics.ts

@@ -813,10 +813,10 @@ async function buildEventFragmentProperties({
 
   let contractMethodName;
   if (transactionMeta.txParams.data) {
-    const { name } = await transactionMetricsRequest.getMethodData(
+    const methodData = await transactionMetricsRequest.getMethodData(
       transactionMeta.txParams.data,
     );
-    contractMethodName = name;
+    contractMethodName = methodData?.name;
   }
 
   // TODO: Replace `any` with type

app/scripts/metamask-controller.js

@@ -1534,8 +1534,6 @@ export default class MetamaskController extends EventEmitter {
             notification_id: notification.id,
             notification_type: notification.type,
             chain_id: notification?.chain_id,
-            notification_is_read: notification.isRead,
-            click_type: 'push_notification',
           },
         });
       },

test/e2e/tests/metrics/nft-detection-metrics.spec.js

@@ -102,7 +102,6 @@ describe('Nft detection event @no-mmi', function () {
           chain_id: '0x539',
           environment_type: 'fullscreen',
           is_profile_syncing_enabled: null,
-          is_signed_in: false,
         });
         assert.deepStrictEqual(events[2].properties, {
           nft_autodetection_enabled: true,

test/e2e/tests/metrics/token-detection-metrics.spec.js

@@ -99,7 +99,6 @@ describe('Token detection event @no-mmi', function () {
           chain_id: '0x539',
           environment_type: 'fullscreen',
           is_profile_syncing_enabled: null,
-          is_signed_in: false,
         });
         assert.deepStrictEqual(events[2].properties, {
           token_detection_enabled: true,

test/e2e/tests/metrics/wallet-created.spec.js

@@ -88,7 +88,6 @@ describe('Wallet Created Events @no-mmi', function () {
           chain_id: '0x539',
           environment_type: 'fullscreen',
           is_profile_syncing_enabled: null,
-          is_signed_in: false,
         });
       },
     );

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

@@ -148,6 +148,7 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
 
     if (shouldShowEnableModal) {
       trackEvent({
+        category: MetaMetricsEventCategory.NotificationsActivationFlow,
         event: MetaMetricsEventName.NotificationsActivated,
         properties: {
           action_type: 'started',

ui/components/multichain/notification-detail-button/notification-detail-button.tsx

@@ -41,7 +41,7 @@ export const NotificationDetailButton = ({
   const onClick = () => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationClicked,
+      event: MetaMetricsEventName.NotificationDetailClicked,
       properties: {
         notification_id: notification.id,
         notification_type: notification.type,

ui/pages/onboarding-flow/creation-successful/creation-successful.js

@@ -25,7 +25,6 @@ import {
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useCreateSession } from '../../../hooks/metamask-notifications/useCreateSession';
 import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
-import { selectIsSignedIn } from '../../../selectors/metamask-notifications/authentication';
 
 export default function CreationSuccessful() {
   const history = useHistory();
@@ -37,8 +36,6 @@ export default function CreationSuccessful() {
 
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
 
-  const isSignedIn = useSelector(selectIsSignedIn);
-
   return (
     <div className="creation-successful" data-testid="creation-successful">
       <Box textAlign={TextAlign.Center}>
@@ -118,7 +115,6 @@ export default function CreationSuccessful() {
               event: MetaMetricsEventName.OnboardingWalletCreationComplete,
               properties: {
                 method: firstTimeFlowType,
-                is_signed_in: isSignedIn,
                 is_profile_syncing_enabled: isProfileSyncingEnabled,
               },
             });

ui/pages/settings/networks-tab/networks-form/networks-form.js

@@ -490,6 +490,7 @@ const NetworksForm = ({
       }
 
       if (
+        networkMenuRedesign &&
         addNewNetwork &&
         networksList.some(
           (network) =>