Merge with main

Author: Cal-L

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
     - cron: '0 2-6 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
   cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
 
 jobs:
@@ -470,30 +470,9 @@ jobs:
       - name: Check workflow files
         run: ${{ steps.download-actionlint.outputs.executable }} -color -config-file .github/actionlint.yaml
         shell: bash
-  all-jobs-pass-merge-pr:
-    name: All jobs pass
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'merge_group' }}
-    needs:
-      [
-        check-diff,
-        dedupe,
-        scripts,
-        unit-tests,
-        check-workflows,
-        js-bundle-size-check,
-        sonar-cloud-quality-gate-status,
-      ]
-    outputs:
-      ALL_JOBS_PASSED: ${{ steps.jobs-passed-status.outputs.ALL_JOBS_PASSED }}
-    steps:
-      - name: Set jobs passed status
-        id: jobs-passed-status
-        run: echo "ALL_JOBS_PASSED=true" >> "$GITHUB_OUTPUT"
   all-jobs-pass:
-    name: All jobs pass (merge_group)
+    name: All jobs pass
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'merge_group' }}
     needs:
       [
         check-diff,
@@ -510,19 +489,19 @@ jobs:
       - name: Set jobs passed status
         id: jobs-passed-status
         run: echo "ALL_JOBS_PASSED=true" >> "$GITHUB_OUTPUT"
-  check-all-jobs-pass-merge-pr:
+  check-all-jobs-pass:
     name: Check all jobs pass
-    if: ${{ github.event_name != 'merge_group' && always() }}
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     needs:
-      - all-jobs-pass-merge-pr
+      - all-jobs-pass
       - needs_e2e_build
       - e2e-smoke-tests-android
       - e2e-smoke-tests-ios
     steps:
       - run: |
           # Check if all non-E2E jobs passed
-          if [[ "${{ needs.all-jobs-pass-merge-pr.outputs.ALL_JOBS_PASSED }}" != "true" ]]; then
+          if [[ "${{ needs.all-jobs-pass.outputs.ALL_JOBS_PASSED }}" != "true" ]]; then
             echo "Non-E2E jobs failed"
             exit 1
           fi
@@ -540,19 +519,6 @@ jobs:
           fi
 
           echo "All required jobs passed"
-  check-all-jobs-pass:
-    name: Check all jobs pass (merge_group)
-    runs-on: ubuntu-latest
-    needs: all-jobs-pass
-    if: ${{ github.event_name == 'merge_group' && always() }}
-    steps:
-      - run: |
-          if [[ "${{ needs.all-jobs-pass.outputs.ALL_JOBS_PASSED }}" == "true" ]]; then
-            echo "All jobs passed. Unblock PR."
-          else
-            echo "All jobs passed step skipped. Block PR."
-            exit 1
-          fi
 
   log-merge-group-failure:
     name: Log merge group failure

.github/workflows/run-e2e-regression-tests-android.yml

@@ -23,6 +23,10 @@ jobs:
       contents: read
       id-token: write
     uses: ./.github/workflows/build-android-e2e.yml
+    with:
+      build_type: 'main'
+      metamask_environment: 'e2e'
+      keystore_target: 'qa'
     secrets: inherit
 
   regression-confirmations-android:

.husky/pre-push

@@ -72,6 +72,7 @@ import FundActionMenu from '../../UI/FundActionMenu';
 import NetworkSelector from '../../../components/Views/NetworkSelector';
 import ReturnToAppNotification from '../../Views/ReturnToAppNotification';
 import EditAccountName from '../../Views/EditAccountName/EditAccountName';
+import CardNotification from '../../Views/CardNotification';
 import LegacyEditMultichainAccountName from '../../Views/MultichainAccounts/sheets/EditAccountName';
 import { EditMultichainAccountName } from '../../Views/MultichainAccounts/sheets/EditMultichainAccountName';
 import { PPOMView } from '../../../lib/ppom/PPOMView';
@@ -573,6 +574,10 @@ const RootModalFlow = (props: RootModalFlowProps) => (
       component={ReturnToAppNotification}
       initialParams={{ ...props.route.params }}
     />
+    <Stack.Screen
+      name={Routes.CARD.NOTIFICATION}
+      component={CardNotification}
+    />
   </Stack.Navigator>
 );
 

app/components/Nav/App/App.tsx

@@ -72,7 +72,7 @@ const CollectibleModal = () => {
 
   useEffect(() => {
     trackEvent(
-      createEventBuilder(MetaMetricsEvents.COLLECTIBLE_DETAILS_OPENED)
+      createEventBuilder(MetaMetricsEvents.NFT_DETAILS_OPENED)
         .addProperties({ chain_id: getDecimalChainId(chainId) })
         .build(),
     );

app/components/UI/CollectibleModal/CollectibleModal.tsx

@@ -1945,7 +1945,7 @@ export function getPerpsMarketDetailsNavbar(navigation, title) {
     },
   });
   // Always navigate back to markets page for consistent navigation
-  const leftAction = () => navigation.navigate(Routes.PERPS.MARKETS);
+  const leftAction = () => navigation.navigate(Routes.PERPS.PERPS_HOME);
 
   return {
     headerTitle: () => (
@@ -2021,16 +2021,16 @@ export function getDepositNavbarOptions(
           />
         )
       : showConfiguration
-        ? () => (
-            <ButtonIcon
-              onPress={onConfigurationPress}
-              iconName={IconName.MoreHorizontal}
-              size={ButtonIconSize.Lg}
-              testID="deposit-configuration-menu-button"
-              style={styles.headerLeftButton}
-            />
-          )
-        : null,
+      ? () => (
+          <ButtonIcon
+            onPress={onConfigurationPress}
+            iconName={IconName.MoreHorizontal}
+            size={ButtonIconSize.Lg}
+            testID="deposit-configuration-menu-button"
+            style={styles.headerLeftButton}
+          />
+        )
+      : null,
     headerRight: showClose
       ? () => (
           <ButtonIcon

app/components/UI/Navbar/index.js

@@ -4,14 +4,9 @@ import { Alert } from 'react-native';
 import ActionSheet from '@metamask/react-native-actionsheet';
 import { strings } from '../../../../locales/i18n';
 import Engine from '../../../core/Engine';
-import { MetaMetricsEvents, useMetrics } from '../../hooks/useMetrics';
-import { getDecimalChainId } from '../../../util/networks';
 import { useTheme } from '../../../util/theme';
 import { useSelector } from 'react-redux';
-import {
-  selectChainId,
-  selectSelectedNetworkClientId,
-} from '../../../selectors/networkController';
+import { selectSelectedNetworkClientId } from '../../../selectors/networkController';
 
 const NftGridItemActionSheet = ({
   actionSheetRef,
@@ -20,9 +15,7 @@ const NftGridItemActionSheet = ({
   actionSheetRef: React.RefObject<typeof ActionSheet>;
   longPressedCollectible: Nft | null;
 }) => {
-  const chainId = useSelector(selectChainId);
   const { themeAppearance } = useTheme();
-  const { trackEvent, createEventBuilder } = useMetrics();
   const selectedNetworkClientId = useSelector(selectSelectedNetworkClientId);
 
   const removeNft = () => {
@@ -36,13 +29,6 @@ const NftGridItemActionSheet = ({
       selectedNetworkClientId,
     );
 
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.COLLECTIBLE_REMOVED)
-        .addProperties({
-          chain_id: getDecimalChainId(chainId),
-        })
-        .build(),
-    );
     Alert.alert(
       strings('wallet.collectible_removed_title'),
       strings('wallet.collectible_removed_desc'),

app/components/UI/NftGrid/NftGridItemActionSheet.tsx

@@ -2,7 +2,6 @@
 import React, { useContext, useEffect, useRef } from 'react';
 
 // External dependencies.
-import { useMetrics } from '../../../hooks/useMetrics';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../component-library/components/BottomSheets/BottomSheet';
@@ -13,13 +12,12 @@ import {
   IconName,
   IconSize,
 } from '../../../../component-library/components/Icons/Icon';
-import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useResetNotifications } from '../../../../util/notifications/hooks/useNotifications';
 import ModalContent from '../Modal';
 import { ToastContext } from '../../../../component-library/components/Toast';
 import { ToastVariants } from '../../../../component-library/components/Toast/Toast.types';
+
 const ResetNotificationsModal = () => {
-  const { trackEvent, createEventBuilder } = useMetrics();
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const [isChecked, setIsChecked] = React.useState(false);
   const { resetNotifications, loading } = useResetNotifications();
@@ -42,11 +40,6 @@ const ResetNotificationsModal = () => {
   const handleCta = async () => {
     await resetNotifications().then(() => {
       showResultToast();
-      trackEvent(
-        createEventBuilder(MetaMetricsEvents.NOTIFICATION_STORAGE_KEY_DELETED)
-          .addProperties({ settings_type: 'delete_notifications_storage_key' })
-          .build(),
-      );
     });
   };
 

app/components/UI/Notification/ResetNotificationsModal/index.tsx

@@ -59,6 +59,13 @@ const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
 const mockCanGoBack = jest.fn();
 
+// usePerpsNavigation mock functions
+const mockNavigateToHome = jest.fn();
+const mockNavigateToActivity = jest.fn();
+const mockNavigateToOrder = jest.fn();
+const mockNavigateToTutorial = jest.fn();
+const mockNavigateBack = jest.fn();
+
 // Mock notification feature flag
 const mockIsNotificationsFeatureEnabled = jest.fn();
 
@@ -118,6 +125,7 @@ jest.mock('../../hooks/stream/usePerpsLiveAccount', () => ({
 // Mock the selector module first
 jest.mock('../../selectors/perpsController', () => ({
   selectPerpsEligibility: jest.fn(),
+  createSelectIsWatchlistMarket: jest.fn(() => jest.fn(() => false)),
 }));
 
 // Mock react-redux
@@ -250,6 +258,14 @@ jest.mock('../../hooks', () => ({
   usePerpsNetworkManagement: jest.fn(() => ({
     ensureArbitrumNetworkExists: jest.fn().mockResolvedValue(undefined),
   })),
+  usePerpsNavigation: jest.fn(() => ({
+    navigateToHome: mockNavigateToHome,
+    navigateToActivity: mockNavigateToActivity,
+    navigateToOrder: mockNavigateToOrder,
+    navigateToTutorial: mockNavigateToTutorial,
+    navigateBack: mockNavigateBack,
+    canGoBack: mockCanGoBack(),
+  })),
 }));
 
 // Mock PerpsMarketStatisticsCard to simplify the test
@@ -959,8 +975,8 @@ describe('PerpsMarketDetailsView', () => {
         fireEvent.press(longButton);
       });
 
-      expect(mockNavigate).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ORDER, {
+      expect(mockNavigateToOrder).toHaveBeenCalledTimes(1);
+      expect(mockNavigateToOrder).toHaveBeenCalledWith({
         direction: 'long',
         asset: 'BTC',
       });
@@ -994,8 +1010,8 @@ describe('PerpsMarketDetailsView', () => {
         fireEvent.press(shortButton);
       });
 
-      expect(mockNavigate).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ORDER, {
+      expect(mockNavigateToOrder).toHaveBeenCalledTimes(1);
+      expect(mockNavigateToOrder).toHaveBeenCalledWith({
         direction: 'short',
         asset: 'BTC',
       });