Merge branch 'main' into fix/TRAM-3579

Author: meltingice1337

app/components/Views/SocialLeaderboard/FeedView/FeedView.test.tsx

@@ -165,6 +165,7 @@ describe('FeedView', () => {
     jest.clearAllMocks();
     mockFeedResult = buildResult();
     mockQuickBuyAnalyticsContext = undefined;
+    handleTypeFilterChange = undefined;
   });
 
   it('renders the type selector, audience toggle, and feed list when items exist', () => {
@@ -269,50 +270,52 @@ describe('FeedView', () => {
     );
   });
 
-  it('navigates to the trader profile when the trader identity is pressed', () => {
-    renderWithProvider(<FeedView />);
-
-    fireEvent.press(screen.getByTestId(getFeedTraderTestId('feed-1')));
-
-    expect(mockNavigate).toHaveBeenCalledWith(
-      Routes.SOCIAL_LEADERBOARD.PROFILE,
-      expect.objectContaining({
-        traderId: 'trader-1',
-        traderName: 'dutchiono',
-        traderAddress: '0x1111111111111111111111111111111111111111',
-        source: 'trader_feed',
-      }),
-    );
-  });
-
-  it('tracks audience filter changes', () => {
+  it('tracks audience filter changes via Trader Feed Interaction', () => {
     renderWithProvider(<FeedView />);
 
     fireEvent.press(screen.getByTestId(getFeedAudienceOptionTestId('all')));
 
     expect(mockTrack).toHaveBeenCalledWith(
-      MetaMetricsEvents.SOCIAL_TRADER_FEED_AUDIENCE_FILTER_CHANGED,
+      MetaMetricsEvents.SOCIAL_TRADER_FEED_INTERACTION,
       {
+        interaction_type: 'audience_filter_changed',
         feed_audience: 'all',
       },
     );
   });
 
-  it('tracks type filter changes', () => {
+  it('tracks type filter changes via Trader Feed Interaction', () => {
     renderWithProvider(<FeedView />);
 
     fireEvent.press(screen.getByTestId(FeedViewSelectorsIDs.TYPE_SELECTOR));
     fireEvent.press(screen.getByTestId(getFeedTypeOptionTestId('tokens')));
 
     expect(mockTrack).toHaveBeenCalledWith(
-      MetaMetricsEvents.SOCIAL_TRADER_FEED_TYPE_FILTER_CHANGED,
+      MetaMetricsEvents.SOCIAL_TRADER_FEED_INTERACTION,
       {
+        interaction_type: 'type_filter_changed',
         feed_type_filter: 'tokens',
         previous_feed_type_filter: 'all',
       },
     );
   });
 
+  it('navigates to the trader profile when the trader identity is pressed', () => {
+    renderWithProvider(<FeedView />);
+
+    fireEvent.press(screen.getByTestId(getFeedTraderTestId('feed-1')));
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.SOCIAL_LEADERBOARD.PROFILE,
+      expect.objectContaining({
+        traderId: 'trader-1',
+        traderName: 'dutchiono',
+        traderAddress: '0x1111111111111111111111111111111111111111',
+        source: 'trader_feed',
+      }),
+    );
+  });
+
   it('tracks chained type filter changes with the correct previous value', () => {
     renderWithProvider(<FeedView />);
 
@@ -324,8 +327,9 @@ describe('FeedView', () => {
     expect(mockTrack).toHaveBeenCalledTimes(2);
     expect(mockTrack).toHaveBeenNthCalledWith(
       2,
-      MetaMetricsEvents.SOCIAL_TRADER_FEED_TYPE_FILTER_CHANGED,
+      MetaMetricsEvents.SOCIAL_TRADER_FEED_INTERACTION,
       {
+        interaction_type: 'type_filter_changed',
         feed_type_filter: 'perps',
         previous_feed_type_filter: 'tokens',
       },

app/components/Views/SocialLeaderboard/FeedView/FeedView.tsx

@@ -153,7 +153,10 @@ const FeedView: React.FC<FeedViewProps> = ({ isActive = true }) => {
         return;
       }
 
-      track(MetaMetricsEvents.SOCIAL_TRADER_FEED_AUDIENCE_FILTER_CHANGED, {
+      track(MetaMetricsEvents.SOCIAL_TRADER_FEED_INTERACTION, {
+        [SocialLeaderboardEventProperties.INTERACTION_TYPE]:
+          SocialLeaderboardEventValues.TRADER_FEED_INTERACTION_TYPE
+            .AUDIENCE_FILTER_CHANGED,
         [SocialLeaderboardEventProperties.FEED_AUDIENCE]: next,
       });
       audienceRef.current = next;
@@ -169,7 +172,10 @@ const FeedView: React.FC<FeedViewProps> = ({ isActive = true }) => {
         return;
       }
 
-      track(MetaMetricsEvents.SOCIAL_TRADER_FEED_TYPE_FILTER_CHANGED, {
+      track(MetaMetricsEvents.SOCIAL_TRADER_FEED_INTERACTION, {
+        [SocialLeaderboardEventProperties.INTERACTION_TYPE]:
+          SocialLeaderboardEventValues.TRADER_FEED_INTERACTION_TYPE
+            .TYPE_FILTER_CHANGED,
         [SocialLeaderboardEventProperties.FEED_TYPE_FILTER]: next,
         [SocialLeaderboardEventProperties.PREVIOUS_FEED_TYPE_FILTER]: previous,
       });

app/components/Views/SocialLeaderboard/SocialTradersTabsView/SocialTradersTabsView.test.tsx

@@ -145,23 +145,24 @@ describe('SocialTradersTabsView', () => {
     ).toBe(true);
   });
 
-  it('tracks tab changes with tap interaction when a different tab is pressed', () => {
+  it('tracks tab changes via Follow Trading Interaction when a different tab is pressed', () => {
     renderWithProvider(<SocialTradersTabsView />);
 
     fireEvent.press(
       screen.getByTestId(`${SocialTradersTabsViewSelectorsIDs.TABS}-tab-1`),
     );
 
     expect(mockTrack).toHaveBeenCalledWith(
-      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_TAB_CHANGED,
+      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_INTERACTION,
       {
+        interaction_type: 'tab_changed',
         tab: 'tab_feed',
-        interaction_type: 'tap',
+        tab_change_method: 'tap',
       },
     );
   });
 
-  it('tracks tab changes with swipe interaction when the pager reports a page change', () => {
+  it('tracks swipe tab changes via Follow Trading Interaction', () => {
     renderWithProvider(<SocialTradersTabsView />);
 
     fireEvent.press(
@@ -175,10 +176,11 @@ describe('SocialTradersTabsView', () => {
     });
 
     expect(mockTrack).toHaveBeenCalledWith(
-      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_TAB_CHANGED,
+      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_INTERACTION,
       {
+        interaction_type: 'tab_changed',
         tab: 'tab_leaderboard',
-        interaction_type: 'swipe',
+        tab_change_method: 'swipe',
       },
     );
   });
@@ -198,10 +200,11 @@ describe('SocialTradersTabsView', () => {
     });
 
     expect(mockTrack).toHaveBeenCalledWith(
-      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_TAB_CHANGED,
+      MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_INTERACTION,
       {
+        interaction_type: 'tab_changed',
         tab: 'tab_feed',
-        interaction_type: 'swipe',
+        tab_change_method: 'swipe',
       },
     );
   });

app/components/Views/SocialLeaderboard/SocialTradersTabsView/SocialTradersTabsView.tsx

@@ -79,18 +79,21 @@ const SocialTradersTabsView: React.FC = () => {
 
   const changeTab = useCallback(
     (index: number) => {
-      const interactionType = programmaticTabChangeRef.current
-        ? SocialLeaderboardEventValues.INTERACTION_TYPE.TAP
-        : SocialLeaderboardEventValues.INTERACTION_TYPE.SWIPE;
+      const tabChangeMethod = programmaticTabChangeRef.current
+        ? SocialLeaderboardEventValues.TAB_CHANGE_METHOD.TAP
+        : SocialLeaderboardEventValues.TAB_CHANGE_METHOD.SWIPE;
       programmaticTabChangeRef.current = false;
 
       if (activeIndex === index) {
         return;
       }
 
-      track(MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_TAB_CHANGED, {
+      track(MetaMetricsEvents.SOCIAL_FOLLOW_TRADING_INTERACTION, {
+        [SocialLeaderboardEventProperties.INTERACTION_TYPE]:
+          SocialLeaderboardEventValues.FOLLOW_TRADING_INTERACTION_TYPE
+            .TAB_CHANGED,
         [SocialLeaderboardEventProperties.TAB]: getTabAnalyticsValue(index),
-        [SocialLeaderboardEventProperties.INTERACTION_TYPE]: interactionType,
+        [SocialLeaderboardEventProperties.TAB_CHANGE_METHOD]: tabChangeMethod,
       });
 
       playSelection().catch(() => undefined);

app/components/Views/SocialLeaderboard/analytics/socialLeaderboardEvents.ts

@@ -29,6 +29,7 @@ export const SocialLeaderboardEventProperties = {
   SCREEN: 'screen',
   SOURCE: 'source',
   TAB: 'tab',
+  TAB_CHANGE_METHOD: 'tab_change_method',
   TRADER_ADDRESS: 'trader_address',
   TRADER_HAS_PROFILE_PICTURE_SET: 'trader_has_profile_picture_set',
   TRADER_RANK: 'trader_rank',
@@ -59,6 +60,13 @@ export const SocialLeaderboardEventValues = {
     TOKENS: 'tokens',
     PERPS: 'perps',
   },
+  FOLLOW_TRADING_INTERACTION_TYPE: {
+    TAB_CHANGED: 'tab_changed',
+  },
+  TRADER_FEED_INTERACTION_TYPE: {
+    AUDIENCE_FILTER_CHANGED: 'audience_filter_changed',
+    TYPE_FILTER_CHANGED: 'type_filter_changed',
+  },
   INTERACTION_TYPE: {
     ALLOW_NOTIFICATIONS: 'allow_notifications',
     BACK: 'back',
@@ -67,8 +75,6 @@ export const SocialLeaderboardEventValues = {
     FOLLOW_TOP_THREE: 'follow_top_three',
     GOT_IT: 'got_it',
     MAYBE_LATER: 'maybe_later',
-    SWIPE: 'swipe',
-    TAP: 'tap',
   },
   NUX_STEP: {
     STEP_1: 'step_1',
@@ -81,6 +87,10 @@ export const SocialLeaderboardEventValues = {
     LEADERBOARD: 'tab_leaderboard',
     OPEN: 'open',
   },
+  TAB_CHANGE_METHOD: {
+    SWIPE: 'swipe',
+    TAP: 'tap',
+  },
   TRADE_TYPE: {
     PERPS: 'perps',
     SPOT: 'spot',

app/components/Views/confirmations/constants/confirmations.ts

@@ -143,3 +143,17 @@ export const MM_PAY_TRANSACTION_TYPES = [
 export const QUOTE_REQUIRED_TRANSACTION_TYPES = [
   TransactionType.moneyAccountDeposit,
 ] as const;
+
+/**
+ * MetaMask Pay transaction types that cannot work without a payment token
+ * (unless paying with fiat). Confirmation is blocked and publish throws when
+ * no payment token is set. Claims and withdraws are excluded because they can
+ * legitimately submit without engaging MetaMask Pay.
+ */
+export const PAY_TOKEN_REQUIRED_TRANSACTION_TYPES = [
+  TransactionType.musdConversion,
+  TransactionType.perpsDeposit,
+  TransactionType.perpsDepositAndOrder,
+  TransactionType.predictDeposit,
+  TransactionType.predictDepositAndOrder,
+] as const;