update remaining files and remove legacy analytics

MetaMask · Feb 27, 2024 · 6dd6384 · 6dd6384
1 parent 4411edc
commit 6dd6384
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 635 deletions.
diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -31,7 +31,6 @@ import branch from 'react-native-branch';
 import AppConstants from '../../../core/AppConstants';
 import Logger from '../../../util/Logger';
 import { routingInstrumentation } from '../../../util/sentry/utils';
-import Analytics from '../../../core/Analytics/Analytics';
 import { connect, useDispatch } from 'react-redux';
 import {
   CURRENT_APP_VERSION,
@@ -370,13 +369,12 @@ const App = ({ userLoggedIn }) => {
   }, [dispatch, handleDeeplink, navigator, queueOfHandleDeeplinkFunctions]);
 
   useEffect(() => {
-    const initAnalytics = async () => {
+    const initMetrics = async () => {
       await MetaMetrics.getInstance().configure();
-      await Analytics.init();
     };
 
-    initAnalytics().catch((err) => {
-      Logger.error(err, 'Error initializing analytics');
+    initMetrics().catch((err) => {
+      Logger.error(err, 'Error initializing MetaMetrics');
     });
   }, []);
 

diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
@@ -169,14 +169,17 @@ export function getTransactionsNavbarOptions(
  *
  * @param {string} title - Title in string format
  * @param {Object} navigation - Navigation object required to push new views
+ * @param isFullScreenModal
+ * @param themeColors
+ * @param {IMetaMetricsEvent} navigationPopEvent
  * @returns {Object} - Corresponding navbar options containing title and headerTitleStyle
  */
 export function getNavigationOptionsTitle(
   title,
   navigation,
   isFullScreenModal,
   themeColors,
-  navigationPopEvent = undefined,
+  navigationPopEvent = null,
 ) {
   const innerStyles = StyleSheet.create({
     headerStyle: {

diff --git a/app/components/UI/OptinMetrics/index.js b/app/components/UI/OptinMetrics/index.js
@@ -20,8 +20,10 @@ import { connect } from 'react-redux';
 import { clearOnboardingEvents } from '../../../actions/onboarding';
 import { ONBOARDING_WIZARD } from '../../../constants/storage';
 import AppConstants from '../../../core/AppConstants';
-import { Analytics, MetaMetricsEvents } from '../../../core/Analytics';
-import { withMetricsAwareness } from '../../hooks/useMetrics';
+import {
+  MetaMetricsEvents,
+  withMetricsAwareness,
+} from '../../hooks/useMetrics';
 
 import DefaultPreference from 'react-native-default-preference';
 import { ThemeContext } from '../../../util/theme';
@@ -272,7 +274,6 @@ class OptinMetrics extends PureComponent {
       // and disable analytics
       clearOnboardingEvents();
       await metrics.enable(false);
-      Analytics.disableInstance();
     }, 200);
     this.continue();
   };

diff --git a/app/components/Views/Quiz/SRPQuiz/SRPQuiz.tsx b/app/components/Views/Quiz/SRPQuiz/SRPQuiz.tsx
@@ -67,8 +67,8 @@ const SRPQuiz = () => {
   );
 
   const goToRevealPrivateCredential = useCallback((): void => {
-    trackEvent(MetaMetricsEvents.REVEAL_SRP_INITIATED, {});
-    trackEvent(MetaMetricsEvents.REVEAL_SRP_CTA, {});
+    trackEvent(MetaMetricsEvents.REVEAL_SRP_INITIATED);
+    trackEvent(MetaMetricsEvents.REVEAL_SRP_CTA);
     navigation.navigate(Routes.SETTINGS.REVEAL_PRIVATE_CREDENTIAL, {
       credentialName: 'seed_phrase',
       shouldUpdateNav: true,

diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -19,7 +19,6 @@ import Logger from '../../../../util/Logger';
 import { getNavigationOptionsTitle } from '../../../UI/Navbar';
 import { setLockTime } from '../../../../actions/settings';
 import { strings } from '../../../../../locales/i18n';
-import Analytics from '../../../../core/Analytics/Analytics';
 import { passwordSet } from '../../../../actions/user';
 import Engine from '../../../../core/Engine';
 import AppConstants from '../../../../core/AppConstants';
@@ -119,8 +118,8 @@ import Button, {
   ButtonSize,
   ButtonWidthTypes,
 } from '../../../../component-library/components/Buttons/Button';
-import { trackErrorAsAnalytics } from '../../../../util/analyticsV2';
 import { isBlockaidFeatureEnabled } from '../../../../util/blockaid';
+import trackErrorAsAnalytics from '../../../../util/metrics/TrackError/trackErrorAsAnalytics';
 
 const Heading: React.FC<HeadingProps> = ({ children, first }) => {
   const { colors } = useTheme();
@@ -450,8 +449,6 @@ const Settings: React.FC = () => {
 
   const toggleMetricsOptIn = async (metricsEnabled: boolean) => {
     if (metricsEnabled) {
-      Analytics.enable();
-
       const consolidatedTraits = {
         ...generateDeviceAnalyticsMetaData(),
         ...generateUserSettingsAnalyticsMetaData(),
@@ -460,21 +457,14 @@ const Settings: React.FC = () => {
       setAnalyticsEnabled(true);
 
       InteractionManager.runAfterInteractions(async () => {
-        // Segment metrics optin tracking
         await addTraitsToUser(consolidatedTraits);
         trackEvent(MetaMetricsEvents.ANALYTICS_PREFERENCE_SELECTED, {
           analytics_option_selected: 'Metrics Opt in',
           updated_after_onboarding: true,
         });
-        // Legacy metrics optin tracking
-        trackEvent(MetaMetricsEvents.ANALYTICS_PREFERENCE_SELECTED, {
-          analytics_option_selected: 'Metrics Opt in',
-          updated_after_onboarding: true,
-        });
       });
     } else {
       await enable(false);
-      Analytics.disable();
       setAnalyticsEnabled(false);
       Alert.alert(
         strings('app_settings.metametrics_opt_out'),