fix: fix changes that were introduced in (#26807) but broken by 3e1094a…

… (#27435)

This PR correctly applies the changes from #26807 and #26924 to master.
These were broken, probably by careless human error, in 3e1094a

---------

Co-authored-by: Matteo Scurati <matteo.scurati@gmail.com>

app/scripts/metamask-controller.js

@@ -1488,8 +1488,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

@@ -38,7 +38,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,
               },
             });