[pull] main from MetaMask:main

.github/workflows/performance-test-runner.yml

@@ -183,7 +183,7 @@ jobs:
           SELECTED_SENTRY_DSN=""
           SENTRY_ENVIRONMENT="github-actions-performance-e2e"
           FEATURE_FLAGS_ENV="${{ inputs.feature_flags_environment }}"
-          BROWSERSTACK_GEO_LOCATION="${BROWSERSTACK_GEO_LOCATION:-ES}"
+          BROWSERSTACK_GEO_LOCATION="${BROWSERSTACK_GEO_LOCATION:-SE}"
 
           if [[ "$FEATURE_FLAGS_ENV" != "rc" && "$FEATURE_FLAGS_ENV" != "exp" && "$FEATURE_FLAGS_ENV" != "test" && "$FEATURE_FLAGS_ENV" != "dev" && "$FEATURE_FLAGS_ENV" != "prod" ]]; then
             echo "❌ Invalid feature_flags_environment '$FEATURE_FLAGS_ENV'. Expected rc, exp, test, dev, or prod."
@@ -258,7 +258,7 @@ jobs:
           echo "QA App Version: ${{ inputs.app_version }}"
           echo "BrowserStack Build Name: $BROWSERSTACK_BUILD_NAME"
           echo "BrowserStack Local: $BROWSERSTACK_LOCAL"
-          echo "BrowserStack Geo Location: ${BROWSERSTACK_GEO_LOCATION:-ES}"
+          echo "BrowserStack Geo Location: ${BROWSERSTACK_GEO_LOCATION:-SE}"
           if [ -n "$GREP_TAGS" ]; then
             echo "Grep filter: $GREP_TAGS"
           fi

.github/workflows/run-e2e-workflow.yml

@@ -197,16 +197,30 @@ jobs:
           mkdir -p ${{ steps.determine-target-paths.outputs.apk-target-path }}
           mkdir -p ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
 
-      - name: Download Android build artifacts (Namespace)
+      - name: Download Android app APK (Namespace)
         if: ${{ inputs.platform == 'android' && inputs.runner_provider == 'namespace' }}
         uses: namespace-actions/download-artifact@7cbad919e4b0e09f17e9d6311a444ff002992b5b # v2.0.1
         with:
-          path: artifacts/
-      - name: Download Android build artifacts (current)
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+      - name: Download Android test APK (Namespace)
+        if: ${{ inputs.platform == 'android' && inputs.runner_provider == 'namespace' }}
+        uses: namespace-actions/download-artifact@7cbad919e4b0e09f17e9d6311a444ff002992b5b # v2.0.1
+        with:
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
+      - name: Download Android app APK (current)
+        if: ${{ inputs.platform == 'android' && inputs.runner_provider != 'namespace' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+      - name: Download Android test APK (current)
         if: ${{ inputs.platform == 'android' && inputs.runner_provider != 'namespace' }}
         uses: actions/download-artifact@v4
         with:
-          path: artifacts/
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
 
       - name: Move Android artifacts to expected locations
         if: ${{ inputs.platform == 'android' }}
@@ -229,12 +243,14 @@ jobs:
         if: ${{ inputs.platform == 'ios' && inputs.runner_provider == 'namespace' }}
         uses: namespace-actions/download-artifact@7cbad919e4b0e09f17e9d6311a444ff002992b5b # v2.0.1
         with:
-          path: artifacts/
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app
       - name: Download iOS build artifacts (current)
         if: ${{ inputs.platform == 'ios' && inputs.runner_provider != 'namespace' }}
         uses: actions/download-artifact@v4
         with:
-          path: artifacts/
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app
+          path: artifacts/${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app
 
       # actions/upload-artifact strips execute permissions from the ZIP.
       # Also fixes any residual case mismatch as a safety net.

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.81.1]
+
+### Added
+
+- Adds Swap/Bridge feature to ARC mainnet. (#31413)
+
+### Fixed
+
+- Fixed the MetaMask Card section on the Money screen so the "Link card" option and funding token placeholders are only shown when the card spending token is enabled in the card feature configuration. (#31611)
+- Removed the trailing slash from the Arc explorer URL defined in app/util/networks/customNetworks.tsx so now the URL is correctly generated. (#31718)
+- Fixed Arc native token support, included patches for MetaMask/core#9006 and MetaMask/core#9007 (#31662)
+
 ## [7.81.0]
 
 ### Added
@@ -84,8 +96,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added a new Positions screen for Predict users to view active positions and history (#30718)
 - Track explore conversions in swaps (#30720)
 
-
 ### Changed
+
 - Updated the Sei native token icon to Sei's maroon token mark. (#31038)
 - Updated the Sei network and token logo to Sei's new brand mark. (#30892)
 - Improve crypto movers section in explore (#30809)
@@ -368,10 +380,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [7.78.1]
 
-### Fixed
-
-- Fixed a crash caused by CloseEvent dispatch on WebSocket failing instanceof validation (#30612)
-
 ### Added
 
 - Updated the onboarding interest questionnaire layout to a two-column grid with refreshed option labels. (#30753)
@@ -469,6 +477,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed a crash caused by CloseEvent dispatch on WebSocket failing instanceof validation (#30612)
 - Fixed the "Add mUSD" option in the Money account "Add money" sheet so it opens the deposit flow with mUSD pre-selected, and (#30741)
   corrected the in-progress / success / failed toast copy for both the
   Convert and Add flows.
@@ -12078,8 +12087,10 @@ 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.81.0...HEAD
-[7.81.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.79.1...v7.81.0
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.81.1...HEAD
+[7.81.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.81.0...v7.81.1
+[7.81.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.80.0...v7.81.0
+[7.80.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.79.1...v7.80.0
 [7.79.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.79.0...v7.79.1
 [7.79.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.78.1...v7.79.0
 [7.78.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.78.0...v7.78.1

app/components/Nav/App/App.test.tsx

@@ -940,10 +940,6 @@ describe('App', () => {
       expect(Routes.SHEET.SUCCESS_ERROR_SHEET).toBeDefined();
     });
 
-    it('has add account route defined', () => {
-      expect(Routes.SHEET.ADD_ACCOUNT).toBeDefined();
-    });
-
     it('has experience enhancer route defined', () => {
       expect(Routes.SHEET.EXPERIENCE_ENHANCER).toBeDefined();
     });
@@ -1183,10 +1179,6 @@ describe('App', () => {
       expect(Routes.SHEET.ADDRESS_SELECTOR).toBeDefined();
     });
 
-    it('has add account route defined', () => {
-      expect(Routes.SHEET.ADD_ACCOUNT).toBeDefined();
-    });
-
     it('has account actions route defined', () => {
       expect(Routes.SHEET.ACCOUNT_ACTIONS).toBeDefined();
     });

app/components/Nav/App/App.tsx

@@ -126,7 +126,6 @@ import SeedphraseModal from '../../UI/SeedphraseModal';
 import SkipAccountSecurityModal from '../../UI/SkipAccountSecurityModal';
 import SuccessErrorSheet from '../../Views/SuccessErrorSheet';
 import ConfirmTurnOnBackupAndSyncModal from '../../UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal';
-import AddNewAccountBottomSheet from '../../Views/AddNewAccount/AddNewAccountBottomSheet';
 import EligibilityFailedModal from '../../UI/Ramp/components/EligibilityFailedModal';
 import RampUnsupportedModal from '../../UI/Ramp/components/RampUnsupportedModal';
 import RampsBootstrap from '../../UI/Ramp/RampsBootstrap';
@@ -521,10 +520,6 @@ const RootModalFlow = (props: RootModalFlowProps) => (
       name={Routes.SHEET.ADDRESS_SELECTOR}
       component={AddressSelector}
     />
-    <Stack.Screen
-      name={Routes.SHEET.ADD_ACCOUNT}
-      component={AddNewAccountBottomSheet}
-    />
     <Stack.Screen name={Routes.SHEET.SDK_LOADING} component={SDKLoadingModal} />
     <Stack.Screen
       name={Routes.SHEET.SDK_FEEDBACK}

app/components/Nav/Main/MainNavigator.js

@@ -1421,7 +1421,10 @@ const MainNavigator = () => {
       <NativeStack.Screen
         name={Routes.CARD.ROOT}
         component={CardRoutes}
-        options={fullScreenModalSlideFromBottomNativeOptions}
+        options={({ route }) => ({
+          ...fullScreenModalSlideFromBottomNativeOptions,
+          animation: route.params?.animation ?? 'slide_from_right',
+        })}
       />
       <NativeStack.Screen
         name={Routes.RAMP.MODALS.PROCESSING_INFO}

app/components/UI/Card/Views/CardHome/CardHome.test.tsx

@@ -6318,9 +6318,6 @@ describe('CardHome Component', () => {
 
       render();
 
-      expect(
-        screen.getByTestId(CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_TOP),
-      ).toBeOnTheScreen();
       expect(
         screen.getByTestId(CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_BOTTOM),
       ).toBeOnTheScreen();
@@ -6339,7 +6336,9 @@ describe('CardHome Component', () => {
       render();
 
       expect(
-        screen.queryByTestId(CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_TOP),
+        screen.queryByTestId(
+          CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_BOTTOM,
+        ),
       ).not.toBeOnTheScreen();
       expect(
         screen.queryByText(strings('money.metamask_card.link_title')),
@@ -6353,7 +6352,7 @@ describe('CardHome Component', () => {
       render();
 
       expect(
-        screen.getByTestId(CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_TOP),
+        screen.getByTestId(CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_BOTTOM),
       ).toBeOnTheScreen();
     });
 

app/components/UI/Card/Views/CardHome/CardHome.testIds.ts

@@ -31,6 +31,5 @@ export const CardHomeSelectors = {
   FREEZE_CARD_TOGGLE: 'freeze-card-toggle',
   VIEW_PIN_BUTTON: 'view-pin-button',
   CARD_WALLET_ADDRESS: 'card-wallet-address',
-  LINK_MONEY_ACCOUNT_DIVIDER_TOP: 'link-money-account-divider-top',
   LINK_MONEY_ACCOUNT_DIVIDER_BOTTOM: 'link-money-account-divider-bottom',
 };

app/components/UI/Card/Views/CardHome/CardHome.tsx

@@ -422,11 +422,7 @@ const CardHome = () => {
 
         {canLinkMoneyAccount && (
           <>
-            <Box
-              twClassName="h-px bg-border-muted mt-4"
-              testID={CardHomeSelectors.LINK_MONEY_ACCOUNT_DIVIDER_TOP}
-            />
-            <Box twClassName="mb-6 mt-4">
+            <Box twClassName="mb-6 mt-7">
               <MoneyMetaMaskCard
                 mode="link"
                 hideCardImage

app/components/UI/Card/Views/SpendingLimit/SpendingLimit.test.tsx

@@ -347,6 +347,7 @@ describe('SpendingLimit Component', () => {
     limitType: 'full' as const,
     customLimit: '',
     isLoading: false,
+    isUiInteractionLocked: false,
     setSelectedToken: mockSetSelectedToken,
     handleAccountSelect: mockHandleAccountSelect,
     handleOtherSelect: mockHandleOtherSelect,
@@ -769,10 +770,11 @@ describe('SpendingLimit Component', () => {
       );
     });
 
-    it('blocks navigation when isLoading is true', () => {
+    it('blocks navigation when UI interaction is locked', () => {
       mockUseSpendingLimit.mockReturnValue({
         ...getDefaultUseSpendingLimitMock(),
         isLoading: true,
+        isUiInteractionLocked: true,
       });
 
       render();
@@ -785,6 +787,42 @@ describe('SpendingLimit Component', () => {
       expect(mockEvent.preventDefault).toHaveBeenCalled();
     });
 
+    it('allows navigation when Money Account linkage is processing outside onboarding', () => {
+      mockUseSpendingLimit.mockReturnValue({
+        ...getDefaultUseSpendingLimitMock(),
+        isLoading: true,
+        isMoneyAccountSource: true,
+        isUiInteractionLocked: false,
+      });
+
+      render();
+
+      const mockEvent = { preventDefault: jest.fn() };
+      const beforeRemoveCallback = mockAddListener.mock.calls[0][1];
+
+      beforeRemoveCallback(mockEvent);
+
+      expect(mockEvent.preventDefault).not.toHaveBeenCalled();
+    });
+
+    it('blocks navigation when Money Account linkage is processing during onboarding', () => {
+      mockUseSpendingLimit.mockReturnValue({
+        ...getDefaultUseSpendingLimitMock(),
+        isLoading: true,
+        isMoneyAccountSource: true,
+        isUiInteractionLocked: true,
+      });
+
+      render({ params: { flow: 'onboarding' } });
+
+      const mockEvent = { preventDefault: jest.fn() };
+      const beforeRemoveCallback = mockAddListener.mock.calls[0][1];
+
+      beforeRemoveCallback(mockEvent);
+
+      expect(mockEvent.preventDefault).toHaveBeenCalled();
+    });
+
     it('allows navigation when isLoading is false', () => {
       render();
 
@@ -853,12 +891,28 @@ describe('SpendingLimit Component', () => {
         ...getDefaultUseSpendingLimitMock(),
         isLoading: true,
         isMoneyAccountSource: true,
+        isUiInteractionLocked: false,
       });
 
       render();
 
       expect(screen.queryByTestId('button-loading-indicator')).toBeNull();
     });
+
+    it('disables cancel when Money Account linkage is processing outside onboarding', () => {
+      mockUseSpendingLimit.mockReturnValue({
+        ...getDefaultUseSpendingLimitMock(),
+        isLoading: true,
+        isMoneyAccountSource: true,
+        isUiInteractionLocked: false,
+      });
+
+      render();
+
+      const cancelButton = screen.getByText('Cancel');
+
+      expect(cancelButton).toBeDisabled();
+    });
   });
 
   describe('Onboarding Flow', () => {

app/components/UI/Card/Views/SpendingLimit/SpendingLimit.tsx

@@ -108,6 +108,7 @@ const SpendingLimit: React.FC<SpendingLimitProps> = ({ route }) => {
     limitType,
     customLimit,
     isLoading,
+    isUiInteractionLocked,
     handleAccountSelect,
     handleOtherSelect,
     handleLimitSelect,
@@ -129,14 +130,14 @@ const SpendingLimit: React.FC<SpendingLimitProps> = ({ route }) => {
     routeParams: route?.params as Record<string, unknown> | undefined,
   });
 
-  const isLoadingRef = useRef(isLoading);
+  const isUiInteractionLockedRef = useRef(isUiInteractionLocked);
   useEffect(() => {
-    isLoadingRef.current = isLoading;
-  }, [isLoading]);
+    isUiInteractionLockedRef.current = isUiInteractionLocked;
+  }, [isUiInteractionLocked]);
 
   useEffect(() => {
     const unsubscribe = navigation.addListener('beforeRemove', (e) => {
-      if (!isLoadingRef.current) return;
+      if (!isUiInteractionLockedRef.current) return;
       e.preventDefault();
     });
     return unsubscribe;

app/components/UI/Card/components/CardMessageBox/CardMessageBox.tsx

@@ -9,6 +9,7 @@ import {
 } from '@metamask/design-system-react-native';
 import { CardMessageBoxType, CardMessageBoxVariant } from '../../types';
 import { strings } from '../../../../../../locales/i18n';
+import { FLAT_BANNER_ALERT_STYLE } from '../../../shared/flatBannerAlertStyle';
 
 interface CardMessageBoxProps {
   messageType: CardMessageBoxType;
@@ -84,6 +85,7 @@ const CardMessageBox = ({
       severity={SEVERITY_MAP[config.variant]}
       title={config.title}
       description={config.description}
+      style={FLAT_BANNER_ALERT_STYLE}
       testID="card-message-box"
     >
       {(onConfirm || onDismiss) && (