Rename DAPP_VISITED to DAPP_VIEWED. Delete redundant event

app/actions/browser/index.js

@@ -2,18 +2,18 @@
  * Browser actions for Redux
  */
 export const BrowserActionTypes = {
-  ADD_TO_VISITED_DAPP: 'ADD_TO_VISITED_DAPP',
+  ADD_TO_VIEWED_DAPP: 'ADD_TO_VIEWED_DAPP',
 };
 
 /**
- * Adds a new entry to visited dapps
+ * Adds a new entry to viewed dapps
  *
  * @param {string} hostname - Dapp hostname
  * @returns
  */
-export function addToVisitedDapp(hostname) {
+export function addToViewedDapp(hostname) {
   return {
-    type: BrowserActionTypes.ADD_TO_VISITED_DAPP,
+    type: BrowserActionTypes.ADD_TO_VIEWED_DAPP,
     hostname,
   };
 }

app/components/Views/AccountConnect/AccountConnect.tsx

@@ -55,7 +55,7 @@ import useFavicon from '../../hooks/useFavicon/useFavicon';
 import URLParse from 'url-parse';
 import SDKConnect from '../../../core/SDKConnect/SDKConnect';
 import AppConstants from '../../../../app/core/AppConstants';
-import { trackDappVisitedEvent } from '../../../util/metrics';
+import { trackDappViewedEvent } from '../../../util/metrics';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 
 const AccountConnect = (props: AccountConnectProps) => {
@@ -152,10 +152,10 @@ const AccountConnect = (props: AccountConnectProps) => {
     ],
   );
 
-  const triggerDappVisitedEvent = useCallback(
+  const triggerDappViewedEvent = useCallback(
     (numberOfConnectedAccounts: number) =>
-      // Track dapp visited event
-      trackDappVisitedEvent({ hostname, numberOfConnectedAccounts }),
+      // Track dapp viewed event
+      trackDappViewedEvent({ hostname, numberOfConnectedAccounts }),
     [hostname],
   );
 
@@ -186,7 +186,7 @@ const AccountConnect = (props: AccountConnectProps) => {
         request,
       );
 
-      triggerDappVisitedEvent(connectedAccountLength);
+      triggerDappViewedEvent(connectedAccountLength);
 
       trackEvent(MetaMetricsEvents.CONNECT_REQUEST_COMPLETED, {
         number_of_accounts: accountsLength,
@@ -231,7 +231,7 @@ const AccountConnect = (props: AccountConnectProps) => {
     toastRef,
     accountsLength,
     metadataOrigin,
-    triggerDappVisitedEvent,
+    triggerDappViewedEvent,
     trackEvent,
   ]);
 

app/components/Views/BrowserTab/index.js

@@ -99,7 +99,7 @@ import { regex } from '../../../../app/util/regex';
 import { selectChainId } from '../../../selectors/networkController';
 import { BrowserViewSelectorsIDs } from '../../../../e2e/selectors/BrowserView.selectors';
 import { useMetrics } from '../../../components/hooks/useMetrics';
-import trackDappVisitedEvent from '../../../util/metrics/trackDappVisited';
+import { trackDappViewedEvent } from '../../../util/metrics';
 import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
 
 const { HOMEPAGE_URL, NOTIFICATION_NAMES } = AppConstants;
@@ -531,7 +531,7 @@ export const BrowserTab = (props) => {
     [goBack, props.ipfsGateway, setIpfsBannerVisible, props.chainId],
   );
 
-  const triggerDappVisitedEvent = (url) => {
+  const triggerDappViewedEvent = (url) => {
     const permissionsControllerState =
       Engine.context.PermissionController.state;
     const hostname = new URL(url).hostname;
@@ -545,8 +545,8 @@ export const BrowserTab = (props) => {
       return;
     }
 
-    // Track dapp visited event
-    trackDappVisitedEvent({
+    // Track dapp viewed event
+    trackDappViewedEvent({
       hostname,
       numberOfConnectedAccounts: connectedAccounts.length,
     });
@@ -596,7 +596,7 @@ export const BrowserTab = (props) => {
 
         // Skip tracking on initial open
         if (!initialCall) {
-          triggerDappVisitedEvent(urlToGo);
+          triggerDappViewedEvent(urlToGo);
         }
 
         setProgress(0);
@@ -627,7 +627,7 @@ export const BrowserTab = (props) => {
     const { current } = webviewRef;
 
     current && current.reload();
-    triggerDappVisitedEvent(url.current);
+    triggerDappViewedEvent(url.current);
   }, []);
 
   /**

app/core/Analytics/MetaMetrics.events.ts

@@ -151,7 +151,7 @@ enum EVENT_NAME {
   BROWSER_RELOAD = 'Reload Browser',
   BROWSER_ADD_FAVORITES = 'Added Site To Favorites',
   BROWSER_SWITCH_TAB = 'Switched tab within Browser',
-  DAPP_VISITED = 'Dapp Visited',
+  DAPP_VIEWED = 'Dapp Viewed',
 
   // Security & Privacy Settings
   VIEW_SECURITY_SETTINGS = 'Views Security & Privacy',
@@ -534,7 +534,7 @@ const events = {
   BROWSER_SHARE_SITE: generateOpt(EVENT_NAME.BROWSER_SHARE_SITE),
   BROWSER_RELOAD: generateOpt(EVENT_NAME.BROWSER_RELOAD),
   BROWSER_ADD_FAVORITES: generateOpt(EVENT_NAME.BROWSER_ADD_FAVORITES),
-  DAPP_VISITED: generateOpt(EVENT_NAME.DAPP_VISITED),
+  DAPP_VIEWED: generateOpt(EVENT_NAME.DAPP_VIEWED),
   // Security & Privacy Settings
   VIEW_SECURITY_SETTINGS: generateOpt(EVENT_NAME.VIEW_SECURITY_SETTINGS),
   // Reveal SRP

app/reducers/browser/index.js

@@ -7,12 +7,12 @@ const initialState = {
   tabs: [],
   favicons: [],
   activeTab: null,
-  // Keep track of visited Dapps, which is used for MetaMetricsEvents.DAPP_VIEWED event
+  // Keep track of viewed Dapps, which is used for MetaMetricsEvents.DAPP_VIEWED event
   visitedDappsByHostname: {},
 };
 const browserReducer = (state = initialState, action) => {
   switch (action.type) {
-    case BrowserActionTypes.ADD_TO_VISITED_DAPP: {
+    case BrowserActionTypes.ADD_TO_VIEWED_DAPP: {
       const { hostname } = action;
       return {
         ...state,

app/util/metrics/index.ts

@@ -1,9 +1,9 @@
 import DeviceAnalyticsMetaData from './DeviceAnalyticsMetaData/generateDeviceAnalyticsMetaData';
 import UserSettingsAnalyticsMetaData from './UserSettingsAnalyticsMetaData/generateUserProfileAnalyticsMetaData';
 import TrackAfterInteractions from './TrackAfterInteraction/trackAfterInteractions';
-import trackDappVisitedEvent from './trackDappVisitedEvent';
+import trackDappViewedEvent from './trackDappViewedEvent';
 
 export default DeviceAnalyticsMetaData;
 export { UserSettingsAnalyticsMetaData };
 export { TrackAfterInteractions };
-export { trackDappVisitedEvent };
+export { trackDappViewedEvent };

app/util/metrics/trackDappVisited/index.test.ts → app/util/metrics/trackDappViewedEvent/index.test.ts

@@ -1,4 +1,4 @@
-import trackDappVisitedEvent from './index';
+import trackDappViewedEvent from './index';
 import { MetaMetrics, MetaMetricsEvents } from '../../../core/Analytics';
 
 jest.mock('../../../core/Analytics/MetaMetrics');
@@ -34,7 +34,7 @@ jest.mock('../../../store', () => {
   };
 });
 
-describe('trackDappVisitedEvent', () => {
+describe('trackDappViewedEvent', () => {
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -60,13 +60,13 @@ describe('trackDappVisitedEvent', () => {
       source: 'in-app browser',
     };
 
-    trackDappVisitedEvent({
+    trackDappViewedEvent({
       hostname: 'uniswap.org',
       numberOfConnectedAccounts: 1,
     });
 
     expect(mockMetrics.trackEvent).toBeCalledWith(
-      MetaMetricsEvents.DAPP_VISITED,
+      MetaMetricsEvents.DAPP_VIEWED,
       expectedMetrics,
     );
   });
@@ -92,13 +92,13 @@ describe('trackDappVisitedEvent', () => {
       source: 'in-app browser',
     };
 
-    trackDappVisitedEvent({
+    trackDappViewedEvent({
       hostname: 'uniswap.org',
       numberOfConnectedAccounts: 1,
     });
 
     expect(mockMetrics.trackEvent).toBeCalledWith(
-      MetaMetricsEvents.DAPP_VISITED,
+      MetaMetricsEvents.DAPP_VIEWED,
       expectedMetrics,
     );
   });
@@ -124,13 +124,13 @@ describe('trackDappVisitedEvent', () => {
       source: 'in-app browser',
     };
 
-    trackDappVisitedEvent({
+    trackDappViewedEvent({
       hostname: 'uniswap.org',
       numberOfConnectedAccounts: 1,
     });
 
     expect(mockMetrics.trackEvent).toBeCalledWith(
-      MetaMetricsEvents.DAPP_VISITED,
+      MetaMetricsEvents.DAPP_VIEWED,
       expectedMetrics,
     );
   });
@@ -156,13 +156,13 @@ describe('trackDappVisitedEvent', () => {
       source: 'in-app browser',
     };
 
-    trackDappVisitedEvent({
+    trackDappViewedEvent({
       hostname: 'uniswap.org',
       numberOfConnectedAccounts: 1,
     });
 
     expect(mockMetrics.trackEvent).toBeCalledWith(
-      MetaMetricsEvents.DAPP_VISITED,
+      MetaMetricsEvents.DAPP_VIEWED,
       expectedMetrics,
     );
   });

app/util/metrics/trackDappVisited/index.ts → app/util/metrics/trackDappViewedEvent/index.ts

@@ -1,18 +1,18 @@
 import { store } from '../../../store';
 import { selectIdentities } from '../../../selectors/preferencesController';
-import { addToVisitedDapp } from '../../../actions/browser';
+import { addToViewedDapp } from '../../../actions/browser';
 import { MetaMetrics, MetaMetricsEvents } from '../../../core/Analytics';
 
 /**
- * Tracks Dapp visited event
+ * Tracks Dapp viewed event
  *
- * This is used to track when a user visits a Dapp in the in-app browser
+ * This is used to track when a user viewed a Dapp in the in-app browser
  *
  * @param params - The parameter object for the tracking function
  * @param params.hostname - Hostname of the Dapp
  * @param params.numberOfConnectedAccounts - Number of connected accounts that are connected to the Dapp
  */
-const trackDappVisitedEvent = ({
+const trackDappViewedEvent = ({
   hostname,
   numberOfConnectedAccounts,
 }: {
@@ -25,15 +25,15 @@ const trackDappVisitedEvent = ({
   const accountByAddress = selectIdentities(store.getState());
   const numberOfWalletAccounts = Object.keys(accountByAddress).length;
 
-  // Add Dapp hostname to visited dapps
-  store.dispatch(addToVisitedDapp(hostname));
+  // Add Dapp hostname to viewed dapps
+  store.dispatch(addToViewedDapp(hostname));
 
-  MetaMetrics.getInstance().trackEvent(MetaMetricsEvents.DAPP_VISITED, {
+  MetaMetrics.getInstance().trackEvent(MetaMetricsEvents.DAPP_VIEWED, {
     is_first_visit: isFirstVisit,
     number_of_accounts: numberOfWalletAccounts,
     number_of_accounts_connected: numberOfConnectedAccounts,
     source: 'in-app browser',
   });
 };
 
-export default trackDappVisitedEvent;
+export default trackDappViewedEvent;