MetaMask · lwin-kyaw · Oct 1, 2025 · Sep 18, 2025 · Sep 22, 2025 · Sep 23, 2025
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
@@ -94,20 +94,9 @@ class OnboardingCompletePage {
     );
   }
 
-  async completeOnboarding(isSocialImportFlow: boolean = false): Promise<void> {
+  async completeOnboarding(): Promise<void> {
     console.log('Complete onboarding');
-    if (!isSocialImportFlow) {
-      await this.clickCreateWalletDoneButton();
-    }
-
-    await this.displayDownloadAppPageAndContinue();
-
-    await this.driver.waitForSelector(this.installCompleteMessage);
-    await this.driver.waitForSelector(this.pinExtensionMessage);
-
-    await this.driver.clickElementAndWaitToDisappear(
-      this.pinExtensionDoneButton,
-    );
+    await this.clickCreateWalletDoneButton();
   }
 
   async completeBackup(): Promise<void> {

diff --git a/test/e2e/tests/account/unlock-wallet.spec.ts b/test/e2e/tests/account/unlock-wallet.spec.ts
@@ -9,7 +9,6 @@ import LoginPage from '../../page-objects/pages/login-page';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { MOCK_GOOGLE_ACCOUNT, WALLET_PASSWORD } from '../../constants';
 import { OAuthMockttpService } from '../../helpers/seedless-onboarding/mocks';
-import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import { importWalletWithSocialLoginOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
@@ -62,10 +61,6 @@ describe('Unlock wallet - ', function () {
           driver,
         });
 
-        const onboardingCompletePage = new OnboardingCompletePage(driver);
-        const isSocialImportFlow = true;
-        await onboardingCompletePage.completeOnboarding(isSocialImportFlow);
-
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
 

diff --git a/test/e2e/tests/metrics/wallet-created.spec.ts b/test/e2e/tests/metrics/wallet-created.spec.ts
@@ -281,6 +281,7 @@ describe('Wallet Created Events', function () {
         await createNewWalletWithSocialLoginOnboardingFlow(onboardingOptions);
 
         const onboardingCompletePage = new OnboardingCompletePage(driver);
+        await onboardingCompletePage.displayDownloadAppPageAndContinue();
         await onboardingCompletePage.checkPageIsLoaded();
         await onboardingCompletePage.checkWalletReadyMessageIsDisplayed();
         await onboardingCompletePage.completeOnboarding();

diff --git a/test/e2e/tests/onboarding/seedless-onboarding.spec.ts b/test/e2e/tests/onboarding/seedless-onboarding.spec.ts
@@ -35,6 +35,7 @@ describe('Metamask onboarding (with social login)', function () {
         });
 
         const onboardingCompletePage = new OnboardingCompletePage(driver);
+        await onboardingCompletePage.displayDownloadAppPageAndContinue();
         await onboardingCompletePage.checkPageIsLoaded();
         await onboardingCompletePage.checkWalletReadyMessageIsDisplayed();
         await onboardingCompletePage.completeOnboarding();
@@ -64,10 +65,6 @@ describe('Metamask onboarding (with social login)', function () {
           driver,
         });
 
-        const onboardingCompletePage = new OnboardingCompletePage(driver);
-        const isSocialImportFlow = true;
-        await onboardingCompletePage.completeOnboarding(isSocialImportFlow);
-
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
         const displayedWalletAddress = await homePage.getAccountAddress();

diff --git a/test/e2e/tests/settings/change-password.spec.ts b/test/e2e/tests/settings/change-password.spec.ts
@@ -13,7 +13,6 @@ import {
 } from '../../page-objects/flows/onboarding.flow';
 import { OAuthMockttpService } from '../../helpers/seedless-onboarding/mocks';
 import { Driver } from '../../webdriver/driver';
-import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import { MOCK_GOOGLE_ACCOUNT, WALLET_PASSWORD } from '../../constants';
 
 async function doPasswordChangeAndLockWallet(
@@ -107,10 +106,6 @@ describe('Change wallet password', function () {
           password: OLD_PASSWORD,
         });
 
-        const onboardingCompletePage = new OnboardingCompletePage(driver);
-        const isSocialImportFlow = true;
-        await onboardingCompletePage.completeOnboarding(isSocialImportFlow);
-
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
 

diff --git a/test/integration/onboarding/import-wallet.test.tsx b/test/integration/onboarding/import-wallet.test.tsx
@@ -10,7 +10,6 @@ import {
 import {
   clickElementById,
   createMockImplementation,
-  waitForElementById,
   waitForElementByText,
 } from '../helpers';
 
@@ -65,15 +64,6 @@ describe('Import Wallet Events', () => {
     await waitForElementByText('Your wallet is ready!');
     await clickElementById('onboarding-complete-done');
 
-    await waitForElementByText('Scan QR code and download the app');
-    await clickElementById('download-app-continue');
-
-    await waitForElementById('pin-extension-next');
-    await clickElementById('pin-extension-next');
-
-    await waitForElementById('pin-extension-done');
-    await clickElementById('pin-extension-done');
-
     // Verify both completeOnboarding and ExtensionPinned event are called
     let completeOnboardingCall;
     let extensionPinnedEvent;

diff --git a/test/integration/onboarding/wallet-created.test.tsx b/test/integration/onboarding/wallet-created.test.tsx
@@ -10,7 +10,6 @@ import {
 import {
   clickElementById,
   createMockImplementation,
-  waitForElementById,
   waitForElementByText,
 } from '../helpers';
 
@@ -73,15 +72,6 @@ describe('Wallet Created Events', () => {
     await waitForElementByText('Your wallet is ready!');
     await clickElementById('onboarding-complete-done');
 
-    await waitForElementByText('Scan QR code and download the app');
-    await clickElementById('download-app-continue');
-
-    await waitForElementById('pin-extension-next');
-    await clickElementById('pin-extension-next');
-
-    await waitForElementById('pin-extension-done');
-    await clickElementById('pin-extension-done');
-
     // Verify both completeOnboarding and ExtensionPinned event are called
     let completeOnboardingCall;
     let extensionPinnedEvent;

@@ -17,6 +17,7 @@ import {
 } from '../../../helpers/constants/design-system';
 import {
   ONBOARDING_COMPLETION_ROUTE,
+  ONBOARDING_DOWNLOAD_APP_ROUTE,
   ONBOARDING_IMPORT_WITH_SRP_ROUTE,
   ONBOARDING_METAMETRICS,
   ONBOARDING_REVIEW_SRP_ROUTE,
@@ -254,7 +255,7 @@ export default function CreatePassword({
         dispatch(setMarketingConsent(true));
         dispatch(setDataCollectionForMarketing(true));
       }
-      navigate(ONBOARDING_COMPLETION_ROUTE, { replace: true });
+      navigate(ONBOARDING_DOWNLOAD_APP_ROUTE, { replace: true });
     } else {
       navigate(ONBOARDING_REVIEW_SRP_ROUTE, { replace: true });
     }

@@ -1,6 +1,6 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useContext } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { capitalize } from 'lodash';
 import {
   Button,
@@ -33,19 +33,38 @@ import {
   ONBOARDING_PRIVACY_SETTINGS_ROUTE,
   DEFAULT_ROUTE,
   SECURITY_ROUTE,
-  ONBOARDING_DOWNLOAD_APP_ROUTE,
 } from '../../../helpers/constants/routes';
-import { getSocialLoginType } from '../../../selectors';
+import {
+  getSocialLoginType,
+  getExternalServicesOnboardingToggleState,
+  getFirstTimeFlowType,
+} from '../../../selectors';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
 import { getIsPrimarySeedPhraseBackedUp } from '../../../ducks/metamask/metamask';
-
+import {
+  toggleExternalServices,
+  setCompletedOnboarding,
+} from '../../../store/actions';
 import { LottieAnimation } from '../../../components/component-library/lottie-animation';
 
 export default function CreationSuccessful() {
   const navigate = useNavigate();
+  const dispatch = useDispatch();
   const t = useI18nContext();
   const { search } = useLocation();
   const isWalletReady = useSelector(getIsPrimarySeedPhraseBackedUp);
   const userSocialLoginType = useSelector(getSocialLoginType);
+  const externalServicesOnboardingToggleState = useSelector(
+    getExternalServicesOnboardingToggleState,
+  );
+  const trackEvent = useContext(MetaMetricsContext);
+  const firstTimeFlowType = useSelector(getFirstTimeFlowType);
+
   const learnMoreLink =
     'https://support.metamask.io/stay-safe/safety-in-web3/basic-safety-and-security-tips-for-metamask/';
 
@@ -124,13 +143,40 @@ export default function CreationSuccessful() {
     );
   }, [isWalletReady, isFromReminder]);
 
-  const onDone = useCallback(() => {
+  const onDone = useCallback(async () => {
+    if (isWalletReady) {
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.ExtensionPinned,
+        properties: {
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          wallet_setup_type:
+            firstTimeFlowType === FirstTimeFlowType.import ? 'import' : 'new',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          new_wallet: firstTimeFlowType === FirstTimeFlowType.create,
+        },
+      });
+    }
+
     if (isFromReminder) {
       navigate(isFromSettingsSecurity ? SECURITY_ROUTE : DEFAULT_ROUTE);
       return;
     }
-    navigate(ONBOARDING_DOWNLOAD_APP_ROUTE);
-  }, [navigate, isFromReminder, isFromSettingsSecurity]);
+    await dispatch(
+      toggleExternalServices(externalServicesOnboardingToggleState),
+    );
+    await dispatch(setCompletedOnboarding());
+    navigate(DEFAULT_ROUTE);
+  }, [
+    isWalletReady,
+    isFromReminder,
+    dispatch,
+    externalServicesOnboardingToggleState,
+    navigate,
+    trackEvent,
+    firstTimeFlowType,
+    isFromSettingsSecurity,
+  ]);
 
   return (
     <Box

@@ -5,7 +5,7 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
 import {
-  ONBOARDING_DOWNLOAD_APP_ROUTE,
+  DEFAULT_ROUTE,
   ONBOARDING_PRIVACY_SETTINGS_ROUTE,
 } from '../../../helpers/constants/routes';
 import CreationSuccessful from './creation-successful';
@@ -46,6 +46,9 @@ describe('Wallet Ready Page', () => {
       firstTimeFlowType: FirstTimeFlowType.create,
       seedPhraseBackedUp: true,
     },
+    appState: {
+      externalServicesOnboardingToggleState: true,
+    },
   };
 
   it('should render the wallet ready content if the seed phrase is backed up', () => {
@@ -98,9 +101,7 @@ describe('Wallet Ready Page', () => {
     const doneButton = getByTestId('onboarding-complete-done');
     fireEvent.click(doneButton);
     await waitFor(() => {
-      expect(mockUseNavigate).toHaveBeenCalledWith(
-        ONBOARDING_DOWNLOAD_APP_ROUTE,
-      );
+      expect(mockUseNavigate).toHaveBeenCalledWith(DEFAULT_ROUTE);
     });
   });
 });
@@ -4,7 +4,7 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import {
-  ONBOARDING_PIN_EXTENSION_ROUTE,
+  ONBOARDING_COMPLETION_ROUTE,
   ONBOARDING_WELCOME_ROUTE,
 } from '../../../helpers/constants/routes';
 import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
@@ -110,7 +110,10 @@ describe('Download App Onboarding View', () => {
 
       expect(mockUseNavigate).toHaveBeenCalledTimes(1);
       expect(mockUseNavigate).toHaveBeenCalledWith(
-        ONBOARDING_PIN_EXTENSION_ROUTE,
+        ONBOARDING_COMPLETION_ROUTE,
+        {
+          replace: true,
+        },
       );
     });
   });

@@ -9,9 +9,10 @@ import {
   BlockSize,
   FlexDirection,
   AlignItems,
+  TextColor,
 } from '../../../helpers/constants/design-system';
 import {
-  ONBOARDING_PIN_EXTENSION_ROUTE,
+  ONBOARDING_COMPLETION_ROUTE,
   ONBOARDING_WELCOME_ROUTE,
 } from '../../../helpers/constants/routes';
 import {
@@ -31,7 +32,7 @@ export default function OnboardingDownloadApp() {
   const currentKeyring = useSelector(getCurrentKeyring);
 
   const handleClick = async () => {
-    navigate(ONBOARDING_PIN_EXTENSION_ROUTE);
+    navigate(ONBOARDING_COMPLETION_ROUTE, { replace: true });
   };
 
   useEffect(() => {
@@ -66,7 +67,9 @@ export default function OnboardingDownloadApp() {
             alt="Download the app"
           />
         </Box>
-        <Text variant={TextVariant.bodyMd}>{t('downloadAppDescription')}</Text>
+        <Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
+          {t('downloadAppDescription')}
+        </Text>
       </Box>
       <Box>
         <Button