Merge branch 'main' into jc/WAPI-1369

Author: ffmcgee725

.github/workflows/security-code-scanner.yml

@@ -24,6 +24,7 @@ jobs:
           paths_ignored: |
             tests/
             docs/
+            scripts/money-movement/debug-dashboard/
             .storybook/
             '**/*.test.js'
             '**/*.test.ts'

.js.env.example

@@ -54,6 +54,10 @@ export METAMASK_ENVIRONMENT="dev"
 # Build type: "main" or "flask" or "beta"
 export METAMASK_BUILD_TYPE="main"
 
+# Optional: enable Ramps debug dashboard bridge in __DEV__ (WebSocket + fetch instrumentation).
+# See app/components/UI/Ramp/debug/README.md
+# export RAMPS_DEBUG_DASHBOARD="true"
+
 # Segment SDK proxy endpoint and write key
 export SEGMENT_WRITE_KEY_DEV=""
 export SEGMENT_PROXY_URL_DEV=""

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.71.1]
+
+### Changed
+
+- Pointed Market Insights digest fallback URL at the production endpoint when `DIGEST_API_URL` is not set at build time (#28098)
+
 ## [7.71.0]
 
 ### Added
@@ -11072,7 +11078,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#957](https://github.com/MetaMask/metamask-mobile/pull/957): fix timeouts (#957)
 - [#954](https://github.com/MetaMask/metamask-mobile/pull/954): Bugfix: onboarding navigation (#954)
 
-[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.71.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.71.1...HEAD
+[7.71.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.71.0...v7.71.1
 [7.71.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.70.1...v7.71.0
 [7.70.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.70.0...v7.70.1
 [7.70.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.69.1...v7.70.0

app/components/UI/BackupAlert/BackupAlert.tsx

@@ -21,7 +21,7 @@ import Icon, {
 import Text, {
   TextVariant,
 } from '../../../component-library/components/Texts/Text';
-import { useMetrics } from '../../../components/hooks/useMetrics';
+import { useAnalytics } from '../../../components/hooks/useAnalytics/useAnalytics';
 import Routes from '../../../constants/navigation/Routes';
 import { selectSeedlessOnboardingLoginFlow } from '../../../selectors/seedlessOnboardingController';
 import { RootState } from '../../../reducers';
@@ -44,7 +44,7 @@ const BLOCKED_LIST = [
 
 const BackupAlert = ({ navigation, onDismiss }: BackupAlertI) => {
   const { styles } = useStyles(styleSheet, {});
-  const { trackEvent, createEventBuilder } = useMetrics();
+  const { trackEvent, createEventBuilder } = useAnalytics();
   const [inBrowserView, setInBrowserView] = useState(false);
   const [inBlockedView, setInBlockedView] = useState(false);
   const [isVisible, setIsVisible] = useState(true);

app/components/UI/BalanceEmptyState/BalanceEmptyState.test.tsx

@@ -5,7 +5,9 @@ import { backgroundState } from '../../../util/test/initial-root-state';
 import BalanceEmptyState from './BalanceEmptyState';
 import { BalanceEmptyStateProps } from './BalanceEmptyState.types';
 import { RampsButtonClickData } from '../Ramp/hooks/useRampsButtonClickData';
-import { useMetrics } from '../../hooks/useMetrics';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
+import { createMockUseAnalyticsHook } from '../../../util/test/analyticsMock';
+import { MetaMetricsEvents } from '../../../core/Analytics';
 
 // Mock useRampNavigation hook
 const mockGoToBuy = jest.fn();
@@ -39,12 +41,7 @@ const mockEventBuilder = {
   build: jest.fn().mockReturnValue({ event: 'built' }),
 };
 
-jest.mock('../../hooks/useMetrics', () => ({
-  useMetrics: jest.fn(),
-  MetaMetricsEvents: {
-    RAMPS_BUTTON_CLICKED: 'ramps_button_clicked',
-  },
-}));
+jest.mock('../../hooks/useAnalytics/useAnalytics');
 
 jest.mock('../../../util/networks', () => ({
   getDecimalChainId: jest.fn(() => 1),
@@ -54,10 +51,12 @@ describe('BalanceEmptyState', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockCreateEventBuilder.mockReturnValue(mockEventBuilder);
-    (useMetrics as jest.Mock).mockReturnValue({
-      trackEvent: mockTrackEvent,
-      createEventBuilder: mockCreateEventBuilder,
-    });
+    jest.mocked(useAnalytics).mockReturnValue(
+      createMockUseAnalyticsHook({
+        trackEvent: mockTrackEvent,
+        createEventBuilder: mockCreateEventBuilder,
+      }),
+    );
     mockUseRampsUnifiedV1Enabled.mockReturnValue(false);
   });
 
@@ -103,7 +102,9 @@ describe('BalanceEmptyState', () => {
 
     fireEvent.press(actionButton);
 
-    expect(mockCreateEventBuilder).toHaveBeenCalledWith('ramps_button_clicked');
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.RAMPS_BUTTON_CLICKED,
+    );
     expect(mockEventBuilder.addProperties).toHaveBeenCalledWith(
       expect.objectContaining({
         button_text: 'Add funds',
@@ -126,7 +127,9 @@ describe('BalanceEmptyState', () => {
 
     fireEvent.press(actionButton);
 
-    expect(mockCreateEventBuilder).toHaveBeenCalledWith('ramps_button_clicked');
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.RAMPS_BUTTON_CLICKED,
+    );
     expect(mockEventBuilder.addProperties).toHaveBeenCalledWith(
       expect.objectContaining({
         button_text: 'Add funds',

app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx

@@ -16,7 +16,8 @@ import {
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../locales/i18n';
-import { MetaMetricsEvents, useMetrics } from '../../hooks/useMetrics';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { getDecimalChainId } from '../../../util/networks';
 import { selectChainId } from '../../../selectors/networkController';
 import { trace, TraceName } from '../../../util/trace';
@@ -38,7 +39,7 @@ const BalanceEmptyState: React.FC<BalanceEmptyStateProps> = ({
 }) => {
   const tw = useTailwind();
   const chainId = useSelector(selectChainId);
-  const { trackEvent, createEventBuilder } = useMetrics();
+  const { trackEvent, createEventBuilder } = useAnalytics();
   const rampGeodetectedRegion = useSelector(getDetectedGeolocation);
   const { goToBuy } = useRampNavigation();
   const buttonClickData = useRampsButtonClickData();

app/components/UI/Carousel/index.test.tsx

@@ -23,6 +23,8 @@ import Routes from '../../../constants/navigation/Routes';
 import { WalletClientType } from '../../../core/SnapKeyring/MultichainWalletSnapClient';
 import { SolScope } from '@metamask/keyring-api';
 import { setContentPreviewToken } from '../../../actions/notification/helpers';
+import { createMockUseAnalyticsHook } from '../../../util/test/analyticsMock';
+import { useAnalytics } from '../../../components/hooks/useAnalytics/useAnalytics';
 
 const makeMockState = () =>
   ({
@@ -60,16 +62,7 @@ jest.mock('../../../core/Engine', () => ({
   context: { PreferencesController: { state: {} } },
 }));
 
-const mockTrackEvent = jest.fn();
-const mockCreateEventBuilder = jest.fn(() => ({
-  build: () => ({ category: 'Banner Display', properties: {} }),
-}));
-jest.mock('../../../components/hooks/useMetrics', () => ({
-  useMetrics: () => ({
-    trackEvent: mockTrackEvent,
-    createEventBuilder: mockCreateEventBuilder,
-  }),
-}));
+jest.mock('../../../components/hooks/useAnalytics/useAnalytics');
 
 jest.mock('../../../core/DeeplinkManager/DeeplinkManager', () => {
   const mockParse = jest.fn().mockResolvedValue(true);
@@ -119,6 +112,7 @@ const mockReduxHooks = (state?: RootState) => {
 
 beforeEach(() => {
   jest.clearAllMocks();
+  jest.mocked(useAnalytics).mockReturnValue(createMockUseAnalyticsHook());
   mockReduxHooks();
   jest
     .spyOn(FeatureFlagSelectorsModule, 'selectContentfulCarouselEnabledFlag')

app/components/UI/Carousel/index.tsx

@@ -21,7 +21,7 @@ import {
   TextColor,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { useMetrics } from '../../../components/hooks/useMetrics';
+import { useAnalytics } from '../../../components/hooks/useAnalytics/useAnalytics';
 import { WalletViewSelectorsIDs } from '../../Views/Wallet/WalletView.testIds';
 import { selectDismissedBanners } from '../../../selectors/banner';
 ///: BEGIN:ONLY_INCLUDE_IF(solana)
@@ -170,7 +170,7 @@ const CarouselComponent: FC<CarouselProps> = ({ style, onEmptyState }) => {
     carouselScaleY,
   });
 
-  const { trackEvent, createEventBuilder } = useMetrics();
+  const { trackEvent, createEventBuilder } = useAnalytics();
   const hasBalance = useSelector(selectAddressHasTokenBalances);
   const dispatch = useDispatch();
   const { navigate } = useNavigation();

app/components/UI/OTAUpdatesModal/OTAUpdatesModal.test.tsx

@@ -5,6 +5,9 @@ import { reloadAsync } from 'expo-updates';
 import Logger from '../../../util/Logger';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import renderWithProvider from '../../../util/test/renderWithProvider';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
+import { createMockUseAnalyticsHook } from '../../../util/test/analyticsMock';
+import { AnalyticsEventBuilder } from '../../../util/analytics/AnalyticsEventBuilder';
 
 // Mock theme utility
 jest.mock('../../../util/theme', () => ({
@@ -107,38 +110,22 @@ const mockLoggerError = Logger.error as jest.MockedFunction<
   typeof Logger.error
 >;
 
-interface MockEventBuilder {
-  addProperties: jest.Mock;
-  build: jest.Mock;
-}
-
-const mockCreateEventBuilder = jest.fn((event: string): MockEventBuilder => {
-  const builder: MockEventBuilder = {
-    addProperties: jest.fn(),
-    build: jest.fn(),
-  };
-
-  builder.addProperties.mockReturnValue(builder);
-  builder.build.mockReturnValue({ event });
-
-  return builder;
-});
-
 const mockTrackEvent = jest.fn();
 
-jest.mock('../../hooks/useMetrics', () => ({
-  useMetrics: () => ({
-    trackEvent: mockTrackEvent,
-    createEventBuilder: mockCreateEventBuilder,
-  }),
-}));
+jest.mock('../../hooks/useAnalytics/useAnalytics');
 
 // Import component AFTER all mocks are defined
 import OTAUpdatesModal from './OTAUpdatesModal';
 
 describe('OTAUpdatesModal', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.mocked(useAnalytics).mockReturnValue(
+      createMockUseAnalyticsHook({
+        trackEvent: mockTrackEvent,
+        createEventBuilder: AnalyticsEventBuilder.createEventBuilder,
+      }),
+    );
     (Platform as unknown as { OS: string }).OS = 'ios';
     mockOnCloseBottomSheet.mockImplementation((callback?: () => void) => {
       if (callback) callback();
@@ -150,7 +137,7 @@ describe('OTAUpdatesModal', () => {
 
     expect(mockTrackEvent).toHaveBeenCalledWith(
       expect.objectContaining({
-        event: MetaMetricsEvents.OTA_UPDATES_MODAL_VIEWED,
+        name: MetaMetricsEvents.OTA_UPDATES_MODAL_VIEWED.category,
       }),
     );
   });
@@ -163,7 +150,8 @@ describe('OTAUpdatesModal', () => {
     await waitFor(() => {
       expect(mockTrackEvent).toHaveBeenCalledWith(
         expect.objectContaining({
-          event: MetaMetricsEvents.OTA_UPDATES_MODAL_PRIMARY_ACTION_CLICKED,
+          name: MetaMetricsEvents.OTA_UPDATES_MODAL_PRIMARY_ACTION_CLICKED
+            .category,
         }),
       );
     });

app/components/UI/OTAUpdatesModal/OTAUpdatesModal.tsx

@@ -17,7 +17,7 @@ import Logger from '../../../util/Logger';
 import { useAssetFromTheme } from '../../../util/theme';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import generateDeviceAnalyticsMetaData from '../../../util/metrics';
-import { useMetrics } from '../../hooks/useMetrics';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../component-library/components/BottomSheets/BottomSheet';
@@ -35,7 +35,7 @@ export const createOTAUpdatesModalNavDetails = createNavigationDetails(
 
 const OTAUpdatesModal = () => {
   const tw = useTailwind();
-  const { trackEvent, createEventBuilder } = useMetrics();
+  const { trackEvent, createEventBuilder } = useAnalytics();
   const bottomSheetRef = useRef<BottomSheetRef | null>(null);
   const metamaskName = useAssetFromTheme(
     metamaskNameLightMode,