Merge branch 'main' into TAT-1879-tp-sl-of-open-limit-orders-are-displayed-on-the-chart-2

Author: nickewansmith

.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

@@ -97,6 +97,7 @@ import { isNonEvmChainId } from '../../../core/Multichain/utils';
 import { selectTronResourcesBySelectedAccountGroup } from '../../../selectors/assets/assets-list';
 import { createStakedTrxAsset } from './utils/createStakedTrxAsset';
 ///: END:ONLY_INCLUDE_IF
+import { getDetectedGeolocation } from '../../../reducers/fiatOrders';
 
 interface AssetOverviewProps {
   asset: TokenI;
@@ -146,6 +147,8 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   const tokenResult = useSelector((state: RootState) =>
     selectTokenDisplayData(state, asset.chainId as Hex, asset.address as Hex),
   );
+
+  const rampGeodetectedRegion = useSelector(getDetectedGeolocation);
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   const multichainAssetsRates = useSelector(selectMultichainAssetsRates);
 
@@ -346,6 +349,7 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
           text: 'Buy',
           location: 'TokenDetails',
           chain_id_destination: getDecimalChainId(chainId),
+          region: rampGeodetectedRegion,
         })
         .build(),
     );

app/components/UI/AssetOverview/AssetOverview.tsx

@@ -24,6 +24,7 @@ import { trace, TraceName } from '../../../util/trace';
 import { createBuyNavigationDetails } from '../Ramp/Aggregator/routes/utils';
 import { BalanceEmptyStateProps } from './BalanceEmptyState.types';
 import bankTransferImage from '../../../images/bank-transfer.png';
+import { getDetectedGeolocation } from '../../../reducers/fiatOrders';
 
 /**
  * BalanceEmptyState smart component displays an empty state for wallet balance
@@ -37,6 +38,7 @@ const BalanceEmptyState: React.FC<BalanceEmptyStateProps> = ({
   const chainId = useSelector(selectChainId);
   const navigation = useNavigation();
   const { trackEvent, createEventBuilder } = useMetrics();
+  const rampGeodetectedRegion = useSelector(getDetectedGeolocation);
 
   const handleAction = () => {
     navigation.navigate(...createBuyNavigationDetails());
@@ -52,6 +54,7 @@ const BalanceEmptyState: React.FC<BalanceEmptyStateProps> = ({
           location: 'BalanceEmptyState',
           chain_id_destination: getDecimalChainId(chainId),
           ramp_type: 'BUY',
+          region: rampGeodetectedRegion,
         })
         .build(),
     );

app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx

@@ -1,4 +1,5 @@
 import React, { useCallback } from 'react';
+import { useSelector } from 'react-redux';
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
 import BottomSheet, {
   BottomSheetRef,
@@ -32,6 +33,7 @@ import { strings } from '../../../../../../locales/i18n';
 import { CardHomeSelectors } from '../../../../../../e2e/selectors/Card/CardHome.selectors';
 import { createDepositNavigationDetails } from '../../../Ramp/Deposit/routes/utils';
 import { safeFormatChainIdToHex } from '../../util/safeFormatChainIdToHex';
+import { getDetectedGeolocation } from '../../../../../reducers/fiatOrders';
 
 export interface AddFundsBottomSheetProps {
   setOpenAddFundsBottomSheet: (open: boolean) => void;
@@ -53,6 +55,7 @@ const AddFundsBottomSheet: React.FC<AddFundsBottomSheetProps> = ({
     priorityToken,
   });
   const { trackEvent, createEventBuilder } = useMetrics();
+  const rampGeodetectedRegion = useSelector(getDetectedGeolocation);
 
   const closeBottomSheetAndNavigate = useCallback(
     (navigateFunc: () => void) => {
@@ -85,6 +88,7 @@ const AddFundsBottomSheet: React.FC<AddFundsBottomSheetProps> = ({
           location: 'CardHome',
           chain_id_destination: getDecimalChainId(priorityToken?.caipChainId),
           ramp_type: 'DEPOSIT',
+          region: rampGeodetectedRegion,
         })
         .build(),
     );
@@ -93,6 +97,7 @@ const AddFundsBottomSheet: React.FC<AddFundsBottomSheetProps> = ({
       name: TraceName.LoadDepositExperience,
     });
   }, [
+    rampGeodetectedRegion,
     closeBottomSheetAndNavigate,
     navigate,
     trackEvent,

app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react-native';
+import { render } from '@testing-library/react-native';
 import { Text, View, TouchableOpacity, Image } from 'react-native';
 import OnboardingStep from './OnboardingStep';
 
@@ -61,25 +61,6 @@ jest.mock('@metamask/design-system-react-native', () => {
   };
 });
 
-// Mock react-native-safe-area-context
-jest.mock('react-native-safe-area-context', () => ({
-  SafeAreaView: ({
-    children,
-    ...props
-  }: {
-    children: React.ReactNode;
-    [key: string]: unknown;
-  }) => {
-    const ReactActual = jest.requireActual('react');
-    const { View } = jest.requireActual('react-native');
-    return ReactActual.createElement(
-      View,
-      { testID: 'safe-area-view', ...props },
-      children,
-    );
-  },
-}));
-
 // Mock the FOX logo image
 jest.mock('../../../../../images/branding/fox.png', () => 'fox-logo');
 
@@ -96,12 +77,6 @@ describe('OnboardingStep Component', () => {
   });
 
   describe('Component Rendering', () => {
-    it('renders without crashing with required props', () => {
-      render(<OnboardingStep {...defaultProps} />);
-
-      expect(screen.getByTestId('safe-area-view')).toBeDefined();
-    });
-
     it('renders with all required props provided', () => {
       const { getByText } = render(<OnboardingStep {...defaultProps} />);
 
@@ -284,22 +259,12 @@ describe('OnboardingStep Component', () => {
   });
 
   describe('Layout Structure', () => {
-    it('renders with proper container structure', () => {
-      const { getByTestId } = render(<OnboardingStep {...defaultProps} />);
-
-      // Verify SafeAreaView is rendered with correct props
-      const safeAreaView = getByTestId('safe-area-view');
-      expect(safeAreaView).toBeDefined();
-      expect(safeAreaView.props.edges).toEqual(['bottom']);
-    });
-
     it('maintains proper component hierarchy', () => {
       const { getByText, getByTestId } = render(
         <OnboardingStep {...defaultProps} />,
       );
 
       // Verify all main elements are present in the component tree
-      expect(getByTestId('safe-area-view')).toBeDefined();
       expect(getByText('Test Title')).toBeDefined();
       expect(getByText('Test Description')).toBeDefined();
       expect(getByTestId('test-form-fields')).toBeDefined();