MetaMask · n3ps · Nov 8, 2025
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
@@ -58,7 +58,6 @@ export const SENTRY_BACKGROUND_STATE = {
     currentPopupId: false,
     onboardingDate: false,
     currentExtensionPopupId: false,
-    defaultHomeActiveTabName: true,
     enableEnforcedSimulations: true,
     enableEnforcedSimulationsForTransactions: false,
     fullScreenGasPollTokens: true,

diff --git a/app/scripts/controllers/app-state-controller.test.ts b/app/scripts/controllers/app-state-controller.test.ts
@@ -12,7 +12,6 @@ import {
   ORIGIN_METAMASK,
   POLLING_TOKEN_ENVIRONMENT_TYPES,
 } from '../../../shared/constants/app';
-import { AccountOverviewTabKey } from '../../../shared/constants/app-state';
 import { MINUTE } from '../../../shared/constants/time';
 import { AppStateController } from './app-state-controller';
 import type {
@@ -188,18 +187,6 @@ describe('AppStateController', () => {
     });
   });
 
-  describe('setDefaultHomeActiveTabName', () => {
-    it('sets the default home tab name', async () => {
-      await withController(({ controller }) => {
-        controller.setDefaultHomeActiveTabName(AccountOverviewTabKey.Activity);
-
-        expect(controller.state.defaultHomeActiveTabName).toBe(
-          AccountOverviewTabKey.Activity,
-        );
-      });
-    });
-  });
-
   describe('setConnectedStatusPopoverHasBeenShown', () => {
     it('sets connected status popover as shown', async () => {
       await withController(({ controller }) => {
@@ -763,7 +750,6 @@ describe('AppStateController', () => {
               "connectedStatusPopoverHasBeenShown": true,
               "currentExtensionPopupId": 0,
               "currentPopupId": 0,
-              "defaultHomeActiveTabName": null,
               "enableEnforcedSimulations": true,
               "enableEnforcedSimulationsForTransactions": {},
               "enforcedSimulationsSlippage": 10,
@@ -852,7 +838,6 @@ describe('AppStateController', () => {
               "connectedStatusPopoverHasBeenShown": true,
               "currentExtensionPopupId": 0,
               "currentPopupId": 0,
-              "defaultHomeActiveTabName": null,
               "enableEnforcedSimulations": true,
               "enableEnforcedSimulationsForTransactions": {},
               "enforcedSimulationsSlippage": 10,
@@ -937,7 +922,6 @@ describe('AppStateController', () => {
               "browserEnvironment": {},
               "canTrackWalletFundsObtained": true,
               "connectedStatusPopoverHasBeenShown": true,
-              "defaultHomeActiveTabName": null,
               "enableEnforcedSimulations": true,
               "enforcedSimulationsSlippage": 10,
               "hadAdvancedGasFeesSetPriorToMigration92_3": false,
@@ -1017,7 +1001,6 @@ describe('AppStateController', () => {
               "connectedStatusPopoverHasBeenShown": true,
               "currentExtensionPopupId": 0,
               "currentPopupId": 0,
-              "defaultHomeActiveTabName": null,
               "enableEnforcedSimulations": true,
               "enableEnforcedSimulationsForTransactions": {},
               "enforcedSimulationsSlippage": 10,

diff --git a/app/scripts/controllers/app-state-controller.ts b/app/scripts/controllers/app-state-controller.ts
@@ -35,7 +35,7 @@
 import { LastInteractedConfirmationInfo } from '../../../shared/types/confirm';
 import { SecurityAlertResponse } from '../lib/ppom/types';
 import {
  AccountOverviewTabKey,
  CarouselSlide,
  NetworkConnectionBanner,
 } from '../../../shared/constants/app-state';
@@ -73,7 +73,6 @@
   // States used for displaying the changed network toast
   currentExtensionPopupId: number;
   currentPopupId?: number;
-  defaultHomeActiveTabName: AccountOverviewTabKey | null;
   enableEnforcedSimulations: boolean;
   enableEnforcedSimulationsForTransactions: Record<string, boolean>;
   enforcedSimulationsSlippage: number;
@@ -234,7 +233,6 @@
   appActiveTab: undefined,
   browserEnvironment: {},
   connectedStatusPopoverHasBeenShown: true,
-  defaultHomeActiveTabName: null,
   enableEnforcedSimulations: true,
   enableEnforcedSimulationsForTransactions: {},
   enforcedSimulationsSlippage: 10,
@@ -342,12 +340,6 @@
     includeInDebugSnapshot: true,
     usedInUi: true,
   },
-  defaultHomeActiveTabName: {
-    includeInStateLogs: true,
-    persist: true,
-    includeInDebugSnapshot: true,
-    usedInUi: true,
-  },
   enableEnforcedSimulations: {
     includeInStateLogs: true,
     persist: true,
@@ -757,19 +749,6 @@
     this.#acceptApproval();
   }
 
-  /**
-   * Sets the default home tab
-   *
-   * @param defaultHomeActiveTabName - the tab name
-   */
-  setDefaultHomeActiveTabName(
-    defaultHomeActiveTabName: AccountOverviewTabKey | null,
-  ): void {
-    this.update((state) => {
-      state.defaultHomeActiveTabName = defaultHomeActiveTabName;
-    });
-  }
-
   /**
    * Record that the user has seen the connected status info popover
    */

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2768,8 +2768,6 @@ export default class MetamaskController extends EventEmitter {
         appStateController.setCurrentExtensionPopupId.bind(appStateController),
       setBrowserEnvironment:
         appStateController.setBrowserEnvironment.bind(appStateController),
-      setDefaultHomeActiveTabName:
-        appStateController.setDefaultHomeActiveTabName.bind(appStateController),
       setConnectedStatusPopoverHasBeenShown:
         appStateController.setConnectedStatusPopoverHasBeenShown.bind(
           appStateController,

diff --git a/shared/types/background.ts b/shared/types/background.ts
@@ -93,7 +93,6 @@ export type ControllerStatePropertiesEnumerated = {
   pendingApprovalCount: ApprovalControllerState['pendingApprovalCount'];
   timeoutMinutes: AppStateControllerState['timeoutMinutes'];
   connectedStatusPopoverHasBeenShown: AppStateControllerState['connectedStatusPopoverHasBeenShown'];
-  defaultHomeActiveTabName: AppStateControllerState['defaultHomeActiveTabName'];
   browserEnvironment: AppStateControllerState['browserEnvironment'];
   popupGasPollTokens: AppStateControllerState['popupGasPollTokens'];
   notificationGasPollTokens: AppStateControllerState['notificationGasPollTokens'];

@@ -108,7 +108,6 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         connectedStatusPopoverHasBeenShown: true,
         termsOfUseLastAgreed:
           '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
-        defaultHomeActiveTabName: null,
         fullScreenGasPollTokens: [],
         notificationGasPollTokens: [],
         popupGasPollTokens: [],

diff --git a/test/e2e/fixtures/onboarding-fixture.json b/test/e2e/fixtures/onboarding-fixture.json
@@ -48,7 +48,6 @@
         "os": "mac"
       },
       "connectedStatusPopoverHasBeenShown": true,
-      "defaultHomeActiveTabName": null,
       "enableEnforcedSimulations": true,
       "enforcedSimulationsSlippage": 10,
       "hadAdvancedGasFeesSetPriorToMigration92_3": false,

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -33,7 +33,6 @@
     "browserEnvironment": { "os": "string", "browser": "string" },
     "canTrackWalletFundsObtained": false,
     "connectedStatusPopoverHasBeenShown": true,
-    "defaultHomeActiveTabName": null,
     "enableEnforcedSimulations": true,
     "enableEnforcedSimulationsForTransactions": "object",
     "enforcedSimulationsSlippage": "number",

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -136,7 +136,6 @@
     "appActiveTab": "object",
     "browserEnvironment": { "os": "string", "browser": "string" },
     "connectedStatusPopoverHasBeenShown": true,
-    "defaultHomeActiveTabName": null,
     "enableEnforcedSimulations": true,
     "enableEnforcedSimulationsForTransactions": "object",
     "enforcedSimulationsSlippage": "number",

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -37,7 +37,6 @@
       "nftsDropdownState": {},
       "connectedStatusPopoverHasBeenShown": true,
       "termsOfUseLastAgreed": "number",
-      "defaultHomeActiveTabName": null,
       "fullScreenGasPollTokens": "object",
       "notificationGasPollTokens": "object",
       "popupGasPollTokens": "object",

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -37,7 +37,6 @@
       "nftsDropdownState": {},
       "connectedStatusPopoverHasBeenShown": true,
       "termsOfUseLastAgreed": "number",
-      "defaultHomeActiveTabName": null,
       "fullScreenGasPollTokens": "object",
       "notificationGasPollTokens": "object",
       "popupGasPollTokens": "object",

diff --git a/test/integration/data/integration-init-state.json b/test/integration/data/integration-init-state.json
@@ -355,7 +355,6 @@
       }
     }
   },
-  "defaultHomeActiveTabName": "activity",
   "desktopEnabled": false,
   "detectedTokens": [],
   "dismissSeedBackUpReminder": false,

diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
@@ -111,7 +111,6 @@
   "customNonceValue": "",
   "database": null,
   "databaseUnavailable": false,
-  "defaultHomeActiveTabName": null,
   "desktopEnabled": false,
   "detectedTokens": [],
   "dismissSeedBackUpReminder": false,

diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -20,7 +20,6 @@ import {
 } from '../../../../shared/constants/metametrics';
 import EthOverview from './eth-overview';
 
-// We need to mock `dispatch` since we use it for `setDefaultHomeActiveTabName`.
 const mockDispatch = jest.fn().mockReturnValue(() => jest.fn());
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),

diff --git a/ui/components/app/wallet-overview/hooks/useHandleSendNonEvm.test.ts b/ui/components/app/wallet-overview/hooks/useHandleSendNonEvm.test.ts
@@ -1,17 +1,13 @@
 import { SolScope } from '@metamask/keyring-api';
 import { renderHookWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-import {
-  sendMultichainTransaction,
-  setDefaultHomeActiveTabName,
-} from '../../../../store/actions';
+import { sendMultichainTransaction } from '../../../../store/actions';
 import { SOLANA_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts/solana-wallet-snap';
 import { CONFIRMATION_V_NEXT_ROUTE } from '../../../../helpers/constants/routes';
 import { mockMultichainNetworkState } from '../../../../../test/stub/networks';
 import { useHandleSendNonEvm } from './useHandleSendNonEvm';
 
 jest.mock('../../../../store/actions', () => ({
   sendMultichainTransaction: jest.fn(),
-  setDefaultHomeActiveTabName: jest.fn(),
 }));
 
 const mockDispatch = jest.fn();
@@ -65,7 +61,6 @@ const mockState = {
         requestData: {},
       },
     ],
-    defaultHomeActiveTabName: 'activity',
     selectedMultichainNetworkChainId: SolScope.Mainnet,
     isEvmSelected: false,
     remoteFeatureFlags: {
@@ -147,8 +142,6 @@ describe('useHandleSendNonEvm', () => {
     const handleSendNonEvm = result.current;
 
     await handleSendNonEvm();
-
-    expect(setDefaultHomeActiveTabName).toHaveBeenCalledWith('activity');
   });
 
   describe('when a caipAssetType is provided', () => {

diff --git a/ui/components/app/wallet-overview/hooks/useHandleSendNonEvm.ts b/ui/components/app/wallet-overview/hooks/useHandleSendNonEvm.ts
@@ -1,19 +1,19 @@
 import { SnapId } from '@metamask/snaps-sdk';
 import { parseCaipAssetType, CaipAssetType } from '@metamask/utils';
 import { useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useNavigate } from 'react-router-dom-v5-compat';
-import {
-  sendMultichainTransaction,
-  setDefaultHomeActiveTabName,
-} from '../../../../store/actions';
+import { useSelector } from 'react-redux';
+import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
+import { sendMultichainTransaction } from '../../../../store/actions';
 import {
   getMemoizedUnapprovedTemplatedConfirmations,
   getSelectedInternalAccount,
 } from '../../../../selectors';
 import { getSelectedMultichainNetworkConfiguration } from '../../../../selectors/multichain/networks';
 import { isMultichainWalletSnap } from '../../../../../shared/lib/accounts/snaps';
-import { CONFIRMATION_V_NEXT_ROUTE } from '../../../../helpers/constants/routes';
+import {
+  CONFIRMATION_V_NEXT_ROUTE,
+  DEFAULT_ROUTE,
+} from '../../../../helpers/constants/routes';
 
 /**
  * Use this hook to trigger the send flow for non-EVM accounts.
@@ -31,12 +31,11 @@ export const useHandleSendNonEvm = (caipAssetType?: CaipAssetType) => {
 
   const account = useSelector(getSelectedInternalAccount);
   const navigate = useNavigate();
-  const dispatch = useDispatch();
+  const location = useLocation();
 
-  const currentActivityTabName = useSelector(
-    // @ts-expect-error TODO: fix state type
-    (state) => state.metamask.defaultHomeActiveTabName,
-  );
+  // Get the current tab from URL query params
+  const params = new URLSearchParams(location.search);
+  const currentTab = params.get('tab');
 
   const unapprovedTemplatedConfirmations = useSelector(
     getMemoizedUnapprovedTemplatedConfirmations,
@@ -92,15 +91,17 @@ export const useHandleSendNonEvm = (caipAssetType?: CaipAssetType) => {
     try {
       // FIXME: We switch the tab before starting the send flow (we
       // faced some inconsistencies when changing it after).
-      await dispatch(setDefaultHomeActiveTabName('activity'));
+      navigate(`${DEFAULT_ROUTE}?tab=activity`);
       await sendMultichainTransaction(account.metadata.snap.id, {
         account: account.id,
         scope: chainId,
         assetType: assetTypeToUse,
       });
     } catch (error) {
       // Restore the previous tab in case of any error (see FIXME comment above).
-      await dispatch(setDefaultHomeActiveTabName(currentActivityTabName));
+      if (currentTab) {
+        navigate(`${DEFAULT_ROUTE}?tab=${currentTab}`);
+      }
     }
   };
 };
diff --git a/ui/components/app/wallet-overview/non-evm-overview.test.tsx b/ui/components/app/wallet-overview/non-evm-overview.test.tsx
@@ -19,7 +19,6 @@ import useMultiPolling from '../../../hooks/useMultiPolling';
 import { BITCOIN_WALLET_SNAP_ID } from '../../../../shared/lib/accounts/bitcoin-wallet-snap';
 import NonEvmOverview from './non-evm-overview';
 
-// We need to mock `dispatch` since we use it for `setDefaultHomeActiveTabName`.
 const mockDispatch = jest.fn().mockReturnValue(() => jest.fn());
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -29,7 +28,6 @@ jest.mock('react-redux', () => ({
 jest.mock('../../../store/actions', () => ({
   handleSnapRequest: jest.fn(),
   sendMultichainTransaction: jest.fn(),
-  setDefaultHomeActiveTabName: jest.fn(),
   tokenBalancesStartPolling: jest.fn().mockResolvedValue('pollingToken'),
   tokenBalancesStopPollingByPollingToken: jest.fn(),
 }));

@@ -1,5 +1,6 @@
 import React, { useState, useCallback, useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { useSearchParams } from 'react-router-dom-v5-compat';
 import {
   BtcAccountType,
   EthAccountType,
@@ -16,7 +17,6 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   getAllChainsToPoll,
   getConnectedSubjectsForAllAddresses,
-  getDefaultHomeActiveTabName,
   getHDEntropyIndex,
   getOriginOfCurrentTab,
   getSelectedInternalAccount,
@@ -75,11 +75,20 @@ export const MultichainAccountListMenu = ({
   ) as AccountConnections;
   const currentTabOrigin = useSelector(getOriginOfCurrentTab);
   const dispatch = useDispatch();
+  const [searchParams] = useSearchParams();
 
   const walletAccountCollection = useSelector(getWalletsWithAccountsSimplified);
-  const defaultHomeActiveTabName: AccountOverviewTabKey = useSelector(
-    getDefaultHomeActiveTabName,
-  );
+
+  // Get current tab from URL query parameters
+  const currentTabFromUrl = searchParams.get('tab');
+  const currentTab: AccountOverviewTabKey =
+    currentTabFromUrl &&
+    Object.values(AccountOverviewTabKey).includes(
+      currentTabFromUrl as AccountOverviewTabKey,
+    )
+      ? (currentTabFromUrl as AccountOverviewTabKey)
+      : AccountOverviewTabKey.Tokens;
+
   const [searchPattern, setSearchPattern] = useState<string>('');
 
   // Here we are getting the keyring of the last selected account
@@ -98,26 +107,15 @@ export const MultichainAccountListMenu = ({
         },
       });
       endTrace({
-        name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[
-          defaultHomeActiveTabName
-        ],
+        name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[currentTab],
       });
       trace({
-        name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[
-          defaultHomeActiveTabName
-        ],
+        name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[currentTab],
       });
       dispatch(setSelectedAccount(account.address));
       dispatch(detectNfts(allChainIds));
     },
-    [
-      dispatch,
-      onClose,
-      trackEvent,
-      defaultHomeActiveTabName,
-      hdEntropyIndex,
-      allChainIds,
-    ],
+    [dispatch, onClose, trackEvent, currentTab, hdEntropyIndex, allChainIds],
   );
 
   const onSearchBarChange = useCallback(