diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 169e5ccc3dc..9576fde1dd0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -47,7 +47,7 @@ app/util/walletconnect.js   @MetaMask/sdk-devs
 
 # Accounts Team
 app/core/Encryptor/   @MetaMask/accounts-engineers
-app/core/Engine/controllers/accounts   @MetaMask/accounts-engineers
+app/core/Engine/controllers/AccountsController   @MetaMask/accounts-engineers
 
 # Swaps Team
 app/components/UI/Swaps              @MetaMask/swaps-engineers
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 31ee91b2191..4214943e066 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -57,7 +57,8 @@ body:
        - In production (default)
        - In beta
        - During release testing
-       - On the development branch
+       - On main branch
+       - On a feature branch
    validations:
      required: true
  - type: input
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index ee49fad0639..4b36fc4275e 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -25,7 +25,8 @@ To merge your PR one of the following QA labels are required:
 - **Run E2E Smoke**: This label will kick-off E2E testing and trigger a check to make sure the E2E tests pass. 
 
 ### Optional labels:
-- **regression-develop**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.
+- **regression-main**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.
+- **feature-branch-bug**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on a feature branch, i.e., before merging to `main`.
 
 ### Labels prohibited when PR needs to be merged:
 Any PR that includes one of the following labels can not be merged:
diff --git a/.github/scripts/bitrise/run-bitrise-e2e-check.ts b/.github/scripts/bitrise/run-bitrise-e2e-check.ts
index 62935ca966d..123920a036d 100644
--- a/.github/scripts/bitrise/run-bitrise-e2e-check.ts
+++ b/.github/scripts/bitrise/run-bitrise-e2e-check.ts
@@ -8,11 +8,107 @@ import {
 } from '../scripts.types';
 import axios from 'axios';
 
+let octokitInstance: InstanceType<typeof GitHub> | null = null;
+let owner: string;
+let repo: string;
+
 main().catch((error: Error): void => {
   console.error(error);
   process.exit(1);
 });
 
+
+
+function getOctokitInstance(): InstanceType<typeof GitHub> {
+  if (!octokitInstance) {
+    const githubToken = process.env.GITHUB_TOKEN;
+    if (!githubToken) {
+      throw new Error("GitHub token is not set in the environment variables");
+    }
+    octokitInstance = getOctokit(githubToken);
+  }
+  return octokitInstance;
+}
+
+async function upsertStatusCheck(
+  statusCheckName: string,
+  commitHash: string,
+  status: StatusCheckStatusType, 
+  conclusion: CompletedConclusionType | undefined, 
+  summary: string
+): Promise<void> {
+  const octokit = getOctokitInstance();
+
+  // List existing checks
+  const listResponse = await octokit.rest.checks.listForRef({
+    owner,
+    repo,
+    ref: commitHash,
+  });
+
+  if (listResponse.status !== 200) {
+    core.setFailed(
+      `Failed to list checks for commit ${commitHash}, received status code ${listResponse.status}`,
+    );
+    process.exit(1);
+  }
+
+  const existingCheck = listResponse.data.check_runs.find(check => check.name === statusCheckName);
+
+  if (existingCheck) {
+    console.log(`Check already exists: ${existingCheck.name}, updating...`);
+    // Update the existing check
+    const updateCheckResponse = await octokit.rest.checks.update({
+      owner,
+      repo,
+      check_run_id: existingCheck.id,
+      name: statusCheckName,
+      status: status,
+      conclusion: conclusion,
+      output: {
+        title: `${statusCheckName} Status Check`,
+        summary: summary,
+      },
+    });
+
+    if (updateCheckResponse.status !== 200) {
+      core.setFailed(
+        `Failed to update '${statusCheckName}' check with status ${status} for commit ${commitHash}, got status code ${updateCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
+
+    console.log(`Updated existing check: ${statusCheckName} with id ${existingCheck.id} & status ${status} for commit ${commitHash}`);
+
+    
+
+  } else {
+    console.log(`Check does not exist: ${statusCheckName}, creating...`);
+    // Create a new status check
+    const createCheckResponse = await octokit.rest.checks.create({
+      owner,
+      repo,
+      name: statusCheckName,
+      head_sha: commitHash,
+      status: status,
+      conclusion: conclusion,
+      started_at: new Date().toISOString(),
+      output: {
+        title: `${statusCheckName} Status Check`,
+        summary: summary,
+      },
+    });
+
+    if (createCheckResponse.status !== 201) {
+      core.setFailed(
+        `Failed to create '${statusCheckName}' check with status ${status} for commit ${commitHash}, got status code ${createCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
+
+    console.log(`Created check: ${statusCheckName} with id ${createCheckResponse.data.id} & status ${status} for commit ${commitHash}`);
+  }
+}
 // Determine whether E2E should run and provide the associated reason
 function shouldRunBitriseE2E(antiLabel: boolean, hasSmokeTestLabel: boolean, isDocs: boolean, isFork: boolean, isMergeQueue: boolean): [boolean, string] {
 
@@ -43,7 +139,11 @@ async function main(): Promise<void> {
   const e2ePipeline = process.env.E2E_PIPELINE;
   const workflowName = process.env.WORKFLOW_NAME;
   const triggerAction = context.payload.action as PullRequestTriggerType;
-  const { owner, repo, number: pullRequestNumber } = context.issue;
+  // Assuming context.issue comes populated with owner and repo, as typical with GitHub Actions
+  const { owner: contextOwner, repo: contextRepo, number: pullRequestNumber } = context.issue;
+  owner = contextOwner;
+  repo = contextRepo;
+  
   const removeAndApplyInstructions = `Remove and re-apply the "${e2eLabel}" label to trigger a E2E smoke test on Bitrise.`;
   const mergeFromMainCommitMessagePrefix = `Merge branch 'main' into`;
   const pullRequestLink = `https://github.com/MetaMask/metamask-mobile/pull/${pullRequestNumber}`;
@@ -80,7 +180,7 @@ async function main(): Promise<void> {
   const mqCommitHash = context.payload?.merge_group?.head_sha;
 
 
-  const octokit: InstanceType<typeof GitHub> = getOctokit(githubToken);
+  const octokit = getOctokitInstance();
 
   const { data: prData } = await octokit.rest.pulls.get({
     owner,
@@ -114,34 +214,9 @@ async function main(): Promise<void> {
   if (!mergeQueue && !hasSmokeTestLabel && !hasAntiLabel) {
 
     // Fail Status due to missing labels
-    const createStatusCheckResponse = await octokit.rest.checks.create({
-      owner,
-      repo,
-      name: statusCheckName,
-      head_sha: latestCommitHash,
-      status: StatusCheckStatusType.Completed,
-      conclusion: CompletedConclusionType.Failure, 
-      started_at: new Date().toISOString(),
-      output: {
-        title: statusCheckTitle,
-        summary: `Failed due to missing labels. Please apply either ${e2eLabel} or ${antiLabel}.`,
-      },
-    });
-
-    if (createStatusCheckResponse.status === 201) {
-      console.log(
-        `Created '${statusCheckName}' check with failed status for commit ${latestCommitHash}`,
-      );
-    } else {
-      core.setFailed(
-        `Failed to create '${statusCheckName}' check with failed status for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
-    core.setFailed(
-      `At least 1 E2E Label must be Applied either ${e2eLabel} or ${antiLabel}`,
-    );
-    process.exit(1);
+    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed, 
+      CompletedConclusionType.Failure, `Failed due to missing labels. Please apply either ${e2eLabel} or ${antiLabel}.`);
+    return
   }
 
   if (!shouldRun) {
@@ -149,32 +224,8 @@ async function main(): Promise<void> {
       `Skipping Bitrise status check. due to the following reason: ${reason}`,
     );
 
-    
-    // Post success status (skipped)
-    const createStatusCheckResponse = await octokit.rest.checks.create({
-      owner,
-      repo,
-      name: statusCheckName,
-      head_sha: latestCommitHash,
-      status: StatusCheckStatusType.Completed,
-      conclusion: CompletedConclusionType.Success, 
-      started_at: new Date().toISOString(),
-      output: {
-        title: statusCheckTitle,
-        summary: `Skip run since ${reason}`,
-      },
-    });
-
-    if (createStatusCheckResponse.status === 201) {
-      console.log(
-        `Created '${statusCheckName}' check with skipped status for commit ${latestCommitHash}`,
-      );
-    } else {
-      core.setFailed(
-        `Failed to create '${statusCheckName}' check with skipped status for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
+    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed, CompletedConclusionType.Success,
+      `Skip run since ${reason}`);
     return;
   }
 
@@ -314,29 +365,9 @@ async function main(): Promise<void> {
     // Post pending status
     console.log(`Posting pending status for commit ${latestCommitHash}`);
     
-    const createStatusCheckResponse = await octokit.rest.checks.create({
-      owner,
-      repo,
-      name: statusCheckName,
-      head_sha: latestCommitHash,
-      status: StatusCheckStatusType.InProgress,
-      started_at: new Date().toISOString(),
-      output: {
-        title: statusCheckTitle,
-        summary: `Test runs in progress... You can view them at ${buildLink}`,
-      },
-    });
+    await upsertStatusCheck( statusCheckName, latestCommitHash, StatusCheckStatusType.InProgress, undefined, `Test runs in progress... You can view them at ${buildLink}`);
+
 
-    if (createStatusCheckResponse.status === 201) {
-      console.log(
-        `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
-      );
-    } else {
-      core.setFailed(
-        `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
     return;
   }
 
@@ -383,31 +414,11 @@ async function main(): Promise<void> {
   if (!bitriseComment) {
 
     console.log(`Bitrise comment not detected for commit ${latestCommitHash}`);
-    // Post fail status
-    const createStatusCheckResponse = await octokit.rest.checks.create({
-      owner,
-      repo,
-      name: statusCheckName,
-      head_sha: latestCommitHash,
-      status: StatusCheckStatusType.Completed,
-      conclusion: CompletedConclusionType.Failure,
-      started_at: new Date().toISOString(),
-      output: {
-        title: statusCheckTitle,
-        summary: `No Bitrise comment found for commit ${latestCommitHash}. Try re-applying the '${e2eLabel}' label.`,
-      },
-    });
 
-    if (createStatusCheckResponse.status === 201) {
-      console.log(
-        `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
-      );
-    } else {
-      core.setFailed(
-        `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
+    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed,
+       CompletedConclusionType.Failure, 
+       `No Bitrise comment found for commit ${latestCommitHash}. Try re-applying the '${e2eLabel}' label.`);
+
     return;
   }
 
@@ -498,27 +509,6 @@ async function main(): Promise<void> {
   }
 
   // Post status check
-  const createStatusCheckResponse = await octokit.rest.checks.create({
-    owner,
-    repo,
-    name: statusCheckName,
-    head_sha: latestCommitHash,
-    started_at: new Date().toISOString(),
-    output: {
-      title: statusCheckTitle,
-      summary: statusMessage,
-    },
-    ...checkStatus,
-  });
+  await upsertStatusCheck(statusCheckName, latestCommitHash, checkStatus.status, checkStatus.conclusion, statusMessage);
 
-  if (createStatusCheckResponse.status === 201) {
-    console.log(
-      `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
-    );
-  } else {
-    core.setFailed(
-      `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
-    );
-    process.exit(1);
-  }
 }
diff --git a/.github/scripts/check-template-and-add-labels.ts b/.github/scripts/check-template-and-add-labels.ts
index e0a59e21d8e..fef8a5585d1 100644
--- a/.github/scripts/check-template-and-add-labels.ts
+++ b/.github/scripts/check-template-and-add-labels.ts
@@ -20,7 +20,8 @@ import { TemplateType, templates } from './shared/template';
 import { retrievePullRequest } from './shared/pull-request';
 
 enum RegressionStage {
-  Development,
+  DevelopmentFeature,
+  DevelopmentMain,
   Testing,
   Beta,
   Production
@@ -202,8 +203,10 @@ function extractRegressionStageFromBugReportIssueBody(
   const extractedAnswer = match ? match[1].trim() : undefined;
 
   switch (extractedAnswer) {
-    case 'On the development branch':
-      return RegressionStage.Development;
+    case 'On a feature branch':
+      return RegressionStage.DevelopmentFeature;
+    case 'On main branch':
+      return RegressionStage.DevelopmentMain;
     case 'During release testing':
       return RegressionStage.Testing;
     case 'In beta':
@@ -317,11 +320,18 @@ async function userBelongsToMetaMaskOrg(
 // This function crafts appropriate label, corresponding to regression stage and release version.
 function craftRegressionLabel(regressionStage: RegressionStage | undefined, releaseVersion: string | undefined): Label {
   switch (regressionStage) {
-    case RegressionStage.Development:
+    case RegressionStage.DevelopmentFeature:
+      return {
+        name: `feature-branch-bug`,
+        color: '5319E7', // violet
+        description: `bug that was found on a feature branch, but not yet merged in main branch`,
+      };
+
+    case RegressionStage.DevelopmentMain:
       return {
         name: `regression-develop`,
         color: '5319E7', // violet
-        description: `Regression bug that was found on development branch, but not yet present in production`,
+        description: `Regression bug that was found on main branch, but not yet present in production`,
       };
 
     case RegressionStage.Testing:
diff --git a/.js.env.example b/.js.env.example
index 1c11f591536..56c7c1bb865 100644
--- a/.js.env.example
+++ b/.js.env.example
@@ -1,16 +1,15 @@
 # Sign up and generate your own keys at pubnub.com
 # Then rename this file to ".js.env" and rebuild the app
-#
+# 
 # In order for this feature to work properly, you need to
 # build metamask-extension from source (https://github.com/MetaMask/metamask-extension)
 # and set your the same values there.
-#
+# 
 # For more info take a look at https://github.com/MetaMask/metamask-extension/pull/5955
 
 export MM_PUBNUB_SUB_KEY=""
 export MM_PUBNUB_PUB_KEY=""
 export MM_OPENSEA_KEY=""
-export MM_ETHERSCAN_KEY=""
 export MM_FOX_CODE="EXAMPLE_FOX_CODE"
 
 # NOTE: Non-MetaMask only, will need to create an account and generate
@@ -70,6 +69,10 @@ export SEGMENT_FLUSH_EVENT_LIMIT="1"
 # URL of security alerts API used to validate dApp requests.
 export SECURITY_ALERTS_API_URL="https://security-alerts.api.cx.metamask.io"
 
+# Enable Portfolio View
+export PORTFOLIO_VIEW="true"
+
+
 # Temporary mechanism to enable security alerts API prior to release.
 export MM_SECURITY_ALERTS_API_ENABLED="true"
 # Firebase
@@ -81,7 +84,7 @@ export FCM_CONFIG_MESSAGING_SENDER_ID=""
 export FCM_CONFIG_APP_ID=""
 export GOOGLE_SERVICES_B64_ANDROID=""
 export GOOGLE_SERVICES_B64_IOS=""
-#Notifications Feature Announcements
+# Notifications Feature Announcements
 export FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN=
 export FEATURES_ANNOUNCEMENTS_SPACE_ID=
 
@@ -96,8 +99,8 @@ export MM_PER_DAPP_SELECTED_NETWORK=""
 
 export MM_CHAIN_PERMISSIONS=""
 
-#Multichain feature flag specific to UI changes
+# Multichain feature flag specific to UI changes
 export MM_MULTICHAIN_V1_ENABLED=""
 
-#Permissions Settings feature flag specific to UI changes
+# Permissions Settings feature flag specific to UI changes
 export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e735c29e177..155b760639f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,68 @@
 
 ## Current Main Branch
 
+## 7.37.0 - Nov 28, 2024
+### Added
+- [#12091](https://github.com/MetaMask/metamask-mobile/pull/12091): feat: 2020 Add a performance test for iOS in Bitrise (#12091)
+- [#12148](https://github.com/MetaMask/metamask-mobile/pull/12148): feat: Enable smart transactions for new users (#12148)
+- [#12442](https://github.com/MetaMask/metamask-mobile/pull/12442): test: add a new unit test to cover for multichain feature flags ON (#12442)
+- [#12420](https://github.com/MetaMask/metamask-mobile/pull/12420): feat(3598): non permitted chain flow small improvements (#12420)
+- [#12198](https://github.com/MetaMask/metamask-mobile/pull/12198): feat: custom names for snap accounts  (Flask only) (#12198)
+- [#12396](https://github.com/MetaMask/metamask-mobile/pull/12396): feat(ramp): enable buy button in asset overview (#12396)
+- [#11613](https://github.com/MetaMask/metamask-mobile/pull/11613): feat(ramp): improve amount editing formatting (#11613)
+- [#12393](https://github.com/MetaMask/metamask-mobile/pull/12393): feat: Creating data tree for signed type V1 signatures (#12393)
+- [#12160](https://github.com/MetaMask/metamask-mobile/pull/12160): feat: Integrate NFT api to display image & names in simulations includes `erc721`s (#12160)
+- [#12324](https://github.com/MetaMask/metamask-mobile/pull/12324): feat: confirmation re-designs add basic page for types sign V1 signature request (#12324)
+- [#11424](https://github.com/MetaMask/metamask-mobile/pull/11424): feat: add workflow for updating automated test results in TestRail (#11424)
+- [#12337](https://github.com/MetaMask/metamask-mobile/pull/12337): feat: updated staking events to use withMetaMetrics helper (#12337)
+- [#12363](https://github.com/MetaMask/metamask-mobile/pull/12363): feat: add PooledStaking slice for managing staking state (#12363)
+- [#12398](https://github.com/MetaMask/metamask-mobile/pull/12398): feat: limit input digits to 12 in useInputHandler (#12398)
+- [#12344](https://github.com/MetaMask/metamask-mobile/pull/12344): feat: upgrade assets controllers to v44 (#12344)
+- [#12340](https://github.com/MetaMask/metamask-mobile/pull/12340): feat: upgrade assets controllers to version 43 (#12340)
+- [#12270](https://github.com/MetaMask/metamask-mobile/pull/12270): feat: upgrade assets controllers to 42 with multichain token rates (#12270)
+- [#12452](https://github.com/MetaMask/metamask-mobile/pull/12452): feat: updated staking events to use withMetaMetrics helper (#12337) (#12452)
+
+### Changed
+- [#12356](https://github.com/MetaMask/metamask-mobile/pull/12356): chore: Remove unnecessary event prop (#12356)
+- [#12425](https://github.com/MetaMask/metamask-mobile/pull/12425): ci: create ci workflow for multichain flow (#12425)
+- [#12350](https://github.com/MetaMask/metamask-mobile/pull/12350): chore: Bump Snaps packages (#12350)
+- [#11409](https://github.com/MetaMask/metamask-mobile/pull/11409): refactor: use `withKeyring` to batch account restore operation (#11409)
+- [#12339](https://github.com/MetaMask/metamask-mobile/pull/12339): chore: Update accounts-controller @v19.0.0 and keyring-controller @v18.0.0 (#12339)
+- [#12440](https://github.com/MetaMask/metamask-mobile/pull/12440): chore(ramp): upgrade sdk to 1.28.7 (#12440)
+- [#12351](https://github.com/MetaMask/metamask-mobile/pull/12351): refactor(ramp): remove anonymous events (#12351)
+- [#12355](https://github.com/MetaMask/metamask-mobile/pull/12355): chore: Add missing confirmation unit tests (#12355)
+- [#12369](https://github.com/MetaMask/metamask-mobile/pull/12369): chore: upgrade transaction controller to increase polling rate (#12369)
+- [#12202](https://github.com/MetaMask/metamask-mobile/pull/12202): refactor: update swaps quote poll count (#12202)
+- [#10743](https://github.com/MetaMask/metamask-mobile/pull/10743): chore: @metamask/swaps-controller v9 -> v10 (#10743)
+- [#12415](https://github.com/MetaMask/metamask-mobile/pull/12415): chore: Cherry pick 2506358 (merge in trackEvent work) (#12415)
+- [#12238](https://github.com/MetaMask/metamask-mobile/pull/12238): chore: update codeowners (#12238)
+- [#12416](https://github.com/MetaMask/metamask-mobile/pull/12416): chore: Chore/update accounts controller messenger code owner (#12416)
+- [#12366](https://github.com/MetaMask/metamask-mobile/pull/12366): chore: #12184 MVP split engine file (#12366)
+- [#12362](https://github.com/MetaMask/metamask-mobile/pull/12362): chore: Unit tests for tags approval controller undefined  (#12362)
+- [#12343](https://github.com/MetaMask/metamask-mobile/pull/12343): chore: Cherry pick f35d583 (#12343)
+- [#12332](https://github.com/MetaMask/metamask-mobile/pull/12332): chore: do not show staked eth balance when balance is zero on homepage or asset detail (#12332)
+- [#12413](https://github.com/MetaMask/metamask-mobile/pull/12413): chore: simplify cicd rls script (#12413)
+- [#12334](https://github.com/MetaMask/metamask-mobile/pull/12334): chore: updating filter icon (#12334)
+
+### Fixed
+- [#12313](https://github.com/MetaMask/metamask-mobile/pull/12313): fix: Remove run all tests section (#12313)
+- [#12489](https://github.com/MetaMask/metamask-mobile/pull/12489): fix: replace end of navigation init and UIStartup span (#12489)
+- [#12331](https://github.com/MetaMask/metamask-mobile/pull/12331): fix: tags pending approvals receiving undefined  (#12331)
+- [#10486](https://github.com/MetaMask/metamask-mobile/pull/10486): fix: limit ReactNativeWebview message size (#10486)
+- [#12478](https://github.com/MetaMask/metamask-mobile/pull/12478): fix: incorrect event source in analytics and connection (#12478)
+- [#10786](https://github.com/MetaMask/metamask-mobile/pull/10786): fix: added icon to walletconnect metadata (#10786)
+- [#12455](https://github.com/MetaMask/metamask-mobile/pull/12455): fix: gas fee edit from swaps (#12455)
+- [#12370](https://github.com/MetaMask/metamask-mobile/pull/12370): fix: Fix copy of ""Network fee"" on approval (#12370)
+- [#12273](https://github.com/MetaMask/metamask-mobile/pull/12273): fix: Disable confirm button if `transactionMeta` is undefined (#12273)
+- [#12367](https://github.com/MetaMask/metamask-mobile/pull/12367): fix: app crashing after send or swap (#12367)
+- [#12446](https://github.com/MetaMask/metamask-mobile/pull/12446): fix: update wallet_addEthereumChain.js with correct MetricsEventBuilder (#12446)
+- [#12180](https://github.com/MetaMask/metamask-mobile/pull/12180): fix: trackevent enabled is undefined (#12180)
+- [#12315](https://github.com/MetaMask/metamask-mobile/pull/12315): fix: e2e: ensure Decrypt button is displayed (#12315)
+- [#12402](https://github.com/MetaMask/metamask-mobile/pull/12402): fix: fix missing variable patch (#12402)
+- [#12319](https://github.com/MetaMask/metamask-mobile/pull/12319): fix: hide rpc url selector for networks with one rpc (#12319)
+- [#12371](https://github.com/MetaMask/metamask-mobile/pull/12371): fix: fix patch missing variable sentry error (#12371)
+- [#12375](https://github.com/MetaMask/metamask-mobile/pull/12375): fix: breaking selector due to missing controller state (#12375)
+
 ## 7.36.0 - Nov 15, 2024
 ### Added
 - [#12015](https://github.com/MetaMask/metamask-mobile/pull/12015): feat: 1957 crash screen redesign (#12015)
diff --git a/README.md b/README.md
index 638b073f580..2f47d76233d 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,15 @@ yarn watch
 
 #### Download and install the development build
 
-Go to the app's [GitHub Releases page](https://github.com/MetaMask/metamask-mobile/releases), download the latest release development build (android-expo-dev-build.apk or ios-expo-dev-build.ipa) and install it on an Android/iOS simulator or Android/iOS physical device.
+#### For internal developers
+- Access Runway via Okta and go to the Expo bucket either on the iOS or Android section. From there you will see the available development builds (android-expo-dev-build.apk or ios-expo-dev-build.ipa).
+- For Android:
+  - Install the .apk on your Android device or simulator.
+- For iOS:
+  - Device: you need to have your iPhone registered with our Apple dev account. If you have it, you can install the .ipa on your device.
+  - Simulator: please follow the [native development section](https://github.com/MetaMask/metamask-mobile?tab=readme-ov-file#native-development) and run `yarn setup` and `yarn start:ios` as the .ipa will not work for now, we are working on having an .app that works on simulators.
+
+##### [SOON] For external developers (we are testing the new dev builds and will make them publicly available soon after)
 
 #### Load the app
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index bbc2eef2ef6..c856cc0492f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -178,8 +178,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1505
-        versionName "7.36.0"
+        versionName "7.37.0"
+        versionCode 1512
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/actions/navigation/index.ts b/app/actions/navigation/index.ts
index 7a6fac7e9a0..b4c82b9a98e 100644
--- a/app/actions/navigation/index.ts
+++ b/app/actions/navigation/index.ts
@@ -1,18 +1,28 @@
 /* eslint-disable import/prefer-default-export */
 import {
-  SET_CURRENT_ROUTE,
-  SET_CURRENT_BOTTOM_NAV_ROUTE,
-} from '../../reducers/navigation';
+  type OnNavigationReadyAction,
+  type SetCurrentRouteAction,
+  type SetCurrentBottomNavRouteAction,
+  NavigationActionType,
+} from './types';
 
-/**
- * Action Creators
- */
-export const setCurrentRoute = (route: string) => ({
-  type: SET_CURRENT_ROUTE,
+export * from './types';
+
+export const setCurrentRoute = (route: string): SetCurrentRouteAction => ({
+  type: NavigationActionType.SET_CURRENT_ROUTE,
   payload: { route },
 });
 
-export const setCurrentBottomNavRoute = (route: string) => ({
-  type: SET_CURRENT_BOTTOM_NAV_ROUTE,
+export const setCurrentBottomNavRoute = (
+  route: string,
+): SetCurrentBottomNavRouteAction => ({
+  type: NavigationActionType.SET_CURRENT_BOTTOM_NAV_ROUTE,
   payload: { route },
 });
+
+/**
+ * Action that is called when navigation is ready
+ */
+export const onNavigationReady = (): OnNavigationReadyAction => ({
+  type: NavigationActionType.ON_NAVIGATION_READY,
+});
diff --git a/app/actions/navigation/types.ts b/app/actions/navigation/types.ts
new file mode 100644
index 00000000000..c57beba69da
--- /dev/null
+++ b/app/actions/navigation/types.ts
@@ -0,0 +1,31 @@
+import { type Action } from 'redux';
+
+/**
+ * Navigation action type enum
+ */
+export enum NavigationActionType {
+  ON_NAVIGATION_READY = 'ON_NAVIGATION_READY',
+  SET_CURRENT_ROUTE = 'SET_CURRENT_ROUTE',
+  SET_CURRENT_BOTTOM_NAV_ROUTE = 'SET_CURRENT_BOTTOM_NAV_ROUTE',
+}
+
+export type OnNavigationReadyAction =
+  Action<NavigationActionType.ON_NAVIGATION_READY>;
+
+export type SetCurrentRouteAction =
+  Action<NavigationActionType.SET_CURRENT_ROUTE> & {
+    payload: { route: string };
+  };
+
+export type SetCurrentBottomNavRouteAction =
+  Action<NavigationActionType.SET_CURRENT_BOTTOM_NAV_ROUTE> & {
+    payload: { route: string };
+  };
+
+/**
+ * Navigation action
+ */
+export type NavigationAction =
+  | OnNavigationReadyAction
+  | SetCurrentRouteAction
+  | SetCurrentBottomNavRouteAction;
diff --git a/app/actions/user/index.js b/app/actions/user/index.js
deleted file mode 100644
index fd996b8707f..00000000000
--- a/app/actions/user/index.js
+++ /dev/null
@@ -1,134 +0,0 @@
-// Constants
-export const LOCKED_APP = 'LOCKED_APP';
-export const AUTH_SUCCESS = 'AUTH_SUCCESS';
-export const AUTH_ERROR = 'AUTH_ERROR';
-export const INTERRUPT_BIOMETRICS = 'INTERRUPT_BIOMETRICS';
-export const LOGIN = 'LOGIN';
-export const LOGOUT = 'LOGOUT';
-
-export function interruptBiometrics() {
-  return {
-    type: INTERRUPT_BIOMETRICS,
-  };
-}
-
-export function lockApp() {
-  return {
-    type: LOCKED_APP,
-  };
-}
-
-export function authSuccess(bioStateMachineId) {
-  return {
-    type: AUTH_SUCCESS,
-    payload: { bioStateMachineId },
-  };
-}
-
-export function authError(bioStateMachineId) {
-  return {
-    type: AUTH_ERROR,
-    payload: { bioStateMachineId },
-  };
-}
-
-export function passwordSet() {
-  return {
-    type: 'PASSWORD_SET',
-  };
-}
-
-export function passwordUnset() {
-  return {
-    type: 'PASSWORD_UNSET',
-  };
-}
-
-export function seedphraseBackedUp() {
-  return {
-    type: 'SEEDPHRASE_BACKED_UP',
-  };
-}
-
-export function seedphraseNotBackedUp() {
-  return {
-    type: 'SEEDPHRASE_NOT_BACKED_UP',
-  };
-}
-
-export function backUpSeedphraseAlertVisible() {
-  return {
-    type: 'BACK_UP_SEEDPHRASE_VISIBLE',
-  };
-}
-
-export function backUpSeedphraseAlertNotVisible() {
-  return {
-    type: 'BACK_UP_SEEDPHRASE_NOT_VISIBLE',
-  };
-}
-
-export function protectWalletModalVisible() {
-  return {
-    type: 'PROTECT_MODAL_VISIBLE',
-  };
-}
-
-export function protectWalletModalNotVisible() {
-  return {
-    type: 'PROTECT_MODAL_NOT_VISIBLE',
-  };
-}
-
-export function loadingSet(loadingMsg) {
-  return {
-    type: 'LOADING_SET',
-    loadingMsg,
-  };
-}
-
-export function loadingUnset() {
-  return {
-    type: 'LOADING_UNSET',
-  };
-}
-
-export function setGasEducationCarouselSeen() {
-  return {
-    type: 'SET_GAS_EDUCATION_CAROUSEL_SEEN',
-  };
-}
-
-export function logIn() {
-  return {
-    type: LOGIN,
-  };
-}
-
-export function logOut() {
-  return {
-    type: LOGOUT,
-  };
-}
-
-export function setAppTheme(theme) {
-  return {
-    type: 'SET_APP_THEME',
-    payload: { theme },
-  };
-}
-
-/**
- * Temporary action to control auth flow
- *
- * @param {string} initialScreen - "login" or "onboarding"
- * @returns - void
- */
-export function checkedAuth(initialScreen) {
-  return {
-    type: 'CHECKED_AUTH',
-    payload: {
-      initialScreen,
-    },
-  };
-}
diff --git a/app/actions/user/index.ts b/app/actions/user/index.ts
new file mode 100644
index 00000000000..9071fcffd50
--- /dev/null
+++ b/app/actions/user/index.ts
@@ -0,0 +1,161 @@
+import { type AppThemeKey } from '../../util/theme/models';
+import {
+  type InterruptBiometricsAction,
+  type LockAppAction,
+  type AuthSuccessAction,
+  type AuthErrorAction,
+  type PasswordSetAction,
+  type PasswordUnsetAction,
+  type SeedphraseBackedUpAction,
+  type SeedphraseNotBackedUpAction,
+  type BackUpSeedphraseVisibleAction,
+  type BackUpSeedphraseNotVisibleAction,
+  type ProtectModalVisibleAction,
+  type ProtectModalNotVisibleAction,
+  type LoadingSetAction,
+  type LoadingUnsetAction,
+  type SetGasEducationCarouselSeenAction,
+  type LoginAction,
+  type LogoutAction,
+  type SetAppThemeAction,
+  type CheckedAuthAction,
+  type PersistedDataLoadedAction,
+  UserActionType,
+} from './types';
+
+export * from './types';
+
+export function interruptBiometrics(): InterruptBiometricsAction {
+  return {
+    type: UserActionType.INTERRUPT_BIOMETRICS,
+  };
+}
+
+export function lockApp(): LockAppAction {
+  return {
+    type: UserActionType.LOCKED_APP,
+  };
+}
+
+export function authSuccess(bioStateMachineId?: string): AuthSuccessAction {
+  return {
+    type: UserActionType.AUTH_SUCCESS,
+    payload: { bioStateMachineId },
+  };
+}
+
+export function authError(bioStateMachineId?: string): AuthErrorAction {
+  return {
+    type: UserActionType.AUTH_ERROR,
+    payload: { bioStateMachineId },
+  };
+}
+
+export function passwordSet(): PasswordSetAction {
+  return {
+    type: UserActionType.PASSWORD_SET,
+  };
+}
+
+export function passwordUnset(): PasswordUnsetAction {
+  return {
+    type: UserActionType.PASSWORD_UNSET,
+  };
+}
+
+export function seedphraseBackedUp(): SeedphraseBackedUpAction {
+  return {
+    type: UserActionType.SEEDPHRASE_BACKED_UP,
+  };
+}
+
+export function seedphraseNotBackedUp(): SeedphraseNotBackedUpAction {
+  return {
+    type: UserActionType.SEEDPHRASE_NOT_BACKED_UP,
+  };
+}
+
+export function backUpSeedphraseAlertVisible(): BackUpSeedphraseVisibleAction {
+  return {
+    type: UserActionType.BACK_UP_SEEDPHRASE_VISIBLE,
+  };
+}
+
+export function backUpSeedphraseAlertNotVisible(): BackUpSeedphraseNotVisibleAction {
+  return {
+    type: UserActionType.BACK_UP_SEEDPHRASE_NOT_VISIBLE,
+  };
+}
+
+export function protectWalletModalVisible(): ProtectModalVisibleAction {
+  return {
+    type: UserActionType.PROTECT_MODAL_VISIBLE,
+  };
+}
+
+export function protectWalletModalNotVisible(): ProtectModalNotVisibleAction {
+  return {
+    type: UserActionType.PROTECT_MODAL_NOT_VISIBLE,
+  };
+}
+
+export function loadingSet(loadingMsg: string): LoadingSetAction {
+  return {
+    type: UserActionType.LOADING_SET,
+    loadingMsg,
+  };
+}
+
+export function loadingUnset(): LoadingUnsetAction {
+  return {
+    type: UserActionType.LOADING_UNSET,
+  };
+}
+
+export function setGasEducationCarouselSeen(): SetGasEducationCarouselSeenAction {
+  return {
+    type: UserActionType.SET_GAS_EDUCATION_CAROUSEL_SEEN,
+  };
+}
+
+export function logIn(): LoginAction {
+  return {
+    type: UserActionType.LOGIN,
+  };
+}
+
+export function logOut(): LogoutAction {
+  return {
+    type: UserActionType.LOGOUT,
+  };
+}
+
+export function setAppTheme(theme: AppThemeKey): SetAppThemeAction {
+  return {
+    type: UserActionType.SET_APP_THEME,
+    payload: { theme },
+  };
+}
+
+/**
+ * Temporary action to control auth flow
+ *
+ * @param initialScreen - "login" or "onboarding"
+ */
+export function checkedAuth(initialScreen: string): CheckedAuthAction {
+  return {
+    type: UserActionType.CHECKED_AUTH,
+    payload: {
+      initialScreen,
+    },
+  };
+}
+
+/**
+ * Action to signal that persisted data has been loaded
+ */
+export function onPersistedDataLoaded(): PersistedDataLoadedAction {
+  return {
+    type: UserActionType.ON_PERSISTED_DATA_LOADED,
+  };
+}
diff --git a/app/actions/user/types.ts b/app/actions/user/types.ts
new file mode 100644
index 00000000000..704aee6092d
--- /dev/null
+++ b/app/actions/user/types.ts
@@ -0,0 +1,111 @@
+import { type AppThemeKey } from '../../util/theme/models';
+import { type Action } from 'redux';
+
+// Action type enum
+export enum UserActionType {
+  LOCKED_APP = 'LOCKED_APP',
+  AUTH_SUCCESS = 'AUTH_SUCCESS',
+  AUTH_ERROR = 'AUTH_ERROR',
+  INTERRUPT_BIOMETRICS = 'INTERRUPT_BIOMETRICS',
+  LOGIN = 'LOGIN',
+  LOGOUT = 'LOGOUT',
+  ON_PERSISTED_DATA_LOADED = 'ON_PERSISTED_DATA_LOADED',
+  PASSWORD_SET = 'PASSWORD_SET',
+  PASSWORD_UNSET = 'PASSWORD_UNSET',
+  SEEDPHRASE_BACKED_UP = 'SEEDPHRASE_BACKED_UP',
+  SEEDPHRASE_NOT_BACKED_UP = 'SEEDPHRASE_NOT_BACKED_UP',
+  BACK_UP_SEEDPHRASE_VISIBLE = 'BACK_UP_SEEDPHRASE_VISIBLE',
+  BACK_UP_SEEDPHRASE_NOT_VISIBLE = 'BACK_UP_SEEDPHRASE_NOT_VISIBLE',
+  PROTECT_MODAL_VISIBLE = 'PROTECT_MODAL_VISIBLE',
+  PROTECT_MODAL_NOT_VISIBLE = 'PROTECT_MODAL_NOT_VISIBLE',
+  LOADING_SET = 'LOADING_SET',
+  LOADING_UNSET = 'LOADING_UNSET',
+  SET_GAS_EDUCATION_CAROUSEL_SEEN = 'SET_GAS_EDUCATION_CAROUSEL_SEEN',
+  SET_APP_THEME = 'SET_APP_THEME',
+  CHECKED_AUTH = 'CHECKED_AUTH',
+}
+
+// User actions
+export type LockAppAction = Action<UserActionType.LOCKED_APP>;
+
+export type AuthSuccessAction = Action<UserActionType.AUTH_SUCCESS> & {
+  payload: { bioStateMachineId?: string };
+};
+
+export type AuthErrorAction = Action<UserActionType.AUTH_ERROR> & {
+  payload: { bioStateMachineId?: string };
+};
+
+export type InterruptBiometricsAction =
+  Action<UserActionType.INTERRUPT_BIOMETRICS>;
+
+export type LoginAction = Action<UserActionType.LOGIN>;
+
+export type LogoutAction = Action<UserActionType.LOGOUT>;
+
+export type PersistedDataLoadedAction =
+  Action<UserActionType.ON_PERSISTED_DATA_LOADED>;
+
+export type PasswordSetAction = Action<UserActionType.PASSWORD_SET>;
+
+export type PasswordUnsetAction = Action<UserActionType.PASSWORD_UNSET>;
+
+export type SeedphraseBackedUpAction =
+  Action<UserActionType.SEEDPHRASE_BACKED_UP>;
+
+export type SeedphraseNotBackedUpAction =
+  Action<UserActionType.SEEDPHRASE_NOT_BACKED_UP>;
+
+export type BackUpSeedphraseVisibleAction =
+  Action<UserActionType.BACK_UP_SEEDPHRASE_VISIBLE>;
+
+export type BackUpSeedphraseNotVisibleAction =
+  Action<UserActionType.BACK_UP_SEEDPHRASE_NOT_VISIBLE>;
+
+export type ProtectModalVisibleAction =
+  Action<UserActionType.PROTECT_MODAL_VISIBLE>;
+
+export type ProtectModalNotVisibleAction =
+  Action<UserActionType.PROTECT_MODAL_NOT_VISIBLE>;
+
+export type LoadingSetAction = Action<UserActionType.LOADING_SET> & {
+  loadingMsg: string;
+};
+
+export type LoadingUnsetAction = Action<UserActionType.LOADING_UNSET>;
+
+export type SetGasEducationCarouselSeenAction =
+  Action<UserActionType.SET_GAS_EDUCATION_CAROUSEL_SEEN>;
+
+export type SetAppThemeAction = Action<UserActionType.SET_APP_THEME> & {
+  payload: { theme: AppThemeKey };
+};
+
+export type CheckedAuthAction = Action<UserActionType.CHECKED_AUTH> & {
+  payload: { initialScreen: string };
+};
+
+/**
+ * User actions union type
+ */
+export type UserAction =
+  | LockAppAction
+  | AuthSuccessAction
+  | AuthErrorAction
+  | InterruptBiometricsAction
+  | LoginAction
+  | LogoutAction
+  | PersistedDataLoadedAction
+  | PasswordSetAction
+  | PasswordUnsetAction
+  | SeedphraseBackedUpAction
+  | SeedphraseNotBackedUpAction
+  | BackUpSeedphraseVisibleAction
+  | BackUpSeedphraseNotVisibleAction
+  | ProtectModalVisibleAction
+  | ProtectModalNotVisibleAction
+  | LoadingSetAction
+  | LoadingUnsetAction
+  | SetGasEducationCarouselSeenAction
+  | SetAppThemeAction
+  | CheckedAuthAction;
diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
index 7218385de28..32ec533e3ae 100644
--- a/app/components/Nav/App/index.js
+++ b/app/components/Nav/App/index.js
@@ -44,6 +44,7 @@ import { getVersion } from 'react-native-device-info';
 import {
   setCurrentBottomNavRoute,
   setCurrentRoute,
+  onNavigationReady,
 } from '../../../actions/navigation';
 import { findRouteNameFromNavigatorState } from '../../../util/general';
 import { Authentication } from '../../../core/';
@@ -880,6 +881,11 @@ const App = (props) => {
     }
   };
 
+  /**
+   * Triggers when the navigation is ready
+   */
+  const onNavigationReadyHandler = () => dispatch(onNavigationReady());
+
   return supressRender ? null : (
     <>
       {
@@ -905,6 +911,7 @@ const App = (props) => {
           const currentRoute = findRouteNameFromNavigatorState(state.routes);
           triggerSetCurrentRoute(currentRoute);
         }}
+        onReady={onNavigationReadyHandler}
       >
         <Stack.Navigator
           initialRouteName={Routes.FOX_LOADER}
diff --git a/app/components/Nav/Main/RootRPCMethodsUI.js b/app/components/Nav/Main/RootRPCMethodsUI.js
index 31515567b19..d774fd86508 100644
--- a/app/components/Nav/Main/RootRPCMethodsUI.js
+++ b/app/components/Nav/Main/RootRPCMethodsUI.js
@@ -234,20 +234,34 @@ const RootRPCMethodsUI = (props) => {
           );
 
         const parameters = {
-          ...analyticsParams,
           time_to_mine: timeToMine,
           estimated_vs_used_gasRatio: estimatedVsUsedGasRatio,
           quote_vs_executionRatio: quoteVsExecutionRatio,
           token_to_amount_received: tokenToAmountReceived.toString(),
           is_smart_transaction: props.shouldUseSmartTransaction,
           ...smartTransactionMetricsProperties,
+          available_quotes: analyticsParams.available_quotes,
+          best_quote_source: analyticsParams.best_quote_source,
+          chain_id: analyticsParams.chain_id,
+          custom_slippage: analyticsParams.custom_slippage,
+          network_fees_USD: analyticsParams.network_fees_USD,
+          other_quote_selected: analyticsParams.other_quote_selected,
+          request_type: analyticsParams.request_type,
+          token_from: analyticsParams.token_from,
+          token_to: analyticsParams.token_to,
+        };
+        const sensitiveParameters = {
+          token_from_amount: analyticsParams.token_from_amount,
+          token_to_amount: analyticsParams.token_to_amount,
+          network_fees_ETH: analyticsParams.network_fees_ETH,
         };
 
         Logger.log('Swaps', 'Sending metrics event', event);
 
         trackEvent(
           createEventBuilder(event)
-            .addSensitiveProperties({ ...parameters })
+            .addProperties({ ...parameters })
+            .addSensitiveProperties({ ...sensitiveParameters })
             .build(),
         );
       } catch (e) {
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
index 5330bfdb1ea..b8ba760da0c 100644
--- a/app/components/Nav/Main/index.js
+++ b/app/components/Nav/Main/index.js
@@ -133,7 +133,7 @@ const Main = (props) => {
     stopIncomingTransactionPolling();
 
     if (showIncomingTransactionsNetworks[chainId]) {
-      startIncomingTransactionPolling([networkClientId]);
+      startIncomingTransactionPolling([chainId]);
     }
   }, [chainId, networkClientId, showIncomingTransactionsNetworks]);
 
@@ -178,11 +178,11 @@ const Main = (props) => {
         removeNotVisibleNotifications();
 
         BackgroundTimer.runBackgroundTimer(async () => {
-          await updateIncomingTransactions([props.networkClientId]);
+          await updateIncomingTransactions([props.chainId]);
         }, AppConstants.TX_CHECK_BACKGROUND_FREQUENCY);
       }
     },
-    [backgroundMode, removeNotVisibleNotifications, props.networkClientId],
+    [backgroundMode, removeNotVisibleNotifications, props.chainId],
   );
 
   const initForceReload = () => {
diff --git a/app/components/UI/AccountApproval/index.test.tsx b/app/components/UI/AccountApproval/index.test.tsx
index 0afe79dd39e..29e438ead16 100644
--- a/app/components/UI/AccountApproval/index.test.tsx
+++ b/app/components/UI/AccountApproval/index.test.tsx
@@ -48,6 +48,13 @@ const mockInitialState = {
           },
         },
       },
+      TokensController: {
+        allTokens: {
+          '0x1': {
+            '0xc4966c0d659d99699bfd7eb54d8fafee40e4a756': [],
+          },
+        },
+      },
     },
   },
 };
diff --git a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
index 68db9cb046b..c650e8640f5 100644
--- a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
+++ b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
@@ -38,7 +38,13 @@ const mockInitialState: DeepPartial<RootState> = {
         },
       },
       TokenBalancesController: {
-        tokenBalances: { },
+        tokenBalances: {
+          '0x326836cc6cd09B5aa59B81A7F72F25FcC0136b95': {
+            '0x5': {
+              '0x326836cc6cd09B5aa59B81A7F72F25FcC0136b95': '0x2b46',
+            },
+          },
+        },
       },
       AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
     },
diff --git a/app/components/UI/AccountSelectorList/AccountSelector.test.tsx b/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
index ec3a6c860fd..ad88315241f 100644
--- a/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
+++ b/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
@@ -18,6 +18,9 @@ import { mockNetworkState } from '../../../util/test/network';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { AccountSelectorListProps } from './AccountSelectorList.types';
 
+// eslint-disable-next-line import/no-namespace
+import * as Utils from '../../hooks/useAccounts/utils';
+
 const BUSINESS_ACCOUNT = '0xC4955C0d639D99699Bfd7Ec54d9FaFEe40e4D272';
 const PERSONAL_ACCOUNT = '0xd018538C87232FF95acbCe4870629b75640a78E7';
 
@@ -125,6 +128,16 @@ const renderComponent = (
 
 describe('AccountSelectorList', () => {
   beforeEach(() => {
+    jest.spyOn(Utils, 'getAccountBalances').mockReturnValueOnce({
+      balanceETH: '1',
+      balanceFiat: '$3200.00',
+      balanceWeiHex: '',
+    });
+    jest.spyOn(Utils, 'getAccountBalances').mockReturnValueOnce({
+      balanceETH: '2',
+      balanceFiat: '$6400.00',
+      balanceWeiHex: '',
+    });
     onSelectAccount.mockClear();
     onRemoveImportedAccount.mockClear();
   });
diff --git a/app/components/UI/AssetOverview/AssetOverview.test.tsx b/app/components/UI/AssetOverview/AssetOverview.test.tsx
index e84206b8c13..8be0735dace 100644
--- a/app/components/UI/AssetOverview/AssetOverview.test.tsx
+++ b/app/components/UI/AssetOverview/AssetOverview.test.tsx
@@ -10,8 +10,13 @@ import {
   MOCK_ADDRESS_2,
 } from '../../../util/test/accountsControllerTestUtils';
 import { createBuyNavigationDetails } from '../Ramp/routes/utils';
-import { getDecimalChainId } from '../../../util/networks';
+import {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../util/networks';
 import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/wallet/TokenOverview.selectors';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 
 const MOCK_CHAIN_ID = '0x1';
 
@@ -43,6 +48,15 @@ const mockInitialState = {
         },
       } as const,
     },
+    CurrencyRateController: {
+      conversionRate: {
+        ETH: {
+          conversionDate: 1732572535.47,
+          conversionRate: 3432.53,
+          usdConversionRate: 3432.53,
+        },
+      },
+    },
   },
   settings: {
     primaryCurrency: 'ETH',
@@ -51,6 +65,15 @@ const mockInitialState = {
 
 const mockNavigate = jest.fn();
 const navigate = mockNavigate;
+const mockNetworkConfiguration = {
+  rpcEndpoints: [
+    {
+      networkClientId: 'mockNetworkClientId',
+    },
+  ],
+  defaultRpcEndpointIndex: 0,
+};
+
 jest.mock('@react-navigation/native', () => {
   const actualNav = jest.requireActual('@react-navigation/native');
   return {
@@ -72,9 +95,21 @@ jest.mock('../../hooks/useStyles', () => ({
   }),
 }));
 
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      getNetworkConfigurationByChainId: jest
+        .fn()
+        .mockReturnValue(mockNetworkConfiguration),
+      setActiveNetwork: jest.fn().mockResolvedValue(undefined),
+    },
+  },
+}));
+
 const asset = {
   balance: '400',
   balanceFiat: '1500',
+  chainId: MOCK_CHAIN_ID,
   logo: 'https://upload.wikimedia.org/wikipedia/commons/0/05/Ethereum_logo_2014.svg',
   symbol: 'ETH',
   name: 'Ethereum',
@@ -87,6 +122,10 @@ const asset = {
 };
 
 describe('AssetOverview', () => {
+  beforeEach(() => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
+  });
+
   it('should render correctly', async () => {
     const container = renderWithProvider(
       <AssetOverview asset={asset} displayBuyButton displaySwapsButton />,
@@ -95,6 +134,16 @@ describe('AssetOverview', () => {
     expect(container).toMatchSnapshot();
   });
 
+  it('should render correctly when portfolio view is enabled', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const container = renderWithProvider(
+      <AssetOverview asset={asset} displayBuyButton displaySwapsButton />,
+      { state: mockInitialState },
+    );
+    expect(container).toMatchSnapshot();
+  });
+
   it('should handle buy button press', async () => {
     const { getByTestId } = renderWithProvider(
       <AssetOverview asset={asset} displayBuyButton displaySwapsButton />,
@@ -133,13 +182,34 @@ describe('AssetOverview', () => {
     const swapButton = getByTestId('token-swap-button');
     fireEvent.press(swapButton);
 
-    expect(navigate).toHaveBeenCalledWith('Swaps', {
-      params: {
-        sourcePage: 'MainView',
-        sourceToken: asset.address,
-      },
-      screen: 'SwapsAmountView',
-    });
+    if (isPortfolioViewEnabled()) {
+      expect(navigate).toHaveBeenCalledTimes(3);
+      expect(navigate).toHaveBeenNthCalledWith(1, 'RampBuy', {
+        screen: 'GetStarted',
+        params: {
+          address: asset.address,
+          chainId: getDecimalChainId(MOCK_CHAIN_ID),
+        },
+      });
+      expect(navigate).toHaveBeenNthCalledWith(2, 'SendFlowView', {});
+      expect(navigate).toHaveBeenNthCalledWith(3, 'Swaps', {
+        screen: 'SwapsAmountView',
+        params: {
+          sourcePage: 'MainView',
+          address: asset.address,
+          chainId: MOCK_CHAIN_ID,
+        },
+      });
+    } else {
+      expect(navigate).toHaveBeenCalledWith('Swaps', {
+        screen: 'SwapsAmountView',
+        params: {
+          sourcePage: 'MainView',
+          sourceToken: asset.address,
+          chainId: '0x1',
+        },
+      });
+    }
   });
 
   it('should not render swap button if displaySwapsButton is false', async () => {
diff --git a/app/components/UI/AssetOverview/AssetOverview.tsx b/app/components/UI/AssetOverview/AssetOverview.tsx
index 55ce2b8f222..cbcd738dca6 100644
--- a/app/components/UI/AssetOverview/AssetOverview.tsx
+++ b/app/components/UI/AssetOverview/AssetOverview.tsx
@@ -1,8 +1,9 @@
-import { zeroAddress } from 'ethereumjs-util';
 import React, { useCallback, useEffect } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useDispatch, useSelector } from 'react-redux';
+import { Hex } from '@metamask/utils';
+import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import { strings } from '../../../../locales/i18n';
 import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import { newAssetTransaction } from '../../../actions/transaction';
@@ -11,15 +12,26 @@ import Engine from '../../../core/Engine';
 import {
   selectChainId,
   selectTicker,
+  selectNativeCurrencyByChainId,
 } from '../../../selectors/networkController';
 import {
   selectConversionRate,
   selectCurrentCurrency,
+  selectCurrencyRates,
 } from '../../../selectors/currencyRateController';
-import { selectContractExchangeRates } from '../../../selectors/tokenRatesController';
+import {
+  selectContractExchangeRates,
+  selectTokenMarketData,
+} from '../../../selectors/tokenRatesController';
 import { selectAccountsByChainId } from '../../../selectors/accountTrackerController';
-import { selectContractBalances } from '../../../selectors/tokenBalancesController';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../selectors/accountsController';
+import {
+  selectContractBalances,
+  selectTokensBalances,
+} from '../../../selectors/tokenBalancesController';
+import {
+  selectSelectedInternalAccountAddress,
+  selectSelectedInternalAccountFormattedAddress,
+} from '../../../selectors/accountsController';
 import Logger from '../../../util/Logger';
 import { safeToChecksumAddress } from '../../../util/address';
 import {
@@ -46,9 +58,12 @@ import Routes from '../../../constants/navigation/Routes';
 import TokenDetails from './TokenDetails';
 import { RootState } from '../../../reducers';
 import useGoToBridge from '../Bridge/utils/useGoToBridge';
-import SwapsController from '@metamask/swaps-controller';
+import SwapsController, { swapsUtils } from '@metamask/swaps-controller';
 import { MetaMetricsEvents } from '../../../core/Analytics';
-import { getDecimalChainId } from '../../../util/networks';
+import {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../util/networks';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { createBuyNavigationDetails } from '../Ramp/routes/utils';
 import { TokenI } from '../Tokens/types';
@@ -67,8 +82,12 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
 }: AssetOverviewProps) => {
   const navigation = useNavigation();
   const [timePeriod, setTimePeriod] = React.useState<TimePeriod>('1d');
-  const currentCurrency = useSelector(selectCurrentCurrency);
+  const selectedInternalAccountAddress = useSelector(
+    selectSelectedInternalAccountAddress,
+  );
   const conversionRate = useSelector(selectConversionRate);
+  const conversionRateByTicker = useSelector(selectCurrencyRates);
+  const currentCurrency = useSelector(selectCurrentCurrency);
   const accountsByChainId = useSelector(selectAccountsByChainId);
   const primaryCurrency = useSelector(
     (state: RootState) => state.settings.primaryCurrency,
@@ -79,12 +98,35 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   );
   const { trackEvent, createEventBuilder } = useMetrics();
   const tokenExchangeRates = useSelector(selectContractExchangeRates);
+  const allTokenMarketData = useSelector(selectTokenMarketData);
   const tokenBalances = useSelector(selectContractBalances);
-  const chainId = useSelector((state: RootState) => selectChainId(state));
-  const ticker = useSelector((state: RootState) => selectTicker(state));
+  const selectedChainId = useSelector((state: RootState) =>
+    selectChainId(state),
+  );
+  const selectedTicker = useSelector((state: RootState) => selectTicker(state));
+
+  const nativeCurrency = useSelector((state: RootState) =>
+    selectNativeCurrencyByChainId(state, asset.chainId as Hex),
+  );
+
+  const multiChainTokenBalance = useSelector(selectTokensBalances);
+  const chainId = isPortfolioViewEnabled()
+    ? (asset.chainId as Hex)
+    : selectedChainId;
+  const ticker = isPortfolioViewEnabled() ? nativeCurrency : selectedTicker;
+
+  let currentAddress: Hex;
+
+  if (isPortfolioViewEnabled()) {
+    currentAddress = asset.address as Hex;
+  } else {
+    currentAddress = asset.isETH
+      ? getNativeTokenAddress(chainId as Hex)
+      : (asset.address as Hex);
+  }
 
   const { data: prices = [], isLoading } = useTokenHistoricalPrices({
-    address: asset.isETH ? zeroAddress() : asset.address,
+    address: currentAddress,
     chainId,
     timePeriod,
     vsCurrency: currentCurrency,
@@ -119,7 +161,41 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
     });
   };
 
+  const handleSwapNavigation = useCallback(() => {
+    navigation.navigate('Swaps', {
+      screen: 'SwapsAmountView',
+      params: {
+        sourceToken: asset.address ?? swapsUtils.NATIVE_SWAPS_TOKEN_ADDRESS,
+        sourcePage: 'MainView',
+        chainId: asset.chainId,
+      },
+    });
+  }, [navigation, asset.address, asset.chainId]);
+
   const onSend = async () => {
+    if (isPortfolioViewEnabled()) {
+      navigation.navigate(Routes.WALLET.HOME, {
+        screen: Routes.WALLET.TAB_STACK_FLOW,
+        params: {
+          screen: Routes.WALLET_VIEW,
+        },
+      });
+
+      if (asset.chainId !== selectedChainId) {
+        const { NetworkController } = Engine.context;
+        const networkConfiguration =
+          NetworkController.getNetworkConfigurationByChainId(
+            asset.chainId as Hex,
+          );
+
+        const networkClientId =
+          networkConfiguration?.rpcEndpoints?.[
+            networkConfiguration.defaultRpcEndpointIndex
+          ]?.networkClientId;
+
+        await NetworkController.setActiveNetwork(networkClientId as string);
+      }
+    }
     if (asset.isETH && ticker) {
       dispatch(newAssetTransaction(getEther(ticker)));
     } else {
@@ -128,25 +204,58 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
     navigation.navigate('SendFlowView', {});
   };
 
-  const goToSwaps = () => {
-    navigation.navigate('Swaps', {
-      screen: 'SwapsAmountView',
-      params: {
-        sourceToken: asset.address,
-        sourcePage: 'MainView',
-      },
-    });
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.SWAP_BUTTON_CLICKED)
-        .addProperties({
-          text: 'Swap',
-          tokenSymbol: '',
-          location: 'TokenDetails',
-          chain_id: getDecimalChainId(chainId),
-        })
-        .build(),
-    );
-  };
+  const goToSwaps = useCallback(() => {
+    if (isPortfolioViewEnabled()) {
+      navigation.navigate(Routes.WALLET.HOME, {
+        screen: Routes.WALLET.TAB_STACK_FLOW,
+        params: {
+          screen: Routes.WALLET_VIEW,
+        },
+      });
+      if (asset.chainId !== selectedChainId) {
+        const { NetworkController } = Engine.context;
+        const networkConfiguration =
+          NetworkController.getNetworkConfigurationByChainId(
+            asset.chainId as Hex,
+          );
+
+        const networkClientId =
+          networkConfiguration?.rpcEndpoints?.[
+            networkConfiguration.defaultRpcEndpointIndex
+          ]?.networkClientId;
+
+        NetworkController.setActiveNetwork(networkClientId as string).then(
+          () => {
+            setTimeout(() => {
+              handleSwapNavigation();
+            }, 500);
+          },
+        );
+      } else {
+        handleSwapNavigation();
+      }
+    } else {
+      handleSwapNavigation();
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.SWAP_BUTTON_CLICKED)
+          .addProperties({
+            text: 'Swap',
+            tokenSymbol: '',
+            location: 'TokenDetails',
+            chain_id: getDecimalChainId(asset.chainId),
+          })
+          .build(),
+      );
+    }
+  }, [
+    navigation,
+    asset.chainId,
+    selectedChainId,
+    trackEvent,
+    createEventBuilder,
+    handleSwapNavigation,
+  ]);
+
   const onBuy = () => {
     navigation.navigate(
       ...createBuyNavigationDetails({
@@ -209,14 +318,21 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
       )),
     [handleSelectTimePeriod, timePeriod],
   );
-
   const itemAddress = safeToChecksumAddress(asset.address);
-  const exchangeRate = itemAddress
-    ? tokenExchangeRates?.[itemAddress]?.price
-    : undefined;
+
+  let exchangeRate: number | undefined;
+  if (!isPortfolioViewEnabled()) {
+    exchangeRate = itemAddress
+      ? tokenExchangeRates?.[itemAddress as Hex]?.price
+      : undefined;
+  } else {
+    const currentChainId = chainId as Hex;
+    exchangeRate =
+      allTokenMarketData?.[currentChainId]?.[itemAddress as Hex]?.price;
+  }
 
   let balance, balanceFiat;
-  if (asset.isETH) {
+  if (asset.isETH || asset.isNative) {
     balance = renderFromWei(
       //@ts-expect-error - This should be fixed at the accountsController selector level, ongoing discussion
       accountsByChainId[toHexadecimal(chainId)][selectedAddress]?.balance,
@@ -230,9 +346,22 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
       currentCurrency,
     );
   } else {
+    const multiChainTokenBalanceHex =
+      itemAddress &&
+      multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
+        chainId as Hex
+      ]?.[itemAddress as Hex];
+
+    const selectedTokenBalanceHex =
+      itemAddress && tokenBalances?.[itemAddress as Hex];
+
+    const tokenBalanceHex = isPortfolioViewEnabled()
+      ? multiChainTokenBalanceHex
+      : selectedTokenBalanceHex;
+
     balance =
-      itemAddress && tokenBalances?.[itemAddress]
-        ? renderFromTokenMinimalUnit(tokenBalances[itemAddress], asset.decimals)
+      itemAddress && tokenBalanceHex
+        ? renderFromTokenMinimalUnit(tokenBalanceHex, asset.decimals)
         : 0;
     balanceFiat = balanceToFiat(
       balance,
@@ -243,23 +372,37 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   }
 
   let mainBalance, secondaryBalance;
-  if (primaryCurrency === 'ETH') {
-    mainBalance = `${balance} ${asset.symbol}`;
-    secondaryBalance = balanceFiat;
+  if (!isPortfolioViewEnabled()) {
+    if (primaryCurrency === 'ETH') {
+      mainBalance = `${balance} ${asset.symbol}`;
+      secondaryBalance = balanceFiat;
+    } else {
+      mainBalance = !balanceFiat ? `${balance} ${asset.symbol}` : balanceFiat;
+      secondaryBalance = !balanceFiat
+        ? balanceFiat
+        : `${balance} ${asset.symbol}`;
+    }
   } else {
-    mainBalance = !balanceFiat ? `${balance} ${asset.symbol}` : balanceFiat;
-    secondaryBalance = !balanceFiat
-      ? balanceFiat
-      : `${balance} ${asset.symbol}`;
+    mainBalance = `${balance} ${asset.isETH ? asset.ticker : asset.symbol}`;
+    secondaryBalance = exchangeRate ? asset.balanceFiat : '';
   }
 
   let currentPrice = 0;
   let priceDiff = 0;
 
-  if (asset.isETH) {
-    currentPrice = conversionRate || 0;
-  } else if (exchangeRate && conversionRate) {
-    currentPrice = exchangeRate * conversionRate;
+  if (!isPortfolioViewEnabled()) {
+    if (asset.isETH) {
+      currentPrice = conversionRate || 0;
+    } else if (exchangeRate && conversionRate) {
+      currentPrice = exchangeRate * conversionRate;
+    }
+  } else {
+    const tickerConversionRate =
+      conversionRateByTicker?.[nativeCurrency]?.conversionRate ?? 0;
+    currentPrice =
+      exchangeRate && tickerConversionRate
+        ? exchangeRate * tickerConversionRate
+        : 0;
   }
 
   const comparePrice = prices[0]?.[1] || 0;
diff --git a/app/components/UI/AssetOverview/Balance/Balance.tsx b/app/components/UI/AssetOverview/Balance/Balance.tsx
index afc9b9379af..82662417e44 100644
--- a/app/components/UI/AssetOverview/Balance/Balance.tsx
+++ b/app/components/UI/AssetOverview/Balance/Balance.tsx
@@ -14,7 +14,7 @@ import {
   isLineaMainnetByChainId,
   isMainnetByChainId,
   isTestNet,
-  isPortfolioViewEnabledFunction,
+  isPortfolioViewEnabled,
 } from '../../../../util/networks';
 import images from '../../../../images/image-icons';
 import BadgeWrapper from '../../../../component-library/components/Badges/BadgeWrapper';
@@ -46,7 +46,7 @@ interface BalanceProps {
 export const NetworkBadgeSource = (chainId: Hex, ticker: string) => {
   const isMainnet = isMainnetByChainId(chainId);
   const isLineaMainnet = isLineaMainnetByChainId(chainId);
-  if (!isPortfolioViewEnabledFunction()) {
+  if (!isPortfolioViewEnabled()) {
     if (isTestNet(chainId)) return getTestNetImageByChainId(chainId);
     if (isMainnet) return images.ETHEREUM;
 
@@ -95,14 +95,16 @@ const Balance = ({ asset, mainBalance, secondaryBalance }: BalanceProps) => {
   const networkName = useSelector(selectNetworkName);
   const chainId = useSelector(selectChainId);
 
+  const tokenChainId = isPortfolioViewEnabled() ? asset.chainId : chainId;
+
   const ticker = asset.symbol;
 
   const renderNetworkAvatar = useCallback(() => {
-    if (!isPortfolioViewEnabledFunction() && asset.isETH) {
+    if (!isPortfolioViewEnabled() && asset.isETH) {
       return <NetworkMainAssetLogo style={styles.ethLogo} />;
     }
 
-    if (isPortfolioViewEnabledFunction() && asset.isNative) {
+    if (isPortfolioViewEnabled() && asset.isNative) {
       return (
         <NetworkAssetLogo
           chainId={asset.chainId as Hex}
@@ -142,6 +144,7 @@ const Balance = ({ asset, mainBalance, secondaryBalance }: BalanceProps) => {
         balance={secondaryBalance}
         onPress={() =>
           !asset.isETH &&
+          !asset.isNative &&
           navigation.navigate('AssetDetails', {
             chainId: asset.chainId,
             address: asset.address,
@@ -153,8 +156,8 @@ const Balance = ({ asset, mainBalance, secondaryBalance }: BalanceProps) => {
           badgeElement={
             <Badge
               variant={BadgeVariant.Network}
-              imageSource={NetworkBadgeSource(chainId, ticker)}
-              name={networkName}
+              imageSource={NetworkBadgeSource(tokenChainId as Hex, ticker)}
+              name={networkName || ''}
             />
           }
         >
diff --git a/app/components/UI/AssetOverview/Balance/index.test.tsx b/app/components/UI/AssetOverview/Balance/index.test.tsx
index f3070b52a3f..ba5dd5f2fc3 100644
--- a/app/components/UI/AssetOverview/Balance/index.test.tsx
+++ b/app/components/UI/AssetOverview/Balance/index.test.tsx
@@ -8,7 +8,7 @@ import { Provider, useSelector } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import { NetworkBadgeSource } from './Balance';
-import { isPortfolioViewEnabledFunction } from '../../../../util/networks';
+import { isPortfolioViewEnabled } from '../../../../util/networks';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -37,6 +37,8 @@ const mockDAI = {
   symbol: 'DAI',
   isETH: false,
   logo: 'image-path',
+  chainId: '0x1',
+  isNative: false,
 };
 
 const mockETH = {
@@ -52,6 +54,8 @@ const mockETH = {
   symbol: 'ETH',
   isETH: true,
   logo: 'image-path',
+  chainId: '0x1',
+  isNative: true,
 };
 
 const mockInitialState = {
@@ -67,7 +71,7 @@ jest.mock('../../../../util/networks', () => ({
 
 jest.mock('../../../../util/networks', () => ({
   ...jest.requireActual('../../../../util/networks'),
-  isPortfolioViewEnabledFunction: jest.fn(),
+  isPortfolioViewEnabled: jest.fn(),
 }));
 
 describe('Balance', () => {
@@ -95,23 +99,27 @@ describe('Balance', () => {
     jest.clearAllMocks();
   });
 
-  it('should render correctly with a fiat balance', () => {
-    const wrapper = render(
-      <Balance asset={mockDAI} mainBalance="123" secondaryBalance="456" />,
-    );
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should render correctly without a fiat balance', () => {
-    const wrapper = render(
-      <Balance
-        asset={mockDAI}
-        mainBalance="123"
-        secondaryBalance={undefined}
-      />,
-    );
-    expect(wrapper).toMatchSnapshot();
-  });
+  if (!isPortfolioViewEnabled()) {
+    it('should render correctly with a fiat balance', () => {
+      const wrapper = render(
+        <Balance asset={mockDAI} mainBalance="123" secondaryBalance="456" />,
+      );
+      expect(wrapper).toMatchSnapshot();
+    });
+  }
+
+  if (!isPortfolioViewEnabled()) {
+    it('should render correctly without a fiat balance', () => {
+      const wrapper = render(
+        <Balance
+          asset={mockDAI}
+          mainBalance="123"
+          secondaryBalance={undefined}
+        />,
+      );
+      expect(wrapper).toMatchSnapshot();
+    });
+  }
 
   it('should fire navigation event for non native tokens', () => {
     const { queryByTestId } = render(
@@ -155,11 +163,39 @@ describe('Balance', () => {
     });
 
     it('returns Linea Mainnet image for Linea mainnet chainId isPortfolioViewEnabled is true', () => {
-      (isPortfolioViewEnabledFunction as jest.Mock).mockImplementation(
-        () => true,
-      );
+      if (isPortfolioViewEnabled()) {
+        const result = NetworkBadgeSource('0xe708', 'LINEA');
+        expect(result).toBeDefined();
+      }
+    });
+  });
+});
+
+describe('NetworkBadgeSource', () => {
+  it('returns testnet image for a testnet chainId', () => {
+    const result = NetworkBadgeSource('0xaa36a7', 'ETH');
+    expect(result).toBeDefined();
+  });
+
+  it('returns mainnet Ethereum image for mainnet chainId', () => {
+    const result = NetworkBadgeSource('0x1', 'ETH');
+    expect(result).toBeDefined();
+  });
+
+  it('returns Linea Mainnet image for Linea mainnet chainId', () => {
+    const result = NetworkBadgeSource('0xe708', 'LINEA');
+    expect(result).toBeDefined();
+  });
+
+  it('returns undefined if no image is found', () => {
+    const result = NetworkBadgeSource('0x999', 'UNKNOWN');
+    expect(result).toBeUndefined();
+  });
+
+  it('returns Linea Mainnet image for Linea mainnet chainId isPortfolioViewEnabled is true', () => {
+    if (isPortfolioViewEnabled()) {
       const result = NetworkBadgeSource('0xe708', 'LINEA');
       expect(result).toBeDefined();
-    });
+    }
   });
 });
diff --git a/app/components/UI/AssetOverview/Price/Price.tsx b/app/components/UI/AssetOverview/Price/Price.tsx
index 867441a9a87..9e65e259d4c 100644
--- a/app/components/UI/AssetOverview/Price/Price.tsx
+++ b/app/components/UI/AssetOverview/Price/Price.tsx
@@ -90,7 +90,10 @@ const Price = ({
           <Text variant={TextVariant.BodyMDMedium}>{asset.symbol}</Text>
         )}
         {!isNaN(price) && (
-          <Text testID={TokenOverviewSelectorsIDs.TOKEN_PRICE} variant={TextVariant.HeadingLG}>
+          <Text
+            testID={TokenOverviewSelectorsIDs.TOKEN_PRICE}
+            variant={TextVariant.HeadingLG}
+          >
             {isLoading ? (
               <View style={styles.loadingPrice}>
                 <SkeletonPlaceholder>
diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.test.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.test.tsx
index 7e8d341492d..881977207bb 100644
--- a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.test.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.test.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { Hex } from '@metamask/utils';
+import { MarketDataDetails } from '@metamask/assets-controllers';
 import renderWithProvider from '../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import TokenDetails from './';
@@ -8,9 +10,12 @@ import {
   selectConversionRate,
   selectCurrentCurrency,
 } from '../../../../selectors/currencyRateController';
+import {
+  selectProviderConfig,
+  selectTicker,
+} from '../../../../selectors/networkController';
 // eslint-disable-next-line import/no-namespace
 import * as reactRedux from 'react-redux';
-
 jest.mock('../../../../core/Engine', () => ({
   getTotalFiatAccountBalance: jest.fn(),
   context: {
@@ -80,14 +85,60 @@ const mockContractExchangeRates = {
   },
 };
 
+const mockTokenMarketDataByChainId: Record<
+  Hex,
+  Record<string, MarketDataDetails>
+> = {
+  '0x1': {
+    '0x6B175474E89094C44Da98b954EedeAC495271d0F': {
+      allTimeHigh: 0.00045049491236145674,
+      allTimeLow: 0.00032567089582484455,
+      circulatingSupply: 5210102796.32321,
+      currency: 'ETH',
+      dilutedMarketCap: 1923097.9291743594,
+      high1d: 0.0003703658992610993,
+      low1d: 0.00036798603064620616,
+      marketCap: 1923097.9291743594,
+      marketCapPercentChange1d: -0.03026,
+      price: 0.00036902069191213795,
+      priceChange1d: 0.00134711,
+      pricePercentChange14d: -0.01961306580879152,
+      pricePercentChange1d: 0.13497913251736524,
+      pricePercentChange1h: -0.15571963819527113,
+      pricePercentChange1y: -0.01608509228365429,
+      pricePercentChange200d: -0.0287692372426721,
+      pricePercentChange30d: -0.08401729203937018,
+      pricePercentChange7d: 0.019578202262256407,
+      tokenAddress: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+      totalVolume: 54440.464606773865,
+    },
+  },
+};
+
 describe('TokenDetails', () => {
   beforeAll(() => {
     jest.resetAllMocks();
   });
   it('should render correctly', () => {
     const useSelectorSpy = jest.spyOn(reactRedux, 'useSelector');
-    useSelectorSpy.mockImplementation((selector) => {
-      switch (selector) {
+    useSelectorSpy.mockImplementation((selectorOrCallback) => {
+      const SELECTOR_MOCKS = {
+        selectTokenMarketDataByChainId: mockTokenMarketDataByChainId['0x1'],
+        selectConversionRateBySymbol: mockExchangeRate,
+        selectNativeCurrencyByChainId: 'ETH',
+      } as const;
+
+      if (typeof selectorOrCallback === 'function') {
+        const selectorString = selectorOrCallback.toString();
+        const matchedSelector = Object.keys(SELECTOR_MOCKS).find((key) =>
+          selectorString.includes(key),
+        );
+        if (matchedSelector) {
+          return SELECTOR_MOCKS[matchedSelector as keyof typeof SELECTOR_MOCKS];
+        }
+      }
+
+      switch (selectorOrCallback) {
         case selectTokenList:
           return mockAssets;
         case selectContractExchangeRates:
@@ -133,10 +184,26 @@ describe('TokenDetails', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
-  it('should render TokenDetils without MarketDetails when marketData is null', () => {
+  it('should render Token Details without Market Details when marketData is null', () => {
     const useSelectorSpy = jest.spyOn(reactRedux, 'useSelector');
-    useSelectorSpy.mockImplementation((selector) => {
-      switch (selector) {
+    const SELECTOR_MOCKS = {
+      selectTokenMarketDataByChainId: {},
+      selectConversionRateBySymbol: mockExchangeRate,
+      selectNativeCurrencyByChainId: 'ETH',
+    } as const;
+
+    useSelectorSpy.mockImplementation((selectorOrCallback) => {
+      if (typeof selectorOrCallback === 'function') {
+        const selectorString = selectorOrCallback.toString();
+        const matchedSelector = Object.keys(SELECTOR_MOCKS).find((key) =>
+          selectorString.includes(key),
+        );
+        if (matchedSelector) {
+          return SELECTOR_MOCKS[matchedSelector as keyof typeof SELECTOR_MOCKS];
+        }
+      }
+
+      switch (selectorOrCallback) {
         case selectTokenList:
           return mockAssets;
         case selectContractExchangeRates:
@@ -145,6 +212,10 @@ describe('TokenDetails', () => {
           return mockExchangeRate;
         case selectCurrentCurrency:
           return mockCurrentCurrency;
+        case selectProviderConfig:
+          return { ticker: 'ETH' };
+        case selectTicker:
+          return 'ETH';
         default:
           return undefined;
       }
@@ -162,8 +233,24 @@ describe('TokenDetails', () => {
 
   it('should render MarketDetails without TokenDetails when tokenList is null', () => {
     const useSelectorSpy = jest.spyOn(reactRedux, 'useSelector');
-    useSelectorSpy.mockImplementation((selector) => {
-      switch (selector) {
+    useSelectorSpy.mockImplementation((selectorOrCallback) => {
+      const SELECTOR_MOCKS = {
+        selectTokenMarketDataByChainId: mockTokenMarketDataByChainId['0x1'],
+        selectConversionRateBySymbol: mockExchangeRate,
+        selectNativeCurrencyByChainId: 'ETH',
+      } as const;
+
+      if (typeof selectorOrCallback === 'function') {
+        const selectorString = selectorOrCallback.toString();
+        const matchedSelector = Object.keys(SELECTOR_MOCKS).find((key) =>
+          selectorString.includes(key),
+        );
+        if (matchedSelector) {
+          return SELECTOR_MOCKS[matchedSelector as keyof typeof SELECTOR_MOCKS];
+        }
+      }
+
+      switch (selectorOrCallback) {
         case selectTokenList:
           return {};
         case selectContractExchangeRates:
@@ -179,9 +266,7 @@ describe('TokenDetails', () => {
 
     const { getByText, queryByText } = renderWithProvider(
       <TokenDetails asset={mockDAI} />,
-      {
-        state: initialState,
-      },
+      { state: initialState },
     );
     expect(queryByText('Token details')).toBeNull();
     expect(getByText('Market details')).toBeDefined();
diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx
index 368e2352d23..54df1781873 100644
--- a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx
@@ -1,4 +1,6 @@
 import { zeroAddress } from 'ethereumjs-util';
+import { Hex } from '@metamask/utils';
+import { RootState } from '../../../../reducers';
 import React from 'react';
 import { View } from 'react-native';
 import { useSelector } from 'react-redux';
@@ -7,11 +9,16 @@ import { useStyles } from '../../../../component-library/hooks';
 import styleSheet from './TokenDetails.styles';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { selectTokenList } from '../../../../selectors/tokenListController';
-import { selectContractExchangeRates } from '../../../../selectors/tokenRatesController';
 import {
-  selectConversionRate,
+  selectTokenMarketDataByChainId,
+  selectContractExchangeRates,
+} from '../../../../selectors/tokenRatesController';
+import {
+  selectConversionRateBySymbol,
   selectCurrentCurrency,
+  selectConversionRate,
 } from '../../../../selectors/currencyRateController';
+import { selectNativeCurrencyByChainId } from '../../../../selectors/networkController';
 import {
   convertDecimalToPercentage,
   localizeLargeNumber,
@@ -23,6 +30,7 @@ import MarketDetailsList from './MarketDetailsList';
 import { TokenI } from '../../Tokens/types';
 import { isPooledStakingFeatureEnabled } from '../../Stake/constants';
 import StakingEarnings from '../../Stake/components/StakingEarnings';
+import { isPortfolioViewEnabled } from '../../../../util/networks';
 
 export interface TokenDetails {
   contractAddress: string | null;
@@ -46,20 +54,36 @@ interface TokenDetailsProps {
 
 const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   const { styles } = useStyles(styleSheet, {});
-  const tokenList = useSelector(selectTokenList);
-  const tokenExchangeRates = useSelector(selectContractExchangeRates);
-  const conversionRate = useSelector(selectConversionRate);
+  const tokenExchangeRatesByChainId = useSelector((state: RootState) =>
+    selectTokenMarketDataByChainId(state, asset.chainId as Hex),
+  );
+  const nativeCurrency = useSelector((state: RootState) =>
+    selectNativeCurrencyByChainId(state, asset.chainId as Hex),
+  );
+  const tokenExchangeRatesLegacy = useSelector(selectContractExchangeRates);
+  const conversionRateLegacy = useSelector(selectConversionRate);
+  const conversionRateBySymbol = useSelector((state: RootState) =>
+    selectConversionRateBySymbol(state, nativeCurrency),
+  );
   const currentCurrency = useSelector(selectCurrentCurrency);
   const tokenContractAddress = safeToChecksumAddress(asset.address);
+  const tokenList = useSelector(selectTokenList);
+
+  const conversionRate = isPortfolioViewEnabled()
+    ? conversionRateBySymbol
+    : conversionRateLegacy;
+  const tokenExchangeRates = isPortfolioViewEnabled()
+    ? tokenExchangeRatesByChainId
+    : tokenExchangeRatesLegacy;
 
   let tokenMetadata;
   let marketData;
 
   if (asset.isETH) {
-    marketData = tokenExchangeRates?.[zeroAddress() as `0x${string}`];
-  } else if (!asset.isETH && tokenContractAddress) {
+    marketData = tokenExchangeRates?.[zeroAddress() as Hex];
+  } else if (tokenContractAddress) {
     tokenMetadata = tokenList?.[tokenContractAddress.toLowerCase()];
-    marketData = tokenExchangeRates?.[tokenContractAddress];
+    marketData = tokenExchangeRates?.[tokenContractAddress as Hex];
   } else {
     Logger.log('cannot find contract address');
     return null;
diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.test.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.test.tsx
index 1b0c37923d0..64f1e8da9d0 100644
--- a/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.test.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.test.tsx
@@ -19,6 +19,7 @@ describe('TokenDetails', () => {
   beforeAll(() => {
     jest.resetAllMocks();
   });
+
   it('should render correctly', () => {
     const useDispatchSpy = jest.spyOn(reactRedux, 'useDispatch');
     useDispatchSpy.mockImplementation(() => jest.fn());
diff --git a/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap b/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
index cc3cbd21a25..c1eba443d22 100644
--- a/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
+++ b/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
@@ -1133,3 +1133,1139 @@ exports[`AssetOverview should render correctly 1`] = `
   </View>
 </View>
 `;
+
+exports[`AssetOverview should render correctly when portfolio view is enabled 1`] = `
+<View
+  style={
+    {
+      "paddingTop": 20,
+    }
+  }
+  testID="token-asset-overview"
+>
+  <View>
+    <View
+      style={
+        {
+          "paddingHorizontal": 16,
+        }
+      }
+    >
+      <Text
+        accessibilityRole="text"
+        style={
+          {
+            "color": "#6a737d",
+            "fontFamily": "EuclidCircularB-Medium",
+            "fontSize": 14,
+            "fontWeight": "500",
+            "letterSpacing": 0,
+            "lineHeight": 22,
+          }
+        }
+      >
+        Ethereum
+         (
+        ETH
+        )
+      </Text>
+      <Text
+        accessibilityRole="text"
+        style={
+          {
+            "color": "#141618",
+            "fontFamily": "EuclidCircularB-Bold",
+            "fontSize": 24,
+            "fontWeight": "700",
+            "letterSpacing": 0,
+            "lineHeight": 32,
+          }
+        }
+        testID="token-price"
+      >
+        <View
+          style={
+            {
+              "paddingTop": 8,
+            }
+          }
+        >
+          <View
+            onLayout={[Function]}
+          >
+            <View
+              style={
+                {
+                  "position": "relative",
+                }
+              }
+            >
+              <View
+                style={
+                  [
+                    {
+                      "borderRadius": 6,
+                      "height": 32,
+                      "width": 100,
+                    },
+                    {
+                      "backgroundColor": "#E1E9EE",
+                      "overflow": "hidden",
+                    },
+                  ]
+                }
+              />
+            </View>
+          </View>
+        </View>
+      </Text>
+      <Text
+        accessibilityRole="text"
+        style={
+          {
+            "color": "#141618",
+            "fontFamily": "EuclidCircularB-Regular",
+            "fontSize": 14,
+            "fontWeight": "400",
+            "letterSpacing": 0,
+            "lineHeight": 22,
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "paddingTop": 2,
+            }
+          }
+        >
+          <View
+            onLayout={[Function]}
+          >
+            <View
+              style={
+                {
+                  "position": "relative",
+                }
+              }
+            >
+              <View
+                style={
+                  [
+                    {
+                      "borderRadius": 6,
+                      "height": 18,
+                      "width": 150,
+                    },
+                    {
+                      "backgroundColor": "#E1E9EE",
+                      "overflow": "hidden",
+                    },
+                  ]
+                }
+              />
+            </View>
+          </View>
+        </View>
+      </Text>
+    </View>
+    <View
+      style={
+        {
+          "paddingHorizontal": 16,
+          "paddingTop": 10,
+          "width": 750,
+        }
+      }
+    >
+      <View
+        onLayout={[Function]}
+      >
+        <View
+          style={
+            {
+              "position": "relative",
+            }
+          }
+        >
+          <View
+            style={
+              [
+                {
+                  "borderRadius": 6,
+                  "height": 586.96,
+                  "width": 718,
+                },
+                {
+                  "backgroundColor": "#E1E9EE",
+                  "overflow": "hidden",
+                },
+              ]
+            }
+          />
+        </View>
+      </View>
+    </View>
+    <View
+      style={
+        {
+          "display": "flex",
+          "flexDirection": "row",
+          "justifyContent": "space-around",
+          "paddingHorizontal": 10,
+          "paddingTop": 20,
+        }
+      }
+    >
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#00000014",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          1D
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#ffffff",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          1W
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#ffffff",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          1M
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#ffffff",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          3M
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#ffffff",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          1Y
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "backgroundColor": "#ffffff",
+            "borderRadius": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 8,
+            "paddingLeft": 10,
+            "paddingVertical": 2,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#6a737d",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 12,
+              "fontWeight": "400",
+              "letterSpacing": 3,
+              "lineHeight": 20,
+              "textAlign": "center",
+            }
+          }
+        >
+          3Y
+        </Text>
+      </TouchableOpacity>
+    </View>
+    <View
+      style={
+        {
+          "display": "flex",
+          "flexDirection": "row",
+          "justifyContent": "space-evenly",
+          "padding": 16,
+        }
+      }
+    >
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "display": "flex",
+            "flexDirection": "column",
+          }
+        }
+      >
+        <TouchableOpacity
+          disabled={false}
+          onPress={[Function]}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingVertical": 16,
+                "width": "100%",
+              },
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingTop": 16,
+                "paddingVertical": 2,
+                "width": "100%",
+              },
+              false,
+            ]
+          }
+          testID="token-buy-button"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 20,
+                "height": 40,
+                "justifyContent": "center",
+                "marginHorizontal": 16,
+                "overflow": "hidden",
+                "width": 40,
+              }
+            }
+          >
+            <SvgMock
+              color="#ffffff"
+              height={24}
+              name="Add"
+              style={
+                {
+                  "height": 24,
+                  "width": 24,
+                }
+              }
+              width={24}
+            />
+          </View>
+          <View>
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 16,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 24,
+                }
+              }
+            />
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#6a737d",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            />
+          </View>
+        </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Buy
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "display": "flex",
+            "flexDirection": "column",
+          }
+        }
+      >
+        <TouchableOpacity
+          disabled={false}
+          onPress={[Function]}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingVertical": 16,
+                "width": "100%",
+              },
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingTop": 16,
+                "paddingVertical": 2,
+                "width": "100%",
+              },
+              false,
+            ]
+          }
+          testID="token-swap-button"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 20,
+                "height": 40,
+                "justifyContent": "center",
+                "marginHorizontal": 16,
+                "overflow": "hidden",
+                "width": 40,
+              }
+            }
+          >
+            <SvgMock
+              color="#ffffff"
+              height={24}
+              name="SwapHorizontal"
+              style={
+                {
+                  "height": 24,
+                  "width": 24,
+                }
+              }
+              width={24}
+            />
+          </View>
+          <View>
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 16,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 24,
+                }
+              }
+            />
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#6a737d",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            />
+          </View>
+        </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Swap
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "display": "flex",
+            "flexDirection": "column",
+          }
+        }
+      >
+        <TouchableOpacity
+          disabled={false}
+          onPress={[Function]}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingVertical": 16,
+                "width": "100%",
+              },
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingTop": 16,
+                "paddingVertical": 2,
+                "width": "100%",
+              },
+              false,
+            ]
+          }
+          testID="token-bridge-button"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 20,
+                "height": 40,
+                "justifyContent": "center",
+                "marginHorizontal": 16,
+                "overflow": "hidden",
+                "width": 40,
+              }
+            }
+          >
+            <SvgMock
+              color="#ffffff"
+              height={24}
+              name="Bridge"
+              style={
+                {
+                  "height": 24,
+                  "width": 24,
+                }
+              }
+              width={24}
+            />
+          </View>
+          <View>
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 16,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 24,
+                }
+              }
+            />
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#6a737d",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            />
+          </View>
+        </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Bridge
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "display": "flex",
+            "flexDirection": "column",
+          }
+        }
+      >
+        <TouchableOpacity
+          disabled={false}
+          onPress={[Function]}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingVertical": 16,
+                "width": "100%",
+              },
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingTop": 16,
+                "paddingVertical": 2,
+                "width": "100%",
+              },
+              false,
+            ]
+          }
+          testID="token-send-button"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 20,
+                "height": 40,
+                "justifyContent": "center",
+                "marginHorizontal": 16,
+                "overflow": "hidden",
+                "width": 40,
+              }
+            }
+          >
+            <SvgMock
+              color="#ffffff"
+              height={24}
+              name="Arrow2Upright"
+              style={
+                {
+                  "height": 24,
+                  "width": 24,
+                }
+              }
+              width={24}
+            />
+          </View>
+          <View>
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 16,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 24,
+                }
+              }
+            />
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#6a737d",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            />
+          </View>
+        </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Send
+        </Text>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "display": "flex",
+            "flexDirection": "column",
+          }
+        }
+      >
+        <TouchableOpacity
+          disabled={false}
+          onPress={[Function]}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingVertical": 16,
+                "width": "100%",
+              },
+              {
+                "alignItems": "flex-start",
+                "flexDirection": "row",
+                "justifyContent": "flex-start",
+                "paddingTop": 16,
+                "paddingVertical": 2,
+                "width": "100%",
+              },
+              false,
+            ]
+          }
+          testID="token-receive-button"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#0376c9",
+                "borderRadius": 20,
+                "height": 40,
+                "justifyContent": "center",
+                "marginHorizontal": 16,
+                "overflow": "hidden",
+                "width": 40,
+              }
+            }
+          >
+            <SvgMock
+              color="#ffffff"
+              height={24}
+              name="QrCode"
+              style={
+                {
+                  "height": 24,
+                  "width": 24,
+                }
+              }
+              width={24}
+            />
+          </View>
+          <View>
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#141618",
+                  "fontFamily": "EuclidCircularB-Medium",
+                  "fontSize": 16,
+                  "fontWeight": "500",
+                  "letterSpacing": 0,
+                  "lineHeight": 24,
+                }
+              }
+            />
+            <Text
+              accessibilityRole="text"
+              style={
+                {
+                  "color": "#6a737d",
+                  "fontFamily": "EuclidCircularB-Regular",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            />
+          </View>
+        </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Receive
+        </Text>
+      </View>
+    </View>
+    <View
+      style={
+        {
+          "flex": 1,
+        }
+      }
+    >
+      <Text
+        accessibilityRole="text"
+        style={
+          {
+            "color": "#141618",
+            "fontFamily": "EuclidCircularB-Bold",
+            "fontSize": 18,
+            "fontWeight": "700",
+            "letterSpacing": 0,
+            "lineHeight": 24,
+            "paddingHorizontal": 15,
+            "paddingVertical": 4,
+          }
+        }
+      >
+        Your balance
+      </Text>
+      <TouchableOpacity
+        onLongPress={[Function]}
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "flex-start",
+            "flex": 1,
+            "flexDirection": "row",
+            "paddingHorizontal": 15,
+            "paddingVertical": 10,
+          }
+        }
+        testID="asset-ETH"
+      >
+        <View
+          onLayout={[Function]}
+          style={
+            {
+              "alignSelf": "center",
+              "position": "relative",
+            }
+          }
+          testID="badge-wrapper-badge"
+        >
+          <View>
+            <View
+              style={
+                {
+                  "backgroundColor": "#ffffff",
+                  "borderRadius": 16,
+                  "height": 32,
+                  "overflow": "hidden",
+                  "width": 32,
+                }
+              }
+            >
+              <Image
+                onError={[Function]}
+                resizeMode="contain"
+                source={
+                  {
+                    "uri": "",
+                  }
+                }
+                style={
+                  {
+                    "flex": 1,
+                    "height": undefined,
+                    "width": undefined,
+                  }
+                }
+                testID="token-avatar-image"
+              />
+            </View>
+          </View>
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "aspectRatio": 1,
+                "height": 0,
+                "justifyContent": "center",
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+                "transform": [
+                  {
+                    "translateX": 0,
+                  },
+                  {
+                    "translateY": -0,
+                  },
+                ],
+              }
+            }
+          >
+            <View
+              onLayout={[Function]}
+              style={
+                {
+                  "alignItems": "center",
+                  "aspectRatio": 1,
+                  "height": "50%",
+                  "justifyContent": "center",
+                  "maxHeight": 24,
+                  "minHeight": 8,
+                  "opacity": 0,
+                }
+              }
+              testID="badgenetwork"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "backgroundColor": "#ffffff",
+                    "borderColor": "#ffffff",
+                    "borderRadius": 16,
+                    "borderWidth": 2,
+                    "height": 32,
+                    "justifyContent": "center",
+                    "overflow": "hidden",
+                    "shadowColor": "#0000001a",
+                    "shadowOffset": {
+                      "height": 2,
+                      "width": 0,
+                    },
+                    "shadowOpacity": 1,
+                    "shadowRadius": 4,
+                    "transform": [
+                      {
+                        "scale": 1,
+                      },
+                    ],
+                    "width": 32,
+                  }
+                }
+              >
+                <Image
+                  onError={[Function]}
+                  resizeMode="contain"
+                  source={
+                    {
+                      "default": {
+                        "uri": "MockImage",
+                      },
+                    }
+                  }
+                  style={
+                    {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                  testID="network-avatar-image"
+                />
+              </View>
+            </View>
+          </View>
+        </View>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "alignSelf": "center",
+              "color": "#141618",
+              "flex": 1,
+              "fontFamily": "EuclidCircularB-Medium",
+              "fontSize": 16,
+              "fontWeight": "500",
+              "justifyContent": "center",
+              "letterSpacing": 0,
+              "lineHeight": 24,
+              "marginLeft": 20,
+            }
+          }
+        >
+          Ethereum
+        </Text>
+        <View
+          style={
+            {
+              "alignItems": "flex-end",
+              "alignSelf": "flex-end",
+              "flex": 1,
+            }
+          }
+        >
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#6a737d",
+                "fontFamily": "EuclidCircularB-Regular",
+                "fontSize": 14,
+                "fontWeight": "400",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+                "paddingHorizontal": 0,
+                "textTransform": "uppercase",
+              }
+            }
+            testID="main-balance-test-id"
+          >
+            0 ETH
+          </Text>
+        </View>
+      </TouchableOpacity>
+    </View>
+    <View
+      style={
+        {
+          "marginBottom": 20,
+          "paddingHorizontal": 16,
+        }
+      }
+    />
+  </View>
+</View>
+`;
diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
index 0ce39e4eb0a..8c8d941b7bb 100644
--- a/app/components/UI/Navbar/index.js
+++ b/app/components/UI/Navbar/index.js
@@ -1361,6 +1361,7 @@ export function getNetworkNavbarOptions(
   onRightPress = undefined,
   disableNetwork = false,
   contentOffset = 0,
+  networkName = '',
 ) {
   const innerStyles = StyleSheet.create({
     headerStyle: {
@@ -1385,6 +1386,7 @@ export function getNetworkNavbarOptions(
         disableNetwork={disableNetwork}
         title={title}
         translate={translate}
+        networkName={networkName}
       />
     ),
     headerLeft: () => (
@@ -1738,9 +1740,16 @@ export function getSwapsQuotesNavbar(navigation, route, themeColors) {
           MetaMetricsEvents.QUOTES_REQUEST_CANCELLED,
         )
           .addProperties({
-            ...trade,
+            token_from: trade.token_from,
+            token_to: trade.token_to,
+            request_type: trade.request_type,
+            custom_slippage: trade.custom_slippage,
+            chain_id: trade.chain_id,
             responseTime: new Date().getTime() - quoteBegin,
           })
+          .addSensitiveProperties({
+            token_from_amount: trade.token_from_amount,
+          })
           .build(),
       );
     }
@@ -1757,9 +1766,16 @@ export function getSwapsQuotesNavbar(navigation, route, themeColors) {
           MetaMetricsEvents.QUOTES_REQUEST_CANCELLED,
         )
           .addProperties({
-            ...trade,
+            token_from: trade.token_from,
+            token_to: trade.token_to,
+            request_type: trade.request_type,
+            custom_slippage: trade.custom_slippage,
+            chain_id: trade.chain_id,
             responseTime: new Date().getTime() - quoteBegin,
           })
+          .addSensitiveProperties({
+            token_from_amount: trade.token_from_amount,
+          })
           .build(),
       );
     }
diff --git a/app/components/UI/NavbarTitle/index.js b/app/components/UI/NavbarTitle/index.js
index 7cc2846d099..d1ce5408209 100644
--- a/app/components/UI/NavbarTitle/index.js
+++ b/app/components/UI/NavbarTitle/index.js
@@ -6,7 +6,6 @@ import { TouchableOpacity, View, StyleSheet } from 'react-native';
 import { fontStyles, colors as importedColors } from '../../../styles/common';
 import Networks, { getDecimalChainId } from '../../../util/networks';
 import { strings } from '../../../../locales/i18n';
-import Device from '../../../util/device';
 import { ThemeContext, mockTheme } from '../../../util/theme';
 import Routes from '../../../constants/navigation/Routes';
 import { MetaMetricsEvents } from '../../../core/Analytics';
diff --git a/app/components/UI/NetworkCell/NetworkCell.tsx b/app/components/UI/NetworkCell/NetworkCell.tsx
index 58ea3d26c5d..a9816e6c86a 100644
--- a/app/components/UI/NetworkCell/NetworkCell.tsx
+++ b/app/components/UI/NetworkCell/NetworkCell.tsx
@@ -1,23 +1,21 @@
 import React from 'react';
 import { Switch, ImageSourcePropType } from 'react-native';
-import { ETHERSCAN_SUPPORTED_NETWORKS } from '@metamask/transaction-controller';
 import { useStyles } from '../../../component-library/hooks';
 import Cell from '../../../component-library/components/Cells/Cell/Cell';
 import { CellVariant } from '../../../component-library/components/Cells/Cell';
 import { AvatarVariant } from '../../../component-library/components/Avatars/Avatar/Avatar.types';
 import { useTheme } from '../../../util/theme';
-import { EtherscanSupportedHexChainId } from '@metamask/preferences-controller';
 import styleSheet from './NetworkCell.styles';
+import { Hex } from '@metamask/utils';
 
-const supportedNetworks = ETHERSCAN_SUPPORTED_NETWORKS;
 interface NetworkCellProps {
   name: string;
-  chainId: EtherscanSupportedHexChainId | keyof typeof supportedNetworks;
+  chainId: Hex;
   imageSource: ImageSourcePropType;
-  secondaryText: string;
+  secondaryText?: string;
   showIncomingTransactionsNetworks: Record<string, boolean>;
   toggleEnableIncomingTransactions: (
-    chainId: EtherscanSupportedHexChainId,
+    chainId: Hex,
     value: boolean,
   ) => void;
   testID?: string;
diff --git a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
index fa6b7d2bf5b..fb2c30e33a1 100644
--- a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
@@ -237,9 +237,8 @@ exports[`NetworkDetails renders correctly 1`] = `
                       style={
                         {
                           "alignItems": "center",
-                          "backgroundColor": "#f2f4f6",
+                          "backgroundColor": "#ffffff",
                           "borderRadius": 8,
-                          "borderWidth": 1,
                           "height": 16,
                           "justifyContent": "center",
                           "overflow": "hidden",
@@ -248,21 +247,24 @@ exports[`NetworkDetails renders correctly 1`] = `
                       }
                       testID="network-avatar-picker"
                     >
-                      <Text
-                        accessibilityRole="text"
+                      <Image
+                        onError={[Function]}
+                        resizeMode="contain"
+                        source={
+                          {
+                            "default": {
+                              "uri": "MockImage",
+                            },
+                          }
+                        }
                         style={
                           {
-                            "color": "#141618",
-                            "fontFamily": "EuclidCircularB-Regular",
-                            "fontSize": 10,
-                            "fontWeight": "400",
-                            "letterSpacing": 0,
-                            "lineHeight": undefined,
+                            "height": 16,
+                            "width": 16,
                           }
                         }
-                      >
-                        T
-                      </Text>
+                        testID="network-avatar-image"
+                      />
                     </View>
                   </View>
                   <Text
@@ -511,7 +513,7 @@ exports[`NetworkDetails renders correctly 1`] = `
                 accessibilityRole="button"
                 accessible={true}
                 activeOpacity={1}
-                onPress={[Function]}
+                onPress={[MockFunction]}
                 onPressIn={[Function]}
                 onPressOut={[Function]}
                 style={
diff --git a/app/components/UI/NetworkModal/index.test.tsx b/app/components/UI/NetworkModal/index.test.tsx
index dd910736de7..f8c38d272a5 100644
--- a/app/components/UI/NetworkModal/index.test.tsx
+++ b/app/components/UI/NetworkModal/index.test.tsx
@@ -1,9 +1,27 @@
 import React from 'react';
 import NetworkModal from './index';
-import { render } from '@testing-library/react-native';
+import { render, fireEvent, act } from '@testing-library/react-native';
 import { useSelector } from 'react-redux';
+import Engine from '../../../core/Engine';
+import { ThemeContext, mockTheme } from '../../../util/theme';
 import { selectNetworkName } from '../../../selectors/networkInfos';
 import { selectUseSafeChainsListValidation } from '../../../selectors/preferencesController';
+import { NetworkApprovalBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Network/NetworkApprovalBottomSheet.selectors';
+import { NetworkAddedBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Network/NetworkAddedBottomSheet.selectors';
+
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    PreferencesController: {
+      setTokenNetworkFilter: jest.fn(),
+    },
+    NetworkController: {
+      updateNetwork: jest.fn(),
+      addNetwork: jest.fn(),
+      setActiveNetwork: jest.fn(),
+    },
+  },
+}));
+
 interface NetworkProps {
   isVisible: boolean;
   onClose: () => void;
@@ -18,27 +36,46 @@ interface NetworkProps {
   showPopularNetworkModal: boolean;
 }
 
+const mockDispatch = jest.fn();
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
-  useDispatch: jest.fn(),
+  useDispatch: () => mockDispatch,
   useSelector: jest.fn(),
 }));
+
 describe('NetworkDetails', () => {
   const props: NetworkProps = {
     isVisible: true,
-    onClose: () => ({}),
+    onClose: jest.fn(),
     networkConfiguration: {
-      chainId: '1',
+      chainId: '0x1',
       nickname: 'Test Network',
-      ticker: 'Test',
+      ticker: 'TEST',
       rpcUrl: 'https://localhost:8545',
       formattedRpcUrl: 'https://localhost:8545',
       rpcPrefs: { blockExplorerUrl: 'https://test.com', imageUrl: 'image' },
     },
-    navigation: 'navigation',
+    navigation: { navigate: jest.fn(), goBack: jest.fn() },
     shouldNetworkSwitchPopToWallet: true,
     showPopularNetworkModal: true,
   };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectNetworkName) return 'Ethereum Main Network';
+      if (selector === selectUseSafeChainsListValidation) return true;
+      return {};
+    });
+  });
+
+  const renderWithTheme = (component: React.ReactNode) =>
+    render(
+      <ThemeContext.Provider value={mockTheme}>
+        {component}
+      </ThemeContext.Provider>,
+    );
+
   it('renders correctly', () => {
     (useSelector as jest.MockedFn<typeof useSelector>).mockImplementation(
       (selector) => {
@@ -46,8 +83,31 @@ describe('NetworkDetails', () => {
         if (selector === selectUseSafeChainsListValidation) return true;
       },
     );
-    const { toJSON } = render(<NetworkModal {...props} />);
+    const { toJSON } = renderWithTheme(<NetworkModal {...props} />);
 
     expect(toJSON()).toMatchSnapshot();
   });
+
+  it('should call setTokenNetworkFilter when switching networks', async () => {
+    const { getByTestId } = renderWithTheme(<NetworkModal {...props} />);
+
+    const approveButton = getByTestId(
+      NetworkApprovalBottomSheetSelectorsIDs.APPROVE_BUTTON,
+    );
+    fireEvent.press(approveButton);
+
+    const switchButton = getByTestId(
+      NetworkAddedBottomSheetSelectorsIDs.SWITCH_NETWORK_BUTTON,
+    );
+    await act(async () => {
+      fireEvent.press(switchButton);
+    });
+
+    expect(
+      Engine.context.PreferencesController.setTokenNetworkFilter,
+    ).toHaveBeenCalledWith({
+      [props.networkConfiguration.chainId]: true,
+    });
+    expect(mockDispatch).toHaveBeenCalled();
+  });
 });
diff --git a/app/components/UI/NetworkModal/index.tsx b/app/components/UI/NetworkModal/index.tsx
index 53c37e95c45..30d7d4e1efd 100644
--- a/app/components/UI/NetworkModal/index.tsx
+++ b/app/components/UI/NetworkModal/index.tsx
@@ -22,7 +22,10 @@ import {
 import { useTheme } from '../../../util/theme';
 import { networkSwitched } from '../../../actions/onboardNetwork';
 import { NetworkApprovalBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Network/NetworkApprovalBottomSheet.selectors';
-import { selectUseSafeChainsListValidation } from '../../../selectors/preferencesController';
+import {
+  selectTokenNetworkFilter,
+  selectUseSafeChainsListValidation,
+} from '../../../selectors/preferencesController';
 import BottomSheetFooter, {
   ButtonsAlignment,
 } from '../../../component-library/components/BottomSheets/BottomSheetFooter';
@@ -34,7 +37,10 @@ import { useMetrics } from '../../../components/hooks/useMetrics';
 import { toHex } from '@metamask/controller-utils';
 import { rpcIdentifierUtility } from '../../../components/hooks/useSafeChains';
 import Logger from '../../../util/Logger';
-import { selectNetworkConfigurations } from '../../../selectors/networkController';
+import {
+  selectNetworkConfigurations,
+  selectIsAllNetworks,
+} from '../../../selectors/networkController';
 import {
   NetworkConfiguration,
   RpcEndpointType,
@@ -85,6 +91,7 @@ const NetworkModals = (props: NetworkProps) => {
   const [showDetails, setShowDetails] = React.useState(false);
   const [networkAdded, setNetworkAdded] = React.useState(false);
   const [showCheckNetwork, setShowCheckNetwork] = React.useState(false);
+  const tokenNetworkFilter = useSelector(selectTokenNetworkFilter);
   const [alerts, setAlerts] = React.useState<
     {
       alertError: string;
@@ -96,6 +103,7 @@ const NetworkModals = (props: NetworkProps) => {
   const isCustomNetwork = true;
   const showDetailsModal = () => setShowDetails(!showDetails);
   const showCheckNetworkModal = () => setShowCheckNetwork(!showCheckNetwork);
+  const isAllNetworks = useSelector(selectIsAllNetworks);
 
   const { colors } = useTheme();
   const styles = createNetworkModalStyles(colors);
@@ -107,6 +115,30 @@ const NetworkModals = (props: NetworkProps) => {
     return true;
   };
 
+  const customNetworkInformation = {
+    chainId,
+    blockExplorerUrl,
+    chainName: nickname,
+    rpcUrl,
+    icon: imageUrl,
+    ticker,
+    alerts,
+  };
+
+  const onUpdateNetworkFilter = useCallback(() => {
+    const { PreferencesController } = Engine.context;
+    if (!isAllNetworks) {
+      PreferencesController.setTokenNetworkFilter({
+        [customNetworkInformation.chainId]: true,
+      });
+    } else {
+      PreferencesController.setTokenNetworkFilter({
+        ...tokenNetworkFilter,
+        [customNetworkInformation.chainId]: true,
+      });
+    }
+  }, [customNetworkInformation.chainId, isAllNetworks, tokenNetworkFilter]);
+
   const addNetwork = async () => {
     const isValidUrl = validateRpcUrl(rpcUrl);
     if (showPopularNetworkModal) {
@@ -170,16 +202,6 @@ const NetworkModals = (props: NetworkProps) => {
     selectNetworkConfigurations,
   );
 
-  const customNetworkInformation = {
-    chainId,
-    blockExplorerUrl,
-    chainName: nickname,
-    rpcUrl,
-    icon: imageUrl,
-    ticker,
-    alerts,
-  };
-
   const checkNetwork = useCallback(async () => {
     if (useSafeChainsListValidation) {
       const alertsNetwork = await checkSafeNetwork(
@@ -243,6 +265,7 @@ const NetworkModals = (props: NetworkProps) => {
     }
 
     if (networkClientId) {
+      onUpdateNetworkFilter();
       await NetworkController.setActiveNetwork(networkClientId);
     }
 
@@ -268,7 +291,7 @@ const NetworkModals = (props: NetworkProps) => {
     const { networkClientId } =
       updatedNetwork?.rpcEndpoints?.[updatedNetwork.defaultRpcEndpointIndex] ??
       {};
-
+    onUpdateNetworkFilter();
     await NetworkController.setActiveNetwork(networkClientId);
   };
 
@@ -337,6 +360,7 @@ const NetworkModals = (props: NetworkProps) => {
         addedNetwork?.rpcEndpoints?.[addedNetwork.defaultRpcEndpointIndex] ??
         {};
 
+      onUpdateNetworkFilter();
       NetworkController.setActiveNetwork(networkClientId);
     }
     onClose();
diff --git a/app/components/UI/Notification/BaseNotification/index.js b/app/components/UI/Notification/BaseNotification/index.js
index a8fe45ea886..8c137a39168 100644
--- a/app/components/UI/Notification/BaseNotification/index.js
+++ b/app/components/UI/Notification/BaseNotification/index.js
@@ -154,7 +154,7 @@ const getTitle = (status, { nonce, amount, assetType }) => {
 };
 
 export const getDescription = (status, { amount = null, type = null }) => {
-  if (amount && typeof amount !== 'object') {
+  if (amount && typeof amount !== 'object' && type) {
     return strings(`notifications.${type}_${status}_message`, { amount });
   }
   return strings(`notifications.${status}_message`);
diff --git a/app/components/UI/PaymentRequest/index.test.tsx b/app/components/UI/PaymentRequest/index.test.tsx
index 391fe7e3b89..a01c0814d2f 100644
--- a/app/components/UI/PaymentRequest/index.test.tsx
+++ b/app/components/UI/PaymentRequest/index.test.tsx
@@ -39,6 +39,11 @@ const initialState = {
           },
         },
         tokens: [],
+        allTokens: {
+          '0x1': {
+            '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272': [],
+          },
+        },
       },
       NetworkController: {
         provider: {
@@ -50,7 +55,7 @@ const initialState = {
         ...MOCK_ACCOUNTS_CONTROLLER_STATE,
         internalAccounts: {
           ...MOCK_ACCOUNTS_CONTROLLER_STATE.internalAccounts,
-          selectedAccount: {},
+          selectedAccount: '30786334-3935-4563-b064-363339643939',
         },
       },
       TokenListController: {
diff --git a/app/components/UI/PermissionsSummary/PermissionsSummary.tsx b/app/components/UI/PermissionsSummary/PermissionsSummary.tsx
index 2b6d27d344b..cf998ed53a2 100644
--- a/app/components/UI/PermissionsSummary/PermissionsSummary.tsx
+++ b/app/components/UI/PermissionsSummary/PermissionsSummary.tsx
@@ -505,6 +505,9 @@ const PermissionsSummary = ({
                 <Button
                   variant={ButtonVariants.Secondary}
                   label={strings('permissions.choose_from_permitted_networks')}
+                  testID={
+                    NetworkNonPemittedBottomSheetSelectorsIDs.CHOOSE_FROM_PERMITTED_NETWORKS_BUTTON
+                  }
                   onPress={onChooseFromPermittedNetworks}
                   size={ButtonSize.Lg}
                   style={{
diff --git a/app/components/UI/Stake/Views/StakeInputView/StakeInputView.test.tsx b/app/components/UI/Stake/Views/StakeInputView/StakeInputView.test.tsx
index 53621dcd7e0..650343c3958 100644
--- a/app/components/UI/Stake/Views/StakeInputView/StakeInputView.test.tsx
+++ b/app/components/UI/Stake/Views/StakeInputView/StakeInputView.test.tsx
@@ -57,6 +57,23 @@ jest.mock('../../../../../selectors/currencyRateController.ts', () => ({
   selectCurrentCurrency: jest.fn(() => 'USD'),
 }));
 
+// Add mock for multichain selectors
+jest.mock('../../../../../selectors/multichain', () => ({
+  selectAccountTokensAcrossChains: jest.fn(() => ({
+    '0x1': [
+      {
+        address: '0x0',
+        symbol: 'ETH',
+        decimals: 18,
+        balance: '1.5',
+        balanceFiat: '$3000',
+        isNative: true,
+        isETH: true,
+      },
+    ],
+  })),
+}));
+
 const mockBalanceBN = toWei('1.5'); // 1.5 ETH
 
 const mockPooledStakingContractService: PooledStakingContract = {
diff --git a/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.test.tsx b/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.test.tsx
index 02c92e51339..b2f83588cf4 100644
--- a/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.test.tsx
+++ b/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.test.tsx
@@ -10,6 +10,22 @@ import {
   MOCK_STAKED_ETH_ASSET,
 } from '../../__mocks__/mockData';
 
+jest.mock('../../../../../selectors/multichain', () => ({
+  selectAccountTokensAcrossChains: jest.fn(() => ({
+    '0x1': [
+      {
+        address: '0x0',
+        symbol: 'ETH',
+        decimals: 18,
+        balance: '1.5',
+        balanceFiat: '$3000',
+        isNative: true,
+        isETH: true,
+      },
+    ],
+  })),
+}));
+
 function render(Component: React.ComponentType) {
   return renderScreen(
     Component,
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
index 09abd65ab7f..39e0dd2084b 100644
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
+++ b/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
@@ -12,6 +12,8 @@ import {
 } from '../../__mocks__/mockData';
 import { createMockAccountsControllerState } from '../../../../../util/test/accountsControllerTestUtils';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../../../util/networks';
 
 const MOCK_ADDRESS_1 = '0x0';
 
@@ -130,6 +132,15 @@ describe('StakingBalance', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
+  it('should match the snapshot when portfolio view is enabled  ', () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+    const { toJSON } = renderWithProvider(
+      <StakingBalance asset={MOCK_STAKED_ETH_ASSET} />,
+      { state: mockInitialState },
+    );
+    expect(toJSON()).toMatchSnapshot();
+  });
+
   it('redirects to StakeInputView on stake button click', () => {
     const { getByText } = renderWithProvider(
       <StakingBalance asset={MOCK_STAKED_ETH_ASSET} />,
diff --git a/app/components/UI/Stake/components/StakingBalance/__snapshots__/StakingBalance.test.tsx.snap b/app/components/UI/Stake/components/StakingBalance/__snapshots__/StakingBalance.test.tsx.snap
index c87de236d68..61fe94e4e3f 100644
--- a/app/components/UI/Stake/components/StakingBalance/__snapshots__/StakingBalance.test.tsx.snap
+++ b/app/components/UI/Stake/components/StakingBalance/__snapshots__/StakingBalance.test.tsx.snap
@@ -158,7 +158,945 @@ exports[`StakingBalance render matches snapshot 1`] = `
               resizeMode="contain"
               source={
                 {
-                  "uri": "MockImage",
+                  "default": {
+                    "uri": "MockImage",
+                  },
+                }
+              }
+              style={
+                {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+              testID="network-avatar-image"
+            />
+          </View>
+        </View>
+      </View>
+    </View>
+    <Text
+      accessibilityRole="text"
+      style={
+        {
+          "alignSelf": "center",
+          "color": "#141618",
+          "flex": 1,
+          "fontFamily": "EuclidCircularB-Medium",
+          "fontSize": 16,
+          "fontWeight": "500",
+          "justifyContent": "center",
+          "letterSpacing": 0,
+          "lineHeight": 24,
+          "marginLeft": 20,
+        }
+      }
+    >
+      Staked Ethereum
+    </Text>
+    <View
+      style={
+        {
+          "alignItems": "flex-end",
+          "alignSelf": "flex-end",
+          "flex": 1,
+        }
+      }
+    />
+  </TouchableOpacity>
+  <View
+    style={
+      {
+        "paddingHorizontal": 16,
+      }
+    }
+  >
+    <View
+      style={
+        {
+          "backgroundColor": "#0376c91a",
+          "borderColor": "#0376c9",
+          "borderLeftWidth": 4,
+          "borderRadius": 4,
+          "flexDirection": "row",
+          "marginVertical": 8,
+          "padding": 12,
+          "paddingLeft": 8,
+        }
+      }
+      testID="banneralert"
+      variant="Alert"
+    >
+      <View
+        style={
+          {
+            "marginRight": 8,
+          }
+        }
+      >
+        <SvgMock
+          color="#0376c9"
+          height={24}
+          name="Info"
+          style={
+            {
+              "height": 24,
+              "width": 24,
+            }
+          }
+          width={24}
+        />
+      </View>
+      <View
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Unstaking 0.0010 ETH in progress. Come back in a few days to claim it.
+        </Text>
+      </View>
+    </View>
+    <View
+      style={
+        {
+          "backgroundColor": "#1c82341a",
+          "borderColor": "#1c8234",
+          "borderLeftWidth": 4,
+          "borderRadius": 4,
+          "flexDirection": "row",
+          "marginVertical": 8,
+          "padding": 12,
+          "paddingLeft": 8,
+        }
+      }
+      testID="banneralert"
+      variant="Alert"
+    >
+      <View
+        style={
+          {
+            "marginRight": 8,
+          }
+        }
+      >
+        <SvgMock
+          color="#1c8234"
+          height={24}
+          name="Confirmation"
+          style={
+            {
+              "height": 24,
+              "width": 24,
+            }
+          }
+          width={24}
+        />
+      </View>
+      <View
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          You can claim 0.00214 ETH. Once claimed, you'll get ETH back in your wallet.
+        </Text>
+        <Text
+          accessibilityRole="link"
+          accessible={true}
+          disabled={false}
+          loading={false}
+          onPress={[Function]}
+          onPressIn={[Function]}
+          onPressOut={[Function]}
+          style={
+            {
+              "alignSelf": "flex-start",
+              "backgroundColor": "transparent",
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+          suppressHighlighting={true}
+          testID="claim-banner-claim-eth-button"
+        >
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#0376c9",
+                "fontFamily": "EuclidCircularB-Medium",
+                "fontSize": 14,
+                "fontWeight": "500",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+              }
+            }
+          >
+            Claim
+             ETH
+          </Text>
+        </Text>
+      </View>
+    </View>
+    <View
+      style={
+        [
+          {
+            "flexDirection": "row",
+            "gap": 8,
+            "justifyContent": "space-between",
+          },
+          {
+            "paddingTop": 8,
+          },
+        ]
+      }
+    >
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "alignSelf": "flex-start",
+            "backgroundColor": "transparent",
+            "borderColor": "#0376c9",
+            "borderRadius": 20,
+            "borderWidth": 1,
+            "flex": 1,
+            "flexDirection": "row",
+            "height": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#0376c9",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Unstake
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "alignSelf": "flex-start",
+            "backgroundColor": "transparent",
+            "borderColor": "#0376c9",
+            "borderRadius": 20,
+            "borderWidth": 1,
+            "flex": 1,
+            "flexDirection": "row",
+            "height": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#0376c9",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Stake more
+        </Text>
+      </TouchableOpacity>
+    </View>
+  </View>
+</View>
+`;
+
+exports[`StakingBalance should match the snapshot when portfolio view is enabled   1`] = `
+<View>
+  <TouchableOpacity
+    onLongPress={[Function]}
+    onPress={[Function]}
+    style={
+      {
+        "alignItems": "flex-start",
+        "flex": 1,
+        "flexDirection": "row",
+        "paddingHorizontal": 15,
+        "paddingVertical": 10,
+      }
+    }
+    testID="asset-ETH"
+  >
+    <View
+      onLayout={[Function]}
+      style={
+        {
+          "alignSelf": "center",
+          "position": "relative",
+        }
+      }
+      testID="badge-wrapper-badge"
+    >
+      <View>
+        <View
+          useNativeDriver={true}
+        >
+          <Image
+            fadeIn={true}
+            onError={[Function]}
+            onLoadEnd={[Function]}
+            source={
+              {
+                "uri": "",
+              }
+            }
+            style={
+              [
+                {
+                  "borderRadius": 12,
+                  "height": 24,
+                  "width": 24,
+                },
+                undefined,
+                undefined,
+                undefined,
+                {
+                  "borderRadius": 16,
+                  "height": 32,
+                  "overflow": "hidden",
+                  "width": 32,
+                },
+              ]
+            }
+          />
+          <View
+            collapsable={false}
+            style={
+              {
+                "bottom": 0,
+                "left": 0,
+                "opacity": 1,
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+              }
+            }
+          >
+            <View
+              style={
+                [
+                  {
+                    "borderRadius": 16,
+                    "height": 32,
+                    "overflow": "hidden",
+                    "width": 32,
+                  },
+                  {
+                    "backgroundColor": "#eee",
+                  },
+                  undefined,
+                ]
+              }
+            />
+          </View>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "aspectRatio": 1,
+            "height": 0,
+            "justifyContent": "center",
+            "position": "absolute",
+            "right": 0,
+            "top": 0,
+            "transform": [
+              {
+                "translateX": 0,
+              },
+              {
+                "translateY": -0,
+              },
+            ],
+          }
+        }
+      >
+        <View
+          onLayout={[Function]}
+          style={
+            {
+              "alignItems": "center",
+              "aspectRatio": 1,
+              "height": "50%",
+              "justifyContent": "center",
+              "maxHeight": 24,
+              "minHeight": 8,
+              "opacity": 0,
+            }
+          }
+          testID="badgenetwork"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#ffffff",
+                "borderColor": "#ffffff",
+                "borderRadius": 16,
+                "borderWidth": 2,
+                "height": 32,
+                "justifyContent": "center",
+                "overflow": "hidden",
+                "shadowColor": "#0000001a",
+                "shadowOffset": {
+                  "height": 2,
+                  "width": 0,
+                },
+                "shadowOpacity": 1,
+                "shadowRadius": 4,
+                "transform": [
+                  {
+                    "scale": 1,
+                  },
+                ],
+                "width": 32,
+              }
+            }
+          >
+            <Image
+              onError={[Function]}
+              resizeMode="contain"
+              source={
+                {
+                  "default": {
+                    "uri": "MockImage",
+                  },
+                }
+              }
+              style={
+                {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+              testID="network-avatar-image"
+            />
+          </View>
+        </View>
+      </View>
+    </View>
+    <Text
+      accessibilityRole="text"
+      style={
+        {
+          "alignSelf": "center",
+          "color": "#141618",
+          "flex": 1,
+          "fontFamily": "EuclidCircularB-Medium",
+          "fontSize": 16,
+          "fontWeight": "500",
+          "justifyContent": "center",
+          "letterSpacing": 0,
+          "lineHeight": 24,
+          "marginLeft": 20,
+        }
+      }
+    >
+      Staked Ethereum
+    </Text>
+    <View
+      style={
+        {
+          "alignItems": "flex-end",
+          "alignSelf": "flex-end",
+          "flex": 1,
+        }
+      }
+    />
+  </TouchableOpacity>
+  <View
+    style={
+      {
+        "paddingHorizontal": 16,
+      }
+    }
+  >
+    <View
+      style={
+        {
+          "backgroundColor": "#0376c91a",
+          "borderColor": "#0376c9",
+          "borderLeftWidth": 4,
+          "borderRadius": 4,
+          "flexDirection": "row",
+          "marginVertical": 8,
+          "padding": 12,
+          "paddingLeft": 8,
+        }
+      }
+      testID="banneralert"
+      variant="Alert"
+    >
+      <View
+        style={
+          {
+            "marginRight": 8,
+          }
+        }
+      >
+        <SvgMock
+          color="#0376c9"
+          height={24}
+          name="Info"
+          style={
+            {
+              "height": 24,
+              "width": 24,
+            }
+          }
+          width={24}
+        />
+      </View>
+      <View
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Unstaking 0.0010 ETH in progress. Come back in a few days to claim it.
+        </Text>
+      </View>
+    </View>
+    <View
+      style={
+        {
+          "backgroundColor": "#1c82341a",
+          "borderColor": "#1c8234",
+          "borderLeftWidth": 4,
+          "borderRadius": 4,
+          "flexDirection": "row",
+          "marginVertical": 8,
+          "padding": 12,
+          "paddingLeft": 8,
+        }
+      }
+      testID="banneralert"
+      variant="Alert"
+    >
+      <View
+        style={
+          {
+            "marginRight": 8,
+          }
+        }
+      >
+        <SvgMock
+          color="#1c8234"
+          height={24}
+          name="Confirmation"
+          style={
+            {
+              "height": 24,
+              "width": 24,
+            }
+          }
+          width={24}
+        />
+      </View>
+      <View
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          You can claim 0.00214 ETH. Once claimed, you'll get ETH back in your wallet.
+        </Text>
+        <Text
+          accessibilityRole="link"
+          accessible={true}
+          disabled={false}
+          loading={false}
+          onPress={[Function]}
+          onPressIn={[Function]}
+          onPressOut={[Function]}
+          style={
+            {
+              "alignSelf": "flex-start",
+              "backgroundColor": "transparent",
+              "color": "#141618",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+          suppressHighlighting={true}
+          testID="claim-banner-claim-eth-button"
+        >
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#0376c9",
+                "fontFamily": "EuclidCircularB-Medium",
+                "fontSize": 14,
+                "fontWeight": "500",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+              }
+            }
+          >
+            Claim
+             ETH
+          </Text>
+        </Text>
+      </View>
+    </View>
+    <View
+      style={
+        [
+          {
+            "flexDirection": "row",
+            "gap": 8,
+            "justifyContent": "space-between",
+          },
+          {
+            "paddingTop": 8,
+          },
+        ]
+      }
+    >
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "alignSelf": "flex-start",
+            "backgroundColor": "transparent",
+            "borderColor": "#0376c9",
+            "borderRadius": 20,
+            "borderWidth": 1,
+            "flex": 1,
+            "flexDirection": "row",
+            "height": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#0376c9",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Unstake
+        </Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "alignSelf": "flex-start",
+            "backgroundColor": "transparent",
+            "borderColor": "#0376c9",
+            "borderRadius": 20,
+            "borderWidth": 1,
+            "flex": 1,
+            "flexDirection": "row",
+            "height": 40,
+            "justifyContent": "center",
+            "paddingHorizontal": 16,
+          }
+        }
+      >
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#0376c9",
+              "fontFamily": "EuclidCircularB-Regular",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Stake more
+        </Text>
+      </TouchableOpacity>
+    </View>
+  </View>
+</View>
+`;
+
+exports[`StakingBalance should match the snapshot when portfolio view is enabled   1`] = `
+<View>
+  <TouchableOpacity
+    onLongPress={[Function]}
+    onPress={[Function]}
+    style={
+      {
+        "alignItems": "flex-start",
+        "flex": 1,
+        "flexDirection": "row",
+        "paddingHorizontal": 15,
+        "paddingVertical": 10,
+      }
+    }
+    testID="asset-ETH"
+  >
+    <View
+      onLayout={[Function]}
+      style={
+        {
+          "alignSelf": "center",
+          "position": "relative",
+        }
+      }
+      testID="badge-wrapper-badge"
+    >
+      <View>
+        <View
+          useNativeDriver={true}
+        >
+          <Image
+            fadeIn={true}
+            onError={[Function]}
+            onLoadEnd={[Function]}
+            source={
+              {
+                "uri": "",
+              }
+            }
+            style={
+              [
+                {
+                  "borderRadius": 12,
+                  "height": 24,
+                  "width": 24,
+                },
+                undefined,
+                undefined,
+                undefined,
+                {
+                  "borderRadius": 16,
+                  "height": 32,
+                  "overflow": "hidden",
+                  "width": 32,
+                },
+              ]
+            }
+          />
+          <View
+            collapsable={false}
+            style={
+              {
+                "bottom": 0,
+                "left": 0,
+                "opacity": 1,
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+              }
+            }
+          >
+            <View
+              style={
+                [
+                  {
+                    "borderRadius": 16,
+                    "height": 32,
+                    "overflow": "hidden",
+                    "width": 32,
+                  },
+                  {
+                    "backgroundColor": "#eee",
+                  },
+                  undefined,
+                ]
+              }
+            />
+          </View>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "aspectRatio": 1,
+            "height": 0,
+            "justifyContent": "center",
+            "position": "absolute",
+            "right": 0,
+            "top": 0,
+            "transform": [
+              {
+                "translateX": 0,
+              },
+              {
+                "translateY": -0,
+              },
+            ],
+          }
+        }
+      >
+        <View
+          onLayout={[Function]}
+          style={
+            {
+              "alignItems": "center",
+              "aspectRatio": 1,
+              "height": "50%",
+              "justifyContent": "center",
+              "maxHeight": 24,
+              "minHeight": 8,
+              "opacity": 0,
+            }
+          }
+          testID="badgenetwork"
+        >
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#ffffff",
+                "borderColor": "#ffffff",
+                "borderRadius": 16,
+                "borderWidth": 2,
+                "height": 32,
+                "justifyContent": "center",
+                "overflow": "hidden",
+                "shadowColor": "#0000001a",
+                "shadowOffset": {
+                  "height": 2,
+                  "width": 0,
+                },
+                "shadowOpacity": 1,
+                "shadowRadius": 4,
+                "transform": [
+                  {
+                    "scale": 1,
+                  },
+                ],
+                "width": 32,
+              }
+            }
+          >
+            <Image
+              onError={[Function]}
+              resizeMode="contain"
+              source={
+                {
+                  "default": {
+                    "uri": "MockImage",
+                  },
                 }
               }
               style={
diff --git a/app/components/UI/Stake/hooks/useStakingChain.test.tsx b/app/components/UI/Stake/hooks/useStakingChain.test.tsx
index c29df592c0a..a53380a458b 100644
--- a/app/components/UI/Stake/hooks/useStakingChain.test.tsx
+++ b/app/components/UI/Stake/hooks/useStakingChain.test.tsx
@@ -1,8 +1,9 @@
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import { renderHookWithProvider } from '../../../../util/test/renderWithProvider';
 import { toHex } from '@metamask/controller-utils';
-import useStakingChain from './useStakingChain';
+import useStakingChain, { useStakingChainByChainId } from './useStakingChain';
 import { mockNetworkState } from '../../../../util/test/network';
+import { Hex } from '@metamask/utils';
 
 const buildStateWithNetwork = (chainId: string, nickname: string) => ({
   engine: {
@@ -57,3 +58,41 @@ describe('useStakingChain', () => {
     });
   });
 });
+
+describe('useStakingChainByChainId', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  it('returns true for a supported chainId (mainnet)', () => {
+    const { result } = renderHookWithProvider(() =>
+      useStakingChainByChainId(toHex('1')),
+    );
+    expect(result.current.isStakingSupportedChain).toBe(true);
+  });
+
+  it('returns true for a supported chainId (Holesky)', () => {
+    const { result } = renderHookWithProvider(() =>
+      useStakingChainByChainId(toHex('17000')),
+    );
+    expect(result.current.isStakingSupportedChain).toBe(true);
+  });
+
+  it('returns false for an unsupported chainId', () => {
+    const { result } = renderHookWithProvider(() =>
+      useStakingChainByChainId(toHex('11')),
+    );
+    expect(result.current.isStakingSupportedChain).toBe(false);
+  });
+
+  it('handles invalid chainId gracefully', () => {
+    const { result } = renderHookWithProvider(() =>
+      useStakingChainByChainId('invalid-chain-id' as Hex),
+    );
+    expect(result.current.isStakingSupportedChain).toBe(false);
+  });
+});
diff --git a/app/components/UI/Stake/hooks/useStakingChain.ts b/app/components/UI/Stake/hooks/useStakingChain.ts
index d5da33c504e..934d7901023 100644
--- a/app/components/UI/Stake/hooks/useStakingChain.ts
+++ b/app/components/UI/Stake/hooks/useStakingChain.ts
@@ -1,3 +1,4 @@
+import { Hex } from '@metamask/utils';
 import { useSelector } from 'react-redux';
 import { getDecimalChainId } from '../../../../util/networks';
 import { selectChainId } from '../../../../selectors/networkController';
@@ -13,4 +14,12 @@ const useStakingChain = () => {
   };
 };
 
+export const useStakingChainByChainId = (chainId: Hex) => {
+  const isStakingSupportedChain = isSupportedChain(getDecimalChainId(chainId));
+
+  return {
+    isStakingSupportedChain,
+  };
+};
+
 export default useStakingChain;
diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
index 494216449fd..9d58c556bec 100644
--- a/app/components/UI/Swaps/QuotesView.js
+++ b/app/components/UI/Swaps/QuotesView.js
@@ -739,7 +739,7 @@ function SwapsQuotesView({
 
       trackEvent(
         createEventBuilder(MetaMetricsEvents.GAS_FEES_CHANGED)
-          .addSensitiveProperties(parameters)
+          .addProperties(parameters)
           .build(),
       );
     },
@@ -871,15 +871,7 @@ function SwapsQuotesView({
       const parameters = {
         account_type: getAddressAccountType(selectedAddress),
         token_from: sourceToken.symbol,
-        token_from_amount: fromTokenMinimalUnitString(
-          sourceAmount,
-          sourceToken.decimals,
-        ),
         token_to: destinationToken.symbol,
-        token_to_amount: fromTokenMinimalUnitString(
-          selectedQuote.destinationAmount,
-          destinationToken.decimals,
-        ),
         request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
         slippage,
         custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
@@ -895,9 +887,20 @@ function SwapsQuotesView({
         chain_id: getDecimalChainId(chainId),
         is_smart_transaction: shouldUseSmartTransaction,
       };
+      const sensitiveParameters = {
+        token_from_amount: fromTokenMinimalUnitString(
+          sourceAmount,
+          sourceToken.decimals,
+        ),
+        token_to_amount: fromTokenMinimalUnitString(
+          selectedQuote.destinationAmount,
+          destinationToken.decimals,
+        ),
+      };
       trackEvent(
         createEventBuilder(MetaMetricsEvents.SWAP_STARTED)
-          .addSensitiveProperties(parameters)
+          .addProperties(parameters)
+          .addSensitiveProperties(sensitiveParameters)
           .build(),
       );
     },
@@ -1157,15 +1160,7 @@ function SwapsQuotesView({
 
     const parameters = {
       token_from: sourceToken.symbol,
-      token_from_amount: fromTokenMinimalUnitString(
-        sourceAmount,
-        sourceToken.decimals,
-      ),
       token_to: destinationToken.symbol,
-      token_to_amount: fromTokenMinimalUnitString(
-        selectedQuote.destinationAmount,
-        destinationToken.decimals,
-      ),
       request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
       slippage,
       custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
@@ -1181,9 +1176,20 @@ function SwapsQuotesView({
       custom_spend_limit_amount: currentAmount,
       chain_id: getDecimalChainId(chainId),
     };
+    const sensitiveParameters = {
+      token_from_amount: fromTokenMinimalUnitString(
+        sourceAmount,
+        sourceToken.decimals,
+      ),
+      token_to_amount: fromTokenMinimalUnitString(
+        selectedQuote.destinationAmount,
+        destinationToken.decimals,
+      ),
+    };
     trackEvent(
       createEventBuilder(MetaMetricsEvents.EDIT_SPEND_LIMIT_OPENED)
-        .addSensitiveProperties(parameters)
+        .addProperties(parameters)
+        .addSensitiveProperties(sensitiveParameters)
         .build(),
     );
   }, [
@@ -1209,15 +1215,7 @@ function SwapsQuotesView({
     if (!selectedQuote || !selectedQuoteValue) return;
     const parameters = {
       token_from: sourceToken.symbol,
-      token_from_amount: fromTokenMinimalUnitString(
-        sourceAmount,
-        sourceToken.decimals,
-      ),
       token_to: destinationToken.symbol,
-      token_to_amount: fromTokenMinimalUnitString(
-        selectedQuote.destinationAmount,
-        destinationToken.decimals,
-      ),
       request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
       slippage,
       custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
@@ -1232,9 +1230,20 @@ function SwapsQuotesView({
       available_quotes: allQuotes.length,
       chain_id: getDecimalChainId(chainId),
     };
+    const sensitiveParameters = {
+      token_from_amount: fromTokenMinimalUnitString(
+        sourceAmount,
+        sourceToken.decimals,
+      ),
+      token_to_amount: fromTokenMinimalUnitString(
+          selectedQuote.destinationAmount,
+        destinationToken.decimals,
+      ),
+    };
     trackEvent(
       createEventBuilder(MetaMetricsEvents.QUOTES_RECEIVED)
-        .addSensitiveProperties(parameters)
+        .addProperties(parameters)
+        .addSensitiveProperties(sensitiveParameters)
         .build(),
     );
   }, [
@@ -1258,15 +1267,7 @@ function SwapsQuotesView({
     toggleQuotesModal();
     const parameters = {
       token_from: sourceToken.symbol,
-      token_from_amount: fromTokenMinimalUnitString(
-        sourceAmount,
-        sourceToken.decimals,
-      ),
       token_to: destinationToken.symbol,
-      token_to_amount: fromTokenMinimalUnitString(
-        selectedQuote.destinationAmount,
-        destinationToken.decimals,
-      ),
       request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
       slippage,
       custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
@@ -1281,10 +1282,21 @@ function SwapsQuotesView({
       available_quotes: allQuotes.length,
       chain_id: getDecimalChainId(chainId),
     };
+    const sensitiveParameters = {
+      token_from_amount: fromTokenMinimalUnitString(
+        sourceAmount,
+        sourceToken.decimals,
+      ),
+      token_to_amount: fromTokenMinimalUnitString(
+        selectedQuote.destinationAmount,
+        destinationToken.decimals,
+      ),
+    };
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.ALL_AVAILABLE_QUOTES_OPENED)
-        .addSensitiveProperties(parameters)
+        .addProperties(parameters)
+        .addSensitiveProperties(sensitiveParameters)
         .build(),
     );
   }, [
@@ -1308,16 +1320,18 @@ function SwapsQuotesView({
     (error) => {
       const data = {
         token_from: sourceToken.symbol,
-        token_from_amount: fromTokenMinimalUnitString(
-          sourceAmount,
-          sourceToken.decimals,
-        ),
         token_to: destinationToken.symbol,
         request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
         slippage,
         custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
         chain_id: getDecimalChainId(chainId),
       };
+      const sensitiveData = {
+        token_from_amount: fromTokenMinimalUnitString(
+          sourceAmount,
+          sourceToken.decimals,
+        ),
+      };
       if (error?.key === swapsUtils.SwapsError.QUOTES_EXPIRED_ERROR) {
         const parameters = {
           ...data,
@@ -1326,7 +1340,8 @@ function SwapsQuotesView({
 
         trackEvent(
           createEventBuilder(MetaMetricsEvents.QUOTES_TIMED_OUT)
-            .addSensitiveProperties(parameters)
+            .addProperties(parameters)
+            .addSensitiveProperties(sensitiveData)
             .build(),
         );
       } else if (
@@ -1335,7 +1350,8 @@ function SwapsQuotesView({
         const parameters = { ...data };
         trackEvent(
           createEventBuilder(MetaMetricsEvents.NO_QUOTES_AVAILABLE)
-            .addSensitiveProperties(parameters)
+            .addProperties(parameters)
+            .addSensitiveProperties(sensitiveData)
             .build(),
         );
       } else {
@@ -1606,22 +1622,25 @@ function SwapsQuotesView({
     setTrackedRequestedQuotes(true);
     const data = {
       token_from: sourceToken.symbol,
-      token_from_amount: fromTokenMinimalUnitString(
-        sourceAmount,
-        sourceToken.decimals,
-      ),
       token_to: destinationToken.symbol,
       request_type: hasEnoughTokenBalance ? 'Order' : 'Quote',
       custom_slippage: slippage !== AppConstants.SWAPS.DEFAULT_SLIPPAGE,
       chain_id: getDecimalChainId(chainId),
     };
-    navigation.setParams({ requestedTrade: data });
+    const sensitiveData = {
+      token_from_amount: fromTokenMinimalUnitString(
+        sourceAmount,
+        sourceToken.decimals,
+      ),
+    };
+    navigation.setParams({ requestedTrade: { ...data, ...sensitiveData } });
     navigation.setParams({ selectedQuote: undefined });
     navigation.setParams({ quoteBegin: Date.now() });
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.QUOTES_REQUESTED)
-        .addSensitiveProperties(data)
+        .addProperties(data)
+        .addSensitiveProperties(sensitiveData)
         .build(),
     );
   }, [
diff --git a/app/components/UI/Swaps/index.js b/app/components/UI/Swaps/index.js
index 5b1710f43c0..8d189c21d8f 100644
--- a/app/components/UI/Swaps/index.js
+++ b/app/components/UI/Swaps/index.js
@@ -275,7 +275,7 @@ function SwapsAmountView({
 
             trackEvent(
               createEventBuilder(MetaMetricsEvents.SWAPS_OPENED)
-                .addSensitiveProperties(parameters)
+                .addProperties(parameters)
                 .build(),
             );
           });
diff --git a/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx b/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx
index 43257ab4d1e..92e72f96ab2 100644
--- a/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx
+++ b/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx
@@ -110,14 +110,14 @@ export const PortfolioBalance = () => {
 
   let total;
   if (isOriginalNativeTokenSymbol) {
-    if (isPortfolioViewEnabled) {
+    if (isPortfolioViewEnabled()) {
       total = totalFiatBalance ?? 0;
     } else {
       const tokenFiatTotal = balance?.tokenFiat ?? 0;
       const ethFiatTotal = balance?.ethFiat ?? 0;
       total = tokenFiatTotal + ethFiatTotal;
     }
-  } else if (isPortfolioViewEnabled) {
+  } else if (isPortfolioViewEnabled()) {
     total = totalTokenFiat ?? 0;
   } else {
     total = balance?.tokenFiat ?? 0;
@@ -175,7 +175,7 @@ export const PortfolioBalance = () => {
       return null;
     }
 
-    if (isPortfolioViewEnabled) {
+    if (isPortfolioViewEnabled()) {
       return (
         <AggregatedPercentageCrossChains
           privacyMode={privacyMode}
diff --git a/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx b/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx
index 6fcf28d762a..c3732eb505d 100644
--- a/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx
@@ -25,7 +25,10 @@ import {
   MetaMetricsEvents,
   useMetrics,
 } from '../../../../../components/hooks/useMetrics';
-import { getDecimalChainId } from '../../../../../util/networks';
+import {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../../../util/networks';
 import {
   selectChainId,
   selectIsAllNetworks,
@@ -40,8 +43,6 @@ interface TokenListFooterProps {
   isAddTokenEnabled: boolean;
 }
 
-const isPortfolioViewEnabled = process.env.PORTFOLIO_VIEW === 'true';
-
 const getDetectedTokensCount = (
   isPortfolioEnabled: boolean,
   isAllNetworksSelected: boolean,
@@ -73,7 +74,6 @@ export const TokenListFooter = ({
 
   const isTokenDetectionEnabled = useSelector(selectUseTokenDetection);
   const chainId = useSelector(selectChainId);
-
   const isAllNetworks = useSelector(selectIsAllNetworks);
 
   const styles = createStyles(colors);
@@ -99,7 +99,7 @@ export const TokenListFooter = ({
   };
 
   const tokenCount = getDetectedTokensCount(
-    isPortfolioViewEnabled,
+    isPortfolioViewEnabled(),
     isAllNetworks,
     allDetectedTokens,
     detectedTokens,
diff --git a/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx b/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx
index 836b90b68c4..0cf16912f0e 100644
--- a/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { View } from 'react-native';
 import { Hex } from '@metamask/utils';
 import { zeroAddress } from 'ethereumjs-util';
@@ -13,11 +13,18 @@ import {
   selectChainId,
   selectProviderConfig,
   selectTicker,
+  selectNetworkConfigurations,
 } from '../../../../../selectors/networkController';
-import { selectContractExchangeRates } from '../../../../../selectors/tokenRatesController';
+import {
+  selectContractExchangeRates,
+  selectTokenMarketData,
+} from '../../../../../selectors/tokenRatesController';
+import { selectTokensBalances } from '../../../../../selectors/tokenBalancesController';
+import { selectSelectedInternalAccountAddress } from '../../../../../selectors/accountsController';
 import {
   selectConversionRate,
   selectCurrentCurrency,
+  selectCurrencyRates,
 } from '../../../../../selectors/currencyRateController';
 import { selectNetworkName } from '../../../../../selectors/networkInfos';
 import { RootState } from '../../../../../reducers';
@@ -27,6 +34,8 @@ import {
   isLineaMainnetByChainId,
   isMainnetByChainId,
   isTestNet,
+  getDefaultNetworkByChainId,
+  isPortfolioViewEnabled,
 } from '../../../../../util/networks';
 import createStyles from '../../styles';
 import BadgeWrapper from '../../../../../component-library/components/Badges/BadgeWrapper';
@@ -41,14 +50,20 @@ import Text, {
 import PercentageChange from '../../../../../component-library/components-temp/Price/PercentageChange';
 import AssetElement from '../../../AssetElement';
 import NetworkMainAssetLogo from '../../../NetworkMainAssetLogo';
+import NetworkAssetLogo from '../../../NetworkAssetLogo';
 import images from 'images/image-icons';
 import { TokenI } from '../../types';
 import { strings } from '../../../../../../locales/i18n';
 import { ScamWarningIcon } from '../ScamWarningIcon';
 import { ScamWarningModal } from '../ScamWarningModal';
 import { StakeButton } from '../../../Stake/components/StakeButton';
-import { CustomNetworkImgMapping } from '../../../../../util/networks/customNetworks';
-import useStakingChain from '../../../Stake/hooks/useStakingChain';
+import { useStakingChainByChainId } from '../../../Stake/hooks/useStakingChain';
+import {
+  PopularList,
+  UnpopularNetworkList,
+  CustomNetworkImgMapping,
+} from '../../../../../util/networks/customNetworks';
+import { selectShowFiatInTestnets } from '../../../../../selectors/settings';
 
 interface TokenListItemProps {
   asset: TokenI;
@@ -67,75 +82,117 @@ export const TokenListItem = ({
 }: TokenListItemProps) => {
   const navigation = useNavigation();
   const { colors } = useTheme();
-  const { data: tokenBalances } = useTokenBalancesController();
+  const selectedInternalAccountAddress = useSelector(
+    selectSelectedInternalAccountAddress,
+  );
+  const { data: selectedChainTokenBalance } = useTokenBalancesController();
 
   const { type } = useSelector(selectProviderConfig);
-  const chainId = useSelector(selectChainId);
+  const selectedChainId = useSelector(selectChainId);
+  const chainId = isPortfolioViewEnabled()
+    ? (asset.chainId as Hex)
+    : selectedChainId;
   const ticker = useSelector(selectTicker);
   const isOriginalNativeTokenSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
     type,
   );
-  const tokenExchangeRates = useSelector(selectContractExchangeRates);
-  const currentCurrency = useSelector(selectCurrentCurrency);
-  const conversionRate = useSelector(selectConversionRate);
   const networkName = useSelector(selectNetworkName);
   const primaryCurrency = useSelector(
     (state: RootState) => state.settings.primaryCurrency,
   );
+  const currentCurrency = useSelector(selectCurrentCurrency);
+  const networkConfigurations = useSelector(selectNetworkConfigurations);
+  const showFiatOnTestnets = useSelector(selectShowFiatInTestnets);
+
+  // single chain
+  const singleTokenExchangeRates = useSelector(selectContractExchangeRates);
+  const singleTokenConversionRate = useSelector(selectConversionRate);
+
+  // multi chain
+  const multiChainTokenBalance = useSelector(selectTokensBalances);
+  const multiChainMarketData = useSelector(selectTokenMarketData);
+  const multiChainCurrencyRates = useSelector(selectCurrencyRates);
 
   const styles = createStyles(colors);
 
   const itemAddress = safeToChecksumAddress(asset.address);
 
+  // Choose values based on multichain or legacy
+  const exchangeRates = isPortfolioViewEnabled()
+    ? multiChainMarketData?.[chainId as Hex]
+    : singleTokenExchangeRates;
+  const tokenBalances = isPortfolioViewEnabled()
+    ? multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
+        chainId as Hex
+      ]
+    : selectedChainTokenBalance;
+  const nativeCurrency =
+    networkConfigurations?.[chainId as Hex]?.nativeCurrency;
+
+  const conversionRate = isPortfolioViewEnabled()
+    ? multiChainCurrencyRates?.[nativeCurrency]?.conversionRate || 0
+    : singleTokenConversionRate;
+
   const { balanceFiat, balanceValueFormatted } =
     deriveBalanceFromAssetMarketDetails(
       asset,
-      tokenExchangeRates,
-      tokenBalances,
-      conversionRate,
-      currentCurrency,
+      exchangeRates || {},
+      tokenBalances || {},
+      conversionRate || 0,
+      currentCurrency || '',
     );
 
-  const pricePercentChange1d = itemAddress
-    ? tokenExchangeRates?.[itemAddress as `0x${string}`]?.pricePercentChange1d
-    : tokenExchangeRates?.[zeroAddress() as Hex]?.pricePercentChange1d;
+  let pricePercentChange1d: number;
+
+  if (isPortfolioViewEnabled()) {
+    const tokenPercentageChange = asset.address
+      ? multiChainMarketData?.[chainId as Hex]?.[asset.address as Hex]
+          ?.pricePercentChange1d
+      : 0;
+
+    pricePercentChange1d = asset.isNative
+      ? multiChainMarketData?.[chainId as Hex]?.[zeroAddress() as Hex]
+          ?.pricePercentChange1d
+      : tokenPercentageChange;
+  } else {
+    pricePercentChange1d = itemAddress
+      ? exchangeRates?.[itemAddress as Hex]?.pricePercentChange1d
+      : exchangeRates?.[zeroAddress() as Hex]?.pricePercentChange1d;
+  }
 
   // render balances according to primary currency
   let mainBalance;
   let secondaryBalance;
+  const shouldNotShowBalanceOnTestnets =
+    isTestNet(chainId) && !showFiatOnTestnets;
 
   // Set main and secondary balances based on the primary currency and asset type.
   if (primaryCurrency === 'ETH') {
     // Default to displaying the formatted balance value and its fiat equivalent.
     mainBalance = balanceValueFormatted;
     secondaryBalance = balanceFiat;
-
     // For ETH as a native currency, adjust display based on network safety.
     if (asset.isETH) {
       // Main balance always shows the formatted balance value for ETH.
       mainBalance = balanceValueFormatted;
       // Display fiat value as secondary balance only for original native tokens on safe networks.
-      secondaryBalance = isOriginalNativeTokenSymbol ? balanceFiat : null;
-    }
-  } else {
-    // For non-ETH currencies, determine balances based on the presence of fiat value.
-    mainBalance = !balanceFiat ? balanceValueFormatted : balanceFiat;
-    secondaryBalance = !balanceFiat ? balanceFiat : balanceValueFormatted;
-
-    // Adjust balances for native currencies in non-ETH scenarios.
-    if (asset.isETH) {
-      // Main balance logic: Show crypto value if fiat is absent or fiat value on safe networks.
-      if (!balanceFiat) {
-        mainBalance = balanceValueFormatted; // Show crypto value if fiat is not preferred
-      } else if (isOriginalNativeTokenSymbol) {
-        mainBalance = balanceFiat; // Show fiat value if it's a safe network
+      if (isPortfolioViewEnabled()) {
+        secondaryBalance = shouldNotShowBalanceOnTestnets
+          ? undefined
+          : balanceFiat;
       } else {
-        mainBalance = ''; // Otherwise, set to an empty string
+        secondaryBalance = isOriginalNativeTokenSymbol ? balanceFiat : null;
       }
-      // Secondary balance mirrors the main balance logic for consistency.
-      secondaryBalance = !balanceFiat ? balanceFiat : balanceValueFormatted;
+    }
+  } else {
+    secondaryBalance = balanceValueFormatted;
+    if (shouldNotShowBalanceOnTestnets && !balanceFiat) {
+      mainBalance = undefined;
+    } else {
+      mainBalance =
+        balanceFiat ?? strings('wallet.unable_to_find_conversion_rate');
     }
   }
 
@@ -154,38 +211,108 @@ export const TokenListItem = ({
   const isMainnet = isMainnetByChainId(chainId);
   const isLineaMainnet = isLineaMainnetByChainId(chainId);
 
-  const { isStakingSupportedChain } = useStakingChain();
+  const { isStakingSupportedChain } = useStakingChainByChainId(chainId);
 
-  const NetworkBadgeSource = () => {
-    if (isTestNet(chainId)) return getTestNetImageByChainId(chainId);
+  const networkBadgeSource = useCallback(
+    (currentChainId: Hex) => {
+      if (!isPortfolioViewEnabled()) {
+        if (isTestNet(chainId)) return getTestNetImageByChainId(chainId);
+        if (isMainnet) return images.ETHEREUM;
 
-    if (isMainnet) return images.ETHEREUM;
+        if (isLineaMainnet) return images['LINEA-MAINNET'];
 
-    if (isLineaMainnet) return images['LINEA-MAINNET'];
+        if (CustomNetworkImgMapping[chainId]) {
+          return CustomNetworkImgMapping[chainId];
+        }
 
-    if (CustomNetworkImgMapping[chainId]) {
-      return CustomNetworkImgMapping[chainId];
-    }
+        return ticker ? images[ticker] : undefined;
+      }
+      if (isTestNet(currentChainId))
+        return getTestNetImageByChainId(currentChainId);
+      const defaultNetwork = getDefaultNetworkByChainId(currentChainId) as
+        | {
+            imageSource: string;
+          }
+        | undefined;
 
-    return ticker ? images[ticker] : undefined;
-  };
+      if (defaultNetwork) {
+        return defaultNetwork.imageSource;
+      }
+
+      const unpopularNetwork = UnpopularNetworkList.find(
+        (networkConfig) => networkConfig.chainId === currentChainId,
+      );
+
+      const customNetworkImg = CustomNetworkImgMapping[currentChainId];
+
+      const popularNetwork = PopularList.find(
+        (networkConfig) => networkConfig.chainId === currentChainId,
+      );
+
+      const network = unpopularNetwork || popularNetwork;
+      if (network) {
+        return network.rpcPrefs.imageSource;
+      }
+      if (customNetworkImg) {
+        return customNetworkImg;
+      }
+    },
+    [chainId, isLineaMainnet, isMainnet, ticker],
+  );
 
   const onItemPress = (token: TokenI) => {
     // if the asset is staked, navigate to the native asset details
     if (asset.isStaked) {
-      return navigation.navigate('Asset', { ...token.nativeAsset });
+      return navigation.navigate('Asset', {
+        ...token.nativeAsset,
+      });
     }
     navigation.navigate('Asset', {
       ...token,
     });
   };
 
+  const renderNetworkAvatar = useCallback(() => {
+    if (!isPortfolioViewEnabled() && asset.isETH) {
+      return <NetworkMainAssetLogo style={styles.ethLogo} />;
+    }
+
+    if (isPortfolioViewEnabled() && asset.isNative) {
+      return (
+        <NetworkAssetLogo
+          chainId={chainId as Hex}
+          style={styles.ethLogo}
+          ticker={asset.ticker || ''}
+          big={false}
+          biggest={false}
+          testID={'PLACE HOLDER'}
+        />
+      );
+    }
+
+    return (
+      <AvatarToken
+        name={asset.symbol}
+        imageSource={{ uri: asset.image }}
+        size={AvatarSize.Md}
+      />
+    );
+  }, [
+    asset.ticker,
+    asset.isETH,
+    asset.image,
+    asset.symbol,
+    asset.isNative,
+    styles.ethLogo,
+    chainId,
+  ]);
+
   return (
     <AssetElement
       // assign staked asset a unique key
       key={asset.isStaked ? '0x_staked' : itemAddress || '0x'}
       onPress={onItemPress}
-      onLongPress={asset.isETH ? null : showRemoveMenu}
+      onLongPress={asset.isETH || asset.isNative ? null : showRemoveMenu}
       asset={asset}
       balance={secondaryBalance}
       mainBalance={mainBalance}
@@ -195,20 +322,12 @@ export const TokenListItem = ({
         badgeElement={
           <Badge
             variant={BadgeVariant.Network}
-            imageSource={NetworkBadgeSource()}
+            imageSource={networkBadgeSource(chainId)}
             name={networkName}
           />
         }
       >
-        {asset.isETH ? (
-          <NetworkMainAssetLogo style={styles.ethLogo} />
-        ) : (
-          <AvatarToken
-            name={asset.symbol}
-            imageSource={{ uri: asset.image }}
-            size={AvatarSize.Md}
-          />
-        )}
+        {renderNetworkAvatar()}
       </BadgeWrapper>
 
       <View style={styles.balances}>
diff --git a/app/components/UI/Tokens/TokensBottomSheet/TokenFilterBottomSheet.tsx b/app/components/UI/Tokens/TokensBottomSheet/TokenFilterBottomSheet.tsx
index 82eeffc8ddd..ba4c7a41961 100644
--- a/app/components/UI/Tokens/TokensBottomSheet/TokenFilterBottomSheet.tsx
+++ b/app/components/UI/Tokens/TokensBottomSheet/TokenFilterBottomSheet.tsx
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import {
   selectChainId,
   selectNetworkConfigurations,
+  selectIsAllNetworks,
 } from '../../../../selectors/networkController';
 import { selectTokenNetworkFilter } from '../../../../selectors/preferencesController';
 import BottomSheet, {
@@ -19,6 +20,7 @@ import ListItemSelect from '../../../../component-library/components/List/ListIt
 import { VerticalAlignment } from '../../../../component-library/components/List/ListItem';
 import { strings } from '../../../../../locales/i18n';
 import { enableAllNetworksFilter } from '../util/enableAllNetworksFilter';
+import { WalletViewSelectorsIDs } from '../../../../../e2e/selectors/wallet/WalletView.selectors';
 
 enum FilterOption {
   AllNetworks,
@@ -33,6 +35,7 @@ const TokenFilterBottomSheet = () => {
 
   const chainId = useSelector(selectChainId);
   const tokenNetworkFilter = useSelector(selectTokenNetworkFilter);
+  const isAllNetworks = useSelector(selectIsAllNetworks);
   const allNetworksEnabled = useMemo(
     () => enableAllNetworksFilter(allNetworks),
     [allNetworks],
@@ -59,8 +62,6 @@ const TokenFilterBottomSheet = () => {
   const isCurrentNetwork = Boolean(
     tokenNetworkFilter[chainId] && Object.keys(tokenNetworkFilter).length === 1,
   );
-  const isAllNetworks =
-    Object.keys(tokenNetworkFilter).length === Object.keys(allNetworks).length;
 
   return (
     <BottomSheet shouldNavigateBack ref={sheetRef}>
@@ -69,6 +70,7 @@ const TokenFilterBottomSheet = () => {
           {strings('wallet.filter_by')}
         </Text>
         <ListItemSelect
+          testID={WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER_ALL}
           onPress={() =>
             onFilterControlsBottomSheetPress(FilterOption.AllNetworks)
           }
@@ -81,6 +83,7 @@ const TokenFilterBottomSheet = () => {
           </Text>
         </ListItemSelect>
         <ListItemSelect
+          testID={WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER_CURRENT}
           onPress={() =>
             onFilterControlsBottomSheetPress(FilterOption.CurrentNetwork)
           }
diff --git a/app/components/UI/Tokens/__snapshots__/index.test.tsx.snap b/app/components/UI/Tokens/__snapshots__/index.test.tsx.snap
index b1fa6c4ca1f..7ec0de47e65 100644
--- a/app/components/UI/Tokens/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/Tokens/__snapshots__/index.test.tsx.snap
@@ -1,5 +1,1767 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Tokens Portfolio View should match the snapshot when portfolio view is enabled   1`] = `
+<View
+  style={
+    {
+      "flex": 1,
+    }
+  }
+>
+  <RNCSafeAreaProvider
+    onInsetsChange={[Function]}
+    style={
+      [
+        {
+          "flex": 1,
+        },
+        undefined,
+      ]
+    }
+  >
+    <View
+      collapsable={false}
+      pointerEvents="box-none"
+      style={
+        {
+          "zIndex": 1,
+        }
+      }
+    >
+      <View
+        accessibilityElementsHidden={false}
+        importantForAccessibility="auto"
+        onLayout={[Function]}
+        pointerEvents="box-none"
+        style={null}
+      >
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "bottom": 0,
+              "left": 0,
+              "opacity": 1,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+              "zIndex": 0,
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            style={
+              {
+                "backgroundColor": "rgb(255, 255, 255)",
+                "borderBottomColor": "rgb(216, 216, 216)",
+                "flex": 1,
+                "shadowColor": "rgb(216, 216, 216)",
+                "shadowOffset": {
+                  "height": 0.5,
+                  "width": 0,
+                },
+                "shadowOpacity": 0.85,
+                "shadowRadius": 0,
+              }
+            }
+          />
+        </View>
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "height": 64,
+              "maxHeight": undefined,
+              "minHeight": undefined,
+              "opacity": undefined,
+              "transform": undefined,
+            }
+          }
+        >
+          <View
+            pointerEvents="none"
+            style={
+              {
+                "height": 20,
+              }
+            }
+          />
+          <View
+            pointerEvents="box-none"
+            style={
+              {
+                "alignItems": "center",
+                "flex": 1,
+                "flexDirection": "row",
+                "justifyContent": "center",
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              pointerEvents="box-none"
+              style={
+                {
+                  "marginHorizontal": 16,
+                  "opacity": 1,
+                }
+              }
+            >
+              <Text
+                accessibilityRole="header"
+                aria-level="1"
+                collapsable={false}
+                numberOfLines={1}
+                onLayout={[Function]}
+                style={
+                  {
+                    "color": "rgb(28, 28, 30)",
+                    "fontSize": 17,
+                    "fontWeight": "600",
+                  }
+                }
+              >
+                Amount
+              </Text>
+            </View>
+          </View>
+        </View>
+      </View>
+    </View>
+    <RNSScreenContainer
+      onLayout={[Function]}
+      style={
+        {
+          "flex": 1,
+        }
+      }
+    >
+      <RNSScreen
+        activityState={2}
+        collapsable={false}
+        gestureResponseDistance={
+          {
+            "bottom": -1,
+            "end": -1,
+            "start": -1,
+            "top": -1,
+          }
+        }
+        pointerEvents="box-none"
+        style={
+          {
+            "bottom": 0,
+            "left": 0,
+            "position": "absolute",
+            "right": 0,
+            "top": 0,
+          }
+        }
+      >
+        <View
+          collapsable={false}
+          style={
+            {
+              "opacity": 1,
+            }
+          }
+        />
+        <View
+          accessibilityElementsHidden={false}
+          closing={false}
+          gestureVelocityImpact={0.3}
+          importantForAccessibility="auto"
+          onClose={[Function]}
+          onGestureBegin={[Function]}
+          onGestureCanceled={[Function]}
+          onGestureEnd={[Function]}
+          onOpen={[Function]}
+          onTransition={[Function]}
+          pointerEvents="box-none"
+          style={
+            [
+              {
+                "overflow": undefined,
+              },
+              {
+                "bottom": 0,
+                "left": 0,
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+              },
+            ]
+          }
+          transitionSpec={
+            {
+              "close": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+              "open": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            needsOffscreenAlphaCompositing={false}
+            pointerEvents="box-none"
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              onGestureHandlerEvent={[Function]}
+              onGestureHandlerStateChange={[Function]}
+              style={
+                {
+                  "flex": 1,
+                  "transform": [
+                    {
+                      "translateX": 0,
+                    },
+                    {
+                      "translateX": 0,
+                    },
+                  ],
+                }
+              }
+            >
+              <View
+                collapsable={false}
+                pointerEvents="none"
+                style={
+                  {
+                    "backgroundColor": "rgb(242, 242, 242)",
+                    "bottom": 0,
+                    "left": 0,
+                    "position": "absolute",
+                    "shadowColor": "#000",
+                    "shadowOffset": {
+                      "height": 1,
+                      "width": -1,
+                    },
+                    "shadowOpacity": 0.3,
+                    "shadowRadius": 5,
+                    "top": 0,
+                    "width": 3,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "flex": 1,
+                      "overflow": "hidden",
+                    },
+                    [
+                      {
+                        "backgroundColor": "rgb(242, 242, 242)",
+                      },
+                      undefined,
+                    ],
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "flexDirection": "column-reverse",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      {
+                        "flex": 1,
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "backgroundColor": "#ffffff",
+                          "flex": 1,
+                        }
+                      }
+                      testID="tokens"
+                    >
+                      <View
+                        style={
+                          {
+                            "flexDirection": "row",
+                            "justifyContent": "space-between",
+                            "paddingBottom": 16,
+                            "paddingLeft": 8,
+                            "paddingRight": 8,
+                            "paddingTop": 8,
+                          }
+                        }
+                      >
+                        <View
+                          style={
+                            {
+                              "flexDirection": "row",
+                              "justifyContent": "space-between",
+                              "width": "100%",
+                            }
+                          }
+                        >
+                          <TouchableOpacity
+                            accessibilityRole="button"
+                            accessible={true}
+                            activeOpacity={1}
+                            disabled={false}
+                            onPress={[Function]}
+                            style={
+                              {
+                                "alignItems": "center",
+                                "alignSelf": "flex-start",
+                                "backgroundColor": "#ffffff",
+                                "borderColor": "#bbc0c5",
+                                "borderRadius": 20,
+                                "borderStyle": "solid",
+                                "borderWidth": 1,
+                                "flexDirection": "row",
+                                "height": 40,
+                                "justifyContent": "center",
+                                "marginLeft": 5,
+                                "marginRight": 5,
+                                "maxWidth": "60%",
+                                "paddingHorizontal": 16,
+                              }
+                            }
+                            testID="token-network-filter"
+                          >
+                            <Text
+                              numberOfLines={1}
+                              style={
+                                {
+                                  "color": "#141618",
+                                }
+                              }
+                            >
+                              All Networks
+                            </Text>
+                            <SvgMock
+                              color="#141618"
+                              height={16}
+                              name="ArrowDown"
+                              style={
+                                {
+                                  "height": 16,
+                                  "marginLeft": 8,
+                                  "width": 16,
+                                }
+                              }
+                              width={16}
+                            />
+                          </TouchableOpacity>
+                          <View
+                            style={
+                              {
+                                "flexDirection": "row",
+                              }
+                            }
+                          >
+                            <TouchableOpacity
+                              accessible={true}
+                              activeOpacity={1}
+                              disabled={false}
+                              onPress={[Function]}
+                              onPressIn={[Function]}
+                              onPressOut={[Function]}
+                              style={
+                                {
+                                  "alignItems": "center",
+                                  "backgroundColor": "#ffffff",
+                                  "borderColor": "#bbc0c5",
+                                  "borderRadius": 50,
+                                  "borderStyle": "solid",
+                                  "borderWidth": 1,
+                                  "height": 40,
+                                  "justifyContent": "center",
+                                  "marginLeft": 5,
+                                  "marginRight": 5,
+                                  "opacity": 1,
+                                  "width": 50,
+                                }
+                              }
+                              testID="sort-by"
+                            >
+                              <SvgMock
+                                color="#141618"
+                                height={16}
+                                name="SwapVertical"
+                                style={
+                                  {
+                                    "height": 16,
+                                    "width": 16,
+                                  }
+                                }
+                                width={16}
+                              />
+                            </TouchableOpacity>
+                            <TouchableOpacity
+                              accessible={true}
+                              activeOpacity={1}
+                              disabled={false}
+                              onPress={[Function]}
+                              onPressIn={[Function]}
+                              onPressOut={[Function]}
+                              style={
+                                {
+                                  "alignItems": "center",
+                                  "backgroundColor": "#ffffff",
+                                  "borderColor": "#bbc0c5",
+                                  "borderRadius": 50,
+                                  "borderStyle": "solid",
+                                  "borderWidth": 1,
+                                  "height": 40,
+                                  "justifyContent": "center",
+                                  "marginLeft": 5,
+                                  "marginRight": 5,
+                                  "opacity": 1,
+                                  "width": 50,
+                                }
+                              }
+                              testID="import-token-button"
+                            >
+                              <SvgMock
+                                color="#141618"
+                                height={16}
+                                name="Add"
+                                style={
+                                  {
+                                    "height": 16,
+                                    "width": 16,
+                                  }
+                                }
+                                width={16}
+                              />
+                            </TouchableOpacity>
+                          </View>
+                        </View>
+                      </View>
+                      <View
+                        style={
+                          {
+                            "alignItems": "center",
+                            "backgroundColor": "#ffffff",
+                            "justifyContent": "center",
+                            "marginTop": 50,
+                          }
+                        }
+                      >
+                        <Text
+                          accessibilityRole="text"
+                          style={
+                            {
+                              "color": "#141618",
+                              "fontFamily": "EuclidCircularB-Regular",
+                              "fontSize": 20,
+                              "fontWeight": "400",
+                              "letterSpacing": 0,
+                              "lineHeight": 22,
+                            }
+                          }
+                        >
+                          You don't have any tokens!
+                        </Text>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </RNSScreen>
+    </RNSScreenContainer>
+  </RNCSafeAreaProvider>
+</View>
+`;
+
+exports[`Tokens render matches snapshot 1`] = `
+<View
+  style={
+    {
+      "flex": 1,
+    }
+  }
+>
+  <RNCSafeAreaProvider
+    onInsetsChange={[Function]}
+    style={
+      [
+        {
+          "flex": 1,
+        },
+        undefined,
+      ]
+    }
+  >
+    <View
+      collapsable={false}
+      pointerEvents="box-none"
+      style={
+        {
+          "zIndex": 1,
+        }
+      }
+    >
+      <View
+        accessibilityElementsHidden={false}
+        importantForAccessibility="auto"
+        onLayout={[Function]}
+        pointerEvents="box-none"
+        style={null}
+      >
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "bottom": 0,
+              "left": 0,
+              "opacity": 1,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+              "zIndex": 0,
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            style={
+              {
+                "backgroundColor": "rgb(255, 255, 255)",
+                "borderBottomColor": "rgb(216, 216, 216)",
+                "flex": 1,
+                "shadowColor": "rgb(216, 216, 216)",
+                "shadowOffset": {
+                  "height": 0.5,
+                  "width": 0,
+                },
+                "shadowOpacity": 0.85,
+                "shadowRadius": 0,
+              }
+            }
+          />
+        </View>
+        <View
+          collapsable={false}
+          pointerEvents="box-none"
+          style={
+            {
+              "height": 64,
+              "maxHeight": undefined,
+              "minHeight": undefined,
+              "opacity": undefined,
+              "transform": undefined,
+            }
+          }
+        >
+          <View
+            pointerEvents="none"
+            style={
+              {
+                "height": 20,
+              }
+            }
+          />
+          <View
+            pointerEvents="box-none"
+            style={
+              {
+                "alignItems": "center",
+                "flex": 1,
+                "flexDirection": "row",
+                "justifyContent": "center",
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              pointerEvents="box-none"
+              style={
+                {
+                  "marginHorizontal": 16,
+                  "opacity": 1,
+                }
+              }
+            >
+              <Text
+                accessibilityRole="header"
+                aria-level="1"
+                collapsable={false}
+                numberOfLines={1}
+                onLayout={[Function]}
+                style={
+                  {
+                    "color": "rgb(28, 28, 30)",
+                    "fontSize": 17,
+                    "fontWeight": "600",
+                  }
+                }
+              >
+                Amount
+              </Text>
+            </View>
+          </View>
+        </View>
+      </View>
+    </View>
+    <RNSScreenContainer
+      onLayout={[Function]}
+      style={
+        {
+          "flex": 1,
+        }
+      }
+    >
+      <RNSScreen
+        activityState={2}
+        collapsable={false}
+        gestureResponseDistance={
+          {
+            "bottom": -1,
+            "end": -1,
+            "start": -1,
+            "top": -1,
+          }
+        }
+        pointerEvents="box-none"
+        style={
+          {
+            "bottom": 0,
+            "left": 0,
+            "position": "absolute",
+            "right": 0,
+            "top": 0,
+          }
+        }
+      >
+        <View
+          collapsable={false}
+          style={
+            {
+              "opacity": 1,
+            }
+          }
+        />
+        <View
+          accessibilityElementsHidden={false}
+          closing={false}
+          gestureVelocityImpact={0.3}
+          importantForAccessibility="auto"
+          onClose={[Function]}
+          onGestureBegin={[Function]}
+          onGestureCanceled={[Function]}
+          onGestureEnd={[Function]}
+          onOpen={[Function]}
+          onTransition={[Function]}
+          pointerEvents="box-none"
+          style={
+            [
+              {
+                "overflow": undefined,
+              },
+              {
+                "bottom": 0,
+                "left": 0,
+                "position": "absolute",
+                "right": 0,
+                "top": 0,
+              },
+            ]
+          }
+          transitionSpec={
+            {
+              "close": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+              "open": {
+                "animation": "spring",
+                "config": {
+                  "damping": 500,
+                  "mass": 3,
+                  "overshootClamping": true,
+                  "restDisplacementThreshold": 10,
+                  "restSpeedThreshold": 10,
+                  "stiffness": 1000,
+                },
+              },
+            }
+          }
+        >
+          <View
+            collapsable={false}
+            needsOffscreenAlphaCompositing={false}
+            pointerEvents="box-none"
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          >
+            <View
+              collapsable={false}
+              onGestureHandlerEvent={[Function]}
+              onGestureHandlerStateChange={[Function]}
+              style={
+                {
+                  "flex": 1,
+                  "transform": [
+                    {
+                      "translateX": 0,
+                    },
+                    {
+                      "translateX": 0,
+                    },
+                  ],
+                }
+              }
+            >
+              <View
+                collapsable={false}
+                pointerEvents="none"
+                style={
+                  {
+                    "backgroundColor": "rgb(242, 242, 242)",
+                    "bottom": 0,
+                    "left": 0,
+                    "position": "absolute",
+                    "shadowColor": "#000",
+                    "shadowOffset": {
+                      "height": 1,
+                      "width": -1,
+                    },
+                    "shadowOpacity": 0.3,
+                    "shadowRadius": 5,
+                    "top": 0,
+                    "width": 3,
+                  }
+                }
+              />
+              <View
+                style={
+                  [
+                    {
+                      "flex": 1,
+                      "overflow": "hidden",
+                    },
+                    [
+                      {
+                        "backgroundColor": "rgb(242, 242, 242)",
+                      },
+                      undefined,
+                    ],
+                  ]
+                }
+              >
+                <View
+                  style={
+                    {
+                      "flex": 1,
+                      "flexDirection": "column-reverse",
+                    }
+                  }
+                >
+                  <View
+                    style={
+                      {
+                        "flex": 1,
+                      }
+                    }
+                  >
+                    <View
+                      style={
+                        {
+                          "backgroundColor": "#ffffff",
+                          "flex": 1,
+                        }
+                      }
+                      testID="tokens"
+                    >
+                      <View
+                        style={
+                          {
+                            "flexDirection": "row",
+                            "justifyContent": "space-between",
+                            "paddingBottom": 16,
+                            "paddingLeft": 8,
+                            "paddingRight": 8,
+                            "paddingTop": 8,
+                          }
+                        }
+                      >
+                        <TouchableOpacity
+                          accessibilityRole="button"
+                          accessible={true}
+                          activeOpacity={1}
+                          onPress={[Function]}
+                          style={
+                            {
+                              "alignItems": "center",
+                              "alignSelf": "flex-start",
+                              "backgroundColor": "#ffffff",
+                              "borderColor": "#bbc0c5",
+                              "borderRadius": 20,
+                              "borderStyle": "solid",
+                              "borderWidth": 1,
+                              "flexDirection": "row",
+                              "height": 40,
+                              "justifyContent": "center",
+                              "marginLeft": 5,
+                              "marginRight": 5,
+                              "maxWidth": "60%",
+                              "paddingHorizontal": 16,
+                            }
+                          }
+                          testID="sort-by"
+                        >
+                          <Text
+                            accessibilityRole="none"
+                            style={
+                              {
+                                "color": "#141618",
+                                "fontFamily": "EuclidCircularB-Regular",
+                                "fontSize": 14,
+                                "fontWeight": "400",
+                                "letterSpacing": 0,
+                                "lineHeight": 22,
+                              }
+                            }
+                          >
+                            Sort by
+                          </Text>
+                          <SvgMock
+                            color="#141618"
+                            height={16}
+                            name="ArrowDown"
+                            style={
+                              {
+                                "height": 16,
+                                "marginLeft": 8,
+                                "width": 16,
+                              }
+                            }
+                            width={16}
+                          />
+                        </TouchableOpacity>
+                        <TouchableOpacity
+                          accessibilityRole="button"
+                          accessible={true}
+                          activeOpacity={1}
+                          onPress={[Function]}
+                          style={
+                            {
+                              "alignItems": "center",
+                              "alignSelf": "flex-start",
+                              "backgroundColor": "#ffffff",
+                              "borderColor": "#bbc0c5",
+                              "borderRadius": 20,
+                              "borderStyle": "solid",
+                              "borderWidth": 1,
+                              "flexDirection": "row",
+                              "height": 40,
+                              "justifyContent": "center",
+                              "marginLeft": 5,
+                              "marginRight": 5,
+                              "maxWidth": "60%",
+                              "paddingHorizontal": 16,
+                            }
+                          }
+                          testID="import-token-button"
+                        >
+                          <SvgMock
+                            color="#141618"
+                            height={16}
+                            name="Add"
+                            style={
+                              {
+                                "height": 16,
+                                "marginRight": 8,
+                                "width": 16,
+                              }
+                            }
+                            width={16}
+                          />
+                          <Text
+                            accessibilityRole="none"
+                            style={
+                              {
+                                "color": "#141618",
+                                "fontFamily": "EuclidCircularB-Regular",
+                                "fontSize": 14,
+                                "fontWeight": "400",
+                                "letterSpacing": 0,
+                                "lineHeight": 22,
+                              }
+                            }
+                          >
+                            Import
+                          </Text>
+                        </TouchableOpacity>
+                      </View>
+                      <RCTScrollView
+                        ListFooterComponent={
+                          <TokenListFooter
+                            goToAddToken={[Function]}
+                            isAddTokenEnabled={true}
+                            showDetectedTokens={[Function]}
+                            tokens={
+                              [
+                                {
+                                  "address": "0x0",
+                                  "balanceFiat": "< $0.01",
+                                  "decimals": 18,
+                                  "iconUrl": "",
+                                  "isETH": true,
+                                  "isStaked": false,
+                                  "name": "Ethereum",
+                                  "symbol": "ETH",
+                                  "tokenFiatAmount": NaN,
+                                },
+                                {
+                                  "address": "0x01",
+                                  "balanceFiat": "$0",
+                                  "decimals": 18,
+                                  "iconUrl": "",
+                                  "name": "Bat",
+                                  "symbol": "BAT",
+                                  "tokenFiatAmount": NaN,
+                                },
+                              ]
+                            }
+                          />
+                        }
+                        data={
+                          [
+                            {
+                              "address": "0x0",
+                              "balanceFiat": "< $0.01",
+                              "decimals": 18,
+                              "iconUrl": "",
+                              "isETH": true,
+                              "isStaked": false,
+                              "name": "Ethereum",
+                              "symbol": "ETH",
+                              "tokenFiatAmount": NaN,
+                            },
+                            {
+                              "address": "0x01",
+                              "balanceFiat": "$0",
+                              "decimals": 18,
+                              "iconUrl": "",
+                              "name": "Bat",
+                              "symbol": "BAT",
+                              "tokenFiatAmount": NaN,
+                            },
+                          ]
+                        }
+                        getItem={[Function]}
+                        getItemCount={[Function]}
+                        keyExtractor={[Function]}
+                        onContentSizeChange={[Function]}
+                        onLayout={[Function]}
+                        onMomentumScrollBegin={[Function]}
+                        onMomentumScrollEnd={[Function]}
+                        onScroll={[Function]}
+                        onScrollBeginDrag={[Function]}
+                        onScrollEndDrag={[Function]}
+                        refreshControl={
+                          <RefreshControlMock
+                            colors={
+                              [
+                                "#0376c9",
+                              ]
+                            }
+                            onRefresh={[Function]}
+                            refreshing={false}
+                            tintColor="#141618"
+                          />
+                        }
+                        removeClippedSubviews={false}
+                        renderItem={[Function]}
+                        scrollEventThrottle={50}
+                        stickyHeaderIndices={[]}
+                        testID="token-list"
+                        viewabilityConfigCallbackPairs={[]}
+                      >
+                        <RCTRefreshControl />
+                        <View>
+                          <View
+                            onFocusCapture={[Function]}
+                            onLayout={[Function]}
+                            style={null}
+                          >
+                            <TouchableOpacity
+                              onLongPress={[Function]}
+                              onPress={[Function]}
+                              style={
+                                {
+                                  "alignItems": "flex-start",
+                                  "flex": 1,
+                                  "flexDirection": "row",
+                                  "paddingHorizontal": 15,
+                                  "paddingVertical": 10,
+                                }
+                              }
+                              testID="asset-ETH"
+                            >
+                              <View
+                                onLayout={[Function]}
+                                style={
+                                  {
+                                    "alignSelf": "flex-start",
+                                    "position": "relative",
+                                  }
+                                }
+                                testID="badge-wrapper-badge"
+                              >
+                                <View>
+                                  <View
+                                    useNativeDriver={true}
+                                  >
+                                    <Image
+                                      fadeIn={true}
+                                      onError={[Function]}
+                                      onLoadEnd={[Function]}
+                                      source={
+                                        {
+                                          "uri": "",
+                                        }
+                                      }
+                                      style={
+                                        [
+                                          {
+                                            "borderRadius": 12,
+                                            "height": 24,
+                                            "width": 24,
+                                          },
+                                          undefined,
+                                          undefined,
+                                          undefined,
+                                          {
+                                            "borderRadius": 16,
+                                            "height": 32,
+                                            "overflow": "hidden",
+                                            "width": 32,
+                                          },
+                                        ]
+                                      }
+                                    />
+                                    <View
+                                      collapsable={false}
+                                      style={
+                                        {
+                                          "bottom": 0,
+                                          "left": 0,
+                                          "opacity": 1,
+                                          "position": "absolute",
+                                          "right": 0,
+                                          "top": 0,
+                                        }
+                                      }
+                                    >
+                                      <View
+                                        style={
+                                          [
+                                            {
+                                              "borderRadius": 16,
+                                              "height": 32,
+                                              "overflow": "hidden",
+                                              "width": 32,
+                                            },
+                                            {
+                                              "backgroundColor": "#eee",
+                                            },
+                                            undefined,
+                                          ]
+                                        }
+                                      />
+                                    </View>
+                                  </View>
+                                </View>
+                                <View
+                                  style={
+                                    {
+                                      "alignItems": "center",
+                                      "aspectRatio": 1,
+                                      "height": 0,
+                                      "justifyContent": "center",
+                                      "position": "absolute",
+                                      "right": 0,
+                                      "top": 0,
+                                      "transform": [
+                                        {
+                                          "translateX": 0,
+                                        },
+                                        {
+                                          "translateY": -0,
+                                        },
+                                      ],
+                                    }
+                                  }
+                                >
+                                  <View
+                                    onLayout={[Function]}
+                                    style={
+                                      {
+                                        "alignItems": "center",
+                                        "aspectRatio": 1,
+                                        "height": "50%",
+                                        "justifyContent": "center",
+                                        "maxHeight": 24,
+                                        "minHeight": 8,
+                                        "opacity": 0,
+                                      }
+                                    }
+                                    testID="badgenetwork"
+                                  >
+                                    <View
+                                      style={
+                                        {
+                                          "alignItems": "center",
+                                          "backgroundColor": "#ffffff",
+                                          "borderColor": "#ffffff",
+                                          "borderRadius": 16,
+                                          "borderWidth": 2,
+                                          "height": 32,
+                                          "justifyContent": "center",
+                                          "overflow": "hidden",
+                                          "shadowColor": "#0000001a",
+                                          "shadowOffset": {
+                                            "height": 2,
+                                            "width": 0,
+                                          },
+                                          "shadowOpacity": 1,
+                                          "shadowRadius": 4,
+                                          "transform": [
+                                            {
+                                              "scale": 1,
+                                            },
+                                          ],
+                                          "width": 32,
+                                        }
+                                      }
+                                    >
+                                      <Image
+                                        onError={[Function]}
+                                        resizeMode="contain"
+                                        source={
+                                          {
+                                            "uri": "MockImage",
+                                          }
+                                        }
+                                        style={
+                                          {
+                                            "height": 32,
+                                            "width": 32,
+                                          }
+                                        }
+                                        testID="network-avatar-image"
+                                      />
+                                    </View>
+                                  </View>
+                                </View>
+                              </View>
+                              <View
+                                style={
+                                  {
+                                    "flex": 1,
+                                    "justifyContent": "center",
+                                    "marginLeft": 20,
+                                  }
+                                }
+                              >
+                                <View
+                                  style={
+                                    {
+                                      "flexDirection": "row",
+                                    }
+                                  }
+                                >
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#141618",
+                                        "fontFamily": "EuclidCircularB-Medium",
+                                        "fontSize": 16,
+                                        "fontWeight": "500",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 24,
+                                      }
+                                    }
+                                  >
+                                    Ethereum
+                                  </Text>
+                                  <View
+                                    accessibilityState={
+                                      {
+                                        "busy": undefined,
+                                        "checked": undefined,
+                                        "disabled": undefined,
+                                        "expanded": undefined,
+                                        "selected": undefined,
+                                      }
+                                    }
+                                    accessibilityValue={
+                                      {
+                                        "max": undefined,
+                                        "min": undefined,
+                                        "now": undefined,
+                                        "text": undefined,
+                                      }
+                                    }
+                                    accessible={true}
+                                    collapsable={false}
+                                    focusable={true}
+                                    onBlur={[Function]}
+                                    onClick={[Function]}
+                                    onFocus={[Function]}
+                                    onResponderGrant={[Function]}
+                                    onResponderMove={[Function]}
+                                    onResponderRelease={[Function]}
+                                    onResponderTerminate={[Function]}
+                                    onResponderTerminationRequest={[Function]}
+                                    onStartShouldSetResponder={[Function]}
+                                    style={
+                                      {
+                                        "alignItems": "center",
+                                        "flexDirection": "row",
+                                      }
+                                    }
+                                    testID="stake-button"
+                                  >
+                                    <Text
+                                      accessibilityRole="text"
+                                      style={
+                                        {
+                                          "color": "#141618",
+                                          "fontFamily": "EuclidCircularB-Medium",
+                                          "fontSize": 16,
+                                          "fontWeight": "500",
+                                          "letterSpacing": 0,
+                                          "lineHeight": 24,
+                                        }
+                                      }
+                                    >
+                                       • 
+                                      <Text
+                                        accessibilityRole="text"
+                                        style={
+                                          {
+                                            "color": "#0376c9",
+                                            "fontFamily": "EuclidCircularB-Medium",
+                                            "fontSize": 16,
+                                            "fontWeight": "500",
+                                            "letterSpacing": 0,
+                                            "lineHeight": 24,
+                                          }
+                                        }
+                                      >
+                                        Earn 
+                                      </Text>
+                                    </Text>
+                                    <SvgMock
+                                      color="#0376c9"
+                                      height={16}
+                                      name="Plant"
+                                      style={
+                                        {
+                                          "height": 16,
+                                          "width": 16,
+                                        }
+                                      }
+                                      width={16}
+                                    />
+                                  </View>
+                                </View>
+                                <View>
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#d73847",
+                                        "fontFamily": "EuclidCircularB-Medium",
+                                        "fontSize": 14,
+                                        "fontWeight": "500",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 22,
+                                      }
+                                    }
+                                  />
+                                </View>
+                              </View>
+                              <Modal
+                                animationType="none"
+                                deviceHeight={null}
+                                deviceWidth={null}
+                                hardwareAccelerated={false}
+                                hideModalContentWhileAnimating={false}
+                                onBackdropPress={[Function]}
+                                onModalHide={[Function]}
+                                onModalWillHide={[Function]}
+                                onModalWillShow={[Function]}
+                                onRequestClose={[Function]}
+                                onSwipeComplete={[Function]}
+                                panResponderThreshold={4}
+                                scrollHorizontal={false}
+                                scrollOffset={0}
+                                scrollOffsetMax={0}
+                                scrollTo={null}
+                                statusBarTranslucent={false}
+                                supportedOrientations={
+                                  [
+                                    "portrait",
+                                    "landscape",
+                                  ]
+                                }
+                                swipeDirection="down"
+                                swipeThreshold={100}
+                                transparent={true}
+                                visible={false}
+                              />
+                              <View
+                                style={
+                                  {
+                                    "alignItems": "flex-end",
+                                    "alignSelf": "flex-end",
+                                    "flex": 1,
+                                  }
+                                }
+                              >
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#141618",
+                                      "fontFamily": "EuclidCircularB-Medium",
+                                      "fontSize": 16,
+                                      "fontWeight": "500",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 24,
+                                    }
+                                  }
+                                  testID="fiat-balance-test-id"
+                                >
+                                   ETH
+                                </Text>
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#6a737d",
+                                      "fontFamily": "EuclidCircularB-Regular",
+                                      "fontSize": 14,
+                                      "fontWeight": "400",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 22,
+                                      "paddingHorizontal": 0,
+                                      "textTransform": "uppercase",
+                                    }
+                                  }
+                                  testID="main-balance-test-id"
+                                >
+                                  &lt; $0.01
+                                </Text>
+                              </View>
+                            </TouchableOpacity>
+                          </View>
+                          <View
+                            onFocusCapture={[Function]}
+                            onLayout={[Function]}
+                            style={null}
+                          >
+                            <TouchableOpacity
+                              onLongPress={[Function]}
+                              onPress={[Function]}
+                              style={
+                                {
+                                  "alignItems": "flex-start",
+                                  "flex": 1,
+                                  "flexDirection": "row",
+                                  "paddingHorizontal": 15,
+                                  "paddingVertical": 10,
+                                }
+                              }
+                              testID="asset-BAT"
+                            >
+                              <View
+                                onLayout={[Function]}
+                                style={
+                                  {
+                                    "alignSelf": "flex-start",
+                                    "position": "relative",
+                                  }
+                                }
+                                testID="badge-wrapper-badge"
+                              >
+                                <View>
+                                  <View
+                                    style={
+                                      {
+                                        "backgroundColor": "#ffffff",
+                                        "borderRadius": 16,
+                                        "height": 32,
+                                        "overflow": "hidden",
+                                        "width": 32,
+                                      }
+                                    }
+                                  >
+                                    <Image
+                                      onError={[Function]}
+                                      resizeMode="contain"
+                                      source={
+                                        {
+                                          "uri": undefined,
+                                        }
+                                      }
+                                      style={
+                                        {
+                                          "flex": 1,
+                                          "height": undefined,
+                                          "width": undefined,
+                                        }
+                                      }
+                                      testID="token-avatar-image"
+                                    />
+                                  </View>
+                                </View>
+                                <View
+                                  style={
+                                    {
+                                      "alignItems": "center",
+                                      "aspectRatio": 1,
+                                      "height": 0,
+                                      "justifyContent": "center",
+                                      "position": "absolute",
+                                      "right": 0,
+                                      "top": 0,
+                                      "transform": [
+                                        {
+                                          "translateX": 0,
+                                        },
+                                        {
+                                          "translateY": -0,
+                                        },
+                                      ],
+                                    }
+                                  }
+                                >
+                                  <View
+                                    onLayout={[Function]}
+                                    style={
+                                      {
+                                        "alignItems": "center",
+                                        "aspectRatio": 1,
+                                        "height": "50%",
+                                        "justifyContent": "center",
+                                        "maxHeight": 24,
+                                        "minHeight": 8,
+                                        "opacity": 0,
+                                      }
+                                    }
+                                    testID="badgenetwork"
+                                  >
+                                    <View
+                                      style={
+                                        {
+                                          "alignItems": "center",
+                                          "backgroundColor": "#ffffff",
+                                          "borderColor": "#ffffff",
+                                          "borderRadius": 16,
+                                          "borderWidth": 2,
+                                          "height": 32,
+                                          "justifyContent": "center",
+                                          "overflow": "hidden",
+                                          "shadowColor": "#0000001a",
+                                          "shadowOffset": {
+                                            "height": 2,
+                                            "width": 0,
+                                          },
+                                          "shadowOpacity": 1,
+                                          "shadowRadius": 4,
+                                          "transform": [
+                                            {
+                                              "scale": 1,
+                                            },
+                                          ],
+                                          "width": 32,
+                                        }
+                                      }
+                                    >
+                                      <Image
+                                        onError={[Function]}
+                                        resizeMode="contain"
+                                        source={
+                                          {
+                                            "uri": "MockImage",
+                                          }
+                                        }
+                                        style={
+                                          {
+                                            "height": 32,
+                                            "width": 32,
+                                          }
+                                        }
+                                        testID="network-avatar-image"
+                                      />
+                                    </View>
+                                  </View>
+                                </View>
+                              </View>
+                              <View
+                                style={
+                                  {
+                                    "flex": 1,
+                                    "justifyContent": "center",
+                                    "marginLeft": 20,
+                                  }
+                                }
+                              >
+                                <View
+                                  style={
+                                    {
+                                      "flexDirection": "row",
+                                    }
+                                  }
+                                >
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#141618",
+                                        "fontFamily": "EuclidCircularB-Medium",
+                                        "fontSize": 16,
+                                        "fontWeight": "500",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 24,
+                                      }
+                                    }
+                                  >
+                                    Bat
+                                  </Text>
+                                </View>
+                                <View>
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#d73847",
+                                        "fontFamily": "EuclidCircularB-Medium",
+                                        "fontSize": 14,
+                                        "fontWeight": "500",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 22,
+                                      }
+                                    }
+                                  />
+                                </View>
+                              </View>
+                              <Modal
+                                animationType="none"
+                                deviceHeight={null}
+                                deviceWidth={null}
+                                hardwareAccelerated={false}
+                                hideModalContentWhileAnimating={false}
+                                onBackdropPress={[Function]}
+                                onModalHide={[Function]}
+                                onModalWillHide={[Function]}
+                                onModalWillShow={[Function]}
+                                onRequestClose={[Function]}
+                                onSwipeComplete={[Function]}
+                                panResponderThreshold={4}
+                                scrollHorizontal={false}
+                                scrollOffset={0}
+                                scrollOffsetMax={0}
+                                scrollTo={null}
+                                statusBarTranslucent={false}
+                                supportedOrientations={
+                                  [
+                                    "portrait",
+                                    "landscape",
+                                  ]
+                                }
+                                swipeDirection="down"
+                                swipeThreshold={100}
+                                transparent={true}
+                                visible={false}
+                              />
+                              <View
+                                style={
+                                  {
+                                    "alignItems": "flex-end",
+                                    "alignSelf": "flex-end",
+                                    "flex": 1,
+                                  }
+                                }
+                              >
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#141618",
+                                      "fontFamily": "EuclidCircularB-Medium",
+                                      "fontSize": 16,
+                                      "fontWeight": "500",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 24,
+                                    }
+                                  }
+                                  testID="fiat-balance-test-id"
+                                >
+                                  &lt; 0.00001 BAT
+                                </Text>
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#6a737d",
+                                      "fontFamily": "EuclidCircularB-Regular",
+                                      "fontSize": 14,
+                                      "fontWeight": "400",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 22,
+                                      "paddingHorizontal": 0,
+                                      "textTransform": "uppercase",
+                                    }
+                                  }
+                                  testID="main-balance-test-id"
+                                >
+                                  &lt; $0.01
+                                </Text>
+                              </View>
+                            </TouchableOpacity>
+                          </View>
+                          <View
+                            onLayout={[Function]}
+                          >
+                            <View
+                              style={
+                                {
+                                  "alignItems": "center",
+                                  "flex": 1,
+                                  "marginTop": 9,
+                                  "paddingBottom": 30,
+                                }
+                              }
+                            >
+                              <TouchableOpacity
+                                disabled={false}
+                                onPress={[Function]}
+                                style={
+                                  {
+                                    "alignItems": "center",
+                                    "flexDirection": "row",
+                                    "justifyContent": "center",
+                                  }
+                                }
+                                testID="import-token-footer-link"
+                              >
+                                <Text
+                                  accessibilityRole="text"
+                                  style={
+                                    {
+                                      "color": "#141618",
+                                      "fontFamily": "EuclidCircularB-Regular",
+                                      "fontSize": 14,
+                                      "fontWeight": "400",
+                                      "letterSpacing": 0,
+                                      "lineHeight": 22,
+                                      "textAlign": "center",
+                                    }
+                                  }
+                                >
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#6a737d",
+                                        "fontFamily": "EuclidCircularB-Regular",
+                                        "fontSize": 14,
+                                        "fontWeight": "400",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 22,
+                                        "marginBottom": 8,
+                                      }
+                                    }
+                                  >
+                                    Don't see your token?
+                                  </Text>
+                                   
+                                  <Text
+                                    accessibilityRole="text"
+                                    style={
+                                      {
+                                        "color": "#0376c9",
+                                        "fontFamily": "EuclidCircularB-Regular",
+                                        "fontSize": 14,
+                                        "fontWeight": "400",
+                                        "letterSpacing": 0,
+                                        "lineHeight": 22,
+                                      }
+                                    }
+                                  >
+                                    Import tokens
+                                  </Text>
+                                </Text>
+                              </TouchableOpacity>
+                            </View>
+                          </View>
+                        </View>
+                      </RCTScrollView>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </RNSScreen>
+    </RNSScreenContainer>
+  </RNCSafeAreaProvider>
+</View>
+`;
+
 exports[`Tokens should hide zero balance tokens when setting is on 1`] = `
 <View
   style={
@@ -446,6 +2208,7 @@ exports[`Tokens should hide zero balance tokens when setting is on 1`] = `
                                   "decimals": 18,
                                   "iconUrl": "",
                                   "isETH": true,
+                                  "isStaked": false,
                                   "name": "Ethereum",
                                   "symbol": "ETH",
                                   "tokenFiatAmount": NaN,
@@ -471,6 +2234,7 @@ exports[`Tokens should hide zero balance tokens when setting is on 1`] = `
                               "decimals": 18,
                               "iconUrl": "",
                               "isETH": true,
+                              "isStaked": false,
                               "name": "Ethereum",
                               "symbol": "ETH",
                               "tokenFiatAmount": NaN,
@@ -1699,6 +3463,7 @@ exports[`Tokens should render correctly 1`] = `
                                   "decimals": 18,
                                   "iconUrl": "",
                                   "isETH": true,
+                                  "isStaked": false,
                                   "name": "Ethereum",
                                   "symbol": "ETH",
                                   "tokenFiatAmount": NaN,
@@ -1724,6 +3489,7 @@ exports[`Tokens should render correctly 1`] = `
                               "decimals": 18,
                               "iconUrl": "",
                               "isETH": true,
+                              "isStaked": false,
                               "name": "Ethereum",
                               "symbol": "ETH",
                               "tokenFiatAmount": NaN,
@@ -2952,6 +4718,7 @@ exports[`Tokens should show all balance tokens when hideZeroBalanceTokens settin
                                   "decimals": 18,
                                   "iconUrl": "",
                                   "isETH": true,
+                                  "isStaked": false,
                                   "name": "Ethereum",
                                   "symbol": "ETH",
                                   "tokenFiatAmount": NaN,
@@ -2986,6 +4753,7 @@ exports[`Tokens should show all balance tokens when hideZeroBalanceTokens settin
                               "decimals": 18,
                               "iconUrl": "",
                               "isETH": true,
+                              "isStaked": false,
                               "name": "Ethereum",
                               "symbol": "ETH",
                               "tokenFiatAmount": NaN,
diff --git a/app/components/UI/Tokens/index.test.tsx b/app/components/UI/Tokens/index.test.tsx
index 68ac938ab47..13cbb2a6f8e 100644
--- a/app/components/UI/Tokens/index.test.tsx
+++ b/app/components/UI/Tokens/index.test.tsx
@@ -14,11 +14,15 @@ import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletV
 import Engine from '../../../core/Engine';
 import { createTokensBottomSheetNavDetails } from './TokensBottomSheet';
 import useStakingEligibility from '../Stake/hooks/useStakingEligibility';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 
 jest.mock('../../../core/NotificationManager', () => ({
   showSimpleNotification: jest.fn(() => Promise.resolve()),
 }));
 
+const selectedAddress = '0x123';
+
 jest.mock('./TokensBottomSheet', () => ({
   createTokensBottomSheetNavDetails: jest.fn(() => ['BottomSheetScreen', {}]),
 }));
@@ -53,11 +57,53 @@ jest.mock('../../../core/Engine', () => ({
       }),
       findNetworkClientIdByChainId: () => 'mainnet',
     },
+    AccountsController: {
+      state: {
+        internalAccounts: {
+          selectedAccount: '1',
+          accounts: {
+            '1': {
+              address: selectedAddress,
+            },
+          },
+        },
+      },
+    },
   },
 }));
 
-const selectedAddress = '0x123';
-
+const mockTokens = {
+  '0x1': {
+    [selectedAddress]: [
+      {
+        name: 'Ethereum',
+        symbol: 'ETH',
+        address: '0x0',
+        decimals: 18,
+        isETH: true,
+        isStaked: false,
+        balanceFiat: '< $0.01',
+        iconUrl: '',
+      },
+      {
+        name: 'Bat',
+        symbol: 'BAT',
+        address: '0x01',
+        decimals: 18,
+        balanceFiat: '$0',
+        iconUrl: '',
+      },
+      {
+        name: 'Link',
+        symbol: 'LINK',
+        address: '0x02',
+        decimals: 18,
+        balanceFiat: '$0',
+        iconUrl: '',
+      },
+    ],
+  },
+};
 const initialState = {
   engine: {
     backgroundState: {
@@ -80,7 +126,7 @@ const initialState = {
             address: '0x0',
             decimals: 18,
             isETH: true,
-
+            isStaked: false,
             balanceFiat: '< $0.01',
             iconUrl: '',
           },
@@ -101,6 +147,38 @@ const initialState = {
             iconUrl: '',
           },
         ],
+        allTokens: {
+          '0x1': {
+            [selectedAddress]: [
+              {
+                name: 'Ethereum',
+                symbol: 'ETH',
+                address: '0x0',
+                decimals: 18,
+                isETH: true,
+
+                balanceFiat: '< $0.01',
+                iconUrl: '',
+              },
+              {
+                name: 'Bat',
+                symbol: 'BAT',
+                address: '0x01',
+                decimals: 18,
+                balanceFiat: '$0',
+                iconUrl: '',
+              },
+              {
+                name: 'Link',
+                symbol: 'LINK',
+                address: '0x02',
+                decimals: 18,
+                balanceFiat: '$0',
+                iconUrl: '',
+              },
+            ],
+          },
+        },
         detectedTokens: [],
       },
       TokenRatesController: {
@@ -172,11 +250,10 @@ jest.mock('../../UI/Stake/hooks/useStakingEligibility', () => ({
   })),
 }));
 
-const mockIsPortfolioViewEnabled = jest.fn();
-
-jest.mock('../../../util/networks', () => ({
-  ...jest.requireActual('../../../util/networks'),
-  isPortfolioViewEnabled: mockIsPortfolioViewEnabled,
+jest.mock('../Stake/hooks/useStakingChain', () => ({
+  useStakingChainByChainId: () => ({
+    isStakingSupportedChain: true,
+  }),
 }));
 
 const Stack = createStackNavigator();
@@ -199,7 +276,7 @@ const renderComponent = (state: any = {}) =>
 
 describe('Tokens', () => {
   beforeEach(() => {
-    mockIsPortfolioViewEnabled.mockReturnValue(false);
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
   });
 
   afterEach(() => {
@@ -212,6 +289,11 @@ describe('Tokens', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
+  it('render matches snapshot', () => {
+    const { toJSON } = renderComponent(initialState);
+    expect(toJSON()).toMatchSnapshot();
+  });
+
   it('should hide zero balance tokens when setting is on', async () => {
     const { toJSON, getByText, queryByText } = renderComponent(initialState);
 
@@ -264,6 +346,7 @@ describe('Tokens', () => {
           ...backgroundState,
           TokensController: {
             detectedTokens: [],
+            allTokens: mockTokens,
             tokens: [
               {
                 name: 'Link',
@@ -277,7 +360,7 @@ describe('Tokens', () => {
           },
           TokenRatesController: {
             marketData: {
-              0x1: {
+              '0x1': {
                 '0x02': undefined,
               },
             },
@@ -299,6 +382,16 @@ describe('Tokens', () => {
                 },
               },
             },
+            state: {
+              internalAccounts: {
+                selectedAccount: '1',
+                accounts: {
+                  '1': {
+                    address: selectedAddress,
+                  },
+                },
+              },
+            },
           },
           TokenBalancesController: {
             tokenBalances: {
@@ -389,20 +482,23 @@ describe('Tokens', () => {
       },
     );
 
-    await waitFor(() => {
-      expect(
-        Engine.context.TokenDetectionController.detectTokens,
-      ).toHaveBeenCalled();
-      expect(
-        Engine.context.AccountTrackerController.refresh,
-      ).toHaveBeenCalled();
-      expect(
-        Engine.context.CurrencyRateController.updateExchangeRate,
-      ).toHaveBeenCalled();
-      expect(
-        Engine.context.TokenRatesController.updateExchangeRatesByChainId,
-      ).toHaveBeenCalled();
-    });
+    await waitFor(
+      () => {
+        expect(
+          Engine.context.TokenDetectionController.detectTokens,
+        ).toHaveBeenCalled();
+        expect(
+          Engine.context.AccountTrackerController.refresh,
+        ).toHaveBeenCalled();
+        expect(
+          Engine.context.CurrencyRateController.updateExchangeRate,
+        ).toHaveBeenCalled();
+        expect(
+          Engine.context.TokenRatesController.updateExchangeRatesByChainId,
+        ).toHaveBeenCalled();
+      },
+      { timeout: 3000 },
+    );
   });
 
   it('triggers bottom sheet when sort controls are pressed', async () => {
@@ -456,4 +552,383 @@ describe('Tokens', () => {
       });
     });
   });
+
+  it('calls onRefresh and updates state', async () => {
+    const { getByTestId } = renderComponent(initialState);
+
+    fireEvent(
+      getByTestId(WalletViewSelectorsIDs.TOKENS_CONTAINER_LIST),
+      'refresh',
+      {
+        refreshing: true,
+      },
+    );
+
+    await waitFor(() => {
+      expect(
+        Engine.context.TokenDetectionController.detectTokens,
+      ).toHaveBeenCalled();
+      expect(
+        Engine.context.AccountTrackerController.refresh,
+      ).toHaveBeenCalled();
+      expect(
+        Engine.context.CurrencyRateController.updateExchangeRate,
+      ).toHaveBeenCalled();
+      expect(
+        Engine.context.TokenRatesController.updateExchangeRatesByChainId,
+      ).toHaveBeenCalled();
+    });
+  });
+
+  it('hides zero balance tokens when hideZeroBalanceTokens is enabled', () => {
+    const { queryByText } = renderComponent(initialState);
+
+    expect(queryByText('Link')).toBeNull(); // Zero balance token should not be visible
+  });
+
+  it('triggers sort controls when sort button is pressed', async () => {
+    const { getByTestId } = renderComponent(initialState);
+
+    fireEvent.press(getByTestId(WalletViewSelectorsIDs.SORT_BY));
+
+    await waitFor(() => {
+      expect(createTokensBottomSheetNavDetails).toHaveBeenCalledWith({});
+    });
+  });
+
+  describe('Portfolio View', () => {
+    beforeEach(() => {
+      jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+    });
+
+    it('should match the snapshot when portfolio view is enabled  ', () => {
+      const { toJSON } = renderComponent(initialState);
+      expect(toJSON()).toMatchSnapshot();
+    });
+
+    it('should handle network filtering correctly', () => {
+      const multiNetworkState = {
+        ...initialState,
+        engine: {
+          backgroundState: {
+            ...initialState.engine.backgroundState,
+            PreferencesController: {
+              selectedAddress,
+              tokenSortConfig: { key: 'symbol', order: 'asc' },
+              tokenNetworkFilter: {
+                '0x1': true,
+                '0x89': false,
+              },
+            },
+          },
+          selectedAccountTokensChains: {
+            '0x1': [
+              {
+                address: '0x123',
+                symbol: 'ETH',
+                decimals: 18,
+                balance: '1000000000000000000',
+                balanceFiat: '$100',
+                isNative: true,
+                chainId: '0x1',
+              },
+            ],
+            '0x89': [
+              {
+                address: '0x456',
+                symbol: 'MATIC',
+                decimals: 18,
+                balance: '2000000000000000000',
+                balanceFiat: '$200',
+                isNative: true,
+                chainId: '0x89',
+              },
+            ],
+          },
+        },
+      };
+
+      const { queryByText } = renderComponent(multiNetworkState);
+      expect(queryByText('ETH')).toBeDefined();
+      expect(queryByText('MATIC')).toBeNull();
+    });
+
+    describe('When hideZeroBalance is enabled', () => {
+      describe('When currentNetwork is selected', () => {
+        it('should show zero balance native token and hide zero balance ERC20 token', () => {
+          const stateWithZeroBalances = {
+            ...initialState,
+            settings: {
+              hideZeroBalanceTokens: true,
+            },
+            engine: {
+              backgroundState: {
+                ...initialState.engine.backgroundState,
+                PreferencesController: {
+                  selectedAddress,
+                  tokenSortConfig: { key: 'symbol', order: 'asc' },
+                  tokenNetworkFilter: {
+                    '0x1': true,
+                  },
+                },
+                TokenBalancesController: {
+                  tokenBalances: {
+                    [selectedAddress]: {
+                      '0x1': {
+                        '0x456': '1000000000000000000',
+                        '0x5555': '0x0',
+                      },
+                    },
+                  },
+                },
+                TokensController: {
+                  allTokens: {
+                    '0x1': {
+                      [selectedAddress]: [
+                        {
+                          address: '0x123',
+                          symbol: 'ZERO',
+                          decimals: 18,
+                          balance: '0',
+                          balanceFiat: '$0',
+                          isNative: true,
+                          chainId: '0x1',
+                        },
+                        {
+                          address: '0x456',
+                          symbol: 'NON_ZERO_ERC20',
+                          decimals: 18,
+                          balance: '1000000000000000000',
+                          balanceFiat: '$100',
+                          isNative: false,
+                          chainId: '0x1',
+                        },
+                        {
+                          address: '0x5555',
+                          symbol: 'ZERO_ERC20',
+                          decimals: 18,
+                          balance: '0',
+                          balanceFiat: '0',
+                          isNative: false,
+                          chainId: '0x1',
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          };
+
+          const { queryByText } = renderComponent(stateWithZeroBalances);
+          expect(queryByText('ZERO')).toBeDefined();
+          expect(queryByText('NON_ZERO_ERC20')).toBeDefined();
+          expect(queryByText('ZERO_ERC20')).toBeNull();
+        });
+      });
+
+      describe('When allNetworks is selected', () => {
+        it('should hide zero balance ERC20 tokens and native tokens', () => {
+          const stateWithZeroBalances = {
+            ...initialState,
+            settings: {
+              hideZeroBalanceTokens: true,
+            },
+            engine: {
+              backgroundState: {
+                ...initialState.engine.backgroundState,
+                PreferencesController: {
+                  selectedAddress,
+                  tokenSortConfig: { key: 'symbol', order: 'asc' },
+                  tokenNetworkFilter: {
+                    '0x1': true,
+                    '0xe705': true,
+                  },
+                },
+                TokenBalancesController: {
+                  tokenBalances: {
+                    [selectedAddress]: {
+                      '0x1': {
+                        NON_ZERO_ERC20_1: '1000000000000000000',
+                      },
+                      '0xe705': {
+                        '0x4565': '1000000000000000000',
+                        '0x45654444': '0x0',
+                      },
+                    },
+                  },
+                },
+                TokensController: {
+                  allTokens: {
+                    '0x1': {
+                      [selectedAddress]: [
+                        {
+                          address: '0x123',
+                          symbol: 'ZERO_1',
+                          decimals: 18,
+                          balance: '0',
+                          balanceFiat: '$0',
+                          isNative: true,
+                          chainId: '0x1',
+                        },
+                        {
+                          address: '0x456',
+                          symbol: 'NON_ZERO_ERC20_1',
+                          decimals: 18,
+                          balance: '1000000000000000000',
+                          balanceFiat: '$100',
+                          isNative: false,
+                          chainId: '0x1',
+                        },
+                      ],
+                    },
+                    '0xe705': {
+                      [selectedAddress]: [
+                        {
+                          address: '0x1233',
+                          symbol: 'ZERO_2',
+                          decimals: 18,
+                          balance: '2233333',
+                          balanceFiat: '$344',
+                          isNative: true,
+                          chainId: '0xe705',
+                        },
+                        {
+                          address: '0x4565',
+                          symbol: 'NON_ZERO_ERC20_2',
+                          decimals: 18,
+                          balance: '1000000000000000000',
+                          balanceFiat: '$100',
+                          isNative: false,
+                          chainId: '0xe705',
+                        },
+                        {
+                          address: '0x45654444',
+                          symbol: 'NON_ZERO_ERC20_3',
+                          decimals: 18,
+                          balance: '0',
+                          balanceFiat: '0',
+                          isNative: false,
+                          chainId: '0xe705',
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          };
+          const { queryByText } = renderComponent(stateWithZeroBalances);
+          expect(queryByText('ZERO_1')).toBeNull();
+          expect(queryByText('ZERO_2')).toBeDefined();
+
+          expect(queryByText('NON_ZERO_ERC20_1')).toBeDefined();
+          expect(queryByText('NON_ZERO_ERC20_2')).toBeDefined();
+          expect(queryByText('NON_ZERO_ERC20_3')).toBeNull();
+        });
+      });
+    });
+
+    describe('When hideZeroBalance is disabled', () => {
+      it('should show zero balance native and ERC20 tokens', () => {
+        const stateWithZeroBalances = {
+          ...initialState,
+          settings: {
+            hideZeroBalanceTokens: false,
+          },
+          engine: {
+            backgroundState: {
+              ...initialState.engine.backgroundState,
+              PreferencesController: {
+                selectedAddress,
+                tokenSortConfig: { key: 'symbol', order: 'asc' },
+                tokenNetworkFilter: {
+                  '0x1': true,
+                  '0xe705': true,
+                },
+              },
+              TokenBalancesController: {
+                tokenBalances: {
+                  [selectedAddress]: {
+                    '0x1': {
+                      NON_ZERO_ERC20_1: '1000000000000000000',
+                    },
+                    '0xe705': {
+                      '0x4565': '1000000000000000000',
+                      '0x45654444': '0x0',
+                    },
+                  },
+                },
+              },
+              TokensController: {
+                allTokens: {
+                  '0x1': {
+                    [selectedAddress]: [
+                      {
+                        address: '0x123',
+                        symbol: 'ZERO_1',
+                        decimals: 18,
+                        balance: '0',
+                        balanceFiat: '$0',
+                        isNative: true,
+                        chainId: '0x1',
+                      },
+                      {
+                        address: '0x456',
+                        symbol: 'NON_ZERO_ERC20_1',
+                        decimals: 18,
+                        balance: '1000000000000000000',
+                        balanceFiat: '$100',
+                        isNative: false,
+                        chainId: '0x1',
+                      },
+                    ],
+                  },
+                  '0xe705': {
+                    [selectedAddress]: [
+                      {
+                        address: '0x1233',
+                        symbol: 'ZERO_2',
+                        decimals: 18,
+                        balance: '2233333',
+                        balanceFiat: '$344',
+                        isNative: true,
+                        chainId: '0xe705',
+                      },
+                      {
+                        address: '0x4565',
+                        symbol: 'NON_ZERO_ERC20_2',
+                        decimals: 18,
+                        balance: '1000000000000000000',
+                        balanceFiat: '$100',
+                        isNative: false,
+                        chainId: '0xe705',
+                      },
+                      {
+                        address: '0x45654444',
+                        symbol: 'NON_ZERO_ERC20_3',
+                        decimals: 18,
+                        balance: '0',
+                        balanceFiat: '0',
+                        isNative: false,
+                        chainId: '0xe705',
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+          },
+        };
+
+        const { queryByText } = renderComponent(stateWithZeroBalances);
+        expect(queryByText('ZERO_1')).toBeDefined();
+        expect(queryByText('ZERO_2')).toBeDefined();
+
+        expect(queryByText('NON_ZERO_ERC20_1')).toBeDefined();
+        expect(queryByText('NON_ZERO_ERC20_2')).toBeDefined();
+        expect(queryByText('NON_ZERO_ERC20_3')).toBeDefined();
+      });
+    });
+  });
 });
diff --git a/app/components/UI/Tokens/index.tsx b/app/components/UI/Tokens/index.tsx
index 0c28821fc34..1bb72a74667 100644
--- a/app/components/UI/Tokens/index.tsx
+++ b/app/components/UI/Tokens/index.tsx
@@ -1,8 +1,11 @@
-import React, { useRef, useState, LegacyRef, useMemo } from 'react';
+import React, { useRef, useState, LegacyRef, useMemo, useEffect } from 'react';
+import { Hex } from '@metamask/utils';
 import { View, Text } from 'react-native';
 import ActionSheet from '@metamask/react-native-actionsheet';
 import { useSelector } from 'react-redux';
 import useTokenBalancesController from '../../hooks/useTokenBalancesController/useTokenBalancesController';
+import { selectTokensBalances } from '../../../selectors/tokenBalancesController';
+import { selectSelectedInternalAccountAddress } from '../../../selectors/accountsController';
 import { useTheme } from '../../../util/theme';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import Engine from '../../../core/Engine';
@@ -11,12 +14,13 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import Logger from '../../../util/Logger';
 import {
   selectChainId,
+  selectIsAllNetworks,
   selectNetworkConfigurations,
 } from '../../../selectors/networkController';
 import {
   getDecimalChainId,
-  isPortfolioViewEnabled,
   isTestNet,
+  isPortfolioViewEnabled,
 } from '../../../util/networks';
 import { isZero } from '../../../util/lodash';
 import createStyles from './styles';
@@ -26,6 +30,7 @@ import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletV
 import { strings } from '../../../../locales/i18n';
 import { IconName } from '../../../component-library/components/Icons/Icon';
 import {
+  selectIsTokenNetworkFilterEqualCurrentNetwork,
   selectTokenNetworkFilter,
   selectTokenSortConfig,
 } from '../../../selectors/preferencesController';
@@ -33,10 +38,14 @@ import { deriveBalanceFromAssetMarketDetails, sortAssets } from './util';
 import { useNavigation } from '@react-navigation/native';
 import { StackNavigationProp } from '@react-navigation/stack';
 import { RootState } from '../../../reducers';
-import { selectContractExchangeRates } from '../../../selectors/tokenRatesController';
+import {
+  selectContractExchangeRates,
+  selectTokenMarketData,
+} from '../../../selectors/tokenRatesController';
 import {
   selectConversionRate,
   selectCurrentCurrency,
+  selectCurrencyRates,
 } from '../../../selectors/currencyRateController';
 import {
   createTokenBottomSheetFilterNavDetails,
@@ -45,7 +54,8 @@ import {
 import ButtonBase from '../../../component-library/components/Buttons/Button/foundation/ButtonBase';
 import { selectNetworkName } from '../../../selectors/networkInfos';
 import ButtonIcon from '../../../component-library/components/Buttons/ButtonIcon';
-import { Hex } from '@metamask/utils';
+import { selectAccountTokensAcrossChains } from '../../../selectors/multichain';
+import { filterAssets } from './util/filterAssets';
 
 // this will be imported from TokenRatesController when it is exported from there
 // PR: https://github.com/MetaMask/core/pull/4622
@@ -88,18 +98,22 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
   const { data: tokenBalances } = useTokenBalancesController();
   const tokenSortConfig = useSelector(selectTokenSortConfig);
   const tokenNetworkFilter = useSelector(selectTokenNetworkFilter);
-  const chainId = useSelector(selectChainId);
+  const selectedChainId = useSelector(selectChainId);
   const networkConfigurationsByChainId = useSelector(
     selectNetworkConfigurations,
   );
   const hideZeroBalanceTokens = useSelector(
     (state: RootState) => state.settings.hideZeroBalanceTokens,
   );
+  const isUserOnCurrentNetwork = useSelector(
+    selectIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const tokenExchangeRates = useSelector(selectContractExchangeRates);
   const currentCurrency = useSelector(selectCurrentCurrency);
   const conversionRate = useSelector(selectConversionRate);
   const networkName = useSelector(selectNetworkName);
+  const currentChainId = useSelector(selectChainId);
   const nativeCurrencies = [
     ...new Set(
       Object.values(networkConfigurationsByChainId).map(
@@ -107,15 +121,131 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
       ),
     ),
   ];
+  const selectedAccountTokensChains = useSelector(
+    selectAccountTokensAcrossChains,
+  );
 
   const actionSheet = useRef<typeof ActionSheet>();
   const [tokenToRemove, setTokenToRemove] = useState<TokenI>();
   const [refreshing, setRefreshing] = useState(false);
   const [isAddTokenEnabled, setIsAddTokenEnabled] = useState(true);
+  const isAllNetworks = useSelector(selectIsAllNetworks);
+
+  // multi chain
+  const selectedInternalAccountAddress = useSelector(
+    selectSelectedInternalAccountAddress,
+  );
+  const multiChainMarketData = useSelector(selectTokenMarketData);
+  const multiChainTokenBalance = useSelector(selectTokensBalances);
+  const multiChainCurrencyRates = useSelector(selectCurrencyRates);
 
   const styles = createStyles(colors);
 
-  const tokensList = useMemo(() => {
+  const tokensList = useMemo((): TokenI[] => {
+    if (isPortfolioViewEnabled()) {
+      // MultiChain implementation
+      const allTokens = Object.values(
+        selectedAccountTokensChains,
+      ).flat() as TokenI[];
+
+      /*
+        If hideZeroBalanceTokens is ON and user is on "all Networks" we respect the setting and filter native and ERC20 tokens when zero
+        If user is on "current Network" we want to show native tokens, even with zero balance
+      */
+      let tokensToDisplay = [];
+      if (hideZeroBalanceTokens) {
+        if (isUserOnCurrentNetwork) {
+          tokensToDisplay = allTokens.filter((curToken) => {
+            const multiChainTokenBalances =
+              multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
+                curToken.chainId as Hex
+              ];
+            const balance = multiChainTokenBalances?.[curToken.address as Hex];
+            return !isZero(balance) || curToken.isNative || curToken.isStaked;
+          });
+        } else {
+          tokensToDisplay = allTokens.filter((curToken) => {
+            const multiChainTokenBalances =
+              multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
+                curToken.chainId as Hex
+              ];
+            const balance =
+              multiChainTokenBalances?.[curToken.address as Hex] ||
+              curToken.balance;
+            return !isZero(balance) || curToken.isStaked;
+          });
+        }
+      } else {
+        tokensToDisplay = allTokens;
+      }
+
+      // Then apply network filters
+      const filteredAssets = filterAssets(tokensToDisplay, [
+        {
+          key: 'chainId',
+          opts: tokenNetworkFilter,
+          filterCallback: 'inclusive',
+        },
+      ]);
+
+      const { nativeTokens, nonNativeTokens } = filteredAssets.reduce<{
+        nativeTokens: TokenI[];
+        nonNativeTokens: TokenI[];
+      }>(
+        (
+          acc: { nativeTokens: TokenI[]; nonNativeTokens: TokenI[] },
+          currToken: unknown,
+        ) => {
+          if (
+            isTestNet((currToken as TokenI & { chainId: string }).chainId) &&
+            !isTestNet(currentChainId)
+          ) {
+            return acc;
+          }
+          if ((currToken as TokenI).isNative) {
+            acc.nativeTokens.push(currToken as TokenI);
+          } else {
+            acc.nonNativeTokens.push(currToken as TokenI);
+          }
+          return acc;
+        },
+        { nativeTokens: [], nonNativeTokens: [] },
+      );
+
+      const assets = [...nativeTokens, ...nonNativeTokens];
+
+      // Calculate fiat balances for tokens
+      const tokenFiatBalances = assets.map((token) => {
+        const chainId = token.chainId as Hex;
+        const multiChainExchangeRates = multiChainMarketData?.[chainId];
+        const multiChainTokenBalances =
+          multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
+            chainId
+          ];
+        const nativeCurrency =
+          networkConfigurationsByChainId[chainId].nativeCurrency;
+        const multiChainConversionRate =
+          multiChainCurrencyRates?.[nativeCurrency]?.conversionRate || 0;
+
+        return token.isETH || token.isNative
+          ? parseFloat(token.balance) * multiChainConversionRate
+          : deriveBalanceFromAssetMarketDetails(
+              token,
+              multiChainExchangeRates || {},
+              multiChainTokenBalances || {},
+              multiChainConversionRate || 0,
+              currentCurrency || '',
+            ).balanceFiatCalculation;
+      });
+
+      const tokensWithBalances = assets.map((token, i) => ({
+        ...token,
+        tokenFiatAmount: tokenFiatBalances[i],
+      }));
+
+      return sortAssets(tokensWithBalances, tokenSortConfig);
+    }
+    // Previous implementation
     // Filter tokens based on hideZeroBalanceTokens flag
     const tokensToDisplay = hideZeroBalanceTokens
       ? tokens.filter(
@@ -130,10 +260,10 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
             ? parseFloat(asset.balance) * conversionRate
             : deriveBalanceFromAssetMarketDetails(
                 asset,
-                tokenExchangeRates,
-                tokenBalances,
-                conversionRate,
-                currentCurrency,
+                tokenExchangeRates || {},
+                tokenBalances || {},
+                conversionRate || 0,
+                currentCurrency || '',
               ).balanceFiatCalculation,
         )
       : [];
@@ -157,6 +287,16 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
     tokenExchangeRates,
     tokenSortConfig,
     tokens,
+    // Dependencies for multichain implementation
+    selectedAccountTokensChains,
+    tokenNetworkFilter,
+    currentChainId,
+    multiChainCurrencyRates,
+    multiChainMarketData,
+    multiChainTokenBalance,
+    networkConfigurationsByChainId,
+    selectedInternalAccountAddress,
+    isUserOnCurrentNetwork,
   ]);
 
   const showRemoveMenu = (token: TokenI) => {
@@ -184,17 +324,18 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
         CurrencyRateController,
         TokenRatesController,
       } = Engine.context;
+
       const actions = [
         TokenDetectionController.detectTokens({
-          chainIds: isPortfolioViewEnabled
+          chainIds: isPortfolioViewEnabled()
             ? (Object.keys(networkConfigurationsByChainId) as Hex[])
-            : [chainId],
+            : [selectedChainId],
         }),
         AccountTrackerController.refresh(),
         CurrencyRateController.updateExchangeRate(nativeCurrencies),
-        ...(isPortfolioViewEnabled
+        ...(isPortfolioViewEnabled()
           ? Object.values(networkConfigurationsByChainId)
-          : [networkConfigurationsByChainId[chainId]]
+          : [networkConfigurationsByChainId[selectedChainId]]
         ).map((network) =>
           TokenRatesController.updateExchangeRatesByChainId({
             chainId: network.chainId,
@@ -210,11 +351,18 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
   };
 
   const removeToken = async () => {
-    const { TokensController } = Engine.context;
+    const { TokensController, NetworkController } = Engine.context;
+    const chainId = isPortfolioViewEnabled()
+      ? tokenToRemove?.chainId
+      : selectedChainId;
+    const networkClientId = NetworkController.findNetworkClientIdByChainId(
+      chainId as Hex,
+    );
     const tokenAddress = tokenToRemove?.address || '';
+
     const symbol = tokenToRemove?.symbol;
     try {
-      await TokensController.ignoreTokens([tokenAddress]);
+      await TokensController.ignoreTokens([tokenAddress], networkClientId);
       NotificationManager.showSimpleNotification({
         status: `simple_notification`,
         duration: 5000,
@@ -230,7 +378,7 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
             token_standard: 'ERC20',
             asset_type: 'token',
             tokens: [`${symbol} - ${tokenAddress}`],
-            chain_id: getDecimalChainId(chainId),
+            chain_id: getDecimalChainId(selectedChainId),
           })
           .build(),
       );
@@ -246,7 +394,7 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
       createEventBuilder(MetaMetricsEvents.TOKEN_IMPORT_CLICKED)
         .addProperties({
           source: 'manual',
-          chain_id: getDecimalChainId(chainId),
+          chain_id: getDecimalChainId(selectedChainId),
         })
         .build(),
     );
@@ -256,26 +404,41 @@ const Tokens: React.FC<TokensI> = ({ tokens }) => {
   const onActionSheetPress = (index: number) =>
     index === 0 ? removeToken() : null;
 
+  useEffect(() => {
+    const { PreferencesController } = Engine.context;
+    if (isTestNet(currentChainId)) {
+      PreferencesController.setTokenNetworkFilter({
+        [currentChainId]: true,
+      });
+    }
+  }, [currentChainId]);
+
   return (
     <View
       style={styles.wrapper}
       testID={WalletViewSelectorsIDs.TOKENS_CONTAINER}
     >
       <View style={styles.actionBarWrapper}>
-        {isPortfolioViewEnabled ? (
+        {isPortfolioViewEnabled() ? (
           <View style={styles.controlButtonOuterWrapper}>
             <ButtonBase
+              testID={WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER}
               label={
                 <Text style={styles.controlButtonText} numberOfLines={1}>
-                  {tokenNetworkFilter[chainId]
-                    ? networkName ?? strings('wallet.current_network')
-                    : strings('wallet.all_networks')}
+                  {isAllNetworks
+                    ? strings('wallet.all_networks')
+                    : networkName ?? strings('wallet.current_network')}
                 </Text>
               }
+              isDisabled={isTestNet(currentChainId)}
               onPress={showFilterControls}
               endIconName={IconName.ArrowDown}
-              style={styles.controlButton}
-              disabled={isTestNet(chainId)}
+              style={
+                isTestNet(currentChainId)
+                  ? styles.controlButtonDisabled
+                  : styles.controlButton
+              }
+              disabled={isTestNet(currentChainId)}
             />
             <View style={styles.controlButtonInnerWrapper}>
               <ButtonIcon
diff --git a/app/components/UI/Tokens/styles.ts b/app/components/UI/Tokens/styles.ts
index 3e0f36a8bba..fcb3c758960 100644
--- a/app/components/UI/Tokens/styles.ts
+++ b/app/components/UI/Tokens/styles.ts
@@ -175,6 +175,16 @@ const createStyles = (colors: Colors) =>
       marginRight: 5,
       maxWidth: '60%',
     },
+    controlButtonDisabled: {
+      backgroundColor: colors.background.default,
+      borderColor: colors.border.default,
+      borderStyle: 'solid',
+      borderWidth: 1,
+      marginLeft: 5,
+      marginRight: 5,
+      maxWidth: '60%',
+      opacity: 0.5,
+    },
     controlButtonText: {
       color: colors.text.default,
     },
diff --git a/app/components/UI/Tokens/types.ts b/app/components/UI/Tokens/types.ts
index 90fa5ad8b49..a1efce4ff09 100644
--- a/app/components/UI/Tokens/types.ts
+++ b/app/components/UI/Tokens/types.ts
@@ -25,4 +25,5 @@ export interface TokenI {
   nativeAsset?: TokenI | undefined;
   chainId?: string;
   isNative?: boolean;
+  ticker?: string;
 }
diff --git a/app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts b/app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts
index 6f9d642b4f2..5f23998dae1 100644
--- a/app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts
+++ b/app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts
@@ -42,8 +42,10 @@ export const deriveBalanceFromAssetMarketDetails = (
       balanceValueFormatted: TOKEN_BALANCE_LOADING,
     };
   }
-
-  const balanceValueFormatted = `${balance} ${asset.symbol}`;
+  let balanceValueFormatted = `${balance} ${asset.symbol}`;
+  if (asset.isNative) {
+    balanceValueFormatted = `${balance} ${asset.ticker}`;
+  }
 
   if (!conversionRate)
     return {
@@ -53,10 +55,12 @@ export const deriveBalanceFromAssetMarketDetails = (
 
   if (!tokenMarketData || tokenMarketData === TOKEN_RATE_UNDEFINED)
     return {
-      balanceFiat: asset.isETH ? asset.balanceFiat : TOKEN_RATE_UNDEFINED,
+      balanceFiat:
+        asset.isETH || asset.isNative
+          ? asset.balanceFiat
+          : TOKEN_RATE_UNDEFINED,
       balanceValueFormatted,
     };
-
   const balanceFiatCalculation = Number(
     asset.balanceFiat ||
       balanceToFiatNumber(balance, conversionRate, tokenMarketData.price),
diff --git a/app/components/UI/Tokens/util/enableAllNetworksFilter.test.ts b/app/components/UI/Tokens/util/enableAllNetworksFilter.test.ts
new file mode 100644
index 00000000000..0a41d9c6db7
--- /dev/null
+++ b/app/components/UI/Tokens/util/enableAllNetworksFilter.test.ts
@@ -0,0 +1,164 @@
+import { RpcEndpointType } from '@metamask/network-controller';
+import { NETWORK_CHAIN_ID } from '../../../../util/networks/customNetworks';
+import {
+  enableAllNetworksFilter,
+  KnownNetworkConfigurations,
+} from './enableAllNetworksFilter';
+
+type TestNetworkConfigurations = Pick<
+  KnownNetworkConfigurations,
+  '0x1' | '0x89'
+>;
+
+type FlareTestNetworkConfigurations = Pick<
+  KnownNetworkConfigurations,
+  '0xe' | '0x13'
+>;
+
+type MultiNetworkConfigurations = Pick<
+  KnownNetworkConfigurations,
+  '0x1' | '0x89' | typeof NETWORK_CHAIN_ID.BASE
+>;
+
+describe('enableAllNetworksFilter', () => {
+  it('should create a record with all network chain IDs mapped to true', () => {
+    const mockNetworks: TestNetworkConfigurations = {
+      [NETWORK_CHAIN_ID.MAINNET]: {
+        chainId: NETWORK_CHAIN_ID.MAINNET,
+        name: 'Ethereum Mainnet',
+        blockExplorerUrls: ['https://etherscan.io'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'ETH',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.MAINNET,
+            url: 'https://mainnet.infura.io/v3/{infuraProjectId}',
+          },
+        ],
+      },
+      [NETWORK_CHAIN_ID.POLYGON]: {
+        chainId: NETWORK_CHAIN_ID.POLYGON,
+        name: 'Polygon',
+        blockExplorerUrls: ['https://polygonscan.com'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'MATIC',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.POLYGON,
+            url: 'https://polygon-rpc.com',
+          },
+        ],
+      },
+    };
+
+    const result = enableAllNetworksFilter(mockNetworks);
+
+    expect(result).toEqual({
+      [NETWORK_CHAIN_ID.MAINNET]: true,
+      [NETWORK_CHAIN_ID.POLYGON]: true,
+    });
+  });
+
+  it('should handle empty networks object', () => {
+    const result = enableAllNetworksFilter({});
+    expect(result).toEqual({});
+  });
+
+  it('should work with NETWORK_CHAIN_ID constants', () => {
+    const mockNetworks: FlareTestNetworkConfigurations = {
+      [NETWORK_CHAIN_ID.FLARE_MAINNET]: {
+        chainId: NETWORK_CHAIN_ID.FLARE_MAINNET,
+        name: 'Flare Mainnet',
+        blockExplorerUrls: ['https://flare.network'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'FLR',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.FLARE_MAINNET,
+            url: 'https://flare-rpc.com',
+          },
+        ],
+      },
+      [NETWORK_CHAIN_ID.SONGBIRD_TESTNET]: {
+        chainId: NETWORK_CHAIN_ID.SONGBIRD_TESTNET,
+        name: 'Songbird Testnet',
+        blockExplorerUrls: ['https://songbird.flare.network'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'SGB',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.SONGBIRD_TESTNET,
+            url: 'https://songbird-rpc.flare.network',
+          },
+        ],
+      },
+    };
+
+    const result = enableAllNetworksFilter(mockNetworks);
+
+    expect(result).toEqual({
+      [NETWORK_CHAIN_ID.FLARE_MAINNET]: true,
+      [NETWORK_CHAIN_ID.SONGBIRD_TESTNET]: true,
+    });
+  });
+
+  it('should handle networks with different property values', () => {
+    const mockNetworks: MultiNetworkConfigurations = {
+      [NETWORK_CHAIN_ID.MAINNET]: {
+        chainId: NETWORK_CHAIN_ID.MAINNET,
+        name: 'Network 1',
+        blockExplorerUrls: ['https://etherscan.io'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'ETH',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.MAINNET,
+            url: 'https://mainnet.infura.io/v3/your-api-key',
+          },
+        ],
+      },
+      [NETWORK_CHAIN_ID.POLYGON]: {
+        chainId: NETWORK_CHAIN_ID.POLYGON,
+        name: 'Network 2',
+        blockExplorerUrls: ['https://polygonscan.com'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'MATIC',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.POLYGON,
+            url: 'https://polygon-rpc.com',
+          },
+        ],
+      },
+      [NETWORK_CHAIN_ID.BASE]: {
+        chainId: NETWORK_CHAIN_ID.BASE,
+        name: 'Network 3',
+        blockExplorerUrls: ['https://base.network'],
+        defaultRpcEndpointIndex: 0,
+        nativeCurrency: 'BASE',
+        rpcEndpoints: [
+          {
+            type: RpcEndpointType.Custom,
+            networkClientId: NETWORK_CHAIN_ID.BASE,
+            url: 'https://base-rpc.com',
+          },
+        ],
+      },
+    };
+
+    const result = enableAllNetworksFilter(mockNetworks);
+
+    expect(Object.values(result).every((value) => value === true)).toBe(true);
+    expect(Object.keys(result)).toEqual([
+      NETWORK_CHAIN_ID.MAINNET,
+      NETWORK_CHAIN_ID.POLYGON,
+      NETWORK_CHAIN_ID.BASE,
+    ]);
+  });
+});
diff --git a/app/components/UI/Tokens/util/filterAssets.test.ts b/app/components/UI/Tokens/util/filterAssets.test.ts
new file mode 100644
index 00000000000..4c23fe54815
--- /dev/null
+++ b/app/components/UI/Tokens/util/filterAssets.test.ts
@@ -0,0 +1,183 @@
+import { filterAssets, FilterCriteria } from './filterAssets';
+
+describe('filterAssets function', () => {
+  interface MockToken {
+    name: string;
+    symbol: string;
+    chainId: string;
+    balance: number;
+  }
+
+  const mockTokens: MockToken[] = [
+    { name: 'Token1', symbol: 'T1', chainId: '0x01', balance: 100 },
+    { name: 'Token2', symbol: 'T2', chainId: '0x02', balance: 50 },
+    { name: 'Token3', symbol: 'T3', chainId: '0x01', balance: 200 },
+    { name: 'Token4', symbol: 'T4', chainId: '0x89', balance: 150 },
+  ];
+
+  test('returns all assets if no criteria are provided', () => {
+    const criteria: FilterCriteria[] = [];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toEqual(mockTokens); // No filtering occurs
+  });
+
+  test('returns all assets if filterCallback is undefined', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'chainId',
+        opts: { '0x01': true, '0x89': true }, // Valid opts
+        filterCallback: undefined as unknown as 'inclusive', // Undefined callback
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toEqual(mockTokens); // No filtering occurs due to missing filterCallback
+  });
+
+  test('filters by inclusive chainId', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'chainId',
+        opts: { '0x01': true, '0x89': true },
+        filterCallback: 'inclusive',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(3);
+    expect(filtered.map((token) => token.chainId)).toEqual([
+      '0x01',
+      '0x01',
+      '0x89',
+    ]);
+  });
+
+  test('filters tokens with balance between 100 and 150 inclusive', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'balance',
+        opts: { min: 100, max: 150 },
+        filterCallback: 'range',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(2); // Token1 and Token4
+    expect(filtered.map((token) => token.balance)).toEqual([100, 150]);
+  });
+
+  test('filters by inclusive chainId and balance range', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'chainId',
+        opts: { '0x01': true, '0x89': true },
+        filterCallback: 'inclusive',
+      },
+      {
+        key: 'balance',
+        opts: { min: 100, max: 150 },
+        filterCallback: 'range',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(2); // Token1 and Token4
+  });
+
+  test('returns no tokens if no chainId matches', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'chainId',
+        opts: { '0x04': true },
+        filterCallback: 'inclusive',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(0); // No matching tokens
+  });
+
+  test('returns no tokens if balance is not within range', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'balance',
+        opts: { min: 300, max: 400 },
+        filterCallback: 'range',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(0); // No matching tokens
+  });
+
+  test('handles empty opts in inclusive callback', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'chainId',
+        opts: {}, // Empty opts
+        filterCallback: 'inclusive',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(0); // No tokens match empty opts
+  });
+
+  test('handles invalid range opts', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'balance',
+        opts: { min: undefined, max: undefined } as unknown as {
+          min: number;
+          max: number;
+        },
+        filterCallback: 'range',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toHaveLength(0); // No tokens match invalid range
+  });
+
+  test('handles missing values in assets gracefully', () => {
+    const incompleteTokens = [
+      { name: 'Token1', symbol: 'T1', chainId: '0x01' }, // Missing balance
+    ];
+
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'balance',
+        opts: { min: 100, max: 150 },
+        filterCallback: 'range',
+      },
+    ];
+
+    const filtered = filterAssets(incompleteTokens, criteria);
+
+    expect(filtered).toHaveLength(0); // Incomplete token doesn't match
+  });
+
+  test('ignores unknown filterCallback types', () => {
+    const criteria: FilterCriteria[] = [
+      {
+        key: 'balance',
+        opts: { min: 100, max: 150 },
+        filterCallback: 'unknown' as unknown as 'inclusive',
+      },
+    ];
+
+    const filtered = filterAssets(mockTokens, criteria);
+
+    expect(filtered).toEqual(mockTokens); // Unknown callback doesn't filter
+  });
+});
diff --git a/app/components/UI/Tokens/util/filterAssets.ts b/app/components/UI/Tokens/util/filterAssets.ts
new file mode 100644
index 00000000000..7d201831b57
--- /dev/null
+++ b/app/components/UI/Tokens/util/filterAssets.ts
@@ -0,0 +1,91 @@
+import { get } from 'lodash';
+
+export interface FilterCriteria {
+  key: string;
+  opts: Record<string, FilterType>; // Use opts for range, inclusion, etc.
+  filterCallback: FilterCallbackKeys; // Specify the type of filter: 'range', 'inclusive', etc.
+}
+
+export type FilterType = string | number | boolean | Date;
+type FilterCallbackKeys = keyof FilterCallbacksT;
+
+export interface FilterCallbacksT {
+  inclusive: (value: string, opts: Record<string, boolean>) => boolean;
+  range: (value: number, opts: Record<string, number>) => boolean;
+}
+
+/**
+ * A collection of filter callback functions used for various filtering operations.
+ */
+const filterCallbacks: FilterCallbacksT = {
+  /**
+   * Checks if a given value exists as a key in the provided options object
+   * and returns its corresponding boolean value.
+   *
+   * @param value - The key to check in the options object.
+   * @param opts - A record object containing boolean values for keys.
+   * @returns `false` if the options object is empty, otherwise returns the boolean value associated with the key.
+   */
+  inclusive: (value: string, opts: Record<string, boolean>) => {
+    if (Object.entries(opts).length === 0) {
+      return false;
+    }
+    return opts[value];
+  },
+  /**
+   * Checks if a given numeric value falls within a specified range.
+   *
+   * @param value - The number to check.
+   * @param opts - A record object with `min` and `max` properties defining the range.
+   * @returns `true` if the value is within the range [opts.min, opts.max], otherwise `false`.
+   */
+  range: (value: number, opts: Record<string, number>) =>
+    value >= opts.min && value <= opts.max,
+};
+
+function getNestedValue<T>(obj: T, keyPath: string): FilterType {
+  return get(obj, keyPath);
+}
+
+/**
+ * Filters an array of assets based on a set of criteria.
+ *
+ * @template T - The type of the assets in the array.
+ * @param assets - The array of assets to be filtered.
+ * @param criteria - An array of filter criteria objects. Each criterion contains:
+ * - `key`: A string representing the key to be accessed within the asset (supports nested keys).
+ * - `opts`: An object specifying the options for the filter. The structure depends on the `filterCallback` type.
+ * - `filterCallback`: The filtering method to apply, such as `'inclusive'` or `'range'`.
+ * @returns A new array of assets that match all the specified criteria.
+ */
+export function filterAssets<T>(assets: T[], criteria: FilterCriteria[]): T[] {
+  if (criteria.length === 0) {
+    return assets;
+  }
+
+  return assets.filter((asset) =>
+    criteria.every(({ key, opts, filterCallback }) => {
+      const nestedValue = getNestedValue(asset, key);
+
+      // If there's no callback or options, exit early and don't filter based on this criterion.
+      if (!filterCallback || !opts) {
+        return true;
+      }
+
+      switch (filterCallback) {
+        case 'inclusive':
+          return filterCallbacks.inclusive(
+            nestedValue as string,
+            opts as Record<string, boolean>,
+          );
+        case 'range':
+          return filterCallbacks.range(
+            nestedValue as number,
+            opts as { min: number; max: number },
+          );
+        default:
+          return true;
+      }
+    }),
+  );
+}
diff --git a/app/components/UI/Transactions/index.js b/app/components/UI/Transactions/index.js
index 3e251d4cfd7..d6a7d025150 100644
--- a/app/components/UI/Transactions/index.js
+++ b/app/components/UI/Transactions/index.js
@@ -76,6 +76,7 @@ import {
 } from '../../../util/transaction-controller';
 import { selectGasFeeEstimates } from '../../../selectors/confirmTransaction';
 import { decGWEIToHexWEI } from '../../../util/conversions';
+import { ActivitiesViewSelectorsIDs } from '../../../../e2e/selectors/Transactions/ActivitiesView.selectors';
 
 const createStyles = (colors, typography) =>
   StyleSheet.create({
@@ -104,6 +105,12 @@ const createStyles = (colors, typography) =>
       color: colors.text.muted,
       ...fontStyles.normal,
     },
+    textTransactions: {
+      fontSize: 20,
+      color: colors.text.muted,
+      textAlign: 'center',
+      ...fontStyles.normal,
+    },
     viewMoreWrapper: {
       padding: 16,
     },
@@ -208,9 +215,9 @@ class Transactions extends PureComponent {
     onScrollThroughContent: PropTypes.func,
     gasFeeEstimates: PropTypes.object,
     /**
-     * ID of the global network client
+     * Chain ID of the token
      */
-    networkClientId: PropTypes.string,
+    tokenChainId: PropTypes.string,
   };
 
   static defaultProps = {
@@ -346,11 +353,11 @@ class Transactions extends PureComponent {
   };
 
   onRefresh = async () => {
-    const { networkClientId } = this.props;
+    const { chainId } = this.props;
 
     this.setState({ refreshing: true });
 
-    await updateIncomingTransactions([networkClientId]);
+    await updateIncomingTransactions([chainId]);
 
     this.setState({ refreshing: false });
   };
@@ -369,6 +376,15 @@ class Transactions extends PureComponent {
   renderEmpty = () => {
     const { colors, typography } = this.context || mockTheme;
     const styles = createStyles(colors, typography);
+    if (this.props.tokenChainId !== this.props.chainId) {
+      return (
+        <View style={styles.emptyContainer}>
+          <Text style={styles.textTransactions}>
+            {strings('wallet.switch_network_to_view_transactions')}
+          </Text>
+        </View>
+      );
+    }
     return (
       <View style={styles.emptyContainer}>
         <Text style={styles.text}>{strings('wallet.no_transactions')}</Text>
@@ -572,7 +588,7 @@ class Transactions extends PureComponent {
     const onConfirmation = (isComplete) => {
       if (isComplete) {
         transaction.speedUpParams &&
-          transaction.speedUpParams?.type === 'SpeedUp'
+        transaction.speedUpParams?.type === 'SpeedUp'
           ? this.onSpeedUpCompleted()
           : this.onCancelCompleted();
       }
@@ -758,8 +774,8 @@ class Transactions extends PureComponent {
     const transactions =
       submittedTransactions && submittedTransactions.length
         ? submittedTransactions
-          .sort((a, b) => b.time - a.time)
-          .concat(confirmedTransactions)
+            .sort((a, b) => b.time - a.time)
+            .concat(confirmedTransactions)
         : this.props.transactions;
 
     const renderRetryGas = (rate) => {
@@ -785,6 +801,7 @@ class Transactions extends PureComponent {
         <PriceChartContext.Consumer>
           {({ isChartBeingTouched }) => (
             <FlatList
+              testID={ActivitiesViewSelectorsIDs.CONTAINER}
               ref={this.flatList}
               getItemLayout={this.getItemLayout}
               data={transactions}
diff --git a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
index 7dc24e99228..acdd40c7f1f 100644
--- a/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/NetworkPermissionsConnected/NetworkPermissionsConnected.tsx
@@ -53,6 +53,7 @@ import Button, {
   ButtonVariants,
   ButtonWidthTypes,
 } from '../../../../component-library/components/Buttons/Button';
+import { NetworkNonPemittedBottomSheetSelectorsIDs } from '../../../../../e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors';
 import { handleNetworkSwitch } from '../../../../util/networks/handleNetworkSwitch';
 
 const AccountPermissionsConnected = ({
@@ -215,6 +216,9 @@ const AccountPermissionsConnected = ({
           style={styles.managePermissionsButton}
           variant={ButtonVariants.Secondary}
           label={strings('permissions.edit_permissions')}
+          testID={
+            NetworkNonPemittedBottomSheetSelectorsIDs.EDIT_PERMISSIONS_BUTTON
+          }
           size={ButtonSize.Lg}
           onPress={() => {
             onSetPermissionsScreen(
diff --git a/app/components/Views/Asset/index.js b/app/components/Views/Asset/index.js
index 2c22b4307bb..4610949677e 100644
--- a/app/components/Views/Asset/index.js
+++ b/app/components/Views/Asset/index.js
@@ -18,7 +18,9 @@ import {
 } from '../../../constants/transaction';
 import AppConstants from '../../../core/AppConstants';
 import {
+  swapsLivenessMultichainSelector,
   swapsLivenessSelector,
+  swapsTokensMultiChainObjectSelector,
   swapsTokensObjectSelector,
 } from '../../../reducers/swaps';
 import {
@@ -34,6 +36,7 @@ import { toLowerCaseEquals } from '../../../util/general';
 import {
   findBlockExplorerForRpc,
   isMainnetByChainId,
+  isPortfolioViewEnabled,
 } from '../../../util/networks';
 import { mockTheme, ThemeContext } from '../../../util/theme';
 import { addAccountTimeFlagFilter } from '../../../util/transactions';
@@ -165,10 +168,6 @@ class Asset extends PureComponent {
      * Boolean that indicates if native token is supported to buy
      */
     isNetworkBuyNativeTokenSupported: PropTypes.bool,
-    /**
-     * ID of the global network client
-     */
-    networkClientId: PropTypes.string,
   };
 
   state = {
@@ -192,8 +191,14 @@ class Asset extends PureComponent {
   );
 
   updateNavBar = (contentOffset = 0) => {
-    const { navigation, route, chainId, rpcUrl, networkConfigurations } =
-      this.props;
+    const {
+      route: { params },
+      navigation,
+      route,
+      chainId,
+      rpcUrl,
+      networkConfigurations,
+    } = this.props;
     const colors = this.context.colors || mockTheme.colors;
     const isNativeToken = route.params.isETH;
     const isMainnet = isMainnetByChainId(chainId);
@@ -204,7 +209,9 @@ class Asset extends PureComponent {
 
     const shouldShowMoreOptionsInNavBar =
       isMainnet || !isNativeToken || (isNativeToken && blockExplorer);
-
+    const asset = navigation && params;
+    const currentNetworkName =
+      this.props.networkConfigurations[asset.chainId]?.name;
     navigation.setOptions(
       getNetworkNavbarOptions(
         route.params?.symbol ?? '',
@@ -224,6 +231,7 @@ class Asset extends PureComponent {
           : undefined,
         true,
         contentOffset,
+        currentNetworkName,
       ),
     );
   };
@@ -441,11 +449,11 @@ class Asset extends PureComponent {
   };
 
   onRefresh = async () => {
-    const { networkClientId } = this.props;
+    const { chainId } = this.props;
 
     this.setState({ refreshing: true });
 
-    await updateIncomingTransactions([networkClientId]);
+    await updateIncomingTransactions([chainId]);
 
     this.setState({ refreshing: false });
   };
@@ -469,7 +477,10 @@ class Asset extends PureComponent {
     const styles = createStyles(colors);
     const asset = navigation && params;
     const isSwapsFeatureLive = this.props.swapsIsLive;
-    const isNetworkAllowed = isSwapsAllowed(chainId);
+    const isNetworkAllowed = isPortfolioViewEnabled()
+      ? isSwapsAllowed(asset.chainId)
+      : isSwapsAllowed(chainId);
+
     const isAssetAllowed =
       asset.isETH || asset.address?.toLowerCase() in this.props.swapsTokens;
 
@@ -511,6 +522,7 @@ class Asset extends PureComponent {
             loading={!transactionsUpdated}
             headerHeight={280}
             onScrollThroughContent={this.onScrollThroughContent}
+            tokenChainId={asset.chainId}
           />
         )}
       </View>
@@ -520,9 +532,13 @@ class Asset extends PureComponent {
 
 Asset.contextType = ThemeContext;
 
-const mapStateToProps = (state) => ({
-  swapsIsLive: swapsLivenessSelector(state),
-  swapsTokens: swapsTokensObjectSelector(state),
+const mapStateToProps = (state, { route }) => ({
+  swapsIsLive: isPortfolioViewEnabled()
+    ? swapsLivenessMultichainSelector(state, route.params.chainId)
+    : swapsLivenessSelector(state),
+  swapsTokens: isPortfolioViewEnabled()
+    ? swapsTokensMultiChainObjectSelector(state)
+    : swapsTokensObjectSelector(state),
   swapsTransactions: selectSwapsTransactions(state),
   conversionRate: selectConversionRate(state),
   currentCurrency: selectCurrentCurrency(state),
diff --git a/app/components/Views/Asset/index.test.js b/app/components/Views/Asset/index.test.js
index 968ed7f4b69..a7461510901 100644
--- a/app/components/Views/Asset/index.test.js
+++ b/app/components/Views/Asset/index.test.js
@@ -9,6 +9,13 @@ const mockInitialState = {
     backgroundState: {
       ...backgroundState,
       AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
+      TokensController: {
+        allTokens: {
+          '0x1': {
+            '0xc4966c0d659d99699bfd7eb54d8fafee40e4a756': [],
+          },
+        },
+      },
     },
   },
 };
diff --git a/app/components/Views/AssetDetails/AssetsDetails.test.tsx b/app/components/Views/AssetDetails/AssetsDetails.test.tsx
index 7dfb2cea993..ce066448c97 100644
--- a/app/components/Views/AssetDetails/AssetsDetails.test.tsx
+++ b/app/components/Views/AssetDetails/AssetsDetails.test.tsx
@@ -62,8 +62,8 @@ const initialState = {
       TokenBalancesController: {
         tokenBalances: {
           [MOCK_ADDRESS_1]: {
-            '0x1': {
-              '0xAddress': '0xde0b6B3A7640000',
+            [CHAIN_IDS.MAINNET]: {
+              '0xAddress': '0xde0b6b3a7640000',
             },
           },
         },
@@ -77,6 +77,28 @@ const initialState = {
             aggregators: ['Metamask', 'CMC'],
           },
         ],
+        tokensByChainId: {
+          [CHAIN_IDS.MAINNET]: [
+            {
+              address: '0xAddress',
+              symbol: 'TKN',
+              decimals: 18,
+              aggregators: ['Metamask', 'CMC'],
+            },
+          ],
+        },
+        allTokens: {
+          [CHAIN_IDS.MAINNET]: {
+            [MOCK_ADDRESS_1]: [
+              {
+                address: '0xAddress',
+                symbol: 'TKN',
+                decimals: 18,
+                aggregators: ['Metamask', 'CMC'],
+              },
+            ],
+          },
+        },
       },
       AccountsController: {
         internalAccounts: {
@@ -117,6 +139,7 @@ describe('AssetDetails', () => {
           route={{
             params: {
               address: '0xAddress',
+              chainId: CHAIN_IDS.MAINNET,
             },
           }}
         />
@@ -146,6 +169,7 @@ describe('AssetDetails', () => {
           route={{
             params: {
               address: '0xAddress',
+              chainId: CHAIN_IDS.MAINNET,
             },
           }}
         />
@@ -195,6 +219,7 @@ describe('AssetDetails', () => {
           route={{
             params: {
               address: '0xAddress',
+              chainId: CHAIN_IDS.MAINNET,
             },
           }}
         />
@@ -224,6 +249,7 @@ describe('AssetDetails', () => {
           route={{
             params: {
               address: '0xAddress',
+              chainId: CHAIN_IDS.MAINNET,
             },
           }}
         />
diff --git a/app/components/Views/AssetDetails/index.tsx b/app/components/Views/AssetDetails/index.tsx
index c4e7d682c09..905113db79e 100644
--- a/app/components/Views/AssetDetails/index.tsx
+++ b/app/components/Views/AssetDetails/index.tsx
@@ -17,7 +17,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import EthereumAddress from '../../UI/EthereumAddress';
 import Icon from 'react-native-vector-icons/Feather';
 import TokenImage from '../../UI/TokenImage';
-import Networks, { getDecimalChainId } from '../../../util/networks';
+import Networks, {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../util/networks';
 import Engine from '../../../core/Engine';
 import Logger from '../../../util/Logger';
 import NotificationManager from '../../../core/NotificationManager';
@@ -34,18 +37,30 @@ import Routes from '../../../constants/navigation/Routes';
 import {
   selectChainId,
   selectProviderConfig,
+  selectNetworkConfigurationByChainId,
 } from '../../../selectors/networkController';
 import {
   selectConversionRate,
   selectCurrentCurrency,
+  selectConversionRateBySymbol,
 } from '../../../selectors/currencyRateController';
-import { selectTokens } from '../../../selectors/tokensController';
-import { selectContractExchangeRates } from '../../../selectors/tokenRatesController';
-import { selectContractBalances } from '../../../selectors/tokenBalancesController';
+import {
+  selectAllTokens,
+  selectTokens,
+} from '../../../selectors/tokensController';
+import {
+  selectContractExchangeRates,
+  selectTokenMarketDataByChainId,
+} from '../../../selectors/tokenRatesController';
+import {
+  selectContractBalances,
+  selectTokensBalances,
+} from '../../../selectors/tokenBalancesController';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { RootState } from 'app/reducers';
 import { Colors } from '../../../util/theme/models';
 import { Hex } from '@metamask/utils';
+import { selectSelectedInternalAccountAddress } from '../../../selectors/accountsController';
 
 const createStyles = (colors: Colors) =>
   StyleSheet.create({
@@ -100,31 +115,68 @@ interface Props {
   route: {
     params: {
       address: Hex;
+      chainId: Hex;
     };
   };
 }
 
 const AssetDetails = (props: Props) => {
-  const { address } = props.route.params;
+  const { address, chainId: networkId } = props.route.params;
+
   const { colors } = useTheme();
   const { trackEvent, createEventBuilder } = useMetrics();
   const styles = createStyles(colors);
   const navigation = useNavigation();
   const dispatch = useDispatch();
   const providerConfig = useSelector(selectProviderConfig);
+  const allTokens = useSelector(selectAllTokens);
+  const selectedAccountAddress = useSelector(
+    selectSelectedInternalAccountAddress,
+  );
+  const selectedChainId = useSelector(selectChainId);
+  const chainId = isPortfolioViewEnabled() ? networkId : selectedChainId;
   const tokens = useSelector(selectTokens);
-  const conversionRate = useSelector(selectConversionRate);
+
+  const tokensByChain = useMemo(
+    () => allTokens?.[chainId as Hex]?.[selectedAccountAddress as Hex] ?? [],
+    [allTokens, chainId, selectedAccountAddress],
+  );
+
+  const conversionRateLegacy = useSelector(selectConversionRate);
+  const networkConfigurationByChainId = useSelector((state: RootState) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+  const conversionRateBySymbol = useSelector((state: RootState) =>
+    selectConversionRateBySymbol(
+      state,
+      networkConfigurationByChainId?.nativeCurrency,
+    ),
+  );
   const currentCurrency = useSelector(selectCurrentCurrency);
-  const chainId = useSelector(selectChainId);
   const primaryCurrency = useSelector(
     (state: RootState) => state.settings.primaryCurrency,
   );
-  const tokenExchangeRates = useSelector(selectContractExchangeRates);
-  const tokenBalances = useSelector(selectContractBalances);
-  const token = useMemo(
+  const tokenExchangeRatesLegacy = useSelector(selectContractExchangeRates);
+  const tokenExchangeRatesByChainId = useSelector((state: RootState) =>
+    selectTokenMarketDataByChainId(state, chainId),
+  );
+  const tokenBalancesLegacy = useSelector(selectContractBalances);
+  const allTokenBalances = useSelector(selectTokensBalances);
+
+  const portfolioToken = useMemo(
+    () => tokensByChain.find((rawToken) => rawToken.address === address),
+    [tokensByChain, address],
+  );
+
+  const legacyToken = useMemo(
     () => tokens.find((rawToken) => rawToken.address === address),
     [tokens, address],
   );
+
+  const token: TokenType | undefined = isPortfolioViewEnabled()
+    ? portfolioToken
+    : legacyToken;
+
   const { symbol, decimals, aggregators = [] } = token as TokenType;
 
   const getNetworkName = () => {
@@ -172,8 +224,11 @@ const AssetDetails = (props: Props) => {
         onConfirm: () => {
           navigation.navigate('WalletView');
           InteractionManager.runAfterInteractions(() => {
+            const { NetworkController } = Engine.context;
+            const networkClientId =
+              NetworkController.findNetworkClientIdByChainId(chainId);
             try {
-              TokensController.ignoreTokens([address]);
+              TokensController.ignoreTokens([address], networkClientId);
               NotificationManager.showSimpleNotification({
                 status: `simple_notification`,
                 duration: 5000,
@@ -259,14 +314,39 @@ const AssetDetails = (props: Props) => {
 
   const renderTokenBalance = () => {
     let balanceDisplay = '';
+    const tokenExchangeRates = isPortfolioViewEnabled()
+      ? tokenExchangeRatesByChainId
+      : tokenExchangeRatesLegacy;
+    const tokenBalances = isPortfolioViewEnabled()
+      ? allTokenBalances
+      : tokenBalancesLegacy;
+
+    const multiChainTokenBalance =
+      Object.keys(allTokenBalances).length > 0
+        ? allTokenBalances[selectedAccountAddress as Hex]?.[chainId as Hex]?.[
+            address as Hex
+          ]
+        : undefined;
+
+    const tokenBalance = isPortfolioViewEnabled()
+      ? multiChainTokenBalance
+      : tokenBalancesLegacy[address];
+
+    const conversionRate = isPortfolioViewEnabled()
+      ? conversionRateBySymbol
+      : conversionRateLegacy;
+
     const exchangeRate =
       tokenExchangeRates && address in tokenExchangeRates
         ? tokenExchangeRates[address]?.price
         : undefined;
-    const balance =
-      address in tokenBalances
-        ? renderFromTokenMinimalUnit(tokenBalances[address], decimals)
-        : undefined;
+
+    const balance = tokenBalance
+      ? address in tokenBalances || isPortfolioViewEnabled() || !tokenBalance
+        ? renderFromTokenMinimalUnit(tokenBalance.toString(), decimals)
+        : undefined
+      : undefined;
+
     const balanceFiat = balance
       ? balanceToFiat(balance, conversionRate, exchangeRate, currentCurrency)
       : undefined;
diff --git a/app/components/Views/AssetOptions/AssetOptions.test.tsx b/app/components/Views/AssetOptions/AssetOptions.test.tsx
index 5a430f103ba..d7e298bf86a 100644
--- a/app/components/Views/AssetOptions/AssetOptions.test.tsx
+++ b/app/components/Views/AssetOptions/AssetOptions.test.tsx
@@ -3,6 +3,85 @@ import { render, fireEvent } from '@testing-library/react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import AssetOptions from './AssetOptions';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
+
+import {
+  createProviderConfig,
+  selectNetworkConfigurations,
+} from '../../../selectors/networkController';
+
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    TokensController: {
+      ignoreTokens: jest.fn(() => Promise.resolve()),
+    },
+    NetworkController: {
+      findNetworkClientIdByChainId: jest.fn(() => 'test-network'),
+      getNetworkClientById: jest.fn(() => ({
+        configuration: {
+          chainId: '0x1',
+          rpcUrl: 'https://mainnet.example.com',
+          ticker: 'ETH',
+          type: 'mainnet',
+        },
+      })),
+      state: {
+        providerConfig: {
+          chainId: '0x1',
+          type: 'mainnet',
+        },
+        networkConfigurations: {
+          '0x1': {
+            chainId: '0x1',
+            rpcEndpoints: [{ url: 'https://mainnet.example.com' }],
+            defaultRpcEndpointIndex: 0,
+          },
+        },
+      },
+    },
+    TokenDetectionController: {
+      detectTokens: jest.fn(() => Promise.resolve()),
+    },
+    AccountTrackerController: {
+      refresh: jest.fn(() => Promise.resolve()),
+    },
+    CurrencyRateController: {
+      updateExchangeRate: jest.fn(() => Promise.resolve()),
+    },
+    TokenRatesController: {
+      updateExchangeRatesByChainId: jest.fn(() => Promise.resolve()),
+    },
+  },
+  getTotalFiatAccountBalance: jest.fn(),
+}));
+
+jest.mock('../../../selectors/networkController', () => ({
+  selectChainId: jest.fn(() => '1'),
+  selectProviderConfig: jest.fn(() => ({})),
+  selectNetworkConfigurations: jest.fn(() => ({
+    '0x1': {
+      chainId: '0x1',
+      rpcEndpoints: [{ url: 'https://mainnet.example.com' }],
+      defaultRpcEndpointIndex: 0,
+    },
+    '0x89': {
+      chainId: '0x89',
+      rpcEndpoints: [{ url: 'https://polygon.example.com' }],
+      defaultRpcEndpointIndex: 0,
+    },
+  })),
+  createProviderConfig: jest.fn((networkConfig, rpcEndpoint) => ({
+    chainId: networkConfig.chainId,
+    rpcUrl: rpcEndpoint.url,
+    chainName: 'Example Chain',
+    nativeCurrency: {
+      name: 'Example Token',
+      symbol: 'EXAMPLE',
+      decimals: 18,
+    },
+  })),
+}));
 
 // Mock dependencies
 jest.mock('@react-navigation/native', () => ({
@@ -68,6 +147,16 @@ jest.mock('../../../selectors/networkController', () => ({
   selectChainId: jest.fn(() => '1'),
   selectProviderConfig: jest.fn(() => ({})),
   selectNetworkConfigurations: jest.fn(() => ({})),
+  createProviderConfig: jest.fn(() => ({
+    chainId: '1',
+    rpcUrl: 'https://example.com',
+    chainName: 'Example Chain',
+    nativeCurrency: {
+      name: 'Example Token',
+      symbol: 'EXAMPLE',
+      decimals: 18,
+    },
+  })),
 }));
 
 jest.mock('../../../selectors/tokenListController', () => ({
@@ -89,10 +178,21 @@ describe('AssetOptions Component', () => {
         return { '0x123': { symbol: 'ABC' } };
       return {};
     });
+    jest.clearAllMocks();
+    jest.useRealTimers();
+    jest.useFakeTimers();
   });
 
   afterEach(() => {
+    jest.runAllTimers();
+    jest.clearAllTimers();
+    jest.clearAllMocks();
+    jest.clearAllTimers();
+  });
+
+  afterAll(() => {
     jest.clearAllMocks();
+    jest.clearAllTimers();
   });
 
   it('matches the snapshot', () => {
@@ -101,6 +201,24 @@ describe('AssetOptions Component', () => {
         route={{
           params: {
             address: '0x123',
+            chainId: '0x1',
+            isNativeCurrency: false,
+          },
+        }}
+      />,
+    );
+
+    expect(toJSON()).toMatchSnapshot();
+  });
+
+  it('should match the snapshot when portfolio view is enabled  ', () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+    const { toJSON } = render(
+      <AssetOptions
+        route={{
+          params: {
+            address: '0x123',
+            chainId: '0x1',
             isNativeCurrency: false,
           },
         }}
@@ -116,6 +234,7 @@ describe('AssetOptions Component', () => {
         route={{
           params: {
             address: '0x123',
+            chainId: '0x1',
             isNativeCurrency: false,
           },
         }}
@@ -134,6 +253,7 @@ describe('AssetOptions Component', () => {
         route={{
           params: {
             address: '0x123',
+            chainId: '0x1',
             isNativeCurrency: false,
           },
         }}
@@ -141,6 +261,7 @@ describe('AssetOptions Component', () => {
     );
 
     fireEvent.press(getByText('View on block explorer'));
+    jest.runAllTimers();
     expect(mockNavigation.navigate).toHaveBeenCalledWith('Webview', {
       screen: 'SimpleWebview',
       params: {
@@ -156,6 +277,7 @@ describe('AssetOptions Component', () => {
         route={{
           params: {
             address: '0x123',
+            chainId: '0x1',
             isNativeCurrency: false,
           },
         }}
@@ -163,6 +285,7 @@ describe('AssetOptions Component', () => {
     );
 
     fireEvent.press(getByText('Remove token'));
+    jest.runAllTimers();
     expect(mockNavigation.navigate).toHaveBeenCalledWith('RootModalFlow', {
       screen: 'AssetHideConfirmation',
       params: expect.anything(),
@@ -170,18 +293,64 @@ describe('AssetOptions Component', () => {
   });
 
   it('handles "Token Details" press', () => {
-    const { getByText } = render(
-      <AssetOptions
-        route={{
-          params: {
-            address: '0x123',
-            isNativeCurrency: false,
-          },
-        }}
-      />,
-    );
+    const mockParams = {
+      params: {
+        address: '0x123',
+        chainId: '0x1',
+        isNativeCurrency: false,
+      },
+    };
+    const { getByText } = render(<AssetOptions route={mockParams} />);
 
     fireEvent.press(getByText('Token details'));
-    expect(mockNavigation.navigate).toHaveBeenCalledWith('AssetDetails');
+    jest.runAllTimers();
+    expect(mockNavigation.navigate).toHaveBeenCalledWith(
+      'AssetDetails',
+      expect.anything(),
+    );
+  });
+
+  describe('Portfolio and Network Configuration', () => {
+    const mockNetworkConfigurations = {
+      '0x1': {
+        chainId: '0x1',
+        rpcEndpoints: [{ url: 'https://mainnet.example.com' }],
+        defaultRpcEndpointIndex: 0,
+      },
+      '0x89': {
+        chainId: '0x89',
+        rpcEndpoints: [{ url: 'https://polygon.example.com' }],
+        defaultRpcEndpointIndex: 0,
+      },
+    };
+
+    beforeEach(() => {
+      (useSelector as jest.Mock).mockImplementation((selector) => {
+        if (selector === selectNetworkConfigurations)
+          return mockNetworkConfigurations;
+        return {};
+      });
+    });
+
+    it('should use correct provider config when portfolio view is enabled', () => {
+      jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+      render(
+        <AssetOptions
+          route={{
+            params: {
+              address: '0x123',
+              chainId: '0x1',
+              isNativeCurrency: false,
+            },
+          }}
+        />,
+      );
+
+      expect(createProviderConfig).toHaveBeenCalledWith(
+        mockNetworkConfigurations['0x1'],
+        mockNetworkConfigurations['0x1'].rpcEndpoints[0],
+      );
+    });
   });
 });
diff --git a/app/components/Views/AssetOptions/AssetOptions.tsx b/app/components/Views/AssetOptions/AssetOptions.tsx
index d19a4d4c749..b5552e5f5d8 100644
--- a/app/components/Views/AssetOptions/AssetOptions.tsx
+++ b/app/components/Views/AssetOptions/AssetOptions.tsx
@@ -1,5 +1,5 @@
 import { useNavigation } from '@react-navigation/native';
-import React, { useRef } from 'react';
+import React, { useMemo, useRef } from 'react';
 import { Text, TouchableOpacity, View, InteractionManager } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useSelector } from 'react-redux';
@@ -14,6 +14,7 @@ import Icon, {
 } from '../../../component-library/components/Icons/Icon';
 import useBlockExplorer from '../../../components/UI/Swaps/utils/useBlockExplorer';
 import {
+  createProviderConfig,
   selectChainId,
   selectNetworkConfigurations,
   selectProviderConfig,
@@ -24,10 +25,14 @@ import { selectTokenList } from '../../../selectors/tokenListController';
 import Logger from '../../../util/Logger';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import AppConstants from '../../../core/AppConstants';
-import { getDecimalChainId } from '../../../util/networks';
+import {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../util/networks';
 import { isPortfolioUrl } from '../../../util/url';
 import { BrowserTab } from '../../../components/UI/Tokens/types';
 import { RootState } from '../../../reducers';
+import { Hex } from '../../../util/smart-transactions/smart-publish-hook';
 interface Option {
   label: string;
   onPress: () => void;
@@ -39,12 +44,13 @@ interface Props {
     params: {
       address: string;
       isNativeCurrency: boolean;
+      chainId: string;
     };
   };
 }
 
 const AssetOptions = (props: Props) => {
-  const { address, isNativeCurrency } = props.route.params;
+  const { address, isNativeCurrency, chainId: networkId } = props.route.params;
   const { styles } = useStyles(styleSheet, {});
   const safeAreaInsets = useSafeAreaInsets();
   const navigation = useNavigation();
@@ -58,7 +64,35 @@ const AssetOptions = (props: Props) => {
   const isDataCollectionForMarketingEnabled = useSelector(
     (state: RootState) => state.security.dataCollectionForMarketing,
   );
-  const explorer = useBlockExplorer(providerConfig, networkConfigurations);
+
+  // Memoize the provider config for the token explorer
+  const { providerConfigTokenExplorer } = useMemo(() => {
+    const tokenNetworkConfig = networkConfigurations[networkId as Hex];
+    const tokenRpcEndpoint =
+      networkConfigurations[networkId as Hex]?.rpcEndpoints?.[
+        networkConfigurations[networkId as Hex]?.defaultRpcEndpointIndex
+      ];
+    let providerConfigToken;
+    if (isPortfolioViewEnabled()) {
+      providerConfigToken = createProviderConfig(
+        tokenNetworkConfig,
+        tokenRpcEndpoint,
+      );
+    } else {
+      providerConfigToken = providerConfig;
+    }
+
+    const providerConfigTokenExplorerToken = providerConfigToken;
+
+    return {
+      providerConfigTokenExplorer: providerConfigTokenExplorerToken,
+    };
+  }, [networkId, networkConfigurations, providerConfig]);
+
+  const explorer = useBlockExplorer(
+    providerConfigTokenExplorer,
+    networkConfigurations,
+  );
   const { trackEvent, isEnabled, createEventBuilder } = useMetrics();
 
   const goToBrowserUrl = (url: string, title: string) => {
@@ -88,7 +122,10 @@ const AssetOptions = (props: Props) => {
 
   const openTokenDetails = () => {
     modalRef.current?.dismissModal(() => {
-      navigation.navigate('AssetDetails');
+      navigation.navigate('AssetDetails', {
+        address,
+        chainId: networkId,
+      });
     });
   };
 
@@ -146,7 +183,18 @@ const AssetOptions = (props: Props) => {
           navigation.navigate('WalletView');
           InteractionManager.runAfterInteractions(async () => {
             try {
-              await TokensController.ignoreTokens([address]);
+              const { NetworkController } = Engine.context;
+
+              const chainIdToUse = isPortfolioViewEnabled()
+                ? networkId
+                : chainId;
+
+              const networkClientId =
+                NetworkController.findNetworkClientIdByChainId(
+                  chainIdToUse as Hex,
+                );
+
+              await TokensController.ignoreTokens([address], networkClientId);
               NotificationManager.showSimpleNotification({
                 status: `simple_notification`,
                 duration: 5000,
diff --git a/app/components/Views/AssetOptions/__snapshots__/AssetOptions.test.tsx.snap b/app/components/Views/AssetOptions/__snapshots__/AssetOptions.test.tsx.snap
index fdb892243bb..ff4e041021f 100644
--- a/app/components/Views/AssetOptions/__snapshots__/AssetOptions.test.tsx.snap
+++ b/app/components/Views/AssetOptions/__snapshots__/AssetOptions.test.tsx.snap
@@ -135,3 +135,139 @@ exports[`AssetOptions Component matches the snapshot 1`] = `
   </View>
 </View>
 `;
+
+exports[`AssetOptions Component should match the snapshot when portfolio view is enabled   1`] = `
+<View>
+  <View
+    style={
+      [
+        undefined,
+        {
+          "opacity": undefined,
+        },
+      ]
+    }
+  />
+  <View
+    collapsable={false}
+    onGestureHandlerEvent={[Function]}
+    onGestureHandlerStateChange={[Function]}
+    style={
+      [
+        [
+          undefined,
+          {
+            "transform": [
+              {
+                "translateY": 1334,
+              },
+            ],
+          },
+        ],
+        undefined,
+      ]
+    }
+  >
+    <TouchableOpacity
+      disabled={false}
+      onPress={[Function]}
+    />
+    <View
+      style={
+        [
+          undefined,
+          {
+            "paddingBottom": 10,
+          },
+        ]
+      }
+    >
+      <View />
+      <View>
+        <TouchableOpacity
+          onPress={[Function]}
+        >
+          <SvgMock
+            color="#141618"
+            height={20}
+            name="Export"
+            style={
+              {
+                "height": 20,
+                "width": 20,
+              }
+            }
+            width={20}
+          />
+          <Text>
+            View on Portfolio
+          </Text>
+        </TouchableOpacity>
+      </View>
+      <View>
+        <TouchableOpacity
+          onPress={[Function]}
+        >
+          <SvgMock
+            color="#141618"
+            height={20}
+            name="Export"
+            style={
+              {
+                "height": 20,
+                "width": 20,
+              }
+            }
+            width={20}
+          />
+          <Text>
+            View on block explorer
+          </Text>
+        </TouchableOpacity>
+      </View>
+      <View>
+        <TouchableOpacity
+          onPress={[Function]}
+        >
+          <SvgMock
+            color="#141618"
+            height={20}
+            name="DocumentCode"
+            style={
+              {
+                "height": 20,
+                "width": 20,
+              }
+            }
+            width={20}
+          />
+          <Text>
+            Token details
+          </Text>
+        </TouchableOpacity>
+      </View>
+      <View>
+        <TouchableOpacity
+          onPress={[Function]}
+        >
+          <SvgMock
+            color="#141618"
+            height={20}
+            name="Trash"
+            style={
+              {
+                "height": 20,
+                "width": 20,
+              }
+            }
+            width={20}
+          />
+          <Text>
+            Remove token
+          </Text>
+        </TouchableOpacity>
+      </View>
+    </View>
+  </View>
+</View>
+`;
diff --git a/app/components/Views/DetectedTokens/components/Token.tsx b/app/components/Views/DetectedTokens/components/Token.tsx
index b79049b80b7..1c113c6ef3f 100644
--- a/app/components/Views/DetectedTokens/components/Token.tsx
+++ b/app/components/Views/DetectedTokens/components/Token.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../../../util/number';
 import { useTheme } from '../../../../util/theme';
 import {
-  selectConversionRateFoAllChains,
+  selectCurrencyRates,
   selectCurrentCurrency,
 } from '../../../../selectors/currencyRateController';
 import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
@@ -115,7 +115,7 @@ const Token = ({ token, selected, toggleSelected }: Props) => {
     tokenBalancesAllChains[accountAddress as Hex];
   const tokenBalances =
     balanceAllChainsForAccount[(token.chainId as Hex) ?? currentChainId];
-  const conversionRateByChainId = useSelector(selectConversionRateFoAllChains);
+  const conversionRateByChainId = useSelector(selectCurrencyRates);
   const chainIdToUse = token.chainId ?? currentChainId;
 
   const conversionRate =
diff --git a/app/components/Views/DetectedTokens/index.tsx b/app/components/Views/DetectedTokens/index.tsx
index 61d3f557beb..4078647508d 100644
--- a/app/components/Views/DetectedTokens/index.tsx
+++ b/app/components/Views/DetectedTokens/index.tsx
@@ -12,6 +12,7 @@ import { Token as TokenType } from '@metamask/assets-controllers';
 import { useNavigation } from '@react-navigation/native';
 import { FlatList } from 'react-native-gesture-handler';
 import { Hex } from '@metamask/utils';
+
 // External Dependencies
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { fontStyles } from '../../../styles/common';
@@ -22,7 +23,10 @@ import NotificationManager from '../../../core/NotificationManager';
 import { strings } from '../../../../locales/i18n';
 import Logger from '../../../util/Logger';
 import { useTheme } from '../../../util/theme';
-import { getDecimalChainId } from '../../../util/networks';
+import {
+  getDecimalChainId,
+  isPortfolioViewEnabled,
+} from '../../../util/networks';
 import { createNavigationDetails } from '../../../util/navigation/navUtils';
 import Routes from '../../../constants/navigation/Routes';
 import {
@@ -84,8 +88,6 @@ interface IgnoredTokensByAddress {
   [address: string]: true;
 }
 
-const isPortfolioViewEnabled = process.env.PORTFOLIO_VIEW === 'true';
-
 const DetectedTokens = () => {
   const navigation = useNavigation();
   const { trackEvent, createEventBuilder } = useMetrics();
@@ -100,14 +102,13 @@ const DetectedTokens = () => {
   const [ignoredTokens, setIgnoredTokens] = useState<IgnoredTokensByAddress>(
     {},
   );
-
   const isAllNetworks = useSelector(selectIsAllNetworks);
 
   const { colors } = useTheme();
   const styles = createStyles(colors);
 
   const currentDetectedTokens =
-    isPortfolioViewEnabled && isAllNetworks
+    isPortfolioViewEnabled() && isAllNetworks
       ? allDetectedTokens
       : detectedTokens;
 
@@ -193,7 +194,7 @@ const DetectedTokens = () => {
             await Promise.all(ignorePromises);
           }
           if (tokensToImport.length > 0) {
-            if (isPortfolioViewEnabled) {
+            if (isPortfolioViewEnabled()) {
               // Group tokens by their `chainId` using a plain object
               const tokensByChainId: Record<Hex, TokenType[]> = {};
 
diff --git a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
index bc39f64a71f..6b3a29424ca 100644
--- a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
+++ b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
@@ -35,6 +35,7 @@ import { PermissionKeys } from '../../../../core/Permissions/specifications';
 import { CaveatTypes } from '../../../../core/Permissions/constants';
 import { getNetworkImageSource } from '../../../../util/networks';
 import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
+import { NetworkConnectMultiSelectorSelectorsIDs } from '../../../../../e2e/selectors/Browser/NetworkConnectMultiSelector.selectors';
 import Logger from '../../../../util/Logger';
 
 const NetworkConnectMultiSelector = ({
@@ -271,6 +272,9 @@ const NetworkConnectMultiSelector = ({
               variant={ButtonVariants.Primary}
               label={strings('networks.update')}
               onPress={handleUpdateNetworkPermissions}
+              testID={
+                NetworkConnectMultiSelectorSelectorsIDs.UPDATE_CHAIN_PERMISSIONS
+              }
               size={ButtonSize.Lg}
               style={{
                 ...styles.buttonPositioning,
diff --git a/app/components/Views/NetworkSelector/NetworkSelector.tsx b/app/components/Views/NetworkSelector/NetworkSelector.tsx
index c9dcc00f5f9..6c92a44ca2c 100644
--- a/app/components/Views/NetworkSelector/NetworkSelector.tsx
+++ b/app/components/Views/NetworkSelector/NetworkSelector.tsx
@@ -405,7 +405,7 @@ const NetworkSelector = () => {
       AccountTrackerController.refresh();
 
       setTimeout(async () => {
-        await updateIncomingTransactions([clientId]);
+        await updateIncomingTransactions([networkConfiguration.chainId]);
       }, 1000);
     }
 
diff --git a/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap
index b37f7966a1a..57456e17de5 100644
--- a/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap
@@ -459,7 +459,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
               "variant": "Network",
             }
           }
-          secondaryText="etherscan.io"
           style={
             {
               "backgroundColor": "#ffffff",
@@ -538,22 +537,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
               >
                 Ethereum Mainnet
               </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                etherscan.io
-              </Text>
             </View>
             <View
               style={
@@ -605,7 +588,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
               "variant": "Network",
             }
           }
-          secondaryText="lineascan.build"
           style={
             {
               "backgroundColor": "#ffffff",
@@ -684,22 +666,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
               >
                 Linea
               </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                lineascan.build
-              </Text>
             </View>
             <View
               style={
@@ -739,578 +705,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
             </View>
           </View>
         </TouchableOpacity>
-        <TouchableOpacity
-          avatarProps={
-            {
-              "imageSource": undefined,
-              "name": "Goerli",
-              "variant": "Network",
-            }
-          }
-          secondaryText="etherscan.io"
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 4,
-              "borderWidth": 0,
-              "padding": 16,
-            }
-          }
-          testID="celldisplay"
-          title="Goerli"
-        >
-          <View
-            style={
-              {
-                "flexDirection": "row",
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#f2f4f6",
-                  "borderRadius": 16,
-                  "borderWidth": 1,
-                  "height": 32,
-                  "justifyContent": "center",
-                  "marginRight": 16,
-                  "overflow": "hidden",
-                  "width": 32,
-                }
-              }
-              testID="cellbase-avatar"
-            >
-              <Text
-                accessibilityRole="text"
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                G
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "alignItems": "flex-start",
-                  "flex": 1,
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-                testID="cellbase-avatar-title"
-              >
-                Goerli
-              </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                etherscan.io
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "marginLeft": 16,
-                }
-              }
-            >
-              <RCTSwitch
-                accessibilityRole="switch"
-                onChange={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                onTintColor="#0376c9"
-                style={
-                  [
-                    {
-                      "height": 31,
-                      "width": 51,
-                    },
-                    [
-                      {
-                        "alignSelf": "flex-start",
-                      },
-                      {
-                        "backgroundColor": "#bbc0c566",
-                        "borderRadius": 16,
-                      },
-                    ],
-                  ]
-                }
-                testID=""
-                thumbTintColor="#ffffff"
-                tintColor="#bbc0c566"
-                value={true}
-              />
-            </View>
-          </View>
-        </TouchableOpacity>
-        <TouchableOpacity
-          avatarProps={
-            {
-              "imageSource": {
-                "default": {
-                  "uri": "MockImage",
-                },
-              },
-              "name": "Sepolia",
-              "variant": "Network",
-            }
-          }
-          secondaryText="etherscan.io"
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 4,
-              "borderWidth": 0,
-              "padding": 16,
-            }
-          }
-          testID="celldisplay"
-          title="Sepolia"
-        >
-          <View
-            style={
-              {
-                "flexDirection": "row",
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#ffffff",
-                  "borderRadius": 16,
-                  "height": 32,
-                  "justifyContent": "center",
-                  "marginRight": 16,
-                  "overflow": "hidden",
-                  "width": 32,
-                }
-              }
-              testID="cellbase-avatar"
-            >
-              <Image
-                onError={[Function]}
-                resizeMode="contain"
-                source={
-                  {
-                    "default": {
-                      "uri": "MockImage",
-                    },
-                  }
-                }
-                style={
-                  {
-                    "height": 32,
-                    "width": 32,
-                  }
-                }
-                testID="network-avatar-image"
-              />
-            </View>
-            <View
-              style={
-                {
-                  "alignItems": "flex-start",
-                  "flex": 1,
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-                testID="cellbase-avatar-title"
-              >
-                Sepolia
-              </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                etherscan.io
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "marginLeft": 16,
-                }
-              }
-            >
-              <RCTSwitch
-                accessibilityRole="switch"
-                onChange={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                onTintColor="#0376c9"
-                style={
-                  [
-                    {
-                      "height": 31,
-                      "width": 51,
-                    },
-                    [
-                      {
-                        "alignSelf": "flex-start",
-                      },
-                      {
-                        "backgroundColor": "#bbc0c566",
-                        "borderRadius": 16,
-                      },
-                    ],
-                  ]
-                }
-                testID=""
-                thumbTintColor="#ffffff"
-                tintColor="#bbc0c566"
-                value={true}
-              />
-            </View>
-          </View>
-        </TouchableOpacity>
-        <TouchableOpacity
-          avatarProps={
-            {
-              "imageSource": undefined,
-              "name": "Linea Goerli",
-              "variant": "Network",
-            }
-          }
-          secondaryText="lineascan.build"
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 4,
-              "borderWidth": 0,
-              "padding": 16,
-            }
-          }
-          testID="celldisplay"
-          title="Linea Goerli"
-        >
-          <View
-            style={
-              {
-                "flexDirection": "row",
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#f2f4f6",
-                  "borderRadius": 16,
-                  "borderWidth": 1,
-                  "height": 32,
-                  "justifyContent": "center",
-                  "marginRight": 16,
-                  "overflow": "hidden",
-                  "width": 32,
-                }
-              }
-              testID="cellbase-avatar"
-            >
-              <Text
-                accessibilityRole="text"
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                L
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "alignItems": "flex-start",
-                  "flex": 1,
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-                testID="cellbase-avatar-title"
-              >
-                Linea Goerli
-              </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                lineascan.build
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "marginLeft": 16,
-                }
-              }
-            >
-              <RCTSwitch
-                accessibilityRole="switch"
-                onChange={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                onTintColor="#0376c9"
-                style={
-                  [
-                    {
-                      "height": 31,
-                      "width": 51,
-                    },
-                    [
-                      {
-                        "alignSelf": "flex-start",
-                      },
-                      {
-                        "backgroundColor": "#bbc0c566",
-                        "borderRadius": 16,
-                      },
-                    ],
-                  ]
-                }
-                testID=""
-                thumbTintColor="#ffffff"
-                tintColor="#bbc0c566"
-                value={true}
-              />
-            </View>
-          </View>
-        </TouchableOpacity>
-        <TouchableOpacity
-          avatarProps={
-            {
-              "imageSource": {
-                "default": {
-                  "uri": "MockImage",
-                },
-              },
-              "name": "Linea Sepolia",
-              "variant": "Network",
-            }
-          }
-          secondaryText="lineascan.build"
-          style={
-            {
-              "backgroundColor": "#ffffff",
-              "borderColor": "#bbc0c5",
-              "borderRadius": 4,
-              "borderWidth": 0,
-              "padding": 16,
-            }
-          }
-          testID="celldisplay"
-          title="Linea Sepolia"
-        >
-          <View
-            style={
-              {
-                "flexDirection": "row",
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#ffffff",
-                  "borderRadius": 16,
-                  "height": 32,
-                  "justifyContent": "center",
-                  "marginRight": 16,
-                  "overflow": "hidden",
-                  "width": 32,
-                }
-              }
-              testID="cellbase-avatar"
-            >
-              <Image
-                onError={[Function]}
-                resizeMode="contain"
-                source={
-                  {
-                    "default": {
-                      "uri": "MockImage",
-                    },
-                  }
-                }
-                style={
-                  {
-                    "height": 32,
-                    "width": 32,
-                  }
-                }
-                testID="network-avatar-image"
-              />
-            </View>
-            <View
-              style={
-                {
-                  "alignItems": "flex-start",
-                  "flex": 1,
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#141618",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-                testID="cellbase-avatar-title"
-              >
-                Linea Sepolia
-              </Text>
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#6a737d",
-                    "fontFamily": "EuclidCircularB-Regular",
-                    "fontSize": 14,
-                    "fontWeight": "400",
-                    "letterSpacing": 0,
-                    "lineHeight": 22,
-                  }
-                }
-              >
-                lineascan.build
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "marginLeft": 16,
-                }
-              }
-            >
-              <RCTSwitch
-                accessibilityRole="switch"
-                onChange={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                onTintColor="#0376c9"
-                style={
-                  [
-                    {
-                      "height": 31,
-                      "width": 51,
-                    },
-                    [
-                      {
-                        "alignSelf": "flex-start",
-                      },
-                      {
-                        "backgroundColor": "#bbc0c566",
-                        "borderRadius": 16,
-                      },
-                    ],
-                  ]
-                }
-                testID=""
-                thumbTintColor="#ffffff"
-                tintColor="#bbc0c566"
-                value={true}
-              />
-            </View>
-          </View>
-        </TouchableOpacity>
       </View>
     </View>
     <View
diff --git a/app/components/Views/QRTabSwitcher/QRTabSwitcher.test.tsx b/app/components/Views/QRTabSwitcher/QRTabSwitcher.test.tsx
index d3f6db25b6c..0545e0cb756 100644
--- a/app/components/Views/QRTabSwitcher/QRTabSwitcher.test.tsx
+++ b/app/components/Views/QRTabSwitcher/QRTabSwitcher.test.tsx
@@ -35,8 +35,15 @@ jest.mock('@react-navigation/compat', () => {
 jest.mock('../QRScanner', () => jest.fn(() => null));
 jest.mock('../../UI/ReceiveRequest', () => jest.fn(() => null));
 
+jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
+
 describe('QRTabSwitcher', () => {
-  beforeAll(() => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.runAllTimers();
     jest.useFakeTimers();
   });
 
@@ -46,6 +53,7 @@ describe('QRTabSwitcher', () => {
 
   it('renders QRScanner by default', () => {
     const { getByText } = render(<QRTabSwitcher />);
+    jest.runAllTimers();
     expect(getByText(strings('qr_tab_switcher.scanner_tab'))).toBeTruthy();
   });
 
@@ -57,6 +65,7 @@ describe('QRTabSwitcher', () => {
       },
     });
     const { queryByText } = render(<QRTabSwitcher />);
+    jest.runAllTimers();
     expect(queryByText(strings('qr_tab_switcher.scanner_tab'))).toBeNull();
     expect(queryByText(strings('qr_tab_switcher.receive_tab'))).toBeNull();
   });
diff --git a/app/components/Views/Settings/IncomingTransactionsSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/IncomingTransactionsSettings/__snapshots__/index.test.tsx.snap
index e70c5d9ba67..d5c68712aff 100644
--- a/app/components/Views/Settings/IncomingTransactionsSettings/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/Settings/IncomingTransactionsSettings/__snapshots__/index.test.tsx.snap
@@ -61,7 +61,6 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
           "variant": "Network",
         }
       }
-      secondaryText="etherscan.io"
       style={
         {
           "backgroundColor": "#ffffff",
@@ -140,22 +139,6 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
           >
             Mainnet
           </Text>
-          <Text
-            accessibilityRole="text"
-            numberOfLines={1}
-            style={
-              {
-                "color": "#6a737d",
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            etherscan.io
-          </Text>
         </View>
         <View
           style={
@@ -207,7 +190,6 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
           "variant": "Network",
         }
       }
-      secondaryText="lineascan.build"
       style={
         {
           "backgroundColor": "#ffffff",
@@ -286,22 +268,6 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
           >
             Linea Mainnet
           </Text>
-          <Text
-            accessibilityRole="text"
-            numberOfLines={1}
-            style={
-              {
-                "color": "#6a737d",
-                "fontFamily": "EuclidCircularB-Regular",
-                "fontSize": 14,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": 22,
-              }
-            }
-          >
-            lineascan.build
-          </Text>
         </View>
         <View
           style={
diff --git a/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx b/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
index 09d170b6153..cef7cf2b9e8 100644
--- a/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
+++ b/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
@@ -18,7 +18,6 @@ import {
 } from '../../../../selectors/preferencesController';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
 import { EtherscanSupportedHexChainId } from '@metamask/preferences-controller';
-import { ETHERSCAN_SUPPORTED_NETWORKS } from '@metamask/transaction-controller';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import styleSheet from './index.styles';
 import {
@@ -29,6 +28,8 @@ import {
 import { NetworksI } from './index.types';
 import NetworkCell from '../../../UI/NetworkCell/NetworkCell';
 import { MAINNET, LINEA_MAINNET } from '../../../../../app/constants/network';
+import { INCOMING_TRANSACTIONS_SUPPORTED_CHAIN_IDS } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
 
 const IncomingTransactionsSettings = () => {
   const { styles } = useStyles(styleSheet, {});
@@ -40,14 +41,12 @@ const IncomingTransactionsSettings = () => {
 
   const networkConfigurations = useSelector(selectNetworkConfigurations);
 
-  const supportedNetworks = ETHERSCAN_SUPPORTED_NETWORKS;
-
   const toggleEnableIncomingTransactions = (
-    hexChainId: EtherscanSupportedHexChainId,
+    hexChainId: Hex,
     value: boolean,
   ) => {
     PreferencesController.setEnableNetworkIncomingTransactions(
-      hexChainId,
+      hexChainId as EtherscanSupportedHexChainId,
       value,
     );
   };
@@ -73,7 +72,10 @@ const IncomingTransactionsSettings = () => {
       chainId,
       defaultRpcEndpointIndex,
     }: NetworkConfiguration) => {
-      if (!chainId || !Object.keys(supportedNetworks).includes(chainId))
+      if (
+        !chainId ||
+        !INCOMING_TRANSACTIONS_SUPPORTED_CHAIN_IDS.includes(chainId)
+      )
         return null;
 
       const rpcUrl = rpcEndpoints[defaultRpcEndpointIndex].url;
@@ -88,8 +90,6 @@ const IncomingTransactionsSettings = () => {
 
       //@ts-expect-error - The utils/network file is still JS and this function expects a networkType, and should be optional
       const image = getNetworkImageSource({ chainId: chainId?.toString() });
-      const secondaryText =
-        supportedNetworks[chainId as keyof typeof supportedNetworks].domain;
 
       return (
         <NetworkCell
@@ -97,7 +97,6 @@ const IncomingTransactionsSettings = () => {
           name={name}
           chainId={chainId as EtherscanSupportedHexChainId}
           imageSource={image}
-          secondaryText={secondaryText}
           showIncomingTransactionsNetworks={showIncomingTransactionsNetworks}
           toggleEnableIncomingTransactions={toggleEnableIncomingTransactions}
           testID={testId}
@@ -113,16 +112,15 @@ const IncomingTransactionsSettings = () => {
     const getOtherNetworks = () => getAllNetworks().slice(2);
     return getOtherNetworks().map((networkType) => {
       const { name, imageSource, chainId } = NetworksTyped[networkType];
+
       if (!chainId) return null;
-      const secondaryText =
-        supportedNetworks[chainId as keyof typeof supportedNetworks].domain;
+
       return (
         <NetworkCell
           key={`${name}-${chainId}`}
           name={name}
-          chainId={chainId as keyof typeof supportedNetworks}
+          chainId={chainId as Hex}
           imageSource={imageSource as ImageSourcePropType}
-          secondaryText={secondaryText}
           showIncomingTransactionsNetworks={showIncomingTransactionsNetworks}
           toggleEnableIncomingTransactions={toggleEnableIncomingTransactions}
         />
diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 21c7659023a..f937c9130ac 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -541,7 +541,7 @@ export class NetworkSettings extends PureComponent {
         editable = false;
         blockExplorerUrl =
           networkConfigurations?.[chainId]?.blockExplorerUrls[
-            networkConfigurations?.[chainId]?.defaultBlockExplorerUrlIndex
+          networkConfigurations?.[chainId]?.defaultBlockExplorerUrlIndex
           ];
         rpcUrl =
           networkConfigurations?.[chainId]?.rpcEndpoints[
@@ -563,13 +563,13 @@ export class NetworkSettings extends PureComponent {
           ({ rpcEndpoints, defaultRpcEndpointIndex }) =>
             rpcEndpoints[defaultRpcEndpointIndex].url === networkTypeOrRpcUrl ||
             rpcEndpoints[defaultRpcEndpointIndex].networkClientId ===
-              networkTypeOrRpcUrl,
+            networkTypeOrRpcUrl,
         );
         nickname = networkConfiguration?.name;
         chainId = networkConfiguration?.chainId;
         blockExplorerUrl =
           networkConfiguration?.blockExplorerUrls[
-            networkConfiguration?.defaultBlockExplorerUrlIndex
+          networkConfiguration?.defaultBlockExplorerUrlIndex
           ];
         ticker = networkConfiguration?.nativeCurrency;
         editable = true;
@@ -854,8 +854,8 @@ export class NetworkSettings extends PureComponent {
         networkConfig,
         existingNetwork.chainId === chainId
           ? {
-              replacementSelectedRpcEndpointIndex: indexRpc,
-            }
+            replacementSelectedRpcEndpointIndex: indexRpc,
+          }
           : undefined,
       );
     } else {
@@ -867,8 +867,8 @@ export class NetworkSettings extends PureComponent {
     isCustomMainnet
       ? navigation.navigate('OptinMetrics')
       : shouldNetworkSwitchPopToWallet
-      ? navigation.navigate('WalletView')
-      : navigation.goBack();
+        ? navigation.navigate('WalletView')
+        : navigation.goBack();
   };
 
   /**
@@ -1534,13 +1534,13 @@ export class NetworkSettings extends PureComponent {
 
     const { networkClientId } =
       networkConfigurations?.rpcEndpoints?.[
-        networkConfigurations.defaultRpcEndpointIndex
+      networkConfigurations.defaultRpcEndpointIndex
       ] ?? {};
 
     NetworkController.setActiveNetwork(networkClientId);
 
     setTimeout(async () => {
-      await updateIncomingTransactions([networkClientId]);
+      await updateIncomingTransactions([CHAIN_IDS.MAINNET]);
     }, 1000);
   };
 
@@ -1950,15 +1950,15 @@ export class NetworkSettings extends PureComponent {
                   // Conditionally include secondaryText only if rpcName exists
                   {...(rpcName
                     ? {
-                        secondaryText:
-                          hideKeyFromUrl(rpcUrl) ??
-                          hideKeyFromUrl(
-                            networkConfigurations?.[chainId]?.rpcEndpoints?.[
-                              networkConfigurations?.[chainId]
-                                ?.defaultRpcEndpointIndex
-                            ]?.url,
-                          ),
-                      }
+                      secondaryText:
+                        hideKeyFromUrl(rpcUrl) ??
+                        hideKeyFromUrl(
+                          networkConfigurations?.[chainId]?.rpcEndpoints?.[
+                            networkConfigurations?.[chainId]
+                              ?.defaultRpcEndpointIndex
+                          ]?.url,
+                        ),
+                    }
                     : {})}
                   isSelected={false}
                   withAvatar={false}
@@ -1993,17 +1993,17 @@ export class NetworkSettings extends PureComponent {
 
             {!isNetworkUiRedesignEnabled()
               ? warningRpcUrl && (
-                  <View
-                    style={
-                      isNetworkUiRedesignEnabled()
-                        ? styles.newWarningContainer
-                        : styles.warningContainer
-                    }
-                    testID={NetworksViewSelectorsIDs.RPC_WARNING_BANNER}
-                  >
-                    <Text style={styles.warningText}>{warningRpcUrl}</Text>
-                  </View>
-                )
+                <View
+                  style={
+                    isNetworkUiRedesignEnabled()
+                      ? styles.newWarningContainer
+                      : styles.warningContainer
+                  }
+                  testID={NetworksViewSelectorsIDs.RPC_WARNING_BANNER}
+                >
+                  <Text style={styles.warningText}>{warningRpcUrl}</Text>
+                </View>
+              )
               : null}
 
             <Text style={styles.label}>
@@ -2268,7 +2268,7 @@ export class NetworkSettings extends PureComponent {
         ) : null}
 
         {isNetworkUiRedesignEnabled() &&
-        showMultiBlockExplorerAddModal.isVisible ? (
+          showMultiBlockExplorerAddModal.isVisible ? (
           <ReusableModal
             style={
               blockExplorerUrls.length > 0 ? styles.sheet : styles.sheetSmall
@@ -2478,7 +2478,7 @@ export class NetworkSettings extends PureComponent {
       >
         <View style={styles.informationWrapper}>
           {(isNetworkUiRedesignEnabled() && !shouldShowPopularNetworks) ||
-          networkTypeOrRpcUrl ? (
+            networkTypeOrRpcUrl ? (
             this.customNetwork()
           ) : (
             <ScrollableTabView
diff --git a/app/components/Views/Settings/NetworksSettings/index.js b/app/components/Views/Settings/NetworksSettings/index.js
index 94f55a5e114..a947f999e83 100644
--- a/app/components/Views/Settings/NetworksSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/index.js
@@ -44,6 +44,7 @@ import { updateIncomingTransactions } from '../../../../util/transaction-control
 import { NetworksTicker } from '@metamask/controller-utils';
 import NetworkSearchTextInput from '../../NetworkSelector/NetworkSearchTextInput';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { getGlobalChainId } from '../../../../util/networks/global-network';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -191,7 +192,7 @@ class NetworksSettings extends PureComponent {
     NetworkController.setProviderType(MAINNET);
 
     setTimeout(async () => {
-      await updateIncomingTransactions([MAINNET]);
+      await updateIncomingTransactions([CHAIN_IDS.MAINNET]);
     }, 1000);
   };
 
@@ -451,7 +452,7 @@ class NetworksSettings extends PureComponent {
       (networkConfiguration, i) => {
         const defaultRpcEndpoint =
           networkConfiguration.rpcEndpoints[
-            networkConfiguration.defaultRpcEndpointIndex
+          networkConfiguration.defaultRpcEndpointIndex
           ];
         const { color, name, url, chainId } = {
           name: networkConfiguration.name || defaultRpcEndpoint.url,
diff --git a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
index 8f218fb0c8b..8cd3a457694 100644
--- a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
+++ b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
@@ -1563,7 +1563,6 @@ exports[`SecuritySettings should render correctly 1`] = `
                 "variant": "Network",
               }
             }
-            secondaryText="etherscan.io"
             style={
               {
                 "backgroundColor": "#ffffff",
@@ -1642,22 +1641,6 @@ exports[`SecuritySettings should render correctly 1`] = `
                 >
                   Ethereum Mainnet
                 </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  etherscan.io
-                </Text>
               </View>
               <View
                 style={
@@ -1709,7 +1692,6 @@ exports[`SecuritySettings should render correctly 1`] = `
                 "variant": "Network",
               }
             }
-            secondaryText="lineascan.build"
             style={
               {
                 "backgroundColor": "#ffffff",
@@ -1788,22 +1770,6 @@ exports[`SecuritySettings should render correctly 1`] = `
                 >
                   Linea
                 </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  lineascan.build
-                </Text>
               </View>
               <View
                 style={
@@ -1843,578 +1809,6 @@ exports[`SecuritySettings should render correctly 1`] = `
               </View>
             </View>
           </TouchableOpacity>
-          <TouchableOpacity
-            avatarProps={
-              {
-                "imageSource": undefined,
-                "name": "Goerli",
-                "variant": "Network",
-              }
-            }
-            secondaryText="etherscan.io"
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
-                "borderRadius": 4,
-                "borderWidth": 0,
-                "padding": 16,
-              }
-            }
-            testID="celldisplay"
-            title="Goerli"
-          >
-            <View
-              style={
-                {
-                  "flexDirection": "row",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "backgroundColor": "#f2f4f6",
-                    "borderRadius": 16,
-                    "borderWidth": 1,
-                    "height": 32,
-                    "justifyContent": "center",
-                    "marginRight": 16,
-                    "overflow": "hidden",
-                    "width": 32,
-                  }
-                }
-                testID="cellbase-avatar"
-              >
-                <Text
-                  accessibilityRole="text"
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                >
-                  G
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-start",
-                    "flex": 1,
-                  }
-                }
-              >
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                  testID="cellbase-avatar-title"
-                >
-                  Goerli
-                </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  etherscan.io
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "marginLeft": 16,
-                  }
-                }
-              >
-                <RCTSwitch
-                  accessibilityRole="switch"
-                  onChange={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  onTintColor="#0376c9"
-                  style={
-                    [
-                      {
-                        "height": 31,
-                        "width": 51,
-                      },
-                      [
-                        {
-                          "alignSelf": "flex-start",
-                        },
-                        {
-                          "backgroundColor": "#bbc0c566",
-                          "borderRadius": 16,
-                        },
-                      ],
-                    ]
-                  }
-                  testID=""
-                  thumbTintColor="#ffffff"
-                  tintColor="#bbc0c566"
-                  value={true}
-                />
-              </View>
-            </View>
-          </TouchableOpacity>
-          <TouchableOpacity
-            avatarProps={
-              {
-                "imageSource": {
-                  "default": {
-                    "uri": "MockImage",
-                  },
-                },
-                "name": "Sepolia",
-                "variant": "Network",
-              }
-            }
-            secondaryText="etherscan.io"
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
-                "borderRadius": 4,
-                "borderWidth": 0,
-                "padding": 16,
-              }
-            }
-            testID="celldisplay"
-            title="Sepolia"
-          >
-            <View
-              style={
-                {
-                  "flexDirection": "row",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "backgroundColor": "#ffffff",
-                    "borderRadius": 16,
-                    "height": 32,
-                    "justifyContent": "center",
-                    "marginRight": 16,
-                    "overflow": "hidden",
-                    "width": 32,
-                  }
-                }
-                testID="cellbase-avatar"
-              >
-                <Image
-                  onError={[Function]}
-                  resizeMode="contain"
-                  source={
-                    {
-                      "default": {
-                        "uri": "MockImage",
-                      },
-                    }
-                  }
-                  style={
-                    {
-                      "height": 32,
-                      "width": 32,
-                    }
-                  }
-                  testID="network-avatar-image"
-                />
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-start",
-                    "flex": 1,
-                  }
-                }
-              >
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                  testID="cellbase-avatar-title"
-                >
-                  Sepolia
-                </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  etherscan.io
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "marginLeft": 16,
-                  }
-                }
-              >
-                <RCTSwitch
-                  accessibilityRole="switch"
-                  onChange={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  onTintColor="#0376c9"
-                  style={
-                    [
-                      {
-                        "height": 31,
-                        "width": 51,
-                      },
-                      [
-                        {
-                          "alignSelf": "flex-start",
-                        },
-                        {
-                          "backgroundColor": "#bbc0c566",
-                          "borderRadius": 16,
-                        },
-                      ],
-                    ]
-                  }
-                  testID=""
-                  thumbTintColor="#ffffff"
-                  tintColor="#bbc0c566"
-                  value={true}
-                />
-              </View>
-            </View>
-          </TouchableOpacity>
-          <TouchableOpacity
-            avatarProps={
-              {
-                "imageSource": undefined,
-                "name": "Linea Goerli",
-                "variant": "Network",
-              }
-            }
-            secondaryText="lineascan.build"
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
-                "borderRadius": 4,
-                "borderWidth": 0,
-                "padding": 16,
-              }
-            }
-            testID="celldisplay"
-            title="Linea Goerli"
-          >
-            <View
-              style={
-                {
-                  "flexDirection": "row",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "backgroundColor": "#f2f4f6",
-                    "borderRadius": 16,
-                    "borderWidth": 1,
-                    "height": 32,
-                    "justifyContent": "center",
-                    "marginRight": 16,
-                    "overflow": "hidden",
-                    "width": 32,
-                  }
-                }
-                testID="cellbase-avatar"
-              >
-                <Text
-                  accessibilityRole="text"
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                >
-                  L
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-start",
-                    "flex": 1,
-                  }
-                }
-              >
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                  testID="cellbase-avatar-title"
-                >
-                  Linea Goerli
-                </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  lineascan.build
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "marginLeft": 16,
-                  }
-                }
-              >
-                <RCTSwitch
-                  accessibilityRole="switch"
-                  onChange={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  onTintColor="#0376c9"
-                  style={
-                    [
-                      {
-                        "height": 31,
-                        "width": 51,
-                      },
-                      [
-                        {
-                          "alignSelf": "flex-start",
-                        },
-                        {
-                          "backgroundColor": "#bbc0c566",
-                          "borderRadius": 16,
-                        },
-                      ],
-                    ]
-                  }
-                  testID=""
-                  thumbTintColor="#ffffff"
-                  tintColor="#bbc0c566"
-                  value={true}
-                />
-              </View>
-            </View>
-          </TouchableOpacity>
-          <TouchableOpacity
-            avatarProps={
-              {
-                "imageSource": {
-                  "default": {
-                    "uri": "MockImage",
-                  },
-                },
-                "name": "Linea Sepolia",
-                "variant": "Network",
-              }
-            }
-            secondaryText="lineascan.build"
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
-                "borderRadius": 4,
-                "borderWidth": 0,
-                "padding": 16,
-              }
-            }
-            testID="celldisplay"
-            title="Linea Sepolia"
-          >
-            <View
-              style={
-                {
-                  "flexDirection": "row",
-                }
-              }
-            >
-              <View
-                style={
-                  {
-                    "alignItems": "center",
-                    "backgroundColor": "#ffffff",
-                    "borderRadius": 16,
-                    "height": 32,
-                    "justifyContent": "center",
-                    "marginRight": 16,
-                    "overflow": "hidden",
-                    "width": 32,
-                  }
-                }
-                testID="cellbase-avatar"
-              >
-                <Image
-                  onError={[Function]}
-                  resizeMode="contain"
-                  source={
-                    {
-                      "default": {
-                        "uri": "MockImage",
-                      },
-                    }
-                  }
-                  style={
-                    {
-                      "height": 32,
-                      "width": 32,
-                    }
-                  }
-                  testID="network-avatar-image"
-                />
-              </View>
-              <View
-                style={
-                  {
-                    "alignItems": "flex-start",
-                    "flex": 1,
-                  }
-                }
-              >
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#141618",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 16,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                    }
-                  }
-                  testID="cellbase-avatar-title"
-                >
-                  Linea Sepolia
-                </Text>
-                <Text
-                  accessibilityRole="text"
-                  numberOfLines={1}
-                  style={
-                    {
-                      "color": "#6a737d",
-                      "fontFamily": "EuclidCircularB-Regular",
-                      "fontSize": 14,
-                      "fontWeight": "400",
-                      "letterSpacing": 0,
-                      "lineHeight": 22,
-                    }
-                  }
-                >
-                  lineascan.build
-                </Text>
-              </View>
-              <View
-                style={
-                  {
-                    "marginLeft": 16,
-                  }
-                }
-              >
-                <RCTSwitch
-                  accessibilityRole="switch"
-                  onChange={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  onTintColor="#0376c9"
-                  style={
-                    [
-                      {
-                        "height": 31,
-                        "width": 51,
-                      },
-                      [
-                        {
-                          "alignSelf": "flex-start",
-                        },
-                        {
-                          "backgroundColor": "#bbc0c566",
-                          "borderRadius": 16,
-                        },
-                      ],
-                    ]
-                  }
-                  testID=""
-                  thumbTintColor="#ffffff"
-                  tintColor="#bbc0c566"
-                  value={true}
-                />
-              </View>
-            </View>
-          </TouchableOpacity>
         </View>
       </View>
       <Modal
diff --git a/app/components/Views/TransactionsView/index.js b/app/components/Views/TransactionsView/index.js
index 4f60b3fb2d5..b8403b76e4f 100644
--- a/app/components/Views/TransactionsView/index.js
+++ b/app/components/Views/TransactionsView/index.js
@@ -27,7 +27,7 @@ import {
   selectConversionRate,
   selectCurrentCurrency,
 } from '../../../selectors/currencyRateController';
-import { selectTokens } from '../../../selectors/tokensController';
+import { selectAllTokensFlat, selectTokens } from '../../../selectors/tokensController';
 import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
 import { store } from '../../../store';
 import { NETWORK_ID_LOADING } from '../../../core/redux/slices/inpageProvider';
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index 15f495955b6..df2a6c4fef2 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -501,7 +501,7 @@ const Wallet = ({
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let stakedBalance: any = 0;
 
-    const assets = isPortfolioViewEnabled
+    const assets = isPortfolioViewEnabled()
       ? [...(tokensByChainIdAndAddress || [])]
       : [...(tokens || [])];
 
diff --git a/app/components/Views/confirmations/ApproveView/Approve/index.test.tsx b/app/components/Views/confirmations/ApproveView/Approve/index.test.tsx
index 91b67a3beba..2dc54176d7d 100644
--- a/app/components/Views/confirmations/ApproveView/Approve/index.test.tsx
+++ b/app/components/Views/confirmations/ApproveView/Approve/index.test.tsx
@@ -97,6 +97,34 @@ describe('Approve', () => {
       alert: {
         isVisible: false,
       },
+      engine: {
+        backgroundState: {
+          ...initialRootState.engine.backgroundState,
+          AccountsController: {
+            ...initialRootState.engine.backgroundState.AccountsController,
+            internalAccounts: {
+              ...initialRootState.engine.backgroundState.AccountsController
+                .internalAccounts,
+              selectedAccount: '30786334-3935-4563-b064-363339643939',
+              accounts: {
+                '30786334-3935-4563-b064-363339643939': {
+                  address: '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272',
+                },
+              },
+            },
+          },
+          TokensController: {
+            ...initialRootState.engine.backgroundState.TokensController,
+            allTokens: {
+              ...initialRootState.engine.backgroundState.TokensController
+                .allTokens,
+              '0x1': {
+                '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272': [],
+              },
+            },
+          },
+        },
+      },
     });
   });
 
@@ -131,6 +159,29 @@ describe('Approve', () => {
               },
             ],
           },
+          AccountsController: {
+            ...initialRootState.engine.backgroundState.AccountsController,
+            internalAccounts: {
+              ...initialRootState.engine.backgroundState.AccountsController
+                .internalAccounts,
+              selectedAccount: '30786334-3935-4563-b064-363339643939',
+              accounts: {
+                '30786334-3935-4563-b064-363339643939': {
+                  address: '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272',
+                },
+              },
+            },
+          },
+          TokensController: {
+            ...initialRootState.engine.backgroundState.TokensController,
+            allTokens: {
+              ...initialRootState.engine.backgroundState.TokensController
+                .allTokens,
+              '0x1': {
+                '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272': [],
+              },
+            },
+          },
         },
       },
     });
diff --git a/app/components/Views/confirmations/SendFlow/Amount/index.test.tsx b/app/components/Views/confirmations/SendFlow/Amount/index.test.tsx
index 5ffa1f47f4c..4f57005c85d 100644
--- a/app/components/Views/confirmations/SendFlow/Amount/index.test.tsx
+++ b/app/components/Views/confirmations/SendFlow/Amount/index.test.tsx
@@ -9,7 +9,6 @@ import TransactionTypes from '../../../../../core/TransactionTypes';
 import { AmountViewSelectorsIDs } from '../../../../../../e2e/selectors/SendFlow/AmountView.selectors';
 
 import { backgroundState } from '../../../../../util/test/initial-root-state';
-import { createMockAccountsControllerState } from '../../../../../util/test/accountsControllerTestUtils';
 
 const mockTransactionTypes = TransactionTypes;
 
@@ -73,10 +72,6 @@ const mockNavigate = jest.fn();
 const CURRENT_ACCOUNT = '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3';
 const RECEIVER_ACCOUNT = '0x2a';
 
-const MOCK_ACCOUNTS_CONTROLLER_STATE = createMockAccountsControllerState([
-  CURRENT_ACCOUNT,
-]);
-
 const initialState = {
   engine: {
     backgroundState: {
@@ -111,11 +106,33 @@ const initialState = {
       AccountTrackerController: {
         accounts: { [CURRENT_ACCOUNT]: { balance: '0' } },
       },
-      AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
+      AccountsController: {
+        internalAccounts: {
+          selectedAccount: CURRENT_ACCOUNT,
+          accounts: {
+            [CURRENT_ACCOUNT]: {
+              address: CURRENT_ACCOUNT,
+            },
+          },
+        },
+      },
       NftController: {
         allNfts: { [CURRENT_ACCOUNT]: { '0x1': [] } },
         allNftContracts: { [CURRENT_ACCOUNT]: { '0x1': [] } },
       },
+      TokensController: {
+        allTokens: {
+          '0x1': {
+            [CURRENT_ACCOUNT]: [
+              {
+                address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                symbol: 'LINK',
+                decimals: 18,
+              },
+            ],
+          },
+        },
+      },
     },
   },
   settings: {
@@ -177,6 +194,23 @@ describe('Amount', () => {
               },
             },
           },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [],
+              },
+            },
+          },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
         },
       },
       transaction: {
@@ -223,6 +257,23 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [],
+              },
+            },
+          },
         },
       },
       transaction: {
@@ -287,6 +338,23 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [],
+              },
+            },
+          },
         },
       },
       transaction: {
@@ -347,6 +415,29 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [
+                  {
+                    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                    symbol: 'LINK',
+                    decimals: 18,
+                  },
+                ],
+              },
+            },
+          },
         },
       },
       transaction: {
@@ -402,6 +493,29 @@ describe('Amount', () => {
               },
             },
           },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [
+                  {
+                    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                    symbol: 'LINK',
+                    decimals: 18,
+                  },
+                ],
+              },
+            },
+          },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
         },
       },
       transaction: {
@@ -450,6 +564,23 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [],
+              },
+            },
+          },
         },
       },
       settings: {
@@ -499,6 +630,29 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: CURRENT_ACCOUNT,
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [
+                  {
+                    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                    symbol: 'LINK',
+                    decimals: 18,
+                  },
+                ],
+              },
+            },
+          },
           CurrencyRateController: {
             currentCurrency: 'usd',
             currencyRates: {
@@ -552,6 +706,29 @@ describe('Amount', () => {
           TokenRatesController: {
             marketData: {},
           },
+          AccountsController: {
+            internalAccounts: {
+              accounts: {
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+              selectedAccount: CURRENT_ACCOUNT,
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [
+                  {
+                    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                    symbol: 'LINK',
+                    decimals: 18,
+                  },
+                ],
+              },
+            },
+          },
           CurrencyRateController: {},
         },
       },
@@ -597,6 +774,33 @@ describe('Amount', () => {
               },
             },
           },
+          AccountsController: {
+            internalAccounts: {
+              ...initialState.engine.backgroundState.AccountsController
+                .internalAccounts,
+              accounts: {
+                ...initialState.engine.backgroundState.AccountsController
+                  .internalAccounts.accounts,
+                [CURRENT_ACCOUNT]: {
+                  address: CURRENT_ACCOUNT,
+                },
+              },
+              selectedAccount: CURRENT_ACCOUNT,
+            },
+          },
+          TokensController: {
+            allTokens: {
+              '0x1': {
+                [CURRENT_ACCOUNT]: [
+                  {
+                    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+                    symbol: 'LINK',
+                    decimals: 18,
+                  },
+                ],
+              },
+            },
+          },
           CurrencyRateController: {},
         },
       },
@@ -638,6 +842,24 @@ describe('Amount', () => {
         ...initialState.engine,
         backgroundState: {
           ...initialState.engine.backgroundState,
+          TokensController: {
+            tokens: [],
+            allTokens: {
+              '0x1': {
+                '0xAddress1': [],
+              },
+            },
+          },
+          AccountsController: {
+            internalAccounts: {
+              selectedAccount: '0xAddress1',
+              accounts: {
+                '0xAddress1': {
+                  address: '0xAddress1',
+                },
+              },
+            },
+          },
           TokenRatesController: {
             marketData: {
               '0x1': {
diff --git a/app/components/Views/confirmations/components/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.test.tsx b/app/components/Views/confirmations/components/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.test.tsx
index 371d9cd9b48..d8e93bfc710 100644
--- a/app/components/Views/confirmations/components/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.test.tsx
+++ b/app/components/Views/confirmations/components/ApproveTransactionReview/VerifyContractDetails/VerifyContractDetails.test.tsx
@@ -5,7 +5,28 @@ import { backgroundState } from '../../../../../../util/test/initial-root-state'
 
 const initialState = {
   engine: {
-    backgroundState,
+    backgroundState: {
+      ...backgroundState,
+      AccountsController: {
+        ...backgroundState.AccountsController,
+        internalAccounts: {
+          ...backgroundState.AccountsController.internalAccounts,
+          selectedAccount: '30786334-3935-4563-b064-363339643939',
+          accounts: {
+            '30786334-3935-4563-b064-363339643939': {
+              address: '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272',
+            },
+          },
+        },
+      },
+      TokensController: {
+        allTokens: {
+          '0x1': {
+            '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272': [],
+          },
+        },
+      },
+    },
   },
   settings: {
     primaryCurrency: 'ETH',
diff --git a/app/components/Views/confirmations/components/ApproveTransactionReview/index.test.tsx b/app/components/Views/confirmations/components/ApproveTransactionReview/index.test.tsx
index 465c57fd55a..f6a56d3d462 100644
--- a/app/components/Views/confirmations/components/ApproveTransactionReview/index.test.tsx
+++ b/app/components/Views/confirmations/components/ApproveTransactionReview/index.test.tsx
@@ -63,7 +63,27 @@ const transaction = {
 
 const initialState = {
   engine: {
-    backgroundState,
+    backgroundState: {
+      ...backgroundState,
+      TokensController: {
+        tokens: [],
+        allTokens: {
+          '0x1': {
+            '0xAddress1': [],
+          },
+        },
+      },
+      AccountsController: {
+        internalAccounts: {
+          selectedAccount: '0xAddress1',
+          accounts: {
+            '0xAddress1': {
+              address: '0xAddress1',
+            },
+          },
+        },
+      },
+    },
   },
   transaction,
   settings: {
diff --git a/app/components/Views/confirmations/components/Confirm/Info/Info.tsx b/app/components/Views/confirmations/components/Confirm/Info/Info.tsx
index 521f17cb11e..970031579ac 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/Info.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/Info.tsx
@@ -4,10 +4,14 @@ import React from 'react';
 import useApprovalRequest from '../../../hooks/useApprovalRequest';
 import PersonalSign from './PersonalSign';
 import TypedSignV1 from './TypedSignV1';
+import TypedSignV3V4 from './TypedSignV3V4';
 
 const ConfirmationInfoComponentMap = {
   [TransactionType.personalSign]: () => PersonalSign,
-  [TransactionType.signTypedData]: () => TypedSignV1,
+  [TransactionType.signTypedData]: (approvalRequestVersion: string) => {
+    if (approvalRequestVersion === 'V1') return TypedSignV1;
+    return TypedSignV3V4;
+  },
 };
 
 const Info = () => {
@@ -17,10 +21,14 @@ const Info = () => {
     return null;
   }
 
-  const InfoComponent: React.FC =
-    ConfirmationInfoComponentMap[
-      approvalRequest?.type as keyof typeof ConfirmationInfoComponentMap
-    ]();
+  const { requestData } = approvalRequest ?? {
+    requestData: {},
+  };
+  const approvalRequestVersion = requestData?.version;
+
+  const InfoComponent: React.FC = ConfirmationInfoComponentMap[
+    approvalRequest?.type as keyof typeof ConfirmationInfoComponentMap
+  ](approvalRequestVersion);
 
   return <InfoComponent />;
 };
diff --git a/app/components/Views/confirmations/components/Confirm/Info/PersonalSign/PersonalSign.tsx b/app/components/Views/confirmations/components/Confirm/Info/PersonalSign/PersonalSign.tsx
index 53ac21caa1f..524de85cf45 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/PersonalSign/PersonalSign.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/PersonalSign/PersonalSign.tsx
@@ -1,11 +1,8 @@
 import React from 'react';
 
-import { strings } from '../../../../../../../../locales/i18n';
 import useApprovalRequest from '../../../../hooks/useApprovalRequest';
-import InfoSection from '../../../UI/InfoRow/InfoSection';
-import InfoRow from '../../../UI/InfoRow';
-import DisplayURL from '../../../UI/InfoRow/InfoValue/DisplayURL';
 import NoChangeSimulation from '../../NoChangeSimulation';
+import InfoRowOrigin from '../Shared/InfoRowOrigin';
 import Message from './Message';
 
 const PersonalSign = () => {
@@ -18,14 +15,7 @@ const PersonalSign = () => {
   return (
     <>
       <NoChangeSimulation />
-      <InfoSection>
-        <InfoRow
-          label={strings('confirm.request_from')}
-          tooltip={strings('confirm.personal_sign_tooltip')}
-        >
-          <DisplayURL url={approvalRequest.origin} />
-        </InfoRow>
-      </InfoSection>
+      <InfoRowOrigin />
       <Message />
     </>
   );
diff --git a/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.test.tsx b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.test.tsx
new file mode 100644
index 00000000000..2189ae527da
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import renderWithProvider from '../../../../../../../../util/test/renderWithProvider';
+import { typedSignV1ConfirmationState } from '../../../../../../../../util/test/confirm-data-helpers';
+import InfoRowOrigin from './InfoRowOrigin';
+
+describe('InfoRowOrigin', () => {
+  it('should contained required text', async () => {
+    const { getByText } = renderWithProvider(<InfoRowOrigin />, {
+      state: typedSignV1ConfirmationState,
+    });
+    expect(getByText('Request from')).toBeDefined();
+    expect(getByText('metamask.github.io')).toBeDefined();
+  });
+});
diff --git a/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.tsx b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.tsx
new file mode 100644
index 00000000000..aa6bdca8d68
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/InfoRowOrigin.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+
+import { strings } from '../../../../../../../../../locales/i18n';
+import useApprovalRequest from '../../../../../hooks/useApprovalRequest';
+import InfoSection from '../../../../UI/InfoRow/InfoSection';
+import InfoRow from '../../../../UI/InfoRow';
+import DisplayURL from '../../../../UI/InfoRow/InfoValue/DisplayURL';
+
+const InfoRowOrigin = () => {
+  const { approvalRequest } = useApprovalRequest();
+
+  if (!approvalRequest) {
+    return null;
+  }
+
+  return (
+    <InfoSection>
+      <InfoRow
+        label={strings('confirm.request_from')}
+        tooltip={strings('confirm.personal_sign_tooltip')}
+      >
+        <DisplayURL url={approvalRequest.origin} />
+      </InfoRow>
+    </InfoSection>
+  );
+};
+
+export default InfoRowOrigin;
diff --git a/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/index.ts b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/index.ts
new file mode 100644
index 00000000000..94f5edc0c45
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/Shared/InfoRowOrigin/index.ts
@@ -0,0 +1 @@
+export { default } from './InfoRowOrigin';
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.test.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.test.tsx
index 8d99896b962..0c533f651c9 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.test.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import renderWithProvider from '../../../../../../../util/test/renderWithProvider';
 import { typedSignV1ConfirmationState } from '../../../../../../../util/test/confirm-data-helpers';
-import TypedSignV1 from './index';
+import TypedSignV1 from './TypedSignV1';
 
 describe('TypedSignV1', () => {
   it('should contained required text', async () => {
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.tsx
index e4eb92ad8b9..c9823f0320a 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV1/TypedSignV1.tsx
@@ -1,12 +1,9 @@
 import React from 'react';
 
-import { strings } from '../../../../../../../../locales/i18n';
 import useApprovalRequest from '../../../../hooks/useApprovalRequest';
-import InfoSection from '../../../UI/InfoRow/InfoSection';
-import InfoRow from '../../../UI/InfoRow';
-import DisplayURL from '../../../UI/InfoRow/InfoValue/DisplayURL';
-import Message from './Message';
 import NoChangeSimulation from '../../NoChangeSimulation';
+import InfoRowOrigin from '../Shared/InfoRowOrigin';
+import Message from './Message';
 
 const TypedSignV1 = () => {
   const { approvalRequest } = useApprovalRequest();
@@ -18,14 +15,7 @@ const TypedSignV1 = () => {
   return (
     <>
       <NoChangeSimulation />
-      <InfoSection>
-        <InfoRow
-          label={strings('confirm.request_from')}
-          tooltip={strings('confirm.personal_sign_tooltip')}
-        >
-          <DisplayURL url={approvalRequest.origin} />
-        </InfoRow>
-      </InfoSection>
+      <InfoRowOrigin />
       <Message />
     </>
   );
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Message.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Message.tsx
new file mode 100644
index 00000000000..e28269510cb
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Message.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Text } from 'react-native';
+
+import useApprovalRequest from '../../../../hooks/useApprovalRequest';
+import SignatureMessageSection from '../../SignatureMessageSection';
+
+const Message = () => {
+  const { approvalRequest } = useApprovalRequest();
+
+  const typedSignData = approvalRequest?.requestData?.data;
+
+  if (!typedSignData) {
+    return null;
+  }
+
+  const parsedData = JSON.stringify(typedSignData);
+
+  const firstDataValue = parsedData?.substring(0, 100);
+
+  // todo: detailed data tree to be implemented
+  return (
+    <SignatureMessageSection
+      messageCollapsed={<Text>{firstDataValue}</Text>}
+      messageExpanded={<Text>{parsedData}</Text>}
+      copyMessageText={typedSignData}
+    />
+  );
+};
+
+export default Message;
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.test.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.test.tsx
new file mode 100644
index 00000000000..9a45b70fa8c
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import renderWithProvider from '../../../../../../../util/test/renderWithProvider';
+import { typedSignV3ConfirmationState } from '../../../../../../../util/test/confirm-data-helpers';
+import TypedSignV1 from './TypedSignV3V4';
+
+describe('TypedSignV3V4', () => {
+  it('should contained required text', async () => {
+    const { getByText } = renderWithProvider(<TypedSignV1 />, {
+      state: typedSignV3ConfirmationState,
+    });
+    expect(getByText('Request from')).toBeDefined();
+    expect(getByText('metamask.github.io')).toBeDefined();
+  });
+});
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.tsx
new file mode 100644
index 00000000000..1fd23c2fbeb
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/TypedSignV3V4.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import useApprovalRequest from '../../../../hooks/useApprovalRequest';
+import InfoRowOrigin from '../Shared/InfoRowOrigin';
+import Message from './Message';
+
+const TypedSignV3V4 = () => {
+  const { approvalRequest } = useApprovalRequest();
+
+  if (!approvalRequest) {
+    return null;
+  }
+
+  return (
+    <>
+      {/* SIMULATION TO BE ADDED */}
+      <InfoRowOrigin />
+      <Message />
+    </>
+  );
+};
+
+export default TypedSignV3V4;
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/index.ts b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/index.ts
new file mode 100644
index 00000000000..baa019b01ff
--- /dev/null
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/index.ts
@@ -0,0 +1 @@
+export { default } from './TypedSignV3V4';
diff --git a/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts b/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts
index 02bcd6e1910..2a1b63132f3 100644
--- a/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts
+++ b/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts
@@ -6,19 +6,18 @@ import useApprovalRequest from './useApprovalRequest';
 const useConfirmationRedesignEnabled = () => {
   const { approvalRequest } = useApprovalRequest();
 
-  const { type: approvalRequestType, requestData } = approvalRequest ?? {
+  const { type: approvalRequestType } = approvalRequest ?? {
     requestData: {},
   };
-  const approvalRequestVersion = requestData?.version;
 
   const isRedesignedEnabled = useMemo(
     () =>
       approvalRequestType &&
       process.env.REDESIGNED_SIGNATURE_REQUEST === 'true' &&
-      (approvalRequestType === ApprovalTypes.PERSONAL_SIGN ||
-        (approvalRequestType === ApprovalTypes.ETH_SIGN_TYPED_DATA &&
-          approvalRequestVersion === 'V1')),
-    [approvalRequestType, approvalRequestVersion],
+      [ApprovalTypes.PERSONAL_SIGN, ApprovalTypes.ETH_SIGN_TYPED_DATA].includes(
+        approvalRequestType as ApprovalTypes,
+      ),
+    [approvalRequestType],
   );
 
   return { isRedesignedEnabled };
diff --git a/app/components/hooks/AssetPolling/AssetPollingProvider.test.tsx b/app/components/hooks/AssetPolling/AssetPollingProvider.test.tsx
index 2f25159f33b..c954398b018 100644
--- a/app/components/hooks/AssetPolling/AssetPollingProvider.test.tsx
+++ b/app/components/hooks/AssetPolling/AssetPollingProvider.test.tsx
@@ -8,14 +8,14 @@ jest.mock('./useTokenRatesPolling', () => jest.fn());
 jest.mock('./useTokenDetectionPolling', () => jest.fn());
 jest.mock('./useTokenListPolling', () => jest.fn());
 jest.mock('./useTokenBalancesPolling', () => jest.fn());
+jest.mock('./useAccountTrackerPolling', () => jest.fn());
 
 describe('AssetPollingProvider', () => {
   it('should call all polling hooks', () => {
-    
     render(
       <AssetPollingProvider>
         <div></div>
-      </AssetPollingProvider>
+      </AssetPollingProvider>,
     );
 
     expect(jest.requireMock('./useCurrencyRatePolling')).toHaveBeenCalled();
@@ -23,5 +23,6 @@ describe('AssetPollingProvider', () => {
     expect(jest.requireMock('./useTokenDetectionPolling')).toHaveBeenCalled();
     expect(jest.requireMock('./useTokenListPolling')).toHaveBeenCalled();
     expect(jest.requireMock('./useTokenBalancesPolling')).toHaveBeenCalled();
+    expect(jest.requireMock('./useAccountTrackerPolling')).toHaveBeenCalled();
   });
 });
diff --git a/app/components/hooks/AssetPolling/AssetPollingProvider.tsx b/app/components/hooks/AssetPolling/AssetPollingProvider.tsx
index 33fc54e753e..4cc7f880aec 100644
--- a/app/components/hooks/AssetPolling/AssetPollingProvider.tsx
+++ b/app/components/hooks/AssetPolling/AssetPollingProvider.tsx
@@ -4,6 +4,7 @@ import useTokenRatesPolling from './useTokenRatesPolling';
 import useTokenDetectionPolling from './useTokenDetectionPolling';
 import useTokenListPolling from './useTokenListPolling';
 import useTokenBalancesPolling from './useTokenBalancesPolling';
+import useAccountTrackerPolling from './useAccountTrackerPolling';
 
 // This provider is a step towards making controller polling fully UI based.
 // Eventually, individual UI components will call the use*Polling hooks to
@@ -12,6 +13,7 @@ export const AssetPollingProvider = ({ children }: { children: ReactNode }) => {
   useCurrencyRatePolling();
   useTokenRatesPolling();
   useTokenDetectionPolling();
+  useAccountTrackerPolling();
   useTokenListPolling();
   useTokenBalancesPolling();
 
diff --git a/app/components/hooks/AssetPolling/useAccountTrackerPolling.ts b/app/components/hooks/AssetPolling/useAccountTrackerPolling.ts
new file mode 100644
index 00000000000..195d1226c6a
--- /dev/null
+++ b/app/components/hooks/AssetPolling/useAccountTrackerPolling.ts
@@ -0,0 +1,54 @@
+import { useSelector } from 'react-redux';
+import usePolling from '../usePolling';
+import {
+  selectNetworkConfigurations,
+  selectSelectedNetworkClientId,
+} from '../../../selectors/networkController';
+import Engine from '../../../core/Engine';
+import { isPortfolioViewEnabled } from '../../../util/networks';
+import { selectAccountsByChainId } from '../../../selectors/accountTrackerController';
+
+// Polls native currency prices across networks.
+const useAccountTrackerPolling = ({
+  networkClientIds,
+}: { networkClientIds?: { networkClientId: string }[] } = {}) => {
+  // Selectors to determine polling input
+  const networkConfigurations = useSelector(selectNetworkConfigurations);
+  const selectedNetworkClientId = useSelector(selectSelectedNetworkClientId);
+
+  const accountsByChainId = useSelector(selectAccountsByChainId);
+  const networkClientIdsConfig = Object.values(networkConfigurations).map(
+    (network) => ({
+      networkClientId:
+        network?.rpcEndpoints?.[network?.defaultRpcEndpointIndex]
+          ?.networkClientId,
+    }),
+  );
+
+  const chainIdsToPoll = isPortfolioViewEnabled()
+    ? networkClientIds ?? networkClientIdsConfig
+    : [
+        {
+          networkClientId: selectedNetworkClientId,
+        },
+      ];
+
+  const { AccountTrackerController } = Engine.context;
+
+  usePolling({
+    startPolling: AccountTrackerController.startPolling.bind(
+      AccountTrackerController,
+    ),
+    stopPollingByPollingToken:
+      AccountTrackerController.stopPollingByPollingToken.bind(
+        AccountTrackerController,
+      ),
+    input: chainIdsToPoll,
+  });
+
+  return {
+    accountsByChainId,
+  };
+};
+
+export default useAccountTrackerPolling;
diff --git a/app/components/hooks/AssetPolling/useTokenBalancesPolling.test.ts b/app/components/hooks/AssetPolling/useTokenBalancesPolling.test.ts
index e2a3862f7e0..2411b4c6f61 100644
--- a/app/components/hooks/AssetPolling/useTokenBalancesPolling.test.ts
+++ b/app/components/hooks/AssetPolling/useTokenBalancesPolling.test.ts
@@ -1,6 +1,8 @@
 import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import useTokenBalancesPolling from './useTokenBalancesPolling';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 
 jest.mock('../../../core/Engine', () => ({
   context: {
@@ -12,7 +14,6 @@ jest.mock('../../../core/Engine', () => ({
 }));
 
 describe('useTokenBalancesPolling', () => {
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
@@ -29,9 +30,11 @@ describe('useTokenBalancesPolling', () => {
           networkConfigurationsByChainId: {
             [selectedChainId]: {
               chainId: selectedChainId,
-              rpcEndpoints: [{
-                networkClientId: 'selectedNetworkClientId',
-              }]
+              rpcEndpoints: [
+                {
+                  networkClientId: 'selectedNetworkClientId',
+                },
+              ],
             },
             '0x89': {},
           },
@@ -40,19 +43,80 @@ describe('useTokenBalancesPolling', () => {
     },
   };
 
-  it('Should poll by selected chain id, and stop polling on dismount', async () => {
+  it('should poll by selected chain id when portfolio view is disabled', () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
 
-    const { unmount } = renderHookWithProvider(() => useTokenBalancesPolling(), {state});
+    const { unmount } = renderHookWithProvider(
+      () => useTokenBalancesPolling(),
+      {
+        state,
+      },
+    );
 
-    const mockedTokenBalancesController = jest.mocked(Engine.context.TokenBalancesController);
+    const mockedTokenBalancesController = jest.mocked(
+      Engine.context.TokenBalancesController,
+    );
 
     expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledTimes(1);
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledWith({
+      chainId: selectedChainId,
+    });
+
+    unmount();
+    expect(
+      mockedTokenBalancesController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('should poll all network configurations when portfolio view is enabled', () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const { unmount } = renderHookWithProvider(
+      () => useTokenBalancesPolling(),
+      {
+        state,
+      },
+    );
+
+    const mockedTokenBalancesController = jest.mocked(
+      Engine.context.TokenBalancesController,
+    );
+
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledTimes(2); // For both chain IDs
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledWith({
+      chainId: selectedChainId,
+    });
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledWith({
+      chainId: '0x89',
+    });
+
+    unmount();
     expect(
-      mockedTokenBalancesController.startPolling
-    ).toHaveBeenCalledWith({chainId: selectedChainId});
+      mockedTokenBalancesController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(2);
+  });
+
+  it('should use provided chainIds when specified, even with portfolio view enabled', () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const specificChainIds = ['0x5' as const];
+    const { unmount } = renderHookWithProvider(
+      () => useTokenBalancesPolling({ chainIds: specificChainIds }),
+      { state },
+    );
+
+    const mockedTokenBalancesController = jest.mocked(
+      Engine.context.TokenBalancesController,
+    );
+
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledTimes(1);
+    expect(mockedTokenBalancesController.startPolling).toHaveBeenCalledWith({
+      chainId: '0x5',
+    });
 
-    expect(mockedTokenBalancesController.stopPollingByPollingToken).toHaveBeenCalledTimes(0);
     unmount();
-    expect(mockedTokenBalancesController.stopPollingByPollingToken).toHaveBeenCalledTimes(1);
+    expect(
+      mockedTokenBalancesController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/app/components/hooks/AssetPolling/useTokenBalancesPolling.ts b/app/components/hooks/AssetPolling/useTokenBalancesPolling.ts
index 2b67d4ce124..d2f0ca1cc1c 100644
--- a/app/components/hooks/AssetPolling/useTokenBalancesPolling.ts
+++ b/app/components/hooks/AssetPolling/useTokenBalancesPolling.ts
@@ -1,13 +1,15 @@
 import { useSelector } from 'react-redux';
 import usePolling from '../usePolling';
 import Engine from '../../../core/Engine';
-import { selectChainId, selectNetworkConfigurations } from '../../../selectors/networkController';
+import {
+  selectChainId,
+  selectNetworkConfigurations,
+} from '../../../selectors/networkController';
 import { Hex } from '@metamask/utils';
 import { isPortfolioViewEnabled } from '../../../util/networks';
 import { selectAllTokenBalances } from '../../../selectors/tokenBalancesController';
 
 const useTokenBalancesPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
-
   // Selectors to determine polling input
   const networkConfigurations = useSelector(selectNetworkConfigurations);
   const currentChainId = useSelector(selectChainId);
@@ -15,22 +17,25 @@ const useTokenBalancesPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
   // Selectors returning state updated by the polling
   const tokenBalances = useSelector(selectAllTokenBalances);
 
-  const chainIdsToPoll = isPortfolioViewEnabled
-    ? (chainIds ?? Object.keys(networkConfigurations))
+  const chainIdsToPoll = isPortfolioViewEnabled()
+    ? chainIds ?? Object.keys(networkConfigurations)
     : [currentChainId];
 
   const { TokenBalancesController } = Engine.context;
 
   usePolling({
-    startPolling:
-      TokenBalancesController.startPolling.bind(TokenBalancesController),
+    startPolling: TokenBalancesController.startPolling.bind(
+      TokenBalancesController,
+    ),
     stopPollingByPollingToken:
-      TokenBalancesController.stopPollingByPollingToken.bind(TokenBalancesController),
-    input: chainIdsToPoll.map((chainId) => ({chainId: chainId as Hex})),
+      TokenBalancesController.stopPollingByPollingToken.bind(
+        TokenBalancesController,
+      ),
+    input: chainIdsToPoll.map((chainId) => ({ chainId: chainId as Hex })),
   });
 
   return {
-    tokenBalances
+    tokenBalances,
   };
 };
 
diff --git a/app/components/hooks/AssetPolling/useTokenDetectionPolling.test.ts b/app/components/hooks/AssetPolling/useTokenDetectionPolling.test.ts
index 1294d23cad8..b454c1be5e8 100644
--- a/app/components/hooks/AssetPolling/useTokenDetectionPolling.test.ts
+++ b/app/components/hooks/AssetPolling/useTokenDetectionPolling.test.ts
@@ -1,6 +1,8 @@
 import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import useTokenDetectionPolling from './useTokenDetectionPolling';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 
 jest.mock('../../../core/Engine', () => ({
   context: {
@@ -12,7 +14,6 @@ jest.mock('../../../core/Engine', () => ({
 }));
 
 describe('useTokenDetectionPolling', () => {
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
@@ -28,8 +29,8 @@ describe('useTokenDetectionPolling', () => {
             selectedAccount: '1',
             accounts: {
               '1': {
-                address: selectedAddress
-              }
+                address: selectedAddress,
+              },
             },
           },
         },
@@ -41,11 +42,12 @@ describe('useTokenDetectionPolling', () => {
           networkConfigurationsByChainId: {
             [selectedChainId]: {
               chainId: selectedChainId,
-              rpcEndpoints: [{
-                networkClientId: 'selectedNetworkClientId',
-              }]
+              rpcEndpoints: [
+                {
+                  networkClientId: 'selectedNetworkClientId',
+                },
+              ],
             },
-            '0x89': {},
           },
         },
       },
@@ -53,40 +55,212 @@ describe('useTokenDetectionPolling', () => {
   };
 
   it('Should poll by current chain ids/address, and stop polling on dismount', async () => {
+    const { unmount } = renderHookWithProvider(
+      () => useTokenDetectionPolling(),
+      { state },
+    );
 
-    const { unmount } = renderHookWithProvider(() => useTokenDetectionPolling(), {state});
+    const mockedTokenDetectionController = jest.mocked(
+      Engine.context.TokenDetectionController,
+    );
 
-    const mockedTokenDetectionController = jest.mocked(Engine.context.TokenDetectionController);
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(
+      1,
+    );
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledWith({
+      chainIds: [selectedChainId],
+      address: selectedAddress,
+    });
 
-    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(1);
     expect(
-      mockedTokenDetectionController.startPolling
-    ).toHaveBeenCalledWith({chainIds: [selectedChainId], address: selectedAddress});
-
-    expect(mockedTokenDetectionController.stopPollingByPollingToken).toHaveBeenCalledTimes(0);
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(0);
     unmount();
-    expect(mockedTokenDetectionController.stopPollingByPollingToken).toHaveBeenCalledTimes(1);
-
+    expect(
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
   });
 
   it('Should not poll when token detection is disabled', async () => {
+    renderHookWithProvider(
+      () => useTokenDetectionPolling({ chainIds: ['0x1'] }),
+      {
+        state: {
+          ...state,
+          engine: {
+            ...state.engine,
+            backgroundState: {
+              ...state.engine.backgroundState,
+              PreferencesController: {
+                ...state.engine.backgroundState.PreferencesController,
+                useTokenDetection: false,
+              },
+            },
+          },
+        },
+      },
+    );
+
+    const mockedTokenDetectionController = jest.mocked(
+      Engine.context.TokenDetectionController,
+    );
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(
+      0,
+    );
+    expect(
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(0);
+  });
+
+  it('Should poll with specific chainIds when provided', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const specificChainIds = ['0x5' as const];
+    const { unmount } = renderHookWithProvider(
+      () => useTokenDetectionPolling({ chainIds: specificChainIds }),
+      {
+        state: {
+          ...state,
+          engine: {
+            ...state.engine,
+            backgroundState: {
+              ...state.engine.backgroundState,
+              NetworkController: {
+                selectedNetworkClientId: 'selectedNetworkClientId',
+                networkConfigurationsByChainId: {
+                  '0x5': {
+                    chainId: '0x5',
+                    rpcEndpoints: [
+                      {
+                        networkClientId: 'selectedNetworkClientId',
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    );
+
+    const mockedTokenDetectionController = jest.mocked(
+      Engine.context.TokenDetectionController,
+    );
+
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(
+      1,
+    );
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledWith({
+      chainIds: ['0x5'],
+      address: selectedAddress,
+    });
+
+    unmount();
+    expect(
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('Should poll with network configurations when no chainIds provided', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
+
+    const currentChainId = '0x1';
+    const { unmount } = renderHookWithProvider(
+      () => useTokenDetectionPolling(),
+      {
+        state: {
+          ...state,
+          engine: {
+            ...state.engine,
+            backgroundState: {
+              ...state.engine.backgroundState,
+              NetworkController: {
+                selectedNetworkClientId: 'selectedNetworkClientId',
+                networkConfigurationsByChainId: {
+                  [currentChainId]: {
+                    chainId: currentChainId,
+                    rpcEndpoints: [
+                      {
+                        networkClientId: 'selectedNetworkClientId',
+                      },
+                    ],
+                  },
+                  '0x89': {
+                    chainId: '0x89',
+                    rpcEndpoints: [
+                      {
+                        networkClientId: 'otherNetworkClientId',
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    );
+
+    const mockedTokenDetectionController = jest.mocked(
+      Engine.context.TokenDetectionController,
+    );
 
-    renderHookWithProvider(() => useTokenDetectionPolling({chainIds: ['0x1']}), {state:{
-      ...state,
-      engine: {
-        ...state.engine,
-        backgroundState: {
-          ...state.engine.backgroundState,
-          PreferencesController: {
-            ...state.engine.backgroundState.PreferencesController,
-            useTokenDetection: false,
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(
+      1,
+    );
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledWith({
+      chainIds: [currentChainId],
+      address: selectedAddress,
+    });
+
+    unmount();
+    expect(
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('Should handle missing account address gracefully', async () => {
+    const { unmount } = renderHookWithProvider(
+      () => useTokenDetectionPolling(),
+      {
+        state: {
+          ...state,
+          engine: {
+            ...state.engine,
+            backgroundState: {
+              ...state.engine.backgroundState,
+              AccountsController: {
+                internalAccounts: {
+                  selectedAccount: '1',
+                  accounts: {
+                    '1': {
+                      address: undefined,
+                    },
+                  },
+                },
+              },
+            },
           },
         },
       },
-    }});
+    );
+
+    const mockedTokenDetectionController = jest.mocked(
+      Engine.context.TokenDetectionController,
+    );
+
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(
+      1,
+    );
+    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledWith({
+      chainIds: [selectedChainId],
+      address: undefined,
+    });
 
-    const mockedTokenDetectionController = jest.mocked(Engine.context.TokenDetectionController);
-    expect(mockedTokenDetectionController.startPolling).toHaveBeenCalledTimes(0);
-    expect(mockedTokenDetectionController.stopPollingByPollingToken).toHaveBeenCalledTimes(0);
+    unmount();
+    expect(
+      mockedTokenDetectionController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/app/components/hooks/AssetPolling/useTokenDetectionPolling.ts b/app/components/hooks/AssetPolling/useTokenDetectionPolling.ts
index d07ba5c46f9..dccdf39acbd 100644
--- a/app/components/hooks/AssetPolling/useTokenDetectionPolling.ts
+++ b/app/components/hooks/AssetPolling/useTokenDetectionPolling.ts
@@ -1,37 +1,46 @@
 import { useSelector } from 'react-redux';
 import usePolling from '../usePolling';
 import Engine from '../../../core/Engine';
-import { selectChainId, selectNetworkConfigurations } from '../../../selectors/networkController';
+import {
+  selectChainId,
+  selectNetworkConfigurations,
+} from '../../../selectors/networkController';
 import { Hex } from '@metamask/utils';
 import { isPortfolioViewEnabled } from '../../../util/networks';
 import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
 import { selectUseTokenDetection } from '../../../selectors/preferencesController';
 
 const useTokenDetectionPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
-
   const networkConfigurations = useSelector(selectNetworkConfigurations);
   const currentChainId = useSelector(selectChainId);
   const selectedAccount = useSelector(selectSelectedInternalAccount);
   const useTokenDetection = useSelector(selectUseTokenDetection);
 
-  const chainIdsToPoll = isPortfolioViewEnabled
-    ? (chainIds ?? Object.keys(networkConfigurations))
+  const chainIdsToPoll = isPortfolioViewEnabled()
+    ? chainIds ?? Object.keys(networkConfigurations)
     : [currentChainId];
 
   const { TokenDetectionController } = Engine.context;
 
   usePolling({
-    startPolling:
-      TokenDetectionController.startPolling.bind(TokenDetectionController),
+    startPolling: TokenDetectionController.startPolling.bind(
+      TokenDetectionController,
+    ),
     stopPollingByPollingToken:
-      TokenDetectionController.stopPollingByPollingToken.bind(TokenDetectionController),
-    input: useTokenDetection ? [{
-      chainIds: chainIdsToPoll as Hex[],
-      address: selectedAccount?.address as Hex
-    }] : []
+      TokenDetectionController.stopPollingByPollingToken.bind(
+        TokenDetectionController,
+      ),
+    input: useTokenDetection
+      ? [
+          {
+            chainIds: chainIdsToPoll as Hex[],
+            address: selectedAccount?.address as Hex,
+          },
+        ]
+      : [],
   });
 
-  return { };
+  return {};
 };
 
 export default useTokenDetectionPolling;
diff --git a/app/components/hooks/AssetPolling/useTokenListPolling.test.ts b/app/components/hooks/AssetPolling/useTokenListPolling.test.ts
index cbf1ff805e5..6ffc511088e 100644
--- a/app/components/hooks/AssetPolling/useTokenListPolling.test.ts
+++ b/app/components/hooks/AssetPolling/useTokenListPolling.test.ts
@@ -1,6 +1,8 @@
 import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import useTokenListPolling from './useTokenListPolling';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 
 jest.mock('../../../core/Engine', () => ({
   context: {
@@ -12,7 +14,6 @@ jest.mock('../../../core/Engine', () => ({
 }));
 
 describe('useTokenListPolling', () => {
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
@@ -26,9 +27,11 @@ describe('useTokenListPolling', () => {
           networkConfigurationsByChainId: {
             [selectedChainId]: {
               chainId: selectedChainId,
-              rpcEndpoints: [{
-                networkClientId: 'selectedNetworkClientId',
-              }]
+              rpcEndpoints: [
+                {
+                  networkClientId: 'selectedNetworkClientId',
+                },
+              ],
             },
             '0x89': {},
           },
@@ -38,18 +41,52 @@ describe('useTokenListPolling', () => {
   };
 
   it('Should poll by selected chain id, and stop polling on dismount', async () => {
+    const { unmount } = renderHookWithProvider(() => useTokenListPolling(), {
+      state,
+    });
 
-    const { unmount } = renderHookWithProvider(() => useTokenListPolling(), {state});
-
-    const mockedTokenListController = jest.mocked(Engine.context.TokenListController);
+    const mockedTokenListController = jest.mocked(
+      Engine.context.TokenListController,
+    );
+    const calledAmount = networks.isPortfolioViewEnabled() ? 2 : 1;
+    expect(mockedTokenListController.startPolling).toHaveBeenCalledTimes(
+      calledAmount,
+    );
+    expect(mockedTokenListController.startPolling).toHaveBeenCalledWith({
+      chainId: selectedChainId,
+    });
 
-    expect(mockedTokenListController.startPolling).toHaveBeenCalledTimes(1);
     expect(
-      mockedTokenListController.startPolling
-    ).toHaveBeenCalledWith({chainId: selectedChainId});
+      mockedTokenListController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(0);
+    unmount();
+    expect(
+      mockedTokenListController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(calledAmount);
+  });
+
+  it('Should poll all networks when portfolio view is enabled', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const { unmount } = renderHookWithProvider(() => useTokenListPolling(), {
+      state,
+    });
+
+    const mockedTokenListController = jest.mocked(
+      Engine.context.TokenListController,
+    );
+
+    expect(mockedTokenListController.startPolling).toHaveBeenCalledTimes(2);
+    expect(mockedTokenListController.startPolling).toHaveBeenCalledWith({
+      chainId: selectedChainId,
+    });
+    expect(mockedTokenListController.startPolling).toHaveBeenCalledWith({
+      chainId: '0x89',
+    });
 
-    expect(mockedTokenListController.stopPollingByPollingToken).toHaveBeenCalledTimes(0);
     unmount();
-    expect(mockedTokenListController.stopPollingByPollingToken).toHaveBeenCalledTimes(1);
+    expect(
+      mockedTokenListController.stopPollingByPollingToken,
+    ).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/app/components/hooks/AssetPolling/useTokenListPolling.ts b/app/components/hooks/AssetPolling/useTokenListPolling.ts
index 13bc408efd8..cccce3f4c15 100644
--- a/app/components/hooks/AssetPolling/useTokenListPolling.ts
+++ b/app/components/hooks/AssetPolling/useTokenListPolling.ts
@@ -1,13 +1,18 @@
 import { useSelector } from 'react-redux';
 import usePolling from '../usePolling';
 import Engine from '../../../core/Engine';
-import { selectChainId, selectNetworkConfigurations } from '../../../selectors/networkController';
+import {
+  selectChainId,
+  selectNetworkConfigurations,
+} from '../../../selectors/networkController';
 import { Hex } from '@metamask/utils';
 import { isPortfolioViewEnabled } from '../../../util/networks';
-import { selectERC20TokensByChain, selectTokenList } from '../../../selectors/tokenListController';
+import {
+  selectERC20TokensByChain,
+  selectTokenList,
+} from '../../../selectors/tokenListController';
 
 const useTokenListPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
-
   // Selectors to determine polling input
   const networkConfigurations = useSelector(selectNetworkConfigurations);
   const currentChainId = useSelector(selectChainId);
@@ -16,18 +21,17 @@ const useTokenListPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
   const tokenList = useSelector(selectTokenList);
   const tokenListByChain = useSelector(selectERC20TokensByChain);
 
-  const chainIdsToPoll = isPortfolioViewEnabled
-    ? (chainIds ?? Object.keys(networkConfigurations))
+  const chainIdsToPoll = isPortfolioViewEnabled()
+    ? chainIds ?? Object.keys(networkConfigurations)
     : [currentChainId];
 
   const { TokenListController } = Engine.context;
 
   usePolling({
-    startPolling:
-      TokenListController.startPolling.bind(TokenListController),
+    startPolling: TokenListController.startPolling.bind(TokenListController),
     stopPollingByPollingToken:
       TokenListController.stopPollingByPollingToken.bind(TokenListController),
-    input: chainIdsToPoll.map((chainId) => ({ chainId: chainId as Hex }))
+    input: chainIdsToPoll.map((chainId) => ({ chainId: chainId as Hex })),
   });
 
   return {
diff --git a/app/components/hooks/AssetPolling/useTokenRatesPolling.ts b/app/components/hooks/AssetPolling/useTokenRatesPolling.ts
index 404295a94e4..25351bccd5b 100644
--- a/app/components/hooks/AssetPolling/useTokenRatesPolling.ts
+++ b/app/components/hooks/AssetPolling/useTokenRatesPolling.ts
@@ -21,7 +21,7 @@ const useTokenRatesPolling = ({ chainIds }: { chainIds?: Hex[] } = {}) => {
   const contractExchangeRates = useSelector(selectContractExchangeRates);
   const tokenMarketData = useSelector(selectTokenMarketData);
 
-  const chainIdsToPoll = isPortfolioViewEnabled
+  const chainIdsToPoll = isPortfolioViewEnabled()
     ? chainIds ?? Object.keys(networkConfigurations)
     : [currentChainId];
 
diff --git a/app/components/hooks/DeleteWallet/useDeleteWallet.test.tsx b/app/components/hooks/DeleteWallet/useDeleteWallet.test.tsx
index 2f261b8c1f8..fba7a25cd52 100644
--- a/app/components/hooks/DeleteWallet/useDeleteWallet.test.tsx
+++ b/app/components/hooks/DeleteWallet/useDeleteWallet.test.tsx
@@ -21,6 +21,12 @@ jest.mock('../../../store/storage-wrapper', () => ({
   removeItem: jest.fn(),
 }));
 
+jest.mock('../../../core/redux/ReduxService', () => ({
+  store: {
+    dispatch: jest.fn(),
+  },
+}));
+
 describe('useDeleteWallet', () => {
   test('it should provide two outputs of type function', () => {
     const { result } = renderHook(() => useDeleteWallet());
diff --git a/app/components/hooks/useAccounts/useAccounts.test.ts b/app/components/hooks/useAccounts/useAccounts.test.ts
index f156a7ff974..ad33a8da426 100644
--- a/app/components/hooks/useAccounts/useAccounts.test.ts
+++ b/app/components/hooks/useAccounts/useAccounts.test.ts
@@ -6,6 +6,8 @@ import { backgroundState } from '../../../util/test/initial-root-state';
 import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsControllerTestUtils';
 import { Account } from './useAccounts.types';
 import { Hex } from '@metamask/utils';
+// eslint-disable-next-line import/no-namespace
+import * as networks from '../../../util/networks';
 import { getAccountBalances } from './utils';
 
 const mockReturnGetAccountBalances = getAccountBalances as jest.Mock;
@@ -123,6 +125,7 @@ describe('useAccounts', () => {
   });
 
   it('returns internal accounts', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
     mockReturnGetAccountBalances.mockReturnValueOnce({
       balanceWeiHex: '0x0',
       balanceETH: '0',
diff --git a/app/components/hooks/useAccounts/utils.ts b/app/components/hooks/useAccounts/utils.ts
index 1aa05ca94f1..248f9d8d704 100644
--- a/app/components/hooks/useAccounts/utils.ts
+++ b/app/components/hooks/useAccounts/utils.ts
@@ -9,7 +9,7 @@ import {
 } from '../../../util/number';
 import { AccountInformation } from '@metamask/assets-controllers';
 import { TotalFiatBalancesCrossChains } from '../useGetTotalFiatBalanceCrossChains';
-import { isPortfolioViewEnabledFunction } from '../../../util/networks';
+import { isPortfolioViewEnabled } from '../../../util/networks';
 
 interface AccountInfo {
   [address: string]: AccountInformation;
@@ -40,10 +40,14 @@ export const getAccountBalances = ({
   const balanceETH = renderFromWei(totalBalanceWeiHex); // Gives ETH
   // IF portfolio view is active, display aggregated fiat balance cross chains
   let balanceFiat;
-  if (isPortfolioViewEnabledFunction()) {
-    const { totalFiatBalance } =
-      totalFiatBalancesCrossChain[internalAccount.address];
-    balanceFiat = `${renderFiat(totalFiatBalance, currentCurrency)}`;
+  if (isPortfolioViewEnabled()) {
+    const totalFiatBalance =
+      totalFiatBalancesCrossChain[internalAccount?.address as string]
+        ?.totalFiatBalance;
+    balanceFiat =
+      totalFiatBalance !== undefined
+        ? `${renderFiat(totalFiatBalance, currentCurrency)}`
+        : '';
   } else {
     balanceFiat =
       weiToFiat(hexToBN(totalBalanceWeiHex), conversionRate, currentCurrency) ||
diff --git a/app/components/hooks/useGetFormattedTokensPerChain.test.ts b/app/components/hooks/useGetFormattedTokensPerChain.test.ts
index 75f7123dd99..84424b8820b 100644
--- a/app/components/hooks/useGetFormattedTokensPerChain.test.ts
+++ b/app/components/hooks/useGetFormattedTokensPerChain.test.ts
@@ -20,13 +20,11 @@ const mockInitialState: DeepPartial<RootState> = {
                 address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
                 symbol: 'USDC',
                 decimals: 6,
-                name: 'USDC',
               },
               {
                 address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
                 symbol: 'DAI',
                 decimals: 18,
-                name: 'Dai Stablecoin',
               },
             ],
           },
@@ -39,7 +37,6 @@ const mockInitialState: DeepPartial<RootState> = {
                 image:
                   'https://static.cx.metamask.io/api/v1/tokenIcons/59144/0x0d1e753a25ebda689453309112904807625befbe.png',
                 aggregators: ['CoinGecko', 'Lifi', 'Rubic'],
-                name: 'PancakeSwap',
               },
             ],
           },
diff --git a/app/core/AppStateEventListener.test.ts b/app/core/AppStateEventListener.test.ts
index 9940e4c2100..ede6491cc96 100644
--- a/app/core/AppStateEventListener.test.ts
+++ b/app/core/AppStateEventListener.test.ts
@@ -1,23 +1,12 @@
 import { AppState, AppStateStatus } from 'react-native';
-import { store } from '../store';
 import Logger from '../util/Logger';
 import { MetaMetrics, MetaMetricsEvents } from './Analytics';
 import { AppStateEventListener } from './AppStateEventListener';
 import { processAttribution } from './processAttribution';
 import { MetricsEventBuilder } from './Analytics/MetricsEventBuilder';
+import ReduxService, { ReduxStore } from './redux';
 
-jest.mock('react-native', () => ({
-  AppState: {
-    addEventListener: jest.fn(),
-    currentState: 'active',
-  },
-}));
-
-jest.mock('../store', () => ({
-  store: {
-    getState: jest.fn(),
-  },
-}));
+jest.mock('./DeeplinkManager/ParseManager/extractURLParams', () => jest.fn());
 
 jest.mock('../util/Logger', () => ({
   error: jest.fn(),
@@ -44,6 +33,7 @@ describe('AppStateEventListener', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.resetModules();
     jest.useFakeTimers();
     (AppState.addEventListener as jest.Mock).mockImplementation(
       (_, listener) => {
@@ -52,7 +42,7 @@ describe('AppStateEventListener', () => {
       },
     );
     appStateManager = new AppStateEventListener();
-    appStateManager.init(store);
+    appStateManager.start();
   });
 
   afterEach(() => {
@@ -66,16 +56,14 @@ describe('AppStateEventListener', () => {
     );
   });
 
-  it('throws error if store is initialized more than once', () => {
-    expect(() => appStateManager.init(store)).toThrow(
-      'store is already initialized',
-    );
-    expect(Logger.error).toHaveBeenCalledWith(
-      new Error('store is already initialized'),
-    );
+  it('does not initialize event listener more than once', () => {
+    expect(AppState.addEventListener).toHaveBeenCalledTimes(1);
   });
 
   it('tracks event when app becomes active and attribution data is available', () => {
+    jest
+      .spyOn(ReduxService, 'store', 'get')
+      .mockReturnValue({} as unknown as ReduxStore);
     const mockAttribution = {
       attributionId: 'test123',
       utm: 'test_utm',
@@ -113,6 +101,9 @@ describe('AppStateEventListener', () => {
   });
 
   it('handles errors gracefully', () => {
+    jest
+      .spyOn(ReduxService, 'store', 'get')
+      .mockReturnValue({} as unknown as ReduxStore);
     const testError = new Error('Test error');
     (processAttribution as jest.Mock).mockImplementation(() => {
       throw testError;
@@ -135,7 +126,7 @@ describe('AppStateEventListener', () => {
     });
 
     appStateManager = new AppStateEventListener();
-    appStateManager.init(store);
+    appStateManager.start();
     appStateManager.cleanup();
 
     expect(mockRemove).toHaveBeenCalled();
@@ -160,13 +151,22 @@ describe('AppStateEventListener', () => {
   });
 
   it('should handle undefined store gracefully', () => {
-    appStateManager = new AppStateEventListener();
+    const { processAttribution: realProcessAttribution } = jest.requireActual(
+      './processAttribution',
+    );
+    (processAttribution as jest.Mock).mockImplementation(
+      realProcessAttribution,
+    );
+
     mockAppStateListener('active');
     jest.advanceTimersByTime(2000);
 
-    expect(mockMetrics.trackEvent).not.toHaveBeenCalled();
+    const missingReduxStoreError = new Error('Redux store does not exist!');
+    const appStateManagerErrorMessage =
+      'AppStateManager: Error processing app state change';
     expect(Logger.error).toHaveBeenCalledWith(
-      new Error('store is not initialized'),
+      missingReduxStoreError,
+      appStateManagerErrorMessage,
     );
   });
 });
diff --git a/app/core/AppStateEventListener.ts b/app/core/AppStateEventListener.ts
index 9380aa585ea..2376c337494 100644
--- a/app/core/AppStateEventListener.ts
+++ b/app/core/AppStateEventListener.ts
@@ -1,36 +1,33 @@
 import { AppState, AppStateStatus } from 'react-native';
-import { Store } from 'redux';
-import { RootState } from '../reducers';
 import Logger from '../util/Logger';
 import { MetaMetrics, MetaMetricsEvents } from './Analytics';
 import { MetricsEventBuilder } from './Analytics/MetricsEventBuilder';
 import { processAttribution } from './processAttribution';
 import DevLogger from './SDKConnect/utils/DevLogger';
+import ReduxService from './redux';
 
 export class AppStateEventListener {
-  private appStateSubscription: ReturnType<typeof AppState.addEventListener>;
+  private appStateSubscription:
+    | ReturnType<typeof AppState.addEventListener>
+    | undefined = undefined;
   private currentDeeplink: string | null = null;
   private lastAppState: AppStateStatus = AppState.currentState;
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private store: Store<RootState, any> | undefined;
-
   constructor() {
     this.lastAppState = AppState.currentState;
+  }
+
+  start() {
+    if (this.appStateSubscription) {
+      // Already started
+      return;
+    }
     this.appStateSubscription = AppState.addEventListener(
       'change',
       this.handleAppStateChange,
     );
   }
 
-  init(store: Store) {
-    if (this.store) {
-      Logger.error(new Error('store is already initialized'));
-      throw new Error('store is already initialized');
-    }
-    this.store = store;
-  }
-
   public setCurrentDeeplink(deeplink: string | null) {
     this.currentDeeplink = deeplink;
   }
@@ -46,15 +43,10 @@ export class AppStateEventListener {
   };
 
   private processAppStateChange = () => {
-    if (!this.store) {
-      Logger.error(new Error('store is not initialized'));
-      return;
-    }
-
     try {
       const attribution = processAttribution({
         currentDeeplink: this.currentDeeplink,
-        store: this.store,
+        store: ReduxService.store,
       });
       if (attribution) {
         const { attributionId, utm, ...utmParams } = attribution;
@@ -77,7 +69,8 @@ export class AppStateEventListener {
   };
 
   public cleanup() {
-    this.appStateSubscription.remove();
+    this.appStateSubscription?.remove();
+    this.appStateSubscription = undefined;
   }
 }
 
diff --git a/app/core/Authentication/Authentication.test.ts b/app/core/Authentication/Authentication.test.ts
index e8be46072c4..b268825ad18 100644
--- a/app/core/Authentication/Authentication.test.ts
+++ b/app/core/Authentication/Authentication.test.ts
@@ -10,8 +10,7 @@ import AUTHENTICATION_TYPE from '../../constants/userProperties';
 // eslint-disable-next-line import/no-namespace
 import * as Keychain from 'react-native-keychain';
 import SecureKeychain from '../SecureKeychain';
-import configureMockStore from 'redux-mock-store';
-import Logger from '../../util/Logger';
+import ReduxService, { ReduxStore } from '../redux';
 
 const storage: Record<string, unknown> = {};
 
@@ -32,32 +31,11 @@ jest.mock('../../store/storage-wrapper', () => ({
 }));
 
 describe('Authentication', () => {
-  const initialState = {
-    security: {
-      allowLoginWithRememberMe: true,
-    },
-  };
-  const mockStore = configureMockStore();
-  const store = mockStore(initialState);
-
-  beforeEach(() => {
-    Authentication.init(store);
-  });
-
   afterEach(() => {
     StorageWrapper.clearAll();
     jest.restoreAllMocks();
   });
 
-  it('Does not initialize class more than once', async () => {
-    const spy = jest.spyOn(Logger, 'log');
-    Authentication.init(store);
-    Authentication.init(store);
-    expect(spy).toHaveBeenCalledWith(
-      'Attempted to call init on AuthenticationService but an instance has already been initialized',
-    );
-  });
-
   it('should return a type password', async () => {
     SecureKeychain.getSupportedBiometryType = jest
       .fn()
@@ -129,6 +107,10 @@ describe('Authentication', () => {
   });
 
   it('should return a auth type for components AUTHENTICATION_TYPE.REMEMBER_ME', async () => {
+    jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+      getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+    } as unknown as ReduxStore);
+
     SecureKeychain.getSupportedBiometryType = jest
       .fn()
       .mockReturnValue(Keychain.BIOMETRY_TYPE.FINGERPRINT);
diff --git a/app/core/Authentication/Authentication.ts b/app/core/Authentication/Authentication.ts
index beba46cf7c6..ea4bf865def 100644
--- a/app/core/Authentication/Authentication.ts
+++ b/app/core/Authentication/Authentication.ts
@@ -7,7 +7,6 @@ import {
   PASSCODE_DISABLED,
   SEED_PHRASE_HINTS,
 } from '../../constants/storage';
-import Logger from '../../util/Logger';
 import {
   authSuccess,
   authError,
@@ -16,7 +15,6 @@ import {
   passwordSet,
 } from '../../actions/user';
 import AUTHENTICATION_TYPE from '../../constants/userProperties';
-import { Store } from 'redux';
 import AuthenticationError from './AuthenticationError';
 import { UserCredentials, BIOMETRY_TYPE } from 'react-native-keychain';
 import {
@@ -32,6 +30,7 @@ import StorageWrapper from '../../store/storage-wrapper';
 import NavigationService from '../NavigationService';
 import Routes from '../../constants/navigation/Routes';
 import { TraceName, TraceOperation, endTrace, trace } from '../../util/trace';
+import ReduxService from '../redux';
 
 /**
  * Holds auth data used to determine auth configuration
@@ -43,51 +42,17 @@ export interface AuthData {
 
 class AuthenticationService {
   private authData: AuthData = { currentAuthType: AUTHENTICATION_TYPE.UNKNOWN };
-  private store: Store | undefined = undefined;
-  private static isInitialized = false;
-
-  /**
-   * This method creates the instance of the authentication class
-   * @param {Store} store - A redux function that will dispatch global state actions
-   */
-  init(store: Store) {
-    if (!AuthenticationService.isInitialized) {
-      AuthenticationService.isInitialized = true;
-      this.store = store;
-    } else {
-      Logger.log(
-        'Attempted to call init on AuthenticationService but an instance has already been initialized',
-      );
-    }
-  }
 
   private dispatchLogin(): void {
-    if (this.store) {
-      this.store.dispatch(logIn());
-    } else {
-      Logger.log(
-        'Attempted to dispatch logIn action but dispatch was not initialized',
-      );
-    }
+    ReduxService.store.dispatch(logIn());
   }
 
   private dispatchPasswordSet(): void {
-    if (this.store) {
-      this.store.dispatch(passwordSet());
-    } else {
-      Logger.log(
-        'Attempted to dispatch passwordSet action but dispatch was not initialized',
-      );
-    }
+    ReduxService.store.dispatch(passwordSet());
   }
 
   private dispatchLogout(): void {
-    if (this.store) {
-      this.store.dispatch(logOut());
-    } else
-      Logger.log(
-        'Attempted to dispatch logOut action but dispatch was not initialized',
-      );
+    ReduxService.store.dispatch(logOut());
   }
 
   /**
@@ -307,7 +272,7 @@ class AuthenticationService {
       };
     } else if (
       rememberMe &&
-      this.store?.getState().security.allowLoginWithRememberMe
+      ReduxService.store.getState().security.allowLoginWithRememberMe
     ) {
       return {
         currentAuthType: AUTHENTICATION_TYPE.REMEMBER_ME,
@@ -460,12 +425,12 @@ class AuthenticationService {
       endTrace({ name: TraceName.VaultCreation });
 
       this.dispatchLogin();
-      this.store?.dispatch(authSuccess(bioStateMachineId));
+      ReduxService.store.dispatch(authSuccess(bioStateMachineId));
       this.dispatchPasswordSet();
       // TODO: Replace "any" with type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
-      this.store?.dispatch(authError(bioStateMachineId));
+      ReduxService.store.dispatch(authError(bioStateMachineId));
       !disableAutoLogout && this.lockApp({ reset: false });
       throw new AuthenticationError(
         (e as Error).message,
diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js
index 0305cfb53fc..73ac7a3efd5 100644
--- a/app/core/BackgroundBridge/BackgroundBridge.js
+++ b/app/core/BackgroundBridge/BackgroundBridge.js
@@ -497,7 +497,7 @@ export class BackgroundBridge extends EventEmitter {
    */
   getState() {
     const vault = Engine.context.KeyringController.state.vault;
-    const { selectedAddress } = Engine.datamodel.flatState;
+    const { PreferencesController: { selectedAddress } } = Engine.datamodel.state;
     return {
       isInitialized: !!vault,
       isUnlocked: true,
diff --git a/app/core/BackgroundBridge/WalletConnectPort.ts b/app/core/BackgroundBridge/WalletConnectPort.ts
index f19442ec01b..9acd8a76d48 100644
--- a/app/core/BackgroundBridge/WalletConnectPort.ts
+++ b/app/core/BackgroundBridge/WalletConnectPort.ts
@@ -23,7 +23,9 @@ class WalletConnectPort extends EventEmitter {
       if (msg?.data?.method === NOTIFICATION_NAMES.chainChanged) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const { selectedAddress } = Engine.datamodel.flatState;
+        const {
+          PreferencesController: { selectedAddress },
+        } = Engine.datamodel.state;
         this._wcRequestActions?.updateSession?.({
           chainId: parseInt(msg.data.params.chainId, 16),
           accounts: [selectedAddress],
diff --git a/app/core/Engine/Engine.test.ts b/app/core/Engine/Engine.test.ts
index e8dc933f51c..5af5d8965c8 100644
--- a/app/core/Engine/Engine.test.ts
+++ b/app/core/Engine/Engine.test.ts
@@ -70,14 +70,7 @@ describe('Engine', () => {
   it('matches initial state fixture', () => {
     const engine = Engine.init({});
     const initialBackgroundState = engine.datamodel.state;
-
-    // AssetsContractController is stateless in v37 resulting in an undefined state
-    const newBackgroundState = {
-      ...backgroundState,
-      AssetsContractController: undefined,
-    };
-
-    expect(initialBackgroundState).toStrictEqual(newBackgroundState);
+    expect(initialBackgroundState).toStrictEqual(backgroundState);
   });
 
   it('setSelectedAccount throws an error if no account exists for the given address', () => {
@@ -89,6 +82,30 @@ describe('Engine', () => {
     );
   });
 
+  it('normalizes CurrencyController state property conversionRate from null to 0', () => {
+    const ticker = 'ETH';
+    const state = {
+      CurrencyRateController: {
+        currentCurrency: 'usd' as const,
+        currencyRates: {
+          [ticker]: {
+            conversionRate: null,
+            conversionDate: 0,
+            usdConversionRate: null,
+          },
+        },
+      },
+    };
+    const engine = Engine.init(state);
+    expect(
+      engine.datamodel.state.CurrencyRateController.currencyRates[ticker],
+    ).toStrictEqual({
+      conversionRate: 0,
+      conversionDate: 0,
+      usdConversionRate: null,
+    });
+  });
+
   describe('getTotalFiatAccountBalance', () => {
     let engine: EngineClass;
     afterEach(() => engine?.destroyEngineInstance());
diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
index 44f8fea10a9..95c23de7ba2 100644
--- a/app/core/Engine/Engine.ts
+++ b/app/core/Engine/Engine.ts
@@ -154,9 +154,9 @@ import {
   AccountsControllerSelectedAccountChangeEvent,
   AccountsControllerAccountAddedEvent,
   AccountsControllerAccountRenamedEvent,
-} from './controllers/accounts/constants';
+} from './controllers/AccountsController/constants';
 import { AccountsControllerMessenger } from '@metamask/accounts-controller';
-import { createAccountsController } from './controllers/accounts/utils';
+import { createAccountsController } from './controllers/AccountsController/utils';
 import { createRemoteFeatureFlagController } from './controllers/RemoteFeatureFlagController';
 import { captureException } from '@sentry/react-native';
 import { lowerCase } from 'lodash';
@@ -200,11 +200,15 @@ import { JsonMap } from '../Analytics/MetaMetrics.types';
 import { isPooledStakingFeatureEnabled } from '../../components/UI/Stake/constants';
 import {
   ControllerMessenger,
-  Controllers,
   EngineState,
   EngineContext,
   TransactionEventPayload,
+  StatefulControllers,
 } from './types';
+import {
+  BACKGROUND_STATE_CHANGE_EVENT_NAMES,
+  STATELESS_NON_CONTROLLER_NAMES,
+} from './constants';
 import {
   getGlobalChainId,
   getGlobalNetworkClientId,
@@ -239,9 +243,7 @@ export class Engine {
   /**
    * ComposableController reference containing all child controllers
    */
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  datamodel: any;
+  datamodel: ComposableController<EngineState, StatefulControllers>;
 
   /**
    * Object containing the info for the latest incoming tx block
@@ -449,7 +451,25 @@ export class Engine {
         allowedActions: [`${networkController.name}:getNetworkClientById`],
         allowedEvents: [],
       }),
-      state: initialState.CurrencyRateController,
+      // normalize `null` currencyRate to `0`
+      // TODO: handle `null` currencyRate by hiding fiat values instead
+      state: {
+        ...initialState.CurrencyRateController,
+        currencyRates: Object.fromEntries(
+          Object.entries(
+            initialState.CurrencyRateController?.currencyRates ?? {
+              ETH: {
+                conversionRate: 0,
+                conversionDate: 0,
+                usdConversionRate: null,
+              },
+            },
+          ).map(([k, v]) => [
+            k,
+            { ...v, conversionRate: v.conversionRate ?? 0 },
+          ]),
+        ),
+      },
     });
 
     const gasFeeController = new GasFeeController({
@@ -1022,12 +1042,17 @@ export class Engine {
           'NotificationServicesController:selectIsNotificationServicesEnabled',
           AccountsControllerListAccountsAction,
           AccountsControllerUpdateAccountMetadataAction,
+          'NetworkController:getState',
+          'NetworkController:addNetwork',
+          'NetworkController:removeNetwork',
+          'NetworkController:updateNetwork',
         ],
         allowedEvents: [
           'KeyringController:unlock',
           'KeyringController:lock',
           AccountsControllerAccountAddedEvent,
           AccountsControllerAccountRenamedEvent,
+          'NetworkController:networkRemoved',
         ],
       }),
       nativeScryptCrypto: scrypt,
@@ -1148,7 +1173,7 @@ export class Engine {
 
           return Boolean(
             hasProperty(showIncomingTransactions, currentChainId) &&
-              showIncomingTransactions?.[currentHexChainId],
+            showIncomingTransactions?.[currentHexChainId],
           );
         },
         updateTransactions: true,
@@ -1457,24 +1482,21 @@ export class Engine {
       }),
     };
 
-    // Avoiding `Object.values` and `getKnownPropertyNames` for performance benefits: https://www.measurethat.net/Benchmarks/Show/7173/0/objectvalues-vs-reduce
-    const controllers = (
-      Object.keys(this.context) as (keyof Controllers)[]
-    ).reduce<Controllers[keyof Controllers][]>(
-      (controllers, controllerName) => {
-        const controller = this.context[controllerName];
-        if (controller) {
-          controllers.push(controller);
-        }
-        return controllers;
+    const childControllers = Object.assign({}, this.context);
+    STATELESS_NON_CONTROLLER_NAMES.forEach((name) => {
+      if (name in childControllers && childControllers[name]) {
+        delete childControllers[name];
+      }
+    });
+    this.datamodel = new ComposableController<EngineState, StatefulControllers>(
+      {
+        controllers: childControllers as StatefulControllers,
+        messenger: this.controllerMessenger.getRestricted({
+          name: 'ComposableController',
+          allowedActions: [],
+          allowedEvents: Array.from(BACKGROUND_STATE_CHANGE_EVENT_NAMES),
+        }),
       },
-      [],
-    );
-
-    this.datamodel = new ComposableController(
-      // @ts-expect-error TODO: Filter out non-controller instances
-      controllers,
-      this.controllerMessenger,
     );
 
     const { NftController: nfts } = this.context;
@@ -1484,9 +1506,9 @@ export class Engine {
     }
 
     this.controllerMessenger.subscribe(
-      'TransactionController:incomingTransactionBlockReceived',
-      (blockNumber: number) => {
-        NotificationManager.gotIncomingTransaction(blockNumber);
+      'TransactionController:incomingTransactionsReceived',
+      (incomingTransactions: TransactionMeta[]) => {
+        NotificationManager.gotIncomingTransaction(incomingTransactions);
       },
     );
 
@@ -1644,10 +1666,12 @@ export class Engine {
   startPolling() {
     const { NetworkController, TransactionController } = this.context;
 
-    const networkClientId = getGlobalNetworkClientId(NetworkController);
+    const chainId = getGlobalChainId(NetworkController);
+
+    TransactionController.stopIncomingTransactionPolling();
 
     // leaving the reference of TransactionController here, rather than importing it from utils to avoid circular dependency
-    TransactionController.startIncomingTransactionPolling([networkClientId]);
+    TransactionController.startIncomingTransactionPolling([chainId]);
   }
 
   configureControllersOnNetworkChange() {
@@ -1756,7 +1780,7 @@ export class Engine {
 
         const tokenBalances =
           allTokenBalances?.[selectedInternalAccount.address as Hex]?.[
-            chainId
+          chainId
           ] ?? {};
         tokens.forEach(
           (item: { address: string; balance?: string; decimals: number }) => {
@@ -1767,9 +1791,9 @@ export class Engine {
               item.balance ||
               (item.address in tokenBalances
                 ? renderFromTokenMinimalUnit(
-                    tokenBalances[item.address as Hex],
-                    item.decimals,
-                  )
+                  tokenBalances[item.address as Hex],
+                  item.decimals,
+                )
                 : undefined);
             const tokenBalanceFiat = balanceToFiatNumber(
               // TODO: Fix this by handling or eliminating the undefined case
@@ -2074,22 +2098,12 @@ export default {
       AccountsController,
     } = instance.datamodel.state;
 
-    // normalize `null` currencyRate to `0`
-    // TODO: handle `null` currencyRate by hiding fiat values instead
-    const modifiedCurrencyRateControllerState = {
-      ...CurrencyRateController,
-      conversionRate:
-        CurrencyRateController.conversionRate === null
-          ? 0
-          : CurrencyRateController.conversionRate,
-    };
-
     return {
       AccountTrackerController,
       AddressBookController,
       NftController,
       TokenListController,
-      CurrencyRateController: modifiedCurrencyRateControllerState,
+      CurrencyRateController,
       KeyringController,
       NetworkController,
       PhishingController,
diff --git a/app/core/Engine/constants.ts b/app/core/Engine/constants.ts
new file mode 100644
index 00000000000..cc33feb0f69
--- /dev/null
+++ b/app/core/Engine/constants.ts
@@ -0,0 +1,45 @@
+/**
+ * Messageable modules that are part of the Engine's context, but are not defined with state.
+ * TODO: Replace with type guard once consistent inheritance for non-controllers is implemented. See: https://github.com/MetaMask/decisions/pull/41
+ */
+export const STATELESS_NON_CONTROLLER_NAMES = [
+  'AssetsContractController',
+  'NftDetectionController',
+  'TokenDetectionController',
+] as const;
+
+export const BACKGROUND_STATE_CHANGE_EVENT_NAMES = [
+  'AccountsController:stateChange',
+  'AccountTrackerController:stateChange',
+  'AddressBookController:stateChange',
+  'ApprovalController:stateChange',
+  'CurrencyRateController:stateChange',
+  'GasFeeController:stateChange',
+  'KeyringController:stateChange',
+  'LoggingController:stateChange',
+  'NetworkController:stateChange',
+  'NftController:stateChange',
+  'PermissionController:stateChange',
+  'PhishingController:stateChange',
+  'PPOMController:stateChange',
+  'PreferencesController:stateChange',
+  'RemoteFeatureFlagController:stateChange',
+  'SelectedNetworkController:stateChange',
+  'SignatureController:stateChange',
+  'SmartTransactionsController:stateChange',
+  'SwapsController:stateChange',
+  'TokenBalancesController:stateChange',
+  'TokenListController:stateChange',
+  'TokenRatesController:stateChange',
+  'TokensController:stateChange',
+  'TransactionController:stateChange',
+  ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+  'SnapController:stateChange',
+  'SnapsRegistry:stateChange',
+  'SubjectMetadataController:stateChange',
+  'AuthenticationController:stateChange',
+  'UserStorageController:stateChange',
+  'NotificationServicesController:stateChange',
+  'NotificationServicesPushController:stateChange',
+  ///: END:ONLY_INCLUDE_IF
+] as const;
diff --git a/app/core/Engine/controllers/accounts/constants.ts b/app/core/Engine/controllers/AccountsController/constants.ts
similarity index 100%
rename from app/core/Engine/controllers/accounts/constants.ts
rename to app/core/Engine/controllers/AccountsController/constants.ts
diff --git a/app/core/Engine/controllers/accounts/utils.test.ts b/app/core/Engine/controllers/AccountsController/utils.test.ts
similarity index 100%
rename from app/core/Engine/controllers/accounts/utils.test.ts
rename to app/core/Engine/controllers/AccountsController/utils.test.ts
diff --git a/app/core/Engine/controllers/accounts/utils.ts b/app/core/Engine/controllers/AccountsController/utils.ts
similarity index 100%
rename from app/core/Engine/controllers/accounts/utils.ts
rename to app/core/Engine/controllers/AccountsController/utils.ts
diff --git a/app/core/Engine/controllers/accounts/README.md b/app/core/Engine/controllers/accounts/README.md
deleted file mode 100644
index 24ea735bd59..00000000000
--- a/app/core/Engine/controllers/accounts/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Controllers owned by the Accounts team
-
-This folder contains controllers that are owned by the Accounts team.
diff --git a/app/core/Engine/types.ts b/app/core/Engine/types.ts
index d9bc8028859..7484b425db7 100644
--- a/app/core/Engine/types.ts
+++ b/app/core/Engine/types.ts
@@ -159,10 +159,16 @@ import {
   AccountsControllerState,
 } from '@metamask/accounts-controller';
 import { getPermissionSpecifications } from '../Permissions/specifications.js';
+import { ComposableControllerEvents } from '@metamask/composable-controller';
+import { STATELESS_NON_CONTROLLER_NAMES } from './constants';
 import {
   RemoteFeatureFlagController,
-  RemoteFeatureFlagControllerState
+  RemoteFeatureFlagControllerState,
 } from '@metamask/remote-feature-flag-controller';
+import {
+  RemoteFeatureFlagControllerActions,
+  RemoteFeatureFlagControllerEvents,
+} from '@metamask/remote-feature-flag-controller/dist/remote-feature-flag-controller.cjs';
 
 /**
  * Controllers that area always instantiated
@@ -174,6 +180,14 @@ type RequiredControllers = Omit<Controllers, 'PPOMController'>;
  */
 type OptionalControllers = Pick<Controllers, 'PPOMController'>;
 
+/**
+ * Controllers that are defined with state.
+ */
+export type StatefulControllers = Omit<
+  Controllers,
+  (typeof STATELESS_NON_CONTROLLER_NAMES)[number]
+>;
+
 type PermissionsByRpcMethod = ReturnType<typeof getPermissionSpecifications>;
 type Permissions = PermissionsByRpcMethod[keyof PermissionsByRpcMethod];
 
@@ -223,9 +237,11 @@ type GlobalActions =
   | TransactionControllerActions
   | SelectedNetworkControllerActions
   | SmartTransactionsControllerActions
-  | AssetsContractControllerActions;
+  | AssetsContractControllerActions
+  | RemoteFeatureFlagControllerActions;
 
 type GlobalEvents =
+  | ComposableControllerEvents<EngineState>
   | AccountTrackerControllerEvents
   | NftControllerEvents
   | SwapsControllerEvents
@@ -255,7 +271,8 @@ type GlobalEvents =
   | TransactionControllerEvents
   | SelectedNetworkControllerEvents
   | SmartTransactionsControllerEvents
-  | AssetsContractControllerEvents;
+  | AssetsContractControllerEvents
+  | RemoteFeatureFlagControllerEvents;
 
 // TODO: Abstract this into controller utils for TransactionController
 export interface TransactionEventPayload {
@@ -276,7 +293,10 @@ export type ControllerMessenger = ExtendedControllerMessenger<
 /**
  * All mobile controllers, keyed by name
  */
-export interface Controllers {
+// Interfaces are incompatible with our controllers and state types by default.
+// Adding an index signature fixes this, but at the cost of widening the type unnecessarily.
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type Controllers = {
   AccountsController: AccountsController;
   AccountTrackerController: AccountTrackerController;
   AddressBookController: AddressBookController;
@@ -316,7 +336,7 @@ export interface Controllers {
   NotificationServicesPushController: NotificationServicesPushController.Controller;
   ///: END:ONLY_INCLUDE_IF
   SwapsController: SwapsController;
-}
+};
 
 /**
  * Combines required and optional controllers for the Engine context type.
@@ -326,7 +346,10 @@ export type EngineContext = RequiredControllers & Partial<OptionalControllers>;
 /**
  * All engine state, keyed by controller name
  */
-export interface EngineState {
+// Interfaces are incompatible with our controllers and state types by default.
+// Adding an index signature fixes this, but at the cost of widening the type unnecessarily.
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type EngineState = {
   AccountTrackerController: AccountTrackerControllerState;
   AddressBookController: AddressBookControllerState;
   NftController: NftControllerState;
@@ -359,4 +382,4 @@ export interface EngineState {
   PPOMController: PPOMState;
   AccountsController: AccountsControllerState;
   SelectedNetworkController: SelectedNetworkControllerState;
-}
+};
diff --git a/app/core/EngineService/EngineService.test.ts b/app/core/EngineService/EngineService.test.ts
index 2d5d0fcacf4..99bc238b2f5 100644
--- a/app/core/EngineService/EngineService.test.ts
+++ b/app/core/EngineService/EngineService.test.ts
@@ -1,41 +1,45 @@
-import EngineService from './EngineService';
+import { EngineService } from './EngineService';
+import ReduxService, { type ReduxStore } from '../redux';
 import Engine from '../Engine';
-import { store } from '../../store';
+import { type KeyringControllerState } from '@metamask/keyring-controller';
+import NavigationService from '../NavigationService';
+import Logger from '../../util/Logger';
+import Routes from '../../constants/navigation/Routes';
 
-jest.mock('../../util/test/network-store.js', () => jest.fn());
-jest.mock('../../store', () => ({
-  store: {
-    getState: jest.fn(() => ({
-      engine: {
-        backgroundState: {},
-      },
-    })),
-    dispatch: jest.fn(),
+// Mock NavigationService
+jest.mock('../NavigationService', () => ({
+  navigation: {
+    reset: jest.fn(),
   },
 }));
 
+// Mock Logger
+jest.mock('../../util/Logger', () => ({
+  error: jest.fn(),
+}));
+
+jest.mock('../BackupVault', () => ({
+  getVaultFromBackup: () => ({ success: true, vault: 'fake_vault' }),
+}));
+
+jest.mock('../../util/test/network-store.js', () => jest.fn());
+
+// Unmock global Engine
+jest.unmock('../Engine');
+
 jest.mock('../Engine', () => {
   // Do not need to mock entire Engine. Only need subset of data for testing purposes.
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let instance: any;
-  return {
-    get context() {
-      if (!instance) {
-        throw new Error('Engine does not exist');
-      }
-      return instance.context;
-    },
-    get controllerMessenger() {
-      if (!instance) {
-        throw new Error('Engine does not exist');
-      }
-      return instance.controllerMessenger;
-    },
-    destroyEngine: jest.fn(),
-    init: jest.fn((_, keyringState) => {
+
+  const mockEngine = {
+    init: (_: unknown, keyringState: KeyringControllerState) => {
       instance = {
-        controllerMessenger: { subscribe: jest.fn() },
+        controllerMessenger: {
+          subscribe: jest.fn(),
+          subscribeOnceIf: jest.fn(),
+        },
         context: {
           AddressBookController: { subscribe: jest.fn() },
           KeyringController: {
@@ -74,18 +78,68 @@ jest.mock('../Engine', () => {
         },
       };
       return instance;
+    },
+    get context() {
+      if (!instance) {
+        throw new Error('Engine does not exist');
+      }
+      return instance.context;
+    },
+    get controllerMessenger() {
+      if (!instance) {
+        throw new Error('Engine does not exist');
+      }
+      return instance.controllerMessenger;
+    },
+    destroyEngine: jest.fn(async () => {
+      instance = null;
     }),
   };
+
+  return {
+    __esModule: true,
+    default: mockEngine,
+  };
 });
 
 describe('EngineService', () => {
-  EngineService.initalizeEngine(store);
+  let engineService: EngineService;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+      getState: () => ({ engine: { backgroundState: {} } }),
+    } as unknown as ReduxStore);
+
+    engineService = new EngineService();
+  });
+
   it('should have Engine initialized', () => {
+    engineService.start();
     expect(Engine.context).toBeDefined();
   });
+
   it('should have recovered vault on redux store ', async () => {
-    const { success } = await EngineService.initializeVaultFromBackup();
+    engineService.start();
+    const { success } = await engineService.initializeVaultFromBackup();
     expect(success).toBeTruthy();
     expect(Engine.context.KeyringController.state.vault).toBeDefined();
   });
+
+  it('should navigate to vault recovery if Engine fails to initialize', () => {
+    jest.spyOn(Engine, 'init').mockImplementation(() => {
+      throw new Error('Failed to initialize Engine');
+    });
+    engineService.start();
+    // Logs error to Sentry
+    expect(Logger.error).toHaveBeenCalledWith(
+      new Error('Failed to initialize Engine'),
+      'Failed to initialize Engine! Falling back to vault recovery.',
+    );
+    // Navigates to vault recovery
+    expect(NavigationService.navigation?.reset).toHaveBeenCalledWith({
+      routes: [{ name: Routes.VAULT_RECOVERY.RESTORE_WALLET }],
+    });
+  });
 });
diff --git a/app/core/EngineService/EngineService.ts b/app/core/EngineService/EngineService.ts
index 293502f18dc..6ba3e827cb9 100644
--- a/app/core/EngineService/EngineService.ts
+++ b/app/core/EngineService/EngineService.ts
@@ -1,7 +1,6 @@
 import UntypedEngine from '../Engine';
 import AppConstants from '../AppConstants';
 import { getVaultFromBackup } from '../BackupVault';
-import { store as importedStore } from '../../store';
 import Logger from '../../util/Logger';
 import {
   NO_VAULT_IN_BACKUP_ERROR,
@@ -10,6 +9,9 @@ import {
 import { getTraceTags } from '../../util/sentry/tags';
 import { trace, endTrace, TraceName, TraceOperation } from '../../util/trace';
 import getUIStartupSpan from '../Performance/UIStartup';
+import ReduxService from '../redux';
+import NavigationService from '../NavigationService';
+import Routes from '../../constants/navigation/Routes';
 
 interface InitializeEngineResult {
   success: boolean;
@@ -18,37 +20,57 @@ interface InitializeEngineResult {
 
 const UPDATE_BG_STATE_KEY = 'UPDATE_BG_STATE';
 const INIT_BG_STATE_KEY = 'INIT_BG_STATE';
-class EngineService {
+export class EngineService {
   private engineInitialized = false;
 
   /**
-   * Initializer for the EngineService
+   * Starts the Engine and subscribes to the controller state changes
    *
-   * @param store - Redux store
+   * EngineService.start() with SES/lockdown:
+   * Requires ethjs nested patches (lib->src)
+   * - ethjs/ethjs-query
+   * - ethjs/ethjs-contract
+   * Otherwise causing the following errors:
+   * - TypeError: Cannot assign to read only property 'constructor' of object '[object Object]'
+   * - Error: Requiring module "node_modules/ethjs/node_modules/ethjs-query/lib/index.js", which threw an exception: TypeError:
+   * -  V8: Cannot assign to read only property 'constructor' of object '[object Object]'
+   * -  JSC: Attempted to assign to readonly property
+   * - node_modules/babel-runtime/node_modules/regenerator-runtime/runtime.js
+   * - V8: TypeError: _$$_REQUIRE(...) is not a constructor
+   * - TypeError: undefined is not an object (evaluating 'TokenListController.tokenList')
+   * - V8: SES_UNHANDLED_REJECTION
    */
-
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  initalizeEngine = (store: any) => {
+  start = () => {
+    const reduxState = ReduxService.store.getState();
     trace({
       name: TraceName.EngineInitialization,
       op: TraceOperation.EngineInitialization,
       parentContext: getUIStartupSpan(),
-      tags: getTraceTags(store.getState()),
+      tags: getTraceTags(reduxState),
     });
-    const reduxState = store.getState?.();
     const state = reduxState?.engine?.backgroundState || {};
     // TODO: Replace "any" with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const Engine = UntypedEngine as any;
-    Engine.init(state);
-    this.updateControllers(store, Engine);
+    try {
+      Engine.init(state);
+      this.updateControllers(Engine);
+    } catch (error) {
+      Logger.error(
+        error as Error,
+        'Failed to initialize Engine! Falling back to vault recovery.',
+      );
+      // Navigate to vault recovery
+      NavigationService.navigation?.reset({
+        routes: [{ name: Routes.VAULT_RECOVERY.RESTORE_WALLET }],
+      });
+    }
     endTrace({ name: TraceName.EngineInitialization });
   };
 
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private updateControllers = (store: any, engine: any) => {
+  private updateControllers = (engine: any) => {
     if (!engine.context) {
       Logger.error(
         new Error(
@@ -173,29 +195,30 @@ class EngineService {
       },
     ];
 
-    engine?.datamodel?.subscribe?.(() => {
-      if (!engine.context.KeyringController.metadata.vault) {
-        Logger.log('keyringController vault missing for INIT_BG_STATE_KEY');
-      }
-      if (!this.engineInitialized) {
-        store.dispatch({ type: INIT_BG_STATE_KEY });
+    engine.controllerMessenger.subscribeOnceIf(
+      'ComposableController:stateChange',
+      () => {
+        if (!engine.context.KeyringController.metadata.vault) {
+          Logger.log('keyringController vault missing for INIT_BG_STATE_KEY');
+        }
+        ReduxService.store.dispatch({ type: INIT_BG_STATE_KEY });
         this.engineInitialized = true;
-      }
-    });
+      },
+      () => !this.engineInitialized,
+    );
 
     controllers.forEach((controller) => {
-      const { name, key = undefined } = controller;
+      const { name, key } = controller;
       const update_bg_state_cb = () => {
         if (!engine.context.KeyringController.metadata.vault) {
           Logger.log('keyringController vault missing for UPDATE_BG_STATE_KEY');
         }
-        store.dispatch({ type: UPDATE_BG_STATE_KEY, payload: { key: name } });
+        ReduxService.store.dispatch({
+          type: UPDATE_BG_STATE_KEY,
+          payload: { key: name },
+        });
       };
-      if (key) {
-        engine.controllerMessenger.subscribe(key, update_bg_state_cb);
-      } else {
-        engine.context[name].subscribe(update_bg_state_cb);
-      }
+      engine.controllerMessenger.subscribe(key, update_bg_state_cb);
     });
   };
 
@@ -210,7 +233,7 @@ class EngineService {
    */
   async initializeVaultFromBackup(): Promise<InitializeEngineResult> {
     const keyringState = await getVaultFromBackup();
-    const reduxState = importedStore.getState?.();
+    const reduxState = ReduxService.store.getState();
     const state = reduxState?.engine?.backgroundState || {};
     // TODO: Replace "any" with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -225,7 +248,7 @@ class EngineService {
       };
       const instance = Engine.init(state, newKeyringState);
       if (instance) {
-        this.updateControllers(importedStore, instance);
+        this.updateControllers(instance);
         // this is a hack to give the engine time to reinitialize
         await new Promise((resolve) => setTimeout(resolve, 2000));
         return {
diff --git a/app/core/EngineService/index.ts b/app/core/EngineService/index.ts
index 9bed417ddf2..dd9072d50ea 100644
--- a/app/core/EngineService/index.ts
+++ b/app/core/EngineService/index.ts
@@ -1,2 +1 @@
-import EngineService from './EngineService';
-export default EngineService;
+export { default } from './EngineService';
diff --git a/app/core/LockManagerService/index.test.ts b/app/core/LockManagerService/index.test.ts
index a562ab57efe..4924e5d479d 100644
--- a/app/core/LockManagerService/index.test.ts
+++ b/app/core/LockManagerService/index.test.ts
@@ -1,7 +1,8 @@
-import LockManagerService from '.';
-import { AppState } from 'react-native';
-import configureMockStore from 'redux-mock-store';
+import { LockManagerService } from '.';
+import { AppState, AppStateStatus } from 'react-native';
 import { interruptBiometrics, lockApp } from '../../actions/user';
+import Logger from '../../util/Logger';
+import ReduxService, { type ReduxStore } from '../redux';
 
 jest.mock('../Engine', () => ({
   context: {
@@ -10,133 +11,148 @@ jest.mock('../Engine', () => ({
     },
   },
 }));
+
 const mockSetTimeout = jest.fn();
+
 jest.mock('react-native-background-timer', () => ({
   setTimeout: () => mockSetTimeout(),
 }));
+
 jest.mock('../SecureKeychain', () => ({
   getInstance: () => ({
     isAuthenticating: false,
   }),
 }));
 
-const initialState = {
-  settings: {
-    lockTime: 0,
-  },
-};
-const mockStore = configureMockStore();
-const defaultStore = mockStore(initialState);
-
-describe('startListening', () => {
-  const addEventListener = jest.spyOn(AppState, 'addEventListener');
-
-  afterEach(() => {
-    LockManagerService.stopListening();
-    jest.clearAllMocks();
-  });
-
-  it('should do nothing when store is undefined.', async () => {
-    LockManagerService.startListening();
-    expect(addEventListener).not.toBeCalled();
-  });
-
-  it('should do nothing when app state listener is already subscribed.', async () => {
-    LockManagerService.init(defaultStore);
-    LockManagerService.startListening();
-    expect(addEventListener).toBeCalledTimes(1);
-    LockManagerService.startListening();
-    expect(addEventListener).toBeCalledTimes(1);
-  });
-
-  it('should add event listener when store is defined and listener is not yet subscribed.', async () => {
-    LockManagerService.init(defaultStore);
-    LockManagerService.startListening();
-    expect(addEventListener).toBeCalled();
-  });
-});
+jest.mock('../../util/Logger', () => ({
+  log: jest.fn(),
+  error: jest.fn(),
+}));
 
-describe('stopListening', () => {
-  const addEventListener = jest.spyOn(AppState, 'addEventListener');
+describe('LockManagerService', () => {
+  let lockManagerService: LockManagerService;
+  let mockAppStateListener: (state: AppStateStatus) => void;
 
-  afterEach(() => {
-    LockManagerService.stopListening();
+  beforeEach(() => {
     jest.clearAllMocks();
+    jest.resetModules();
+    jest.useFakeTimers();
+    (AppState.addEventListener as jest.Mock).mockImplementation(
+      (_, listener) => {
+        mockAppStateListener = listener;
+        return { remove: jest.fn() };
+      },
+    );
+    lockManagerService = new LockManagerService();
   });
 
-  it('should remove app state listener.', async () => {
-    LockManagerService.init(defaultStore);
-    LockManagerService.startListening();
-    expect(addEventListener).toBeCalledTimes(1);
-    LockManagerService.stopListening();
-    LockManagerService.startListening();
-    expect(addEventListener).toBeCalledTimes(2);
-  });
-});
-
-describe('handleAppStateChange', () => {
-  const addEventListener = jest.spyOn(AppState, 'addEventListener');
-  const defaultDispatch = jest.spyOn(defaultStore, 'dispatch');
-
   afterEach(() => {
-    LockManagerService.stopListening();
-    jest.clearAllMocks();
-  });
-
-  it('should do nothing if lockTime is -1 while going into the background', async () => {
-    const store = mockStore({ settings: { lockTime: -1 } });
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('background');
-    expect(defaultDispatch).not.toBeCalled();
-  });
-
-  it('should do nothing if lockTime is 0 while going inactive.', async () => {
-    const store = mockStore({ settings: { lockTime: 0 } });
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('inactive');
-    expect(defaultDispatch).not.toBeCalled();
-  });
-
-  it('should do nothing while lockTime is 0 while going from inactive to active', async () => {
-    const store = mockStore({ settings: { lockTime: 0 } });
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('inactive');
-    appStateTrigger('active');
-    expect(defaultDispatch).not.toBeCalled();
+    lockManagerService.stopListening();
+    jest.useRealTimers();
   });
 
-  it('should dispatch interruptBiometrics when lockTimer is undefined, lockTime is non-zero, and app state is not active', async () => {
-    const store = mockStore({ settings: { lockTime: 5 } });
-    const dispatch = jest.spyOn(store, 'dispatch');
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('background');
-    expect(dispatch).toBeCalledWith(interruptBiometrics());
+  describe('startListening', () => {
+    it('should do nothing when app state listener is already subscribed.', async () => {
+      lockManagerService.startListening();
+      expect(AppState.addEventListener).toHaveBeenCalledTimes(1);
+      lockManagerService.startListening();
+      expect(AppState.addEventListener).toHaveBeenCalledTimes(1);
+      expect(Logger.log).toHaveBeenCalledWith(
+        'Already subscribed to app state listener.',
+      );
+    });
+
+    it('should add event listener when it is not yet subscribed.', async () => {
+      lockManagerService.startListening();
+      expect(AppState.addEventListener).toHaveBeenCalled();
+    });
   });
 
-  it('should dispatch lockApp when lockTimer is 0 while going into the background', async () => {
-    const store = mockStore({ settings: { lockTime: 0 } });
-    const dispatch = jest.spyOn(store, 'dispatch');
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('background');
-    expect(await dispatch).toBeCalledWith(lockApp());
+  describe('stopListening', () => {
+    it('should remove app state listener.', async () => {
+      lockManagerService.startListening();
+      expect(AppState.addEventListener).toHaveBeenCalledTimes(1);
+      lockManagerService.stopListening();
+      lockManagerService.startListening();
+      expect(AppState.addEventListener).toHaveBeenCalledTimes(2);
+    });
   });
 
-  it('should set background timer when lockTimer is non-zero while going into the background', async () => {
-    const store = mockStore({ settings: { lockTime: 5 } });
-    LockManagerService.init(store);
-    LockManagerService.startListening();
-    const appStateTrigger = addEventListener.mock.calls[0][1];
-    appStateTrigger('background');
-    expect(mockSetTimeout).toBeCalled();
+  describe('handleAppStateChange', () => {
+    it('should throw an error if store is undefined.', async () => {
+      lockManagerService.startListening();
+      mockAppStateListener('active');
+      expect(Logger.error).toHaveBeenCalledWith(
+        new Error('Redux store does not exist!'),
+        'LockManagerService: Error handling app state change',
+      );
+    });
+
+    it('should do nothing if lockTime is -1 while going into the background', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: -1 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('active');
+      expect(mockDispatch).not.toHaveBeenCalled();
+    });
+
+    it('should do nothing if lockTime is 0 while going inactive.', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: 0 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('inactive');
+      expect(mockDispatch).not.toHaveBeenCalled();
+    });
+
+    it('should do nothing while lockTime is 0 while going from inactive to active', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: 0 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('inactive');
+      mockAppStateListener('active');
+      expect(mockDispatch).not.toHaveBeenCalled();
+    });
+
+    it('should dispatch interruptBiometrics when lockTimer is undefined, lockTime is non-zero, and app state is not active', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: 5 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('background');
+      expect(mockDispatch).toHaveBeenCalledWith(interruptBiometrics());
+    });
+
+    it('should dispatch lockApp when lockTimer is 0 while going into the background', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: 0 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('background');
+      expect(await mockDispatch).toHaveBeenCalledWith(lockApp());
+    });
+
+    it('should set background timer when lockTimer is non-zero while going into the background', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        getState: () => ({ settings: { lockTime: 5 } }),
+        dispatch: mockDispatch,
+      } as unknown as ReduxStore);
+      lockManagerService.startListening();
+      mockAppStateListener('background');
+      expect(mockSetTimeout).toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/core/LockManagerService/index.ts b/app/core/LockManagerService/index.ts
index a5f0b346827..0fba5c0978a 100644
--- a/app/core/LockManagerService/index.ts
+++ b/app/core/LockManagerService/index.ts
@@ -8,26 +8,19 @@ import BackgroundTimer from 'react-native-background-timer';
 import Engine from '../Engine';
 import Logger from '../../util/Logger';
 import { lockApp, interruptBiometrics } from '../../actions/user';
-import { Store } from 'redux';
+import ReduxService from '../redux';
 
-class LockManagerService {
+export class LockManagerService {
   #appState?: AppStateStatus;
   #appStateListener?: NativeEventSubscription;
   #lockTimer?: number;
-  #store?: Store;
-
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  init = (store: any) => {
-    this.#store = store;
-  };
 
   #lockApp = async () => {
     if (!SecureKeychain.getInstance().isAuthenticating) {
       const { KeyringController } = Engine.context;
       try {
         await KeyringController.setLocked();
-        this.#store?.dispatch(lockApp());
+        ReduxService.store.dispatch(lockApp());
       } catch (error) {
         Logger.log('Failed to lock KeyringController', error);
       }
@@ -47,55 +40,58 @@ class LockManagerService {
 
   #handleAppStateChange = async (nextAppState: AppStateStatus) => {
     // Don't auto-lock.
-    const lockTime = this.#store?.getState().settings.lockTime;
-    if (
-      lockTime === -1 || // Lock timer isn't set.
-      nextAppState === 'inactive' || // Ignore inactive state.
-      (this.#appState === 'inactive' && nextAppState === 'active') // Ignore going from inactive -> active state.
-    ) {
-      this.#appState = nextAppState;
-      return;
-    }
+    try {
+      const lockTime = ReduxService.store.getState().settings.lockTime;
+      if (
+        lockTime === -1 || // Lock timer isn't set.
+        nextAppState === 'inactive' || // Ignore inactive state.
+        (this.#appState === 'inactive' && nextAppState === 'active') // Ignore going from inactive -> active state.
+      ) {
+        this.#appState = nextAppState;
+        return;
+      }
 
-    // EDGE CASE
-    // Handles interruptions in the middle of authentication while lock timer is a non-zero value
-    // This is most likely called when the background timer fails to be called while backgrounding the app
-    if (!this.#lockTimer && lockTime !== 0 && nextAppState !== 'active') {
-      this.#store?.dispatch(interruptBiometrics());
-    }
+      // EDGE CASE
+      // Handles interruptions in the middle of authentication while lock timer is a non-zero value
+      // This is most likely called when the background timer fails to be called while backgrounding the app
+      if (!this.#lockTimer && lockTime !== 0 && nextAppState !== 'active') {
+        ReduxService.store.dispatch(interruptBiometrics());
+      }
 
-    // Handle lock logic on background.
-    if (nextAppState === 'background') {
-      if (lockTime === 0) {
-        this.#lockApp();
-      } else {
-        // Autolock after some time.
+      // Handle lock logic on background.
+      if (nextAppState === 'background') {
+        if (lockTime === 0) {
+          this.#lockApp();
+        } else {
+          // Autolock after some time.
+          this.#clearBackgroundTimer();
+          this.#lockTimer = BackgroundTimer.setTimeout(() => {
+            if (this.#lockTimer) {
+              this.#lockApp();
+            }
+          }, lockTime);
+        }
+      }
+
+      // App has foregrounded from background.
+      // Clear background timer for safe measure.
+      if (nextAppState === 'active') {
         this.#clearBackgroundTimer();
-        this.#lockTimer = BackgroundTimer.setTimeout(() => {
-          if (this.#lockTimer) {
-            this.#lockApp();
-          }
-        }, lockTime);
       }
-    }
 
-    // App has foregrounded from background.
-    // Clear background timer for safe measure.
-    if (nextAppState === 'active') {
-      this.#clearBackgroundTimer();
+      this.#appState = nextAppState;
+    } catch (error) {
+      Logger.error(
+        error as Error,
+        'LockManagerService: Error handling app state change',
+      );
     }
-
-    this.#appState = nextAppState;
   };
 
   /**
    * Listen to AppState events to control lock state.
    */
   startListening = () => {
-    if (!this.#store) {
-      Logger.log('Failed to start listener since store is undefined.');
-      return;
-    }
     if (this.#appStateListener) {
       Logger.log('Already subscribed to app state listener.');
       return;
diff --git a/app/core/NotificationManager.js b/app/core/NotificationManager.js
index 013a49ebce9..9f068dbac6f 100644
--- a/app/core/NotificationManager.js
+++ b/app/core/NotificationManager.js
@@ -9,13 +9,14 @@ import NotificationsService from '../util/notifications/services/NotificationSer
 import { NotificationTransactionTypes, ChannelId } from '../util/notifications';
 import { safeToChecksumAddress, formatAddress } from '../util/address';
 import ReviewManager from './ReviewManager';
-import { selectChainId, selectTicker } from '../selectors/networkController';
+import { selectTicker } from '../selectors/networkController';
 import { store } from '../store';
-import { useSelector } from 'react-redux';
 import { getTicker } from '../../app/util/transactions';
 import { updateTransaction } from '../../app/util/transaction-controller';
 import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
 
+import Logger from '../util/Logger';
+import { TransactionStatus } from '@metamask/transaction-controller';
 export const constructTitleAndMessage = (notification) => {
   let title, message;
   switch (notification.type) {
@@ -431,56 +432,60 @@ class NotificationManager {
   /**
    * Generates a notification for an incoming transaction
    */
-  gotIncomingTransaction = async (lastBlock) => {
-    const {
-      AccountTrackerController,
-      TransactionController,
-      AccountsController,
-    } = Engine.context;
-    const selectedInternalAccount = AccountsController.getSelectedAccount();
-    const selectedInternalAccountChecksummedAddress = safeToChecksumAddress(
-      selectedInternalAccount.address,
-    );
+  gotIncomingTransaction = async (incomingTransactions) => {
+    try {
+      const {
+        AccountTrackerController,
+        AccountsController,
+      } = Engine.context;
+
+      const selectedInternalAccount = AccountsController.getSelectedAccount();
 
-    const chainId = selectChainId(store.getState());
-    const ticker = useSelector(selectTicker);
+      const selectedInternalAccountChecksummedAddress = safeToChecksumAddress(
+        selectedInternalAccount.address,
+      );
 
-    /// Find the incoming TX
-    const transactions = TransactionController.getTransactions();
+      const ticker = selectTicker(store.getState());
 
-    // If a TX has been confirmed more than 10 min ago, it's considered old
-    const oldestTimeAllowed = Date.now() - 1000 * 60 * 10;
+      // If a TX has been confirmed more than 10 min ago, it's considered old
+      const oldestTimeAllowed = Date.now() - 1000 * 60 * 10;
 
-    if (transactions.length) {
-      const txs = transactions
-        .reverse()
+      const filteredTransactions = incomingTransactions.reverse()
         .filter(
           (tx) =>
             safeToChecksumAddress(tx.txParams?.to) ===
               selectedInternalAccountChecksummedAddress &&
             safeToChecksumAddress(tx.txParams?.from) !==
-              selectedInternalAccountChecksummedAddress &&
-            tx.chainId === chainId &&
-            tx.status === 'confirmed' &&
-            lastBlock <= parseInt(tx.blockNumber, 10) &&
+            selectedInternalAccountChecksummedAddress &&
+            tx.status === TransactionStatus.confirmed &&
             tx.time > oldestTimeAllowed,
         );
-      if (txs.length > 0) {
-        this._showNotification({
-          type: 'received',
-          transaction: {
-            nonce: `${hexToBN(txs[0].txParams.nonce).toString()}`,
-            amount: `${renderFromWei(hexToBN(txs[0].txParams.value))}`,
-            id: txs[0]?.id,
-            assetType: getTicker(ticker),
-          },
-          autoHide: true,
-          duration: 7000,
-        });
+
+      if (!filteredTransactions.length) {
+        return;
       }
+
+      const nonce = hexToBN(filteredTransactions[0].txParams.nonce).toString();
+      const amount = renderFromWei(hexToBN(filteredTransactions[0].txParams.value));
+      const id = filteredTransactions[0]?.id;
+
+      this._showNotification({
+        type: 'received',
+        transaction: {
+          nonce,
+          amount,
+          id,
+          assetType: getTicker(ticker),
+        },
+        autoHide: true,
+        duration: 7000,
+      });
+
+      // Update balance upon detecting a new incoming transaction
+      AccountTrackerController.refresh();
+    } catch (error) {
+      Logger.log('Notifications', 'Error while processing incoming transaction', error);
     }
-    // Update balance upon detecting a new incoming transaction
-    AccountTrackerController.refresh();
   };
 }
 
@@ -512,8 +517,8 @@ export default {
   setTransactionToView(id) {
     return instance?.setTransactionToView(id);
   },
-  gotIncomingTransaction(lastBlock) {
-    return instance?.gotIncomingTransaction(lastBlock);
+  gotIncomingTransaction(incomingTransactions) {
+    return instance?.gotIncomingTransaction(incomingTransactions);
   },
   showSimpleNotification(data) {
     return instance?.showSimpleNotification(data);
diff --git a/app/core/redux/ReduxService.test.ts b/app/core/redux/ReduxService.test.ts
new file mode 100644
index 00000000000..7b14a872c07
--- /dev/null
+++ b/app/core/redux/ReduxService.test.ts
@@ -0,0 +1,67 @@
+import ReduxService from './ReduxService';
+import Logger from '../../util/Logger';
+import type { ReduxStore } from './types';
+
+describe('ReduxService', () => {
+  let mockStore: ReduxStore;
+
+  beforeEach(() => {
+    // Reset any internal state
+    jest.clearAllMocks();
+
+    // Create a mock store
+    mockStore = {
+      dispatch: jest.fn(),
+      getState: jest.fn(),
+      subscribe: jest.fn(),
+      replaceReducer: jest.fn(),
+    } as unknown as ReduxStore;
+
+    // Spy on Logger
+    jest.spyOn(Logger, 'error');
+  });
+
+  describe('store getter', () => {
+    it('should throw error if store does not exist', () => {
+      expect(() => ReduxService.store).toThrow('Redux store does not exist!');
+      expect(Logger.error).toHaveBeenCalledWith(
+        new Error('Redux store does not exist!'),
+      );
+    });
+
+    it('should return store if it exists', () => {
+      ReduxService.store = mockStore;
+      expect(ReduxService.store).toBe(mockStore);
+    });
+  });
+
+  describe('store setter', () => {
+    it('should throw error if store is invalid', () => {
+      const invalidStore = {} as ReduxStore;
+
+      expect(() => {
+        ReduxService.store = invalidStore;
+      }).toThrow('Redux store is not a valid store!');
+
+      expect(Logger.error).toHaveBeenCalledWith(
+        new Error('Redux store is not a valid store!'),
+      );
+    });
+
+    it('should set store if valid', () => {
+      ReduxService.store = mockStore;
+      expect(ReduxService.store).toBe(mockStore);
+    });
+
+    it('should validate store has required methods', () => {
+      const incompleteStore = {
+        dispatch: jest.fn(),
+        // missing getState
+      } as unknown as ReduxStore;
+
+      expect(() => {
+        ReduxService.store = incompleteStore;
+      }).toThrow('Redux store is not a valid store!');
+    });
+  });
+});
diff --git a/app/core/redux/ReduxService.ts b/app/core/redux/ReduxService.ts
new file mode 100644
index 00000000000..7f2d9f75fa6
--- /dev/null
+++ b/app/core/redux/ReduxService.ts
@@ -0,0 +1,49 @@
+import Logger from '../../util/Logger';
+import { ReduxStore } from './types';
+
+/**
+ * ReduxService class that manages the Redux store
+ */
+class ReduxService {
+  static #reduxStore: ReduxStore;
+
+  static #assertReduxStoreType(store: ReduxStore) {
+    if (
+      typeof store.dispatch !== 'function' ||
+      typeof store.getState !== 'function'
+    ) {
+      const error = new Error('Redux store is not a valid store!');
+      Logger.error(error);
+      throw error;
+    }
+    return this.#reduxStore;
+  }
+
+  static #assertReduxStoreExists() {
+    if (!this.#reduxStore) {
+      const error = new Error('Redux store does not exist!');
+      Logger.error(error);
+      throw error;
+    }
+    return this.#reduxStore;
+  }
+
+  /**
+   * Set the store in the Redux class
+   * @param store
+   */
+  static set store(store: ReduxStore) {
+    this.#assertReduxStoreType(store);
+    this.#reduxStore = store;
+  }
+
+  /**
+   * Get the store from the Redux class
+   */
+  static get store() {
+    this.#assertReduxStoreExists();
+    return this.#reduxStore;
+  }
+}
+
+export default ReduxService;
diff --git a/app/core/redux/index.ts b/app/core/redux/index.ts
new file mode 100644
index 00000000000..d3b1d8b7418
--- /dev/null
+++ b/app/core/redux/index.ts
@@ -0,0 +1,3 @@
+export { default } from './ReduxService';
+
+export * from './types';
diff --git a/app/core/redux/types.ts b/app/core/redux/types.ts
new file mode 100644
index 00000000000..09fff70ce7e
--- /dev/null
+++ b/app/core/redux/types.ts
@@ -0,0 +1,8 @@
+import { AnyAction, Store } from 'redux';
+import { RootState } from '../../reducers';
+
+/**
+ * Redux store type
+ * TODO: Replace AnyAction with union type of all actions
+ */
+export type ReduxStore = Store<RootState, AnyAction>;
diff --git a/app/lib/ppom/ppom-util.test.ts b/app/lib/ppom/ppom-util.test.ts
index 27340f43e23..89faa23a585 100644
--- a/app/lib/ppom/ppom-util.test.ts
+++ b/app/lib/ppom/ppom-util.test.ts
@@ -157,6 +157,7 @@ describe('PPOM Utils', () => {
                 url: 'https://mainnet.infura.io/v3',
               },
             ],
+            lastUpdatedAt: Date.now(),
           },
         },
         networksMetadata: {},
@@ -182,7 +183,9 @@ describe('PPOM Utils', () => {
       MockEngine.context.PreferencesController.state.securityAlertsEnabled =
         false;
       await PPOMUtil.validateRequest(mockRequest, CHAIN_ID_MOCK);
-      expect(MockEngine.context.PPOMController?.usePPOM).toHaveBeenCalledTimes(0);
+      expect(MockEngine.context.PPOMController?.usePPOM).toHaveBeenCalledTimes(
+        0,
+      );
       expect(spyTransactionAction).toHaveBeenCalledTimes(0);
     });
 
@@ -437,4 +440,4 @@ describe('PPOM Utils', () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/app/reducers/index.ts b/app/reducers/index.ts
index ee998f4724f..990bc742032 100644
--- a/app/reducers/index.ts
+++ b/app/reducers/index.ts
@@ -7,7 +7,7 @@ import settingsReducer from './settings';
 import alertReducer from './alert';
 import transactionReducer from './transaction';
 import legalNoticesReducer from './legalNotices';
-import userReducer, { IUserReducer } from './user';
+import userReducer, { UserState } from './user';
 import wizardReducer from './wizard';
 import onboardingReducer from './onboarding';
 import fiatOrders from './fiatOrders';
@@ -16,7 +16,7 @@ import signatureRequestReducer from './signatureRequest';
 import notificationReducer from './notification';
 import infuraAvailabilityReducer from './infuraAvailability';
 import collectiblesReducer from './collectibles';
-import navigationReducer from './navigation';
+import navigationReducer, { NavigationState } from './navigation';
 import networkOnboardReducer from './networkSelector';
 import securityReducer, { SecurityState } from './security';
 import { combineReducers, Reducer } from 'redux';
@@ -81,7 +81,7 @@ export interface RootState {
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transaction: any;
-  user: IUserReducer;
+  user: UserState;
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   wizard: any;
@@ -98,10 +98,7 @@ export interface RootState {
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   infuraAvailability: any;
-  // The navigation reducer is TypeScript but not yet a valid reducer
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  navigation: any;
+  navigation: NavigationState;
   // The networkOnboarded reducer is TypeScript but not yet a valid reducer
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/reducers/navigation/index.ts b/app/reducers/navigation/index.ts
index 9078531b0cb..4cdf8a0558f 100644
--- a/app/reducers/navigation/index.ts
+++ b/app/reducers/navigation/index.ts
@@ -1,32 +1,36 @@
-/**
- * Constants
- */
-export const SET_CURRENT_ROUTE = 'SET_CURRENT_ROUTE';
-export const SET_CURRENT_BOTTOM_NAV_ROUTE = 'SET_CURRENT_TAB_BAR_ROUTE';
+import {
+  type NavigationAction,
+  NavigationActionType,
+} from '../../actions/navigation/types';
+import { NavigationState } from './types';
+
+export * from './types';
+
+export * from './selectors';
 
 /**
- * Reducers
+ * Initial navigation state
  */
-interface InitialState {
-  currentRoute: string;
-  currentBottomNavRoute: string;
-}
-
-const initialState: InitialState = {
+export const initialNavigationState: NavigationState = {
   currentRoute: 'WalletView',
   currentBottomNavRoute: 'Wallet',
 };
 
-// TODO: Replace "any" with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const navigationReducer = (state = initialState, action: any = {}) => {
+/**
+ * Navigation reducer
+ */
+/* eslint-disable @typescript-eslint/default-param-last */
+const navigationReducer = (
+  state: NavigationState = initialNavigationState,
+  action: NavigationAction,
+): NavigationState => {
   switch (action.type) {
-    case SET_CURRENT_ROUTE:
+    case NavigationActionType.SET_CURRENT_ROUTE:
       return {
         ...state,
         currentRoute: action.payload.route,
       };
-    case SET_CURRENT_BOTTOM_NAV_ROUTE:
+    case NavigationActionType.SET_CURRENT_BOTTOM_NAV_ROUTE:
       return {
         ...state,
         currentBottomNavRoute: action.payload.route,
diff --git a/app/reducers/navigation/selectors.ts b/app/reducers/navigation/selectors.ts
new file mode 100644
index 00000000000..a85aaa1cac0
--- /dev/null
+++ b/app/reducers/navigation/selectors.ts
@@ -0,0 +1,23 @@
+import { createSelector } from 'reselect';
+import { RootState } from '..';
+
+/**
+ * Selects the navigation state
+ */
+export const selectNavigationState = (state: RootState) => state.navigation;
+
+/**
+ * Selects the current route
+ */
+export const selectCurrentRoute = createSelector(
+  selectNavigationState,
+  (navigationState) => navigationState.currentRoute,
+);
+
+/**
+ * Selects the current bottom nav route
+ */
+export const selectCurrentBottomNavRoute = createSelector(
+  selectNavigationState,
+  (navigationState) => navigationState.currentBottomNavRoute,
+);
diff --git a/app/reducers/navigation/types.ts b/app/reducers/navigation/types.ts
new file mode 100644
index 00000000000..b5f22b005e6
--- /dev/null
+++ b/app/reducers/navigation/types.ts
@@ -0,0 +1,8 @@
+/**
+ * Navigation state
+ */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type NavigationState = {
+  currentRoute: string;
+  currentBottomNavRoute: string;
+};
diff --git a/app/reducers/swaps/index.js b/app/reducers/swaps/index.js
index 84674aee8ca..af7fbe11cae 100644
--- a/app/reducers/swaps/index.js
+++ b/app/reducers/swaps/index.js
@@ -5,11 +5,15 @@ import { toLowerCaseEquals } from '../../util/general';
 import Engine from '../../core/Engine';
 import { lte } from '../../util/lodash';
 import { selectChainId } from '../../selectors/networkController';
-import { selectTokens } from '../../selectors/tokensController';
+import {
+  selectAllTokens,
+  selectTokens,
+} from '../../selectors/tokensController';
 import { selectContractBalances } from '../../selectors/tokenBalancesController';
 import { getChainFeatureFlags, getSwapsLiveness } from './utils';
 import { allowedTestnetChainIds } from '../../components/UI/Swaps/utils';
 import { NETWORKS_CHAIN_ID } from '../../constants/network';
+import { selectSelectedInternalAccountAddress } from '../../selectors/accountsController';
 
 // If we are in dev and on a testnet, just use mainnet feature flags,
 // since we don't have feature flags for testnets in the API
@@ -65,6 +69,11 @@ export const swapsLivenessSelector = createSelector(
   (swapsState, chainId) => swapsState[chainId]?.isLive || false,
 );
 
+export const swapsLivenessMultichainSelector = createSelector(
+  [swapsStateSelector, (_state, chainId) => chainId],
+  (swapsState, chainId) => swapsState[chainId]?.isLive || false,
+);
+
 /**
  * Returns if smart transactions are enabled in feature flags
  */
@@ -190,6 +199,39 @@ const swapsControllerAndUserTokens = createSelector(
   },
 );
 
+const swapsControllerAndUserTokensMultichain = createSelector(
+  swapsControllerTokens,
+  selectAllTokens,
+  selectSelectedInternalAccountAddress,
+  (swapsTokens, allTokens, currentUserAddress) => {
+    const allTokensArr = Object.values(allTokens);
+    const allUserTokensCrossChains = allTokensArr.reduce(
+      (acc, tokensElement) => {
+        const found = tokensElement[currentUserAddress] || [];
+        return [...acc, ...found.flat()];
+      },
+      [],
+    );
+    const values = [...(swapsTokens || []), ...(allUserTokensCrossChains || [])]
+      .filter(Boolean)
+      .reduce((map, { hasBalanceError, image, ...token }) => {
+        const key = token.address.toLowerCase();
+
+        if (!map.has(key)) {
+          map.set(key, {
+            occurrences: 0,
+            ...token,
+            decimals: Number(token.decimals),
+            address: key,
+          });
+        }
+        return map;
+      }, new Map())
+      .values();
+    return [...values];
+  },
+);
+
 export const swapsTokensSelector = createSelector(
   chainIdSelector,
   swapsControllerAndUserTokens,
@@ -220,6 +262,21 @@ export const swapsTokensObjectSelector = createSelector(
       : {},
 );
 
+/**
+ * Returns a memoized object that only has the addesses cross chains of the tokens as keys
+ * and undefined as value. Useful to check if a token is supported by swaps.
+ */
+export const swapsTokensMultiChainObjectSelector = createSelector(
+  swapsControllerAndUserTokensMultichain,
+  (tokens) =>
+    tokens?.length > 0
+      ? tokens.reduce(
+          (acc, token) => ({ ...acc, [token.address]: undefined }),
+          {},
+        )
+      : {},
+);
+
 /**
  * Returns an array of tokens to display by default on the selector modal
  * based on the current account's balances.
diff --git a/app/reducers/user/index.ts b/app/reducers/user/index.ts
index a942f0eb88d..5941561d6ea 100644
--- a/app/reducers/user/index.ts
+++ b/app/reducers/user/index.ts
@@ -1,21 +1,15 @@
+import { UserAction, UserActionType } from '../../actions/user/types';
 import { AppThemeKey } from '../../util/theme/models';
+import { UserState } from './types';
 
-export interface IUserReducer {
-  loadingMsg: string;
-  loadingSet: boolean;
-  passwordSet: boolean;
-  seedphraseBackedUp: boolean;
-  backUpSeedphraseVisible: boolean;
-  protectWalletModalVisible: boolean;
-  gasEducationCarouselSeen: boolean;
-  userLoggedIn: boolean;
-  isAuthChecked: boolean;
-  initialScreen: string;
-  appTheme: AppThemeKey;
-  ambiguousAddressEntries: Record<string, unknown>;
-}
+export * from './types';
 
-export const userInitialState = {
+export * from './selectors';
+
+/**
+ * Initial user state
+ */
+export const userInitialState: UserState = {
   loadingMsg: '',
   loadingSet: false,
   passwordSet: false,
@@ -30,83 +24,69 @@ export const userInitialState = {
   ambiguousAddressEntries: {},
 };
 
-// Define action types
-type UserAction =
-  | { type: 'LOGIN' }
-  | { type: 'LOGOUT' }
-  | { type: 'LOADING_SET'; loadingMsg: string }
-  | { type: 'LOADING_UNSET' }
-  | { type: 'PASSWORD_SET' }
-  | { type: 'PASSWORD_UNSET' }
-  | { type: 'SEEDPHRASE_NOT_BACKED_UP' }
-  | { type: 'SEEDPHRASE_BACKED_UP' }
-  | { type: 'BACK_UP_SEEDPHRASE_VISIBLE' }
-  | { type: 'BACK_UP_SEEDPHRASE_NOT_VISIBLE' }
-  | { type: 'PROTECT_MODAL_VISIBLE' }
-  | { type: 'PROTECT_MODAL_NOT_VISIBLE' }
-  | { type: 'SET_GAS_EDUCATION_CAROUSEL_SEEN' }
-  | { type: 'SET_APP_THEME'; payload: { theme: AppThemeKey } };
-
+/**
+ * User reducer
+ */
+/* eslint-disable @typescript-eslint/default-param-last */
 const userReducer = (
-  // eslint-disable-next-line @typescript-eslint/default-param-last
-  state: IUserReducer = userInitialState,
+  state: UserState = userInitialState,
   action: UserAction,
-) => {
+): UserState => {
   switch (action.type) {
-    case 'LOGIN':
+    case UserActionType.LOGIN:
       return {
         ...state,
         userLoggedIn: true,
       };
-    case 'LOGOUT':
+    case UserActionType.LOGOUT:
       return {
         ...state,
         userLoggedIn: false,
       };
-    case 'LOADING_SET':
+    case UserActionType.LOADING_SET:
       return {
         ...state,
         loadingSet: true,
         loadingMsg: action.loadingMsg,
       };
-    case 'LOADING_UNSET':
+    case UserActionType.LOADING_UNSET:
       return {
         ...state,
         loadingSet: false,
       };
-    case 'PASSWORD_SET':
+    case UserActionType.PASSWORD_SET:
       return {
         ...state,
         passwordSet: true,
       };
-    case 'PASSWORD_UNSET':
+    case UserActionType.PASSWORD_UNSET:
       return {
         ...state,
         passwordSet: false,
       };
-    case 'SEEDPHRASE_NOT_BACKED_UP':
+    case UserActionType.SEEDPHRASE_NOT_BACKED_UP:
       return {
         ...state,
         seedphraseBackedUp: false,
         backUpSeedphraseVisible: true,
       };
-    case 'SEEDPHRASE_BACKED_UP':
+    case UserActionType.SEEDPHRASE_BACKED_UP:
       return {
         ...state,
         seedphraseBackedUp: true,
         backUpSeedphraseVisible: false,
       };
-    case 'BACK_UP_SEEDPHRASE_VISIBLE':
+    case UserActionType.BACK_UP_SEEDPHRASE_VISIBLE:
       return {
         ...state,
         backUpSeedphraseVisible: true,
       };
-    case 'BACK_UP_SEEDPHRASE_NOT_VISIBLE':
+    case UserActionType.BACK_UP_SEEDPHRASE_NOT_VISIBLE:
       return {
         ...state,
         backUpSeedphraseVisible: false,
       };
-    case 'PROTECT_MODAL_VISIBLE':
+    case UserActionType.PROTECT_MODAL_VISIBLE:
       if (!state.seedphraseBackedUp) {
         return {
           ...state,
@@ -114,17 +94,17 @@ const userReducer = (
         };
       }
       return state;
-    case 'PROTECT_MODAL_NOT_VISIBLE':
+    case UserActionType.PROTECT_MODAL_NOT_VISIBLE:
       return {
         ...state,
         protectWalletModalVisible: false,
       };
-    case 'SET_GAS_EDUCATION_CAROUSEL_SEEN':
+    case UserActionType.SET_GAS_EDUCATION_CAROUSEL_SEEN:
       return {
         ...state,
         gasEducationCarouselSeen: true,
       };
-    case 'SET_APP_THEME':
+    case UserActionType.SET_APP_THEME:
       return {
         ...state,
         appTheme: action.payload.theme,
diff --git a/app/reducers/user/selectors.ts b/app/reducers/user/selectors.ts
new file mode 100644
index 00000000000..2341b19cad8
--- /dev/null
+++ b/app/reducers/user/selectors.ts
@@ -0,0 +1,6 @@
+import { RootState } from '..';
+
+/**
+ * Selects the user state
+ */
+export const selectUserState = (state: RootState) => state.user;
diff --git a/app/reducers/user/types.ts b/app/reducers/user/types.ts
new file mode 100644
index 00000000000..4080aebc5ee
--- /dev/null
+++ b/app/reducers/user/types.ts
@@ -0,0 +1,19 @@
+import { AppThemeKey } from '../../util/theme/models';
+
+/**
+ * User state
+ */
+export interface UserState {
+  loadingMsg: string;
+  loadingSet: boolean;
+  passwordSet: boolean;
+  seedphraseBackedUp: boolean;
+  backUpSeedphraseVisible: boolean;
+  protectWalletModalVisible: boolean;
+  gasEducationCarouselSeen: boolean;
+  userLoggedIn: boolean;
+  isAuthChecked: boolean;
+  initialScreen: string;
+  appTheme: AppThemeKey;
+  ambiguousAddressEntries: Record<string, unknown>;
+}
diff --git a/app/selectors/accountTrackerController.ts b/app/selectors/accountTrackerController.ts
index 1673c613172..0798142afa0 100644
--- a/app/selectors/accountTrackerController.ts
+++ b/app/selectors/accountTrackerController.ts
@@ -1,3 +1,4 @@
+
 import { createSelector } from 'reselect';
 import {
   AccountTrackerControllerState,
diff --git a/app/selectors/accountsController.ts b/app/selectors/accountsController.ts
index 1cf9c757be5..3dbf2580f7b 100644
--- a/app/selectors/accountsController.ts
+++ b/app/selectors/accountsController.ts
@@ -55,6 +55,7 @@ export const selectSelectedInternalAccount = createDeepEqualSelector(
     const accountId = accountsControllerState.internalAccounts.selectedAccount;
     const account =
       accountsControllerState.internalAccounts.accounts[accountId];
+
     if (!account) {
       const err = new Error(
         `selectSelectedInternalAccount: Account with ID ${accountId} not found.`,
diff --git a/app/selectors/currencyRateController.test.ts b/app/selectors/currencyRateController.test.ts
index 1505a1b4f47..e48f6b957a4 100644
--- a/app/selectors/currencyRateController.test.ts
+++ b/app/selectors/currencyRateController.test.ts
@@ -2,7 +2,6 @@ import {
   selectConversionRate,
   selectCurrentCurrency,
   selectCurrencyRates,
-  selectConversionRateFoAllChains,
 } from './currencyRateController';
 import { isTestNet } from '../../app/util/networks';
 import { CurrencyRateState } from '@metamask/assets-controllers';
@@ -84,31 +83,15 @@ describe('CurrencyRateController Selectors', () => {
   });
 
   describe('selectCurrencyRates', () => {
-    it('returns the currency rates from the state', () => {
-      const result = selectCurrencyRates.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
-      );
-      expect(result).toStrictEqual(mockCurrencyRateState.currencyRates);
-    });
-
-    it('returns undefined if currency rates are not set', () => {
-      const result = selectCurrencyRates.resultFunc(
-        {} as unknown as CurrencyRateState,
-      );
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('selectConversionRateFoAllChains', () => {
     it('returns all conversion rates from the state', () => {
-      const result = selectConversionRateFoAllChains.resultFunc(
+      const result = selectCurrencyRates.resultFunc(
         mockCurrencyRateState as unknown as CurrencyRateState,
       );
       expect(result).toStrictEqual(mockCurrencyRateState.currencyRates);
     });
 
     it('returns undefined if conversion rates are not set', () => {
-      const result = selectConversionRateFoAllChains.resultFunc(
+      const result = selectCurrencyRates.resultFunc(
         {} as unknown as CurrencyRateState,
       );
       expect(result).toBeUndefined();
diff --git a/app/selectors/currencyRateController.ts b/app/selectors/currencyRateController.ts
index 03bc2624ea7..715ebeb4e8b 100644
--- a/app/selectors/currencyRateController.ts
+++ b/app/selectors/currencyRateController.ts
@@ -27,6 +27,12 @@ export const selectConversionRate = createSelector(
   },
 );
 
+export const selectCurrencyRates = createSelector(
+  selectCurrencyRateControllerState,
+  (currencyRateControllerState: CurrencyRateState) =>
+    currencyRateControllerState?.currencyRates,
+);
+
 export const selectCurrentCurrency = createSelector(
   selectCurrencyRateControllerState,
   selectTicker,
@@ -35,10 +41,14 @@ export const selectCurrentCurrency = createSelector(
     currencyRateControllerState?.currentCurrency,
 );
 
-export const selectCurrencyRates = createSelector(
+export const selectConversionRateBySymbol = createSelector(
   selectCurrencyRateControllerState,
-  (currencyRateControllerState: CurrencyRateState) =>
-    currencyRateControllerState?.currencyRates,
+  (_: RootState, symbol: string) => symbol,
+  (currencyRateControllerState: CurrencyRateState, symbol: string) =>
+    symbol
+      ? currencyRateControllerState?.currencyRates?.[symbol]?.conversionRate ||
+        0
+      : 0,
 );
 
 export const selectConversionRateFoAllChains = createSelector(
diff --git a/app/selectors/multichain.test.ts b/app/selectors/multichain.test.ts
new file mode 100644
index 00000000000..276517a18cd
--- /dev/null
+++ b/app/selectors/multichain.test.ts
@@ -0,0 +1,188 @@
+import { RootState } from '../reducers';
+import {
+  selectedAccountNativeTokenCachedBalanceByChainId,
+  selectAccountTokensAcrossChains,
+  selectIsBitcoinSupportEnabled,
+  selectIsBitcoinTestnetSupportEnabled,
+} from './multichain';
+
+describe('Multichain Selectors', () => {
+  const mockState: RootState = {
+    engine: {
+      backgroundState: {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            '0x1': {
+              chainId: '0x1',
+              name: 'Ethereum Mainnet',
+              nativeCurrency: 'ETH',
+            },
+            '0x89': {
+              chainId: '0x89',
+              name: 'Polygon',
+              nativeCurrency: 'MATIC',
+            },
+          },
+        },
+        AccountTrackerController: {
+          accountsByChainId: {
+            '0x1': {
+              '0xAddress1': {
+                balance: '0x1',
+                stakedBalance: '0x2',
+              },
+            },
+            '0x89': {
+              '0xAddress1': {
+                balance: '0x3',
+                stakedBalance: '0x0',
+              },
+            },
+          },
+        },
+        TokensController: {
+          allTokens: {
+            '0x1': {
+              '0xAddress1': [
+                {
+                  address: '0xToken1',
+                  symbol: 'TK1',
+                  decimals: 18,
+                  balance: '1000000000000000000',
+                },
+              ],
+            },
+          },
+        },
+        TokenBalancesController: {
+          tokenBalances: {
+            '0xAddress1': {
+              '0x1': {
+                '0xToken1': '0x1',
+              },
+            },
+          },
+        },
+        TokenRatesController: {
+          marketData: {
+            '0x1': {
+              '0xToken1': { price: 100 },
+            },
+          },
+        },
+        CurrencyRateController: {
+          currentCurrency: 'USD',
+          conversionRates: {
+            ETH: 2000,
+            MATIC: 1,
+          },
+        },
+        AccountsController: {
+          internalAccounts: {
+            selectedAccount: '0xAddress1',
+            accounts: {
+              '0xAddress1': {
+                address: '0xAddress1',
+              },
+            },
+          },
+        },
+      },
+    },
+    multichainSettings: {
+      bitcoinSupportEnabled: true,
+      bitcoinTestnetSupportEnabled: false,
+    },
+  } as unknown as RootState;
+
+  describe('selectedAccountNativeTokenCachedBalanceByChainId', () => {
+    it('should return native token balances for all chains', () => {
+      const result =
+        selectedAccountNativeTokenCachedBalanceByChainId(mockState);
+      expect(result).toEqual({
+        '0x1': {
+          balance: '0x1',
+          stakedBalance: '0x2',
+          isStaked: true,
+          name: '',
+        },
+        '0x89': {
+          balance: '0x3',
+          stakedBalance: '0x0',
+          isStaked: false,
+          name: '',
+        },
+      });
+    });
+
+    it('should return empty object when no account is selected', () => {
+      const stateWithoutAccount = {
+        ...mockState,
+        engine: {
+          ...mockState.engine,
+          backgroundState: {
+            ...mockState.engine.backgroundState,
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: undefined,
+                accounts: {},
+              },
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      const result =
+        selectedAccountNativeTokenCachedBalanceByChainId(stateWithoutAccount);
+      expect(result).toEqual({});
+    });
+  });
+
+  describe('selectAccountTokensAcrossChains', () => {
+    it('should return tokens across all chains for selected account', () => {
+      const result = selectAccountTokensAcrossChains(mockState);
+      expect(result).toHaveProperty('0x1');
+
+      const chain1Tokens = result['0x1'] || [];
+      expect(chain1Tokens.length).toBeGreaterThan(0);
+
+      const ethToken = chain1Tokens.find(
+        (token) => token.symbol === 'Ethereum' && !token.isStaked,
+      );
+      expect(ethToken).toBeDefined();
+      expect(ethToken?.isNative).toBe(true);
+      expect(ethToken?.isETH).toBe(true);
+
+      const stakedEthToken = chain1Tokens.find(
+        (token) => token.symbol === 'Ethereum' && token.isStaked,
+      );
+      expect(stakedEthToken).toBeDefined();
+      expect(stakedEthToken?.isNative).toBe(true);
+      expect(stakedEthToken?.isStaked).toBe(true);
+
+      const tk1Token = chain1Tokens.find((token) => token.symbol === 'TK1');
+      expect(tk1Token).toBeDefined();
+      expect(tk1Token?.isNative).toBe(false);
+    });
+
+    it('should handle multiple chains correctly', () => {
+      const result = selectAccountTokensAcrossChains(mockState);
+      expect(result).toHaveProperty('0x89');
+      const polygonTokens = result['0x89'];
+      expect(polygonTokens.length).toBeGreaterThan(0);
+      expect(polygonTokens.some((token) => token.symbol === 'MATIC')).toBe(
+        true,
+      );
+    });
+  });
+
+  describe('Bitcoin Support Flags', () => {
+    it('should return bitcoin support enabled state', () => {
+      expect(selectIsBitcoinSupportEnabled(mockState)).toBe(true);
+    });
+
+    it('should return bitcoin testnet support enabled state', () => {
+      expect(selectIsBitcoinTestnetSupportEnabled(mockState)).toBe(false);
+    });
+  });
+});
diff --git a/app/selectors/multichain.ts b/app/selectors/multichain.ts
index e26741e6cd1..08b6436874f 100644
--- a/app/selectors/multichain.ts
+++ b/app/selectors/multichain.ts
@@ -1,4 +1,217 @@
+import { createSelector } from 'reselect';
+import { Hex } from '@metamask/utils';
+import { Token, getNativeTokenAddress } from '@metamask/assets-controllers';
 import { RootState } from '../reducers';
+import {
+  selectSelectedInternalAccountFormattedAddress,
+  selectSelectedInternalAccount,
+} from './accountsController';
+import { selectAllTokens } from './tokensController';
+import { selectAccountsByChainId } from './accountTrackerController';
+import { selectNetworkConfigurations } from './networkController';
+import { TokenI } from '../components/UI/Tokens/types';
+import { renderFromWei } from '../util/number';
+import { toHex } from '@metamask/controller-utils';
+import {
+  selectCurrencyRates,
+  selectCurrentCurrency,
+} from './currencyRateController';
+import { selectTokenMarketData } from './tokenRatesController';
+
+interface NativeTokenBalance {
+  balance: string;
+  stakedBalance: string;
+  isStaked: boolean;
+  name: string;
+}
+
+type ChainBalances = Record<string, NativeTokenBalance>;
+
+/**
+ * Get the cached native token balance for the selected account by chainId.
+ *
+ * @param {RootState} state - The root state.
+ * @returns {ChainBalances} The cached native token balance for the selected account by chainId.
+ */
+export const selectedAccountNativeTokenCachedBalanceByChainId = createSelector(
+  [selectSelectedInternalAccountFormattedAddress, selectAccountsByChainId],
+  (selectedAddress, accountsByChainId): ChainBalances => {
+    if (!selectedAddress || !accountsByChainId) {
+      return {};
+    }
+
+    const result: ChainBalances = {};
+    for (const chainId in accountsByChainId) {
+      const accounts = accountsByChainId[chainId];
+      const account = accounts[selectedAddress];
+      if (account) {
+        result[chainId] = {
+          balance: account.balance,
+          stakedBalance: account.stakedBalance ?? '0x0',
+          isStaked: account.stakedBalance !== '0x0',
+          name: '',
+        };
+      }
+    }
+
+    return result;
+  },
+);
+
+/**
+ * Selector to get native tokens for the selected account across all chains.
+ */
+export const selectNativeTokensAcrossChains = createSelector(
+  [
+    selectNetworkConfigurations,
+    selectedAccountNativeTokenCachedBalanceByChainId,
+    selectCurrencyRates,
+    selectCurrentCurrency,
+    selectTokenMarketData,
+  ],
+  (
+    networkConfigurations,
+    nativeTokenBalancesByChainId,
+    currencyRates,
+    currentCurrency,
+    tokenMarketData,
+  ) => {
+    const tokensByChain: { [chainId: string]: TokenI[] } = {};
+    for (const token of Object.values(networkConfigurations)) {
+      const nativeChainId = token.chainId as Hex;
+      const nativeTokenInfoByChainId =
+        nativeTokenBalancesByChainId[nativeChainId];
+      const isETH = ['ETH', 'GOETH', 'SepoliaETH', 'LineaETH'].includes(
+        token.nativeCurrency || '',
+      );
+
+      const name = isETH ? 'Ethereum' : token.nativeCurrency;
+      const logo = isETH ? '../images/eth-logo-new.png' : '';
+      tokensByChain[nativeChainId] = [];
+
+      if (
+        nativeTokenInfoByChainId &&
+        nativeTokenInfoByChainId.isStaked &&
+        nativeTokenInfoByChainId.stakedBalance !== '0x00' &&
+        nativeTokenInfoByChainId.stakedBalance !== toHex(0)
+      ) {
+        // Staked tokens
+        tokensByChain[nativeChainId].push({
+          ...nativeTokenInfoByChainId,
+          chainId: nativeChainId,
+          address: getNativeTokenAddress(nativeChainId),
+          balance: renderFromWei(nativeTokenInfoByChainId.stakedBalance),
+          balanceFiat: '',
+          isNative: true,
+          aggregators: [],
+          image: '',
+          logo,
+          isETH,
+          decimals: 18,
+          name: 'Staked Ethereum',
+          symbol: name,
+          isStaked: true,
+          ticker: token.nativeCurrency,
+        });
+      }
+
+      const nativeBalanceFormatted = renderFromWei(
+        nativeTokenInfoByChainId?.balance,
+      );
+
+      const tokenMarketDataByChainId = tokenMarketData?.[nativeChainId];
+      let balanceFiat = '';
+
+      if (
+        tokenMarketDataByChainId &&
+        Object.keys(tokenMarketDataByChainId).length === 0
+      ) {
+        const balanceFiatValue =
+          parseFloat(nativeBalanceFormatted) *
+          (currencyRates?.[token.nativeCurrency]?.conversionRate ?? 0);
+
+        balanceFiat = new Intl.NumberFormat('en-US', {
+          style: 'currency',
+          currency: currentCurrency,
+        }).format(balanceFiatValue);
+      }
+
+      // Non-staked tokens
+      tokensByChain[nativeChainId].push({
+        ...nativeTokenInfoByChainId,
+        name,
+        address: getNativeTokenAddress(nativeChainId),
+        balance: nativeBalanceFormatted,
+        chainId: nativeChainId,
+        isNative: true,
+        aggregators: [],
+        balanceFiat,
+        image: '',
+        logo,
+        isETH,
+        decimals: 18,
+        symbol: name,
+        isStaked: false,
+        ticker: token.nativeCurrency,
+      });
+    }
+
+    return tokensByChain;
+  },
+);
+
+/**
+ * Get the tokens for the selected account across all chains.
+ *
+ * @param {RootState} state - The root state.
+ * @returns {TokensByChain} The tokens for the selected account across all chains.
+ */
+export const selectAccountTokensAcrossChains = createSelector(
+  [
+    selectSelectedInternalAccount,
+    selectAllTokens,
+    selectNetworkConfigurations,
+    selectNativeTokensAcrossChains,
+  ],
+  (selectedAccount, allTokens, networkConfigurations, nativeTokens) => {
+    const selectedAddress = selectedAccount?.address;
+    const tokensByChain: {
+      [chainId: string]: (
+        | TokenI
+        | (Token & { isStaked?: boolean; isNative?: boolean; isETH?: boolean })
+      )[];
+    } = {};
+
+    if (!selectedAddress) {
+      return tokensByChain;
+    }
+
+    // Create a list of available chainIds
+    const chainIds = Object.keys(networkConfigurations);
+
+    for (const chainId of chainIds) {
+      const currentChainId = chainId as Hex;
+      const nonNativeTokens =
+        allTokens[currentChainId]?.[selectedAddress]?.map((token) => ({
+          ...token,
+          token: token.name,
+          chainId,
+          isETH: false,
+          isNative: false,
+          balanceFiat: '',
+          isStaked: false,
+        })) || [];
+
+      // Add both native and non-native tokens
+      tokensByChain[currentChainId] = [
+        ...(nativeTokens[currentChainId] || []),
+        ...nonNativeTokens,
+      ];
+    }
+
+    return tokensByChain;
+  },
+);
 
 /**
  * Get the state of the `bitcoinSupportEnabled` flag.
diff --git a/app/selectors/networkController.test.ts b/app/selectors/networkController.test.ts
new file mode 100644
index 00000000000..0c3946640b6
--- /dev/null
+++ b/app/selectors/networkController.test.ts
@@ -0,0 +1,149 @@
+import {
+  selectNetworkControllerState,
+  selectProviderConfig,
+  selectTicker,
+  selectChainId,
+  selectProviderType,
+  selectNickname,
+  selectRpcUrl,
+  selectNetworkStatus,
+  selectNetworkConfigurations,
+  selectNetworkClientId,
+  selectIsAllNetworks,
+  selectNetworkConfigurationByChainId,
+  selectNativeCurrencyByChainId,
+} from './networkController';
+import { RootState } from '../reducers';
+
+describe('networkSelectors', () => {
+  const mockState = {
+    engine: {
+      backgroundState: {
+        NetworkController: {
+          selectedNetworkClientId: 'custom-network',
+          networkConfigurationsByChainId: {
+            '0x1': {
+              chainId: '0x1',
+              nativeCurrency: 'ETH',
+              name: 'Ethereum Mainnet',
+              rpcEndpoints: [
+                {
+                  networkClientId: 'infura-mainnet',
+                  type: 'infura',
+                  url: 'https://mainnet.infura.io/v3/{infuraProjectId}',
+                },
+              ],
+              blockExplorerUrls: ['https://etherscan.io'],
+            },
+            '0x2': {
+              chainId: '0x2',
+              nativeCurrency: 'MATIC',
+              name: 'Polygon',
+              rpcEndpoints: [
+                {
+                  networkClientId: 'custom-network',
+                  type: 'custom',
+                  url: 'https://polygon-rpc.com',
+                },
+              ],
+              blockExplorerUrls: ['https://polygonscan.com'],
+            },
+          },
+          networksMetadata: {
+            'custom-network': { status: 'active' },
+          },
+        },
+      },
+    },
+  } as unknown as RootState;
+
+  it('selectNetworkControllerState should return the network controller state', () => {
+    expect(selectNetworkControllerState(mockState)).toEqual(
+      mockState.engine.backgroundState.NetworkController,
+    );
+  });
+
+  it('selectProviderConfig should return the provider config for the selected network', () => {
+    expect(selectProviderConfig(mockState)).toEqual({
+      chainId: '0x2',
+      ticker: 'MATIC',
+      rpcPrefs: { blockExplorerUrl: 'https://polygonscan.com' },
+      type: 'rpc',
+      id: 'custom-network',
+      nickname: 'Polygon',
+      rpcUrl: 'https://polygon-rpc.com',
+    });
+  });
+
+  it('selectTicker should return the ticker of the provider config', () => {
+    expect(selectTicker(mockState)).toBe('MATIC');
+  });
+
+  it('selectChainId should return the chainId of the provider config', () => {
+    expect(selectChainId(mockState)).toBe('0x2');
+  });
+
+  it('selectProviderType should return the type of the provider config', () => {
+    expect(selectProviderType(mockState)).toBe('rpc');
+  });
+
+  it('selectNickname should return the nickname of the provider config', () => {
+    expect(selectNickname(mockState)).toBe('Polygon');
+  });
+
+  it('selectRpcUrl should return the rpcUrl of the provider config', () => {
+    expect(selectRpcUrl(mockState)).toBe('https://polygon-rpc.com');
+  });
+
+  it('selectNetworkStatus should return the network status for the selected network', () => {
+    expect(selectNetworkStatus(mockState)).toBe('active');
+  });
+
+  it('selectNetworkConfigurations should return the network configurations by chainId', () => {
+    expect(selectNetworkConfigurations(mockState)).toEqual(
+      mockState.engine.backgroundState.NetworkController
+        .networkConfigurationsByChainId,
+    );
+  });
+
+  it('selectNetworkClientId should return the selected network client ID', () => {
+    expect(selectNetworkClientId(mockState)).toBe('custom-network');
+  });
+
+  it('selectIsAllNetworks should return false if tokenNetworkFilter length is greater than 1', () => {
+    const tokenNetworkFilter = { '0x1': 'true' };
+    expect(selectIsAllNetworks.resultFunc(tokenNetworkFilter)).toBe(false);
+  });
+
+  it('selectNetworkConfigurationByChainId should return the network configuration for a given chainId', () => {
+    expect(selectNetworkConfigurationByChainId(mockState, '0x2')).toEqual(
+      mockState.engine.backgroundState.NetworkController
+        .networkConfigurationsByChainId['0x2'],
+    );
+  });
+
+  it('selectNativeCurrencyByChainId should return the native currency for a given chainId', () => {
+    expect(selectNativeCurrencyByChainId(mockState, '0x1')).toBe('ETH');
+  });
+
+  it('should return the default provider config if no matching network is found', () => {
+    const noMatchState = { ...mockState };
+    noMatchState.engine.backgroundState.NetworkController.selectedNetworkClientId =
+      'unknown-network';
+    expect(selectProviderConfig(noMatchState)).toEqual({
+      chainId: '0x2',
+      id: 'custom-network',
+      nickname: 'Polygon',
+      rpcPrefs: {
+        blockExplorerUrl: 'https://polygonscan.com',
+      },
+      rpcUrl: 'https://polygon-rpc.com',
+      ticker: 'MATIC',
+      type: 'rpc',
+    });
+  });
+
+  it('selectNetworkConfigurationByChainId should return null if the chainId does not exist', () => {
+    expect(selectNetworkConfigurationByChainId(mockState, '0x9999')).toBeNull();
+  });
+});
diff --git a/app/selectors/networkController.ts b/app/selectors/networkController.ts
index d37258c979e..d74a47d6074 100644
--- a/app/selectors/networkController.ts
+++ b/app/selectors/networkController.ts
@@ -1,3 +1,4 @@
+import { Hex } from '@metamask/utils';
 import { createSelector } from 'reselect';
 import { InfuraNetworkType } from '@metamask/controller-utils';
 import {
@@ -50,7 +51,7 @@ const getDefaultProviderConfig = (): ProviderConfig => ({
 });
 
 // Helper function to create the provider config based on the network and endpoint
-const createProviderConfig = (
+export const createProviderConfig = (
   networkConfig: NetworkConfiguration,
   rpcEndpoint: RpcEndpoint,
 ): ProviderConfig => {
@@ -80,7 +81,7 @@ const createProviderConfig = (
   };
 };
 
-const selectNetworkControllerState = (state: RootState) =>
+export const selectNetworkControllerState = (state: RootState) =>
   state?.engine?.backgroundState?.NetworkController;
 
 export const selectSelectedNetworkClientId = createSelector(
@@ -149,7 +150,7 @@ export const selectNetworkStatus = createSelector(
 export const selectNetworkConfigurations = createSelector(
   selectNetworkControllerState,
   (networkControllerState: NetworkState) =>
-    networkControllerState.networkConfigurationsByChainId,
+    networkControllerState?.networkConfigurationsByChainId,
 );
 
 export const selectNetworkClientId = createSelector(
@@ -167,9 +168,22 @@ export const selectIsEIP1559Network = createSelector(
 );
 
 export const selectIsAllNetworks = createSelector(
-  selectNetworkConfigurations,
   (state: RootState) => selectTokenNetworkFilter(state),
-  (networkConfigurations, tokenNetworkFilter) =>
-    Object.keys(tokenNetworkFilter).length ===
-    Object.keys(networkConfigurations).length,
+  (tokenNetworkFilter) => {
+    if (Object.keys(tokenNetworkFilter).length === 1) {
+      return false;
+    }
+    return true;
+  },
+);
+
+export const selectNetworkConfigurationByChainId = createSelector(
+  [selectNetworkConfigurations, (_state: RootState, chainId: Hex) => chainId],
+  (networkConfigurations, chainId) => networkConfigurations?.[chainId] || null,
+);
+
+export const selectNativeCurrencyByChainId = createSelector(
+  [selectNetworkConfigurations, (_state: RootState, chainId: Hex) => chainId],
+  (networkConfigurations, chainId) =>
+    networkConfigurations?.[chainId]?.nativeCurrency,
 );
diff --git a/app/selectors/tokenBalancesController.test.ts b/app/selectors/tokenBalancesController.test.ts
index 67371ba848d..c49b72af6a1 100644
--- a/app/selectors/tokenBalancesController.test.ts
+++ b/app/selectors/tokenBalancesController.test.ts
@@ -1,3 +1,4 @@
+import { Hex } from '@metamask/utils';
 import { RootState } from '../reducers';
 import {
   selectContractBalances,
@@ -30,14 +31,30 @@ describe('TokenBalancesController Selectors', () => {
     engine: {
       backgroundState: {
         TokenBalancesController: mockTokenBalancesControllerState,
+        NetworkController: {
+          providerConfig: {
+            chainId: '0x1',
+          },
+        },
+        AccountsController: {
+          internalAccounts: {
+            selectedAccount: 'account1',
+            accounts: {
+              account1: {
+                id: 'account1',
+                address: '0xAccount1',
+              },
+            },
+          },
+        },
       },
     },
   } as unknown as RootState;
 
   describe('selectContractBalances', () => {
     it('returns token balances for the selected account and chain ID', () => {
-      const selectedAccount = '0xAccount1';
-      const chainId = '0x1';
+      const selectedAccount: Hex = '0xAccount1';
+      const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
         mockTokenBalancesControllerState,
@@ -52,8 +69,8 @@ describe('TokenBalancesController Selectors', () => {
     });
 
     it('returns an empty object if no balances exist for the selected account', () => {
-      const selectedAccount = '0xUnknownAccount';
-      const chainId = '0x1';
+      const selectedAccount: Hex = '0xUnknownAccount';
+      const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
         mockTokenBalancesControllerState,
@@ -65,8 +82,8 @@ describe('TokenBalancesController Selectors', () => {
     });
 
     it('returns an empty object if no balances exist for the selected chain ID', () => {
-      const selectedAccount = '0xAccount1';
-      const chainId = '0xUnknownChain';
+      const selectedAccount: Hex = '0xAccount1';
+      const chainId: Hex = '0xUnknownChain';
 
       const result = selectContractBalances.resultFunc(
         mockTokenBalancesControllerState,
@@ -78,12 +95,12 @@ describe('TokenBalancesController Selectors', () => {
     });
 
     it('returns an empty object if the selected account is undefined', () => {
-      const selectedAccount = undefined;
-      const chainId = '0x1';
+      const selectedAccount: Hex | string = '';
+      const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
         mockTokenBalancesControllerState,
-        selectedAccount,
+        selectedAccount as `0x${string}`,
         chainId,
       );
 
diff --git a/app/selectors/tokenBalancesController.ts b/app/selectors/tokenBalancesController.ts
index c663901490e..dc7385e7182 100644
--- a/app/selectors/tokenBalancesController.ts
+++ b/app/selectors/tokenBalancesController.ts
@@ -1,14 +1,20 @@
 /* eslint-disable import/prefer-default-export */
+import { Hex } from '@metamask/utils';
 import { createSelector } from 'reselect';
 import { RootState } from '../reducers';
 import { TokenBalancesControllerState } from '@metamask/assets-controllers';
-import { Hex } from '@metamask/utils';
 import { selectSelectedInternalAccountAddress } from './accountsController';
 import { selectChainId } from './networkController';
 
 const selectTokenBalancesControllerState = (state: RootState) =>
   state.engine.backgroundState.TokenBalancesController;
 
+export const selectTokensBalances = createSelector(
+  selectTokenBalancesControllerState,
+  (tokenBalancesControllerState: TokenBalancesControllerState) =>
+    tokenBalancesControllerState.tokenBalances,
+);
+
 export const selectContractBalances = createSelector(
   selectTokenBalancesControllerState,
   selectSelectedInternalAccountAddress,
@@ -28,9 +34,3 @@ export const selectAllTokenBalances = createSelector(
   (tokenBalancesControllerState: TokenBalancesControllerState) =>
     tokenBalancesControllerState.tokenBalances,
 );
-
-export const selectTokensBalances = createSelector(
-  selectTokenBalancesControllerState,
-  (tokenBalancesControllerState: TokenBalancesControllerState) =>
-    tokenBalancesControllerState.tokenBalances,
-);
diff --git a/app/selectors/tokenRatesController.ts b/app/selectors/tokenRatesController.ts
index 995e5988fd4..33ff578505d 100644
--- a/app/selectors/tokenRatesController.ts
+++ b/app/selectors/tokenRatesController.ts
@@ -20,3 +20,8 @@ export const selectTokenMarketData = createSelector(
   (tokenRatesControllerState: TokenRatesControllerState) =>
     tokenRatesControllerState.marketData,
 );
+
+export const selectTokenMarketDataByChainId = createSelector(
+  [selectTokenMarketData, (_state: RootState, chainId: Hex) => chainId],
+  (marketData, chainId) => marketData?.[chainId] || {},
+);
diff --git a/app/selectors/tokensController.test.ts b/app/selectors/tokensController.test.ts
index eaa963409e8..b29fddd260e 100644
--- a/app/selectors/tokensController.test.ts
+++ b/app/selectors/tokensController.test.ts
@@ -24,8 +24,8 @@ describe('TokensController Selectors', () => {
     ignoredTokens: ['0xToken2'],
     detectedTokens: [mockToken],
     allTokens: {
-      '0xAddress1': {
-        '1': [mockToken],
+      '0x1': {
+        '0xAddress1': [mockToken],
       },
     },
     allDetectedTokens: {
@@ -42,6 +42,16 @@ describe('TokensController Selectors', () => {
     engine: {
       backgroundState: {
         TokensController: mockTokensControllerState,
+        AccountsController: {
+          internalAccounts: {
+            selectedAccount: '0xAddress1',
+            accounts: {
+              '0xAddress1': {
+                address: '0xAddress1',
+              },
+            },
+          },
+        },
       },
     },
   } as unknown as RootState;
@@ -58,14 +68,34 @@ describe('TokensController Selectors', () => {
           backgroundState: {
             TokensController: {
               ...mockTokensControllerState,
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [],
+                },
+              },
               tokens: [],
             },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
+            },
           },
         },
       } as unknown as RootState;
 
       expect(selectTokens(stateWithoutTokens)).toStrictEqual([]);
     });
+
+    it('returns tokens from TokensController state if portfolio view is enabled', () => {
+      jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+      expect(selectTokens(mockRootState)).toStrictEqual([mockToken]);
+    });
   });
 
   describe('selectTokensByAddress', () => {
@@ -82,8 +112,23 @@ describe('TokensController Selectors', () => {
           backgroundState: {
             TokensController: {
               ...mockTokensControllerState,
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [],
+                },
+              },
               tokens: [],
             },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
+            },
           },
         },
       } as unknown as RootState;
@@ -105,6 +150,21 @@ describe('TokensController Selectors', () => {
             TokensController: {
               ...mockTokensControllerState,
               tokens: [],
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [],
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
             },
           },
         },
@@ -255,9 +315,7 @@ describe('TokensController Selectors', () => {
     };
 
     it('returns only the current chain ID if PORTFOLIO_VIEW is not set', () => {
-      jest
-        .spyOn(networks, 'isPortfolioViewEnabledFunction')
-        .mockReturnValue(false);
+      jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(false);
       const chainIds = getChainIdsToPoll.resultFunc(
         mockNetworkConfigurations,
         '0x1',
@@ -266,9 +324,7 @@ describe('TokensController Selectors', () => {
     });
 
     it('returns only the current chain ID if PORTFOLIO_VIEW is set', () => {
-      jest
-        .spyOn(networks, 'isPortfolioViewEnabledFunction')
-        .mockReturnValue(true);
+      jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
       const chainIds = getChainIdsToPoll.resultFunc(
         mockNetworkConfigurations,
         '0x1',
diff --git a/app/selectors/tokensController.ts b/app/selectors/tokensController.ts
index e95e24d82e1..c76f03a3373 100644
--- a/app/selectors/tokensController.ts
+++ b/app/selectors/tokensController.ts
@@ -1,13 +1,10 @@
+import { Hex } from '@metamask/utils';
 import { createSelector } from 'reselect';
 import { TokensControllerState, Token } from '@metamask/assets-controllers';
 import { RootState } from '../reducers';
 import { createDeepEqualSelector } from './util';
 import { selectSelectedInternalAccountAddress } from './accountsController';
-import { Hex } from '@metamask/utils';
-import {
-  isPortfolioViewEnabledFunction,
-  TESTNET_CHAIN_IDS,
-} from '../util/networks';
+import { isPortfolioViewEnabled, TESTNET_CHAIN_IDS } from '../util/networks';
 import {
   selectChainId,
   selectNetworkConfigurations,
@@ -18,8 +15,21 @@ const selectTokensControllerState = (state: RootState) =>
 
 export const selectTokens = createDeepEqualSelector(
   selectTokensControllerState,
-  (tokensControllerState: TokensControllerState) =>
-    tokensControllerState?.tokens,
+  selectChainId,
+  selectSelectedInternalAccountAddress,
+  (
+    tokensControllerState: TokensControllerState,
+    chainId: Hex,
+    selectedAddress: string | undefined,
+  ) => {
+    if (isPortfolioViewEnabled()) {
+      return (
+        tokensControllerState?.allTokens[chainId]?.[selectedAddress as Hex] ||
+        []
+      );
+    }
+    return tokensControllerState?.tokens || [];
+  },
 );
 
 export const selectTokensByChainIdAndAddress = createDeepEqualSelector(
@@ -36,7 +46,7 @@ export const selectTokensByChainIdAndAddress = createDeepEqualSelector(
 export const selectTokensByAddress = createSelector(
   selectTokens,
   (tokens: Token[]) =>
-    tokens.reduce((tokensMap: { [address: string]: Token }, token: Token) => {
+    tokens?.reduce((tokensMap: { [address: string]: Token }, token: Token) => {
       tokensMap[token.address] = token;
       return tokensMap;
     }, {}),
@@ -69,7 +79,7 @@ export const getChainIdsToPoll = createDeepEqualSelector(
   selectNetworkConfigurations,
   selectChainId,
   (networkConfigurations, currentChainId) => {
-    if (!isPortfolioViewEnabledFunction()) {
+    if (!isPortfolioViewEnabled()) {
       return [currentChainId];
     }
 
@@ -84,16 +94,18 @@ export const getChainIdsToPoll = createDeepEqualSelector(
 
 export const selectAllTokensFlat = createSelector(
   selectAllTokens,
-  (tokensByAccountByChain) => {
+  (tokensByAccountByChain: {
+    [account: string]: { [chainId: string]: Token[] };
+  }): Token[] => {
     if (Object.values(tokensByAccountByChain).length === 0) {
       return [];
     }
     const tokensByAccountArray = Object.values(tokensByAccountByChain);
 
-    return tokensByAccountArray.reduce((acc, tokensByAccount) => {
-      const tokensArray = Object.values(tokensByAccount);
+    return tokensByAccountArray.reduce<Token[]>((acc, tokensByAccount) => {
+      const tokensArray = Object.values(tokensByAccount).flat();
       return acc.concat(...tokensArray);
-    }, [] as Token[]);
+    }, []);
   },
 );
 
@@ -123,9 +135,6 @@ export const selectAllDetectedTokensForSelectedAddress = createSelector(
   },
 );
 
-// TODO: This isn't working fully, once a network has been selected then it
-// can detect all tokens in that network. But by default it only shows
-// detected tokens if the user has chosen it in the past
 export const selectAllDetectedTokensFlat = createSelector(
   selectAllDetectedTokensForSelectedAddress,
   (detectedTokensByChain: { [chainId: string]: Token[] }) => {
diff --git a/app/store/index.ts b/app/store/index.ts
index 5f74eb552d9..e158b1e5f81 100644
--- a/app/store/index.ts
+++ b/app/store/index.ts
@@ -4,9 +4,6 @@ import { persistStore, persistReducer } from 'redux-persist';
 import createSagaMiddleware from 'redux-saga';
 import { rootSaga } from './sagas';
 import rootReducer, { RootState } from '../reducers';
-import EngineService from '../core/EngineService';
-import { Authentication } from '../core';
-import LockManagerService from '../core/LockManagerService';
 import ReadOnlyNetworkStore from '../util/test/network-store';
 import { isE2E } from '../util/test/utils';
 import { trace, endTrace, TraceName, TraceOperation } from '../util/trace';
@@ -14,8 +11,9 @@ import { trace, endTrace, TraceName, TraceOperation } from '../util/trace';
 import thunk from 'redux-thunk';
 
 import persistConfig from './persistConfig';
-import { AppStateEventProcessor } from '../core/AppStateEventListener';
 import getUIStartupSpan from '../core/Performance/UIStartup';
+import ReduxService from '../core/redux';
+import { onPersistedDataLoaded } from '../actions/user';
 
 // TODO: Improve type safety by using real Action types instead of `any`
 // TODO: Replace "any" with type
@@ -59,6 +57,8 @@ const createStoreAndPersistor = async () => {
     middleware: middlewares,
     preloadedState: initialState,
   });
+  // Set the store in the Redux class
+  ReduxService.store = store;
 
   sagaMiddleware.run(rootSaga);
 
@@ -66,34 +66,9 @@ const createStoreAndPersistor = async () => {
    * Initialize services after persist is completed
    */
   const onPersistComplete = () => {
-    /**
-     * EngineService.initalizeEngine(store) with SES/lockdown:
-     * Requires ethjs nested patches (lib->src)
-     * - ethjs/ethjs-query
-     * - ethjs/ethjs-contract
-     * Otherwise causing the following errors:
-     * - TypeError: Cannot assign to read only property 'constructor' of object '[object Object]'
-     * - Error: Requiring module "node_modules/ethjs/node_modules/ethjs-query/lib/index.js", which threw an exception: TypeError:
-     * -  V8: Cannot assign to read only property 'constructor' of object '[object Object]'
-     * -  JSC: Attempted to assign to readonly property
-     * - node_modules/babel-runtime/node_modules/regenerator-runtime/runtime.js
-     * - V8: TypeError: _$$_REQUIRE(...) is not a constructor
-     * - TypeError: undefined is not an object (evaluating 'TokenListController.tokenList')
-     * - V8: SES_UNHANDLED_REJECTION
-     */
-
-    store.dispatch({
-      type: 'TOGGLE_BASIC_FUNCTIONALITY',
-      basicFunctionalityEnabled:
-        store.getState().settings.basicFunctionalityEnabled,
-    });
-
-    EngineService.initalizeEngine(store);
-
-    Authentication.init(store);
-    AppStateEventProcessor.init(store);
-    LockManagerService.init(store);
     endTrace({ name: TraceName.StoreInit });
+    // Signal that persisted data has been loaded
+    store.dispatch(onPersistedDataLoaded());
   };
 
   persistor = persistStore(store, null, onPersistComplete);
diff --git a/app/store/migrations/063.test.ts b/app/store/migrations/063.test.ts
new file mode 100644
index 00000000000..2cee3b36f8c
--- /dev/null
+++ b/app/store/migrations/063.test.ts
@@ -0,0 +1,297 @@
+import migrate from './063';
+import { merge } from 'lodash';
+import { captureException } from '@sentry/react-native';
+import initialRootState from '../../util/test/initial-root-state';
+import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
+import { TransactionStatus, CHAIN_IDS } from '@metamask/transaction-controller';
+
+const expectedState = {
+  engine: {
+    backgroundState: {
+      TransactionController: {
+        transactions: [
+          {
+            chainId: CHAIN_IDS.MAINNET,
+            id: '1',
+            origin: 'test.com',
+            status: TransactionStatus.confirmed,
+            time: 1631714312,
+            txParams: {
+              from: '0x1',
+            },
+            hash: '0x2',
+            rawTx: '0x3',
+          },
+          {
+            chainId: CHAIN_IDS.LINEA_MAINNET,
+            id: '2',
+            origin: 'test.com',
+            status: TransactionStatus.confirmed,
+            time: 1631714312,
+            txParams: {
+              from: '0x1',
+            },
+            hash: '0x3',
+          },
+          {
+            chainId: CHAIN_IDS.MAINNET,
+            id: '3',
+            origin: 'test2.com',
+            status: TransactionStatus.failed,
+            time: 1631714313,
+            txParams: {
+              from: '0x6',
+            },
+            hash: '0x4',
+            rawTx: '0x5',
+            error: {
+              name: 'SmartTransactionCancelled',
+              message:
+                'Smart transaction cancelled. Previous status: submitted',
+            },
+          },
+          {
+            chainId: CHAIN_IDS.MAINNET,
+            id: '4',
+            origin: 'test2.com',
+            status: TransactionStatus.failed,
+            time: 1631714313,
+            txParams: {
+              from: '0x6',
+            },
+            hash: '0x5',
+            rawTx: '0x6',
+            error: {
+              name: 'SmartTransactionCancelled',
+              message: 'Smart transaction cancelled. Previous status: signed',
+            },
+          },
+          {
+            chainId: CHAIN_IDS.MAINNET,
+            id: '5',
+            origin: 'test2.com',
+            status: TransactionStatus.failed,
+            time: 1631714313,
+            txParams: {
+              from: '0x6',
+            },
+            hash: '0x6',
+            rawTx: '0x7',
+            error: {
+              name: 'SmartTransactionCancelled',
+              message: 'Smart transaction cancelled. Previous status: signed',
+            },
+          },
+        ],
+      },
+      SmartTransactionsController: {
+        smartTransactionsState: {
+          smartTransactions: {
+            [CHAIN_IDS.MAINNET]: [
+              {
+                txHash: '0x2',
+                status: SmartTransactionStatuses.SUCCESS,
+              },
+              {
+                txHash: '0x4',
+                status: SmartTransactionStatuses.CANCELLED,
+              },
+              {
+                txHash: '0x5',
+                status: SmartTransactionStatuses.CANCELLED,
+              },
+              {
+                txHash: '0x6',
+                status: SmartTransactionStatuses.UNKNOWN,
+              },
+            ],
+          },
+        },
+      },
+    },
+  },
+};
+
+jest.mock('@sentry/react-native', () => ({
+  captureException: jest.fn(),
+}));
+const mockedCaptureException = jest.mocked(captureException);
+
+describe('Migration #63', () => {
+  beforeEach(() => {
+    jest.restoreAllMocks();
+    jest.resetAllMocks();
+  });
+
+  const invalidStates = [
+    {
+      state: null,
+      errorMessage: "FATAL ERROR: Migration 63: Invalid state error: 'object'",
+      scenario: 'state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: null,
+      }),
+      errorMessage:
+        "FATAL ERROR: Migration 63: Invalid engine state error: 'object'",
+      scenario: 'engine state is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: null,
+        },
+      }),
+      errorMessage:
+        "FATAL ERROR: Migration 63: Invalid engine backgroundState error: 'object'",
+      scenario: 'backgroundState is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: { TransactionController: null },
+        },
+      }),
+      errorMessage: "Migration 63: Invalid TransactionController state: 'null'",
+      scenario: 'transactionController is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: { SmartTransactionsController: null },
+        },
+      }),
+      errorMessage:
+        "Migration 63: Invalid SmartTransactionsController state: 'null'",
+      scenario: 'smartTransactionsController is invalid',
+    },
+    {
+      state: merge({}, initialRootState, {
+        engine: {
+          backgroundState: {
+            SmartTransactionsController: {
+              smartTransactionsState: { smartTransactions: null },
+            },
+          },
+        },
+      }),
+      errorMessage:
+        "Migration 63: Missing smart transactions property from SmartTransactionsController: 'object'",
+      scenario:
+        'smartTransactionsController.smartTransactionsState.smartTransactions is invalid',
+    },
+  ];
+  it.each(invalidStates)(
+    'captures exception if $scenario',
+    ({ errorMessage, state }) => {
+      const newState = migrate(state);
+
+      expect(newState).toStrictEqual(state);
+      expect(mockedCaptureException).toHaveBeenCalledWith(expect.any(Error));
+      expect(mockedCaptureException.mock.calls[0][0].message).toBe(
+        errorMessage,
+      );
+    },
+  );
+
+  it('applies migration, changes transaction status to failed if a smart transaction was cancelled or unknown', () => {
+    const oldState = {
+      engine: {
+        backgroundState: {
+          TransactionController: {
+            transactions: [
+              {
+                chainId: CHAIN_IDS.MAINNET,
+                id: '1',
+                origin: 'test.com',
+                status: TransactionStatus.confirmed,
+                time: 1631714312,
+                txParams: {
+                  from: '0x1',
+                },
+                hash: '0x2',
+                rawTx: '0x3',
+              },
+              {
+                chainId: CHAIN_IDS.LINEA_MAINNET,
+                id: '2',
+                origin: 'test.com',
+                status: TransactionStatus.confirmed,
+                time: 1631714312,
+                txParams: {
+                  from: '0x1',
+                },
+                hash: '0x3',
+              },
+              {
+                chainId: CHAIN_IDS.MAINNET,
+                id: '3',
+                origin: 'test2.com',
+                status: TransactionStatus.submitted,
+                time: 1631714313,
+                txParams: {
+                  from: '0x6',
+                },
+                hash: '0x4',
+                rawTx: '0x5',
+              },
+              {
+                chainId: CHAIN_IDS.MAINNET,
+                id: '4',
+                origin: 'test2.com',
+                status: TransactionStatus.signed,
+                time: 1631714313,
+                txParams: {
+                  from: '0x6',
+                },
+                hash: '0x5',
+                rawTx: '0x6',
+              },
+              {
+                chainId: CHAIN_IDS.MAINNET,
+                id: '5',
+                origin: 'test2.com',
+                status: TransactionStatus.signed,
+                time: 1631714313,
+                txParams: {
+                  from: '0x6',
+                },
+                hash: '0x6',
+                rawTx: '0x7',
+              },
+            ],
+          },
+          SmartTransactionsController: {
+            smartTransactionsState: {
+              smartTransactions: {
+                [CHAIN_IDS.MAINNET]: [
+                  {
+                    txHash: '0x2',
+                    status: SmartTransactionStatuses.SUCCESS,
+                  },
+                  {
+                    txHash: '0x4',
+                    status: SmartTransactionStatuses.CANCELLED,
+                  },
+                  {
+                    txHash: '0x5',
+                    status: SmartTransactionStatuses.CANCELLED,
+                  },
+                  {
+                    txHash: '0x6',
+                    status: SmartTransactionStatuses.UNKNOWN,
+                  },
+                ],
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const newState = migrate(oldState);
+
+    expect(newState).toStrictEqual(expectedState);
+  });
+});
diff --git a/app/store/migrations/063.ts b/app/store/migrations/063.ts
new file mode 100644
index 00000000000..e2f6166ac0d
--- /dev/null
+++ b/app/store/migrations/063.ts
@@ -0,0 +1,92 @@
+import { isObject } from '@metamask/utils';
+import { captureException } from '@sentry/react-native';
+import { ensureValidState } from './util';
+import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
+import { TransactionStatus, CHAIN_IDS } from '@metamask/transaction-controller';
+
+export default function migrate(state: unknown) {
+  if (!ensureValidState(state, 63)) {
+    return state;
+  }
+
+  if (!isObject(state.engine.backgroundState.TransactionController)) {
+    captureException(
+      new Error(
+        `Migration 63: Invalid TransactionController state: '${state.engine.backgroundState.TransactionController}'`,
+      ),
+    );
+    return state;
+  }
+
+  if (!isObject(state.engine.backgroundState.SmartTransactionsController)) {
+    captureException(
+      new Error(
+        `Migration 63: Invalid SmartTransactionsController state: '${state.engine.backgroundState.SmartTransactionsController}'`,
+      ),
+    );
+    return state;
+  }
+
+  const transactionControllerState =
+    state.engine.backgroundState.TransactionController;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const smartTransactionsControllerState = state.engine.backgroundState.SmartTransactionsController as any;
+
+  if (!Array.isArray(transactionControllerState.transactions)) {
+    captureException(
+      new Error(
+        `Migration 63: Missing transactions property from TransactionController: '${typeof state
+          .engine.backgroundState.TransactionController}'`,
+      ),
+    );
+    return state;
+  }
+  const smartTransactions =
+    smartTransactionsControllerState?.smartTransactionsState?.smartTransactions;
+  if (!isObject(smartTransactions)) {
+    captureException(
+      new Error(
+        `Migration 63: Missing smart transactions property from SmartTransactionsController: '${typeof state
+          .engine.backgroundState.SmartTransactionsController?.smartTransactionsState}'`,
+      ),
+    );
+    return state;
+  }
+
+  const ethereumMainnetSmartTransactions = smartTransactions[CHAIN_IDS.MAINNET];
+  if (
+    !Array.isArray(ethereumMainnetSmartTransactions) ||
+    ethereumMainnetSmartTransactions.length === 0
+  ) {
+    // If there are no smart transactions, we can skip this migration.
+    return state;
+  }
+
+  const smartTransactionTxHashesForUpdate: Record<string, boolean> = {};
+  ethereumMainnetSmartTransactions.forEach((smartTransaction) => {
+    if (
+      smartTransaction.txHash &&
+      (smartTransaction.status === SmartTransactionStatuses.CANCELLED ||
+        smartTransaction.status === SmartTransactionStatuses.UNKNOWN)
+    ) {
+      smartTransactionTxHashesForUpdate[smartTransaction.txHash.toLowerCase()] = true;
+    }
+  });
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  transactionControllerState.transactions.forEach((transaction: any) => {
+    if (!transaction.hash || transaction.status === TransactionStatus.failed) {
+      return;
+    }
+    const previousStatus = transaction.status;
+    if (smartTransactionTxHashesForUpdate[transaction.hash.toLowerCase()]) {
+      transaction.status = TransactionStatus.failed;
+      transaction.error = {
+        name: 'SmartTransactionCancelled',
+        message: `Smart transaction cancelled. Previous status: ${previousStatus}`,
+      };
+    }
+  });
+
+  return state;
+}
diff --git a/app/store/migrations/index.ts b/app/store/migrations/index.ts
index 4a8d11ad47c..06f50319276 100644
--- a/app/store/migrations/index.ts
+++ b/app/store/migrations/index.ts
@@ -63,6 +63,7 @@ import migration59 from './059';
 import migration60 from './060';
 import migration61 from './061';
 import migration62 from './062';
+import migration63 from './063';
 
 type MigrationFunction = (state: unknown) => unknown;
 type AsyncMigrationFunction = (state: unknown) => Promise<unknown>;
@@ -138,6 +139,7 @@ export const migrationList: MigrationsList = {
   60: migration60,
   61: migration61,
   62: migration62,
+  63: migration63,
 };
 
 // Enable both synchronous and asynchronous migrations
diff --git a/app/store/persistConfig.ts b/app/store/persistConfig.ts
index 0aa71c0ccad..5b8b4358134 100644
--- a/app/store/persistConfig.ts
+++ b/app/store/persistConfig.ts
@@ -6,7 +6,7 @@ import { RootState } from '../reducers';
 import { migrations, version } from './migrations';
 import Logger from '../util/Logger';
 import Device from '../util/device';
-import { IUserReducer } from '../reducers/user';
+import { UserState } from '../reducers/user';
 
 const TIMEOUT = 40000;
 
@@ -96,7 +96,7 @@ const persistTransform = createTransform(
 );
 
 const persistUserTransform = createTransform(
-  (inboundState: IUserReducer) => {
+  (inboundState: UserState) => {
     const { initialScreen, isAuthChecked, ...state } = inboundState;
     // Reconstruct data to persist
     return state;
diff --git a/app/store/sagas/index.ts b/app/store/sagas/index.ts
index 32afb2b55c7..b7b0724a993 100644
--- a/app/store/sagas/index.ts
+++ b/app/store/sagas/index.ts
@@ -1,15 +1,14 @@
-import { fork, take, cancel, put, call } from 'redux-saga/effects';
+import { fork, take, cancel, put, call, all } from 'redux-saga/effects';
 import NavigationService from '../../core/NavigationService';
 import Routes from '../../constants/navigation/Routes';
 import {
-  LOCKED_APP,
-  AUTH_SUCCESS,
-  AUTH_ERROR,
+  AuthSuccessAction,
+  AuthErrorAction,
+  InterruptBiometricsAction,
   lockApp,
-  INTERRUPT_BIOMETRICS,
-  LOGOUT,
-  LOGIN,
+  UserActionType,
 } from '../../actions/user';
+import { NavigationActionType } from '../../actions/navigation';
 import { Task } from 'redux-saga';
 import Engine from '../../core/Engine';
 import Logger from '../../util/Logger';
@@ -18,11 +17,13 @@ import {
   overrideXMLHttpRequest,
   restoreXMLHttpRequest,
 } from './xmlHttpRequestOverride';
+import EngineService from '../../core/EngineService';
+import { AppStateEventProcessor } from '../../core/AppStateEventListener';
 
 export function* appLockStateMachine() {
   let biometricsListenerTask: Task<void> | undefined;
   while (true) {
-    yield take(LOCKED_APP);
+    yield take(UserActionType.LOCKED_APP);
     if (biometricsListenerTask) {
       yield cancel(biometricsListenerTask);
     }
@@ -45,11 +46,11 @@ export function* appLockStateMachine() {
 export function* authStateMachine() {
   // Start when the user is logged in.
   while (true) {
-    yield take(LOGIN);
+    yield take(UserActionType.LOGIN);
     const appLockStateMachineTask: Task<void> = yield fork(appLockStateMachine);
     LockManagerService.startListening();
     // Listen to app lock behavior.
-    yield take(LOGOUT);
+    yield take(UserActionType.LOGOUT);
     LockManagerService.stopListening();
     // Cancels appLockStateMachineTask, which also cancels nested sagas once logged out.
     yield cancel(appLockStateMachineTask);
@@ -78,32 +79,32 @@ export function* biometricsStateMachine(originalBioStateMachineId: string) {
   // Handle next three possible states.
   let shouldHandleAction = false;
   let action:
-    | {
-        type:
-          | typeof AUTH_SUCCESS
-          | typeof AUTH_ERROR
-          | typeof INTERRUPT_BIOMETRICS;
-        payload?: { bioStateMachineId: string };
-      }
+    | AuthSuccessAction
+    | AuthErrorAction
+    | InterruptBiometricsAction
     | undefined;
 
   // Only continue on INTERRUPT_BIOMETRICS action or when actions originated from corresponding state machine.
   while (!shouldHandleAction) {
-    action = yield take([AUTH_SUCCESS, AUTH_ERROR, INTERRUPT_BIOMETRICS]);
+    action = yield take([
+      UserActionType.AUTH_SUCCESS,
+      UserActionType.AUTH_ERROR,
+      UserActionType.INTERRUPT_BIOMETRICS,
+    ]);
     if (
-      action?.type === INTERRUPT_BIOMETRICS ||
+      action?.type === UserActionType.INTERRUPT_BIOMETRICS ||
       action?.payload?.bioStateMachineId === originalBioStateMachineId
     ) {
       shouldHandleAction = true;
     }
   }
 
-  if (action?.type === INTERRUPT_BIOMETRICS) {
+  if (action?.type === UserActionType.INTERRUPT_BIOMETRICS) {
     // Biometrics was most likely interrupted during authentication with a non-zero lock timer.
     yield fork(lockKeyringAndApp);
-  } else if (action?.type === AUTH_ERROR) {
+  } else if (action?.type === UserActionType.AUTH_ERROR) {
     // Authentication service will automatically log out.
-  } else if (action?.type === AUTH_SUCCESS) {
+  } else if (action?.type === UserActionType.AUTH_SUCCESS) {
     // Authentication successful. Navigate to wallet.
     NavigationService.navigation?.navigate(Routes.ONBOARDING.HOME_NAV);
   }
@@ -124,8 +125,24 @@ export function* basicFunctionalityToggle() {
   }
 }
 
+/**
+ * Handles initializing app services on start up
+ */
+export function* startAppServices() {
+  // Wait for persisted data to be loaded and navigation to be ready
+  yield all([
+    take(UserActionType.ON_PERSISTED_DATA_LOADED),
+    take(NavigationActionType.ON_NAVIGATION_READY),
+  ]);
+  // Start services
+  EngineService.start();
+  AppStateEventProcessor.start();
+  // TODO: Track a property in redux to gate keep the app until services are initialized
+}
+
 // Main generator function that initializes other sagas in parallel.
 export function* rootSaga() {
+  yield fork(startAppServices);
   yield fork(authStateMachine);
   yield fork(basicFunctionalityToggle);
 }
diff --git a/app/store/sagas/sagas.test.ts b/app/store/sagas/sagas.test.ts
index c9830d7f8d4..70ffa35e276 100644
--- a/app/store/sagas/sagas.test.ts
+++ b/app/store/sagas/sagas.test.ts
@@ -1,12 +1,8 @@
 import { Action } from 'redux';
 import { take, fork, cancel } from 'redux-saga/effects';
+import { expectSaga } from 'redux-saga-test-plan';
 import {
-  AUTH_ERROR,
-  AUTH_SUCCESS,
-  INTERRUPT_BIOMETRICS,
-  LOGIN,
-  LOCKED_APP,
-  LOGOUT,
+  UserActionType,
   authError,
   authSuccess,
   interruptBiometrics,
@@ -17,10 +13,16 @@ import {
   authStateMachine,
   appLockStateMachine,
   lockKeyringAndApp,
+  startAppServices,
 } from './';
+import { NavigationActionType } from '../../actions/navigation';
+import EngineService from '../../core/EngineService';
+import { AppStateEventProcessor } from '../../core/AppStateEventListener';
 
 const mockBioStateMachineId = '123';
+
 const mockNavigate = jest.fn();
+
 jest.mock('../../core/NavigationService', () => ({
   navigation: {
     // TODO: Replace "any" with type
@@ -31,6 +33,17 @@ jest.mock('../../core/NavigationService', () => ({
   },
 }));
 
+// Mock the services
+jest.mock('../../core/EngineService', () => ({
+  start: jest.fn(),
+}));
+
+jest.mock('../../core/AppStateEventListener', () => ({
+  AppStateEventProcessor: {
+    start: jest.fn(),
+  },
+}));
+
 describe('authStateMachine', () => {
   beforeEach(() => {
     mockNavigate.mockClear();
@@ -38,7 +51,7 @@ describe('authStateMachine', () => {
 
   it('should fork appLockStateMachine when logged in', async () => {
     const generator = authStateMachine();
-    expect(generator.next().value).toEqual(take(LOGIN));
+    expect(generator.next().value).toEqual(take(UserActionType.LOGIN));
     expect(generator.next().value).toEqual(fork(appLockStateMachine));
   });
 
@@ -48,7 +61,7 @@ describe('authStateMachine', () => {
     generator.next();
     // Fork appLockStateMachine
     generator.next();
-    expect(generator.next().value).toEqual(take(LOGOUT));
+    expect(generator.next().value).toEqual(take(UserActionType.LOGOUT));
     expect(generator.next().value).toEqual(cancel());
   });
 });
@@ -60,7 +73,7 @@ describe('appLockStateMachine', () => {
 
   it('should fork biometricsStateMachine when app is locked', async () => {
     const generator = appLockStateMachine();
-    expect(generator.next().value).toEqual(take(LOCKED_APP));
+    expect(generator.next().value).toEqual(take(UserActionType.LOCKED_APP));
     // Fork biometrics listener.
     expect(generator.next().value).toEqual(
       fork(biometricsStateMachine, mockBioStateMachineId),
@@ -90,7 +103,11 @@ describe('biometricsStateMachine', () => {
     const generator = biometricsStateMachine(mockBioStateMachineId);
     // Take next step
     expect(generator.next().value).toEqual(
-      take([AUTH_SUCCESS, AUTH_ERROR, INTERRUPT_BIOMETRICS]),
+      take([
+        UserActionType.AUTH_SUCCESS,
+        UserActionType.AUTH_ERROR,
+        UserActionType.INTERRUPT_BIOMETRICS,
+      ]),
     );
     // Dispatch interrupt biometrics
     const nextFork = generator.next(interruptBiometrics() as Action).value;
@@ -127,3 +144,44 @@ describe('biometricsStateMachine', () => {
     expect(mockNavigate).not.toHaveBeenCalled();
   });
 });
+
+// TODO: Update all saga tests to use expectSaga (more intuitive and easier to read)
+describe('startAppServices', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should start app services', async () => {
+    await expectSaga(startAppServices)
+      // Dispatch both required actions
+      .dispatch({ type: UserActionType.ON_PERSISTED_DATA_LOADED })
+      .dispatch({ type: NavigationActionType.ON_NAVIGATION_READY })
+      .run();
+
+    // Verify services are started
+    expect(EngineService.start).toHaveBeenCalled();
+    expect(AppStateEventProcessor.start).toHaveBeenCalled();
+  });
+
+  it('should not start app services if navigation is not ready', async () => {
+    await expectSaga(startAppServices)
+      // Dispatch both required actions
+      .dispatch({ type: UserActionType.ON_PERSISTED_DATA_LOADED })
+      .run();
+
+    // Verify services are not started
+    expect(EngineService.start).not.toHaveBeenCalled();
+    expect(AppStateEventProcessor.start).not.toHaveBeenCalled();
+  });
+
+  it('should not start app services if persisted data is not loaded', async () => {
+    await expectSaga(startAppServices)
+      // Dispatch both required actions
+      .dispatch({ type: NavigationActionType.ON_NAVIGATION_READY })
+      .run();
+
+    // Verify services are not started
+    expect(EngineService.start).not.toHaveBeenCalled();
+    expect(AppStateEventProcessor.start).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/util/logs/__snapshots__/index.test.ts.snap b/app/util/logs/__snapshots__/index.test.ts.snap
new file mode 100644
index 00000000000..197b81ca95f
--- /dev/null
+++ b/app/util/logs/__snapshots__/index.test.ts.snap
@@ -0,0 +1,356 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`logs :: generateStateLogs generates a valid json export 1`] = `
+{
+  "appVersion": "1",
+  "buildNumber": "123",
+  "engine": {
+    "backgroundState": {
+      "AccountTrackerController": {
+        "accounts": {},
+        "accountsByChainId": {
+          "0x1": {},
+        },
+      },
+      "AccountsController": {
+        "internalAccounts": {
+          "accounts": {},
+          "selectedAccount": "",
+        },
+      },
+      "AddressBookController": {
+        "addressBook": {},
+      },
+      "ApprovalController": {
+        "approvalFlows": [],
+        "pendingApprovalCount": 0,
+        "pendingApprovals": {},
+      },
+      "AuthenticationController": {
+        "isSignedIn": false,
+      },
+      "CurrencyRateController": {
+        "currencyRates": {
+          "ETH": {
+            "conversionDate": 0,
+            "conversionRate": 0,
+            "usdConversionRate": null,
+          },
+        },
+        "currentCurrency": "usd",
+      },
+      "GasFeeController": {
+        "estimatedGasFeeTimeBounds": {},
+        "gasEstimateType": "none",
+        "gasFeeEstimates": {},
+        "gasFeeEstimatesByChainId": {},
+        "nonRPCGasFeeApisDisabled": false,
+      },
+      "KeyringController": {
+        "keyrings": [
+          "keyring1",
+          "keyring2",
+        ],
+      },
+      "LoggingController": {
+        "logs": {},
+      },
+      "NetworkController": {
+        "networkConfigurationsByChainId": {
+          "0x1": {
+            "blockExplorerUrls": [],
+            "chainId": "0x1",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Ethereum Mainnet",
+            "nativeCurrency": "ETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "mainnet",
+                "type": "infura",
+                "url": "https://mainnet.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+          "0x5": {
+            "blockExplorerUrls": [],
+            "chainId": "0x5",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Goerli",
+            "nativeCurrency": "GoerliETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "goerli",
+                "type": "infura",
+                "url": "https://goerli.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+          "0xaa36a7": {
+            "blockExplorerUrls": [],
+            "chainId": "0xaa36a7",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Sepolia",
+            "nativeCurrency": "SepoliaETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "sepolia",
+                "type": "infura",
+                "url": "https://sepolia.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+          "0xe704": {
+            "blockExplorerUrls": [],
+            "chainId": "0xe704",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Linea Goerli",
+            "nativeCurrency": "LineaETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "linea-goerli",
+                "type": "infura",
+                "url": "https://linea-goerli.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+          "0xe705": {
+            "blockExplorerUrls": [],
+            "chainId": "0xe705",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Linea Sepolia",
+            "nativeCurrency": "LineaETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "linea-sepolia",
+                "type": "infura",
+                "url": "https://linea-sepolia.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+          "0xe708": {
+            "blockExplorerUrls": [],
+            "chainId": "0xe708",
+            "defaultRpcEndpointIndex": 0,
+            "name": "Linea",
+            "nativeCurrency": "ETH",
+            "rpcEndpoints": [
+              {
+                "networkClientId": "linea-mainnet",
+                "type": "infura",
+                "url": "https://linea-mainnet.infura.io/v3/{infuraProjectId}",
+              },
+            ],
+          },
+        },
+        "networksMetadata": {
+          "mainnet": {
+            "EIPS": {},
+            "status": "unknown",
+          },
+        },
+        "selectedNetworkClientId": "mainnet",
+      },
+      "NotificationServicesController": {
+        "isCheckingAccountsPresence": false,
+        "isFeatureAnnouncementsEnabled": false,
+        "isFetchingMetamaskNotifications": false,
+        "isMetamaskNotificationsFeatureSeen": false,
+        "isNotificationServicesEnabled": false,
+        "isUpdatingMetamaskNotifications": false,
+        "isUpdatingMetamaskNotificationsAccount": [],
+        "metamaskNotificationsList": [],
+        "metamaskNotificationsReadList": [],
+        "subscriptionAccountsSeen": [],
+      },
+      "NotificationServicesPushController": {
+        "fcmToken": "",
+      },
+      "PPOMController": {
+        "storageMetadata": [],
+        "versionInfo": [],
+      },
+      "PermissionController": {
+        "subjects": {},
+      },
+      "PreferencesController": {
+        "displayNftMedia": true,
+        "featureFlags": {},
+        "identities": {},
+        "ipfsGateway": "https://dweb.link/ipfs/",
+        "isIpfsGatewayEnabled": true,
+        "isMultiAccountBalancesEnabled": true,
+        "lostIdentities": {},
+        "privacyMode": false,
+        "securityAlertsEnabled": true,
+        "selectedAddress": "",
+        "showIncomingTransactions": {
+          "0x1": true,
+          "0x13881": true,
+          "0x38": true,
+          "0x5": true,
+          "0x504": true,
+          "0x505": true,
+          "0x507": true,
+          "0x61": true,
+          "0x64": true,
+          "0x89": true,
+          "0xa": true,
+          "0xa869": true,
+          "0xa86a": true,
+          "0xaa36a7": true,
+          "0xaa37dc": true,
+          "0xe704": true,
+          "0xe705": true,
+          "0xe708": true,
+          "0xfa": true,
+          "0xfa2": true,
+        },
+        "showMultiRpcModal": false,
+        "showTestNetworks": false,
+        "smartTransactionsOptInStatus": true,
+        "tokenNetworkFilter": {},
+        "tokenSortConfig": {
+          "key": "tokenFiatAmount",
+          "order": "dsc",
+          "sortCallback": "stringNumeric",
+        },
+        "useNftDetection": true,
+        "useSafeChainsListValidation": true,
+        "useTokenDetection": true,
+        "useTransactionSimulations": true,
+      },
+      "RemoteFeatureFlagController": {
+        "cacheTimestamp": 0,
+        "remoteFeatureFlags": {},
+      },
+      "SelectedNetworkController": {
+        "domains": {},
+      },
+      "SignatureController": {
+        "signatureRequests": {},
+        "unapprovedPersonalMsgCount": 0,
+        "unapprovedPersonalMsgs": {},
+        "unapprovedTypedMessages": {},
+        "unapprovedTypedMessagesCount": 0,
+      },
+      "SmartTransactionsController": {
+        "smartTransactionsState": {
+          "fees": {
+            "approvalTxFees": null,
+            "tradeTxFees": null,
+          },
+          "feesByChainId": {
+            "0x1": {
+              "approvalTxFees": null,
+              "tradeTxFees": null,
+            },
+            "0xaa36a7": {
+              "approvalTxFees": null,
+              "tradeTxFees": null,
+            },
+          },
+          "liveness": true,
+          "livenessByChainId": {
+            "0x1": true,
+            "0xaa36a7": true,
+          },
+          "smartTransactions": {
+            "0x1": [],
+          },
+          "userOptIn": null,
+          "userOptInV2": null,
+        },
+      },
+      "SnapController": {
+        "snapStates": {},
+        "snaps": {},
+        "unencryptedSnapStates": {},
+      },
+      "SnapsRegistry": {
+        "database": null,
+        "databaseUnavailable": false,
+        "lastUpdated": null,
+      },
+      "SubjectMetadataController": {
+        "subjectMetadata": {},
+      },
+      "SwapsController": {
+        "aggregatorMetadata": null,
+        "aggregatorMetadataLastFetched": 0,
+        "approvalTransaction": null,
+        "chainCache": {
+          "0x1": {
+            "aggregatorMetadata": null,
+            "aggregatorMetadataLastFetched": 0,
+            "tokens": null,
+            "tokensLastFetched": 0,
+            "topAssets": null,
+            "topAssetsLastFetched": 0,
+          },
+        },
+        "error": {
+          "description": null,
+          "key": null,
+        },
+        "fetchParams": {
+          "destinationToken": "",
+          "slippage": 0,
+          "sourceAmount": 0,
+          "sourceToken": "",
+          "walletAddress": "",
+        },
+        "fetchParamsMetaData": {
+          "destinationTokenInfo": {
+            "address": "",
+            "decimals": 0,
+            "symbol": "",
+          },
+          "sourceTokenInfo": {
+            "address": "",
+            "decimals": 0,
+            "symbol": "",
+          },
+        },
+        "isInPolling": false,
+        "pollingCyclesLeft": 3,
+        "quoteRefreshSeconds": null,
+        "quoteValues": {},
+        "quotes": {},
+        "quotesLastFetched": 0,
+        "tokens": null,
+        "tokensLastFetched": 0,
+        "topAggId": null,
+        "topAggSavings": null,
+        "topAssets": null,
+        "topAssetsLastFetched": 0,
+        "usedCustomGas": null,
+        "usedGasEstimate": null,
+      },
+      "TokenBalancesController": {
+        "tokenBalances": {},
+      },
+      "TokenListController": {
+        "preventPollingOnNetworkRestart": false,
+        "tokenList": {},
+        "tokensChainsCache": {},
+      },
+      "TokenRatesController": {
+        "marketData": {},
+      },
+      "TransactionController": {
+        "lastFetchedBlockNumbers": {},
+        "methodData": {},
+        "submitHistory": [],
+        "transactions": [],
+      },
+      "UserStorageController": {
+        "hasAccountSyncingSyncedAtLeastOnce": false,
+        "isAccountSyncingReadyToBeDispatched": false,
+        "isProfileSyncingEnabled": true,
+        "isProfileSyncingUpdateLoading": false,
+      },
+    },
+  },
+  "metaMetricsId": "6D796265-7374-4953-6D65-74616D61736B",
+}
+`;
diff --git a/app/util/logs/index.test.ts b/app/util/logs/index.test.ts
index f6c79401545..ab0cf5b6b79 100644
--- a/app/util/logs/index.test.ts
+++ b/app/util/logs/index.test.ts
@@ -12,6 +12,7 @@ import initialRootState, {
   backgroundState,
 } from '../../util/test/initial-root-state';
 import { merge } from 'lodash';
+import MetaMetrics from '../../core/Analytics/MetaMetrics';
 
 jest.mock('react-native-fs', () => ({
   DocumentDirectoryPath: '/mock/path',
@@ -47,8 +48,39 @@ jest.mock('../../core/Engine', () => ({
   },
 }));
 
+jest.mock('../../core/Analytics/MetaMetrics');
+
+const mockMetrics = {
+  isEnabled: jest.fn(() => true),
+  getMetaMetricsId: jest.fn(() =>
+    Promise.resolve('6D796265-7374-4953-6D65-74616D61736B'),
+  ),
+};
+
+(MetaMetrics.getInstance as jest.Mock).mockReturnValue(mockMetrics);
+
 describe('logs :: generateStateLogs', () => {
-  it('should generate the state logs correctly without the explicitly deleted controller states', async () => {
+
+  it('generates a valid json export', async () => {
+    const mockStateInput = {
+      appVersion: '1',
+      buildNumber: '123',
+      metaMetricsId: '6D796265-7374-4953-6D65-74616D61736B',
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          KeyringController: {
+            vault: 'vault mock',
+          },
+        },
+      },
+    };
+    const logs = generateStateLogs(mockStateInput);
+
+    expect(JSON.parse(logs)).toMatchSnapshot();
+  });
+
+  it('generates the expected state logs without the explicitly deleted controller states', async () => {
     const mockStateInput = {
       engine: {
         backgroundState: {
@@ -74,6 +106,7 @@ describe('logs :: generateStateLogs', () => {
     const mockStateInput = {
       appVersion: '1',
       buildNumber: '123',
+      metaMetricsId: '6D796265-7374-4953-6D65-74616D61736B',
       engine: {
         backgroundState: {
           ...backgroundState,
@@ -94,6 +127,7 @@ describe('logs :: generateStateLogs', () => {
     expect(logs.includes("vault: 'vault mock'")).toBe(false);
     expect(logs.includes('appVersion')).toBe(true);
     expect(logs.includes('buildNumber')).toBe(true);
+    expect(logs.includes('metaMetricsId')).toBe(true);
   });
 });
 
@@ -256,4 +290,41 @@ describe('logs :: downloadStateLogs', () => {
       url: expect.stringContaining('data:text/plain;base64,'),
     });
   });
+
+  it('does not include metametrics id if not opt-in', async () => {
+    (getApplicationName as jest.Mock).mockResolvedValue('TestApp');
+    (getVersion as jest.Mock).mockResolvedValue('1.0.0');
+    (getBuildNumber as jest.Mock).mockResolvedValue('100');
+    (Device.isIos as jest.Mock).mockReturnValue(false);
+    (mockMetrics.isEnabled as jest.Mock).mockReturnValue(false);
+
+    const mockStateInput = merge({}, initialRootState, {
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          KeyringController: {
+            vault: 'vault mock',
+          },
+        },
+      },
+    });
+
+    await downloadStateLogs(mockStateInput);
+
+    expect(Share.open).toHaveBeenCalledWith({
+      subject: 'TestApp State logs -  v1.0.0 (100)',
+      title: 'TestApp State logs -  v1.0.0 (100)',
+      url: expect.stringContaining('data:text/plain;base64,'),
+    });
+
+    // Access the arguments passed to Share.open
+    const shareOpenCalls = (Share.open as jest.Mock).mock.calls;
+    expect(shareOpenCalls.length).toBeGreaterThan(0);
+    const [shareOpenArgs] = shareOpenCalls[0];
+    const { url } = shareOpenArgs;
+    const base64Data = url.replace('data:text/plain;base64,', '');
+    const decodedData = Buffer.from(base64Data, 'base64').toString('utf-8');
+    const jsonData = JSON.parse(decodedData);
+    expect(jsonData).not.toHaveProperty('metaMetricsId');
+  });
 });
diff --git a/app/util/logs/index.ts b/app/util/logs/index.ts
index 64bfa2088b5..6363be63977 100644
--- a/app/util/logs/index.ts
+++ b/app/util/logs/index.ts
@@ -11,6 +11,7 @@ import { Buffer } from 'buffer';
 import Logger from '../../util/Logger';
 import { RootState } from '../../reducers';
 import Device from '../../util/device';
+import {MetaMetrics} from '../../core/Analytics';
 
 // TODO: Replace "any" with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, import/prefer-default-export
@@ -57,6 +58,8 @@ export const downloadStateLogs = async (
   const appName = await getApplicationName();
   const appVersion = await getVersion();
   const buildNumber = await getBuildNumber();
+  const metrics = MetaMetrics.getInstance();
+  const metaMetricsId = metrics.isEnabled() ? await metrics.getMetaMetricsId() : undefined;
   const path =
     RNFS.DocumentDirectoryPath +
     `/state-logs-v${appVersion}-(${buildNumber}).json`;
@@ -68,6 +71,7 @@ export const downloadStateLogs = async (
         ...fullState,
         appVersion,
         buildNumber,
+        metaMetricsId,
       },
       loggedIn,
     );
diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index 80b6d9144a2..461f8ea6b87 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -497,7 +497,5 @@ export const isChainPermissionsFeatureEnabled =
 export const isPermissionsSettingsV1Enabled =
   process.env.MM_PERMISSIONS_SETTINGS_V1_ENABLED === 'true';
 
-export const isPortfolioViewEnabled = process.env.PORTFOLIO_VIEW === 'true';
-
-export const isPortfolioViewEnabledFunction = () =>
+export const isPortfolioViewEnabled = () =>
   process.env.PORTFOLIO_VIEW === 'true';
diff --git a/app/util/smart-transactions/index.test.ts b/app/util/smart-transactions/index.test.ts
index f10f3403108..2bad676e57c 100644
--- a/app/util/smart-transactions/index.test.ts
+++ b/app/util/smart-transactions/index.test.ts
@@ -283,37 +283,53 @@ describe('Smart Transactions utils', () => {
   });
   describe('getShouldStartFlow', () => {
     it('returns true for Send transaction', () => {
-      const res = getShouldStartApprovalRequest(false, true, false, false);
+      const res = getShouldStartApprovalRequest(false, true, false, false, false);
       expect(res).toBe(true);
     });
+    it('returns false for Send transaction when mobileReturnTxHashAsap is true', () => {
+      const res = getShouldStartApprovalRequest(false, true, false, false, true);
+      expect(res).toBe(false);
+    });
     it('returns true for Dapp transaction', () => {
-      const res = getShouldStartApprovalRequest(true, false, false, false);
+      const res = getShouldStartApprovalRequest(true, false, false, false, false);
       expect(res).toBe(true);
     });
+    it('returns false for Dapp transaction when mobileReturnTxHashAsap is true', () => {
+      const res = getShouldStartApprovalRequest(true, false, false, false, true);
+      expect(res).toBe(false);
+    });
     it('returns true for Swap approve transaction', () => {
-      const res = getShouldStartApprovalRequest(false, false, true, false);
+      const res = getShouldStartApprovalRequest(false, false, true, false, false);
       expect(res).toBe(true);
     });
     it('returns false for Swap transaction', () => {
-      const res = getShouldStartApprovalRequest(false, false, false, true);
+      const res = getShouldStartApprovalRequest(false, false, false, true, false);
       expect(res).toBe(false);
     });
   });
   describe('getShouldUpdateFlow', () => {
     it('returns true for Send transaction', () => {
-      const res = getShouldUpdateApprovalRequest(false, true, false);
+      const res = getShouldUpdateApprovalRequest(false, true, false, false);
       expect(res).toBe(true);
     });
+    it('returns false for Send transaction when mobileReturnTxHashAsap is true', () => {
+      const res = getShouldUpdateApprovalRequest(false, true, false, true);
+      expect(res).toBe(false);
+    });
     it('returns true for Dapp transaction', () => {
-      const res = getShouldUpdateApprovalRequest(true, false, false);
+      const res = getShouldUpdateApprovalRequest(true, false, false, false);
       expect(res).toBe(true);
     });
+    it('returns false for Dapp transaction when mobileReturnTxHashAsap is true', () => {
+      const res = getShouldUpdateApprovalRequest(true, false, false, true);
+      expect(res).toBe(false);
+    });
     it('returns true for Swap transaction', () => {
-      const res = getShouldUpdateApprovalRequest(false, false, true);
+      const res = getShouldUpdateApprovalRequest(false, false, true, false);
       expect(res).toBe(true);
     });
     it('returns false for Swap approve transaction', () => {
-      const res = getShouldUpdateApprovalRequest(false, false, false);
+      const res = getShouldUpdateApprovalRequest(false, false, false, false);
       expect(res).toBe(false);
     });
   });
diff --git a/app/util/smart-transactions/index.ts b/app/util/smart-transactions/index.ts
index d831b4ec20f..4b190b5b2a0 100644
--- a/app/util/smart-transactions/index.ts
+++ b/app/util/smart-transactions/index.ts
@@ -69,14 +69,18 @@ export const getShouldStartApprovalRequest = (
   isSend: boolean,
   isSwapApproveTx: boolean,
   hasPendingApprovalForSwapApproveTx: boolean,
+  mobileReturnTxHashAsap: boolean,
 ): boolean =>
-  isDapp || isSend || isSwapApproveTx || !hasPendingApprovalForSwapApproveTx;
+  !mobileReturnTxHashAsap &&
+  (isDapp || isSend || isSwapApproveTx || !hasPendingApprovalForSwapApproveTx);
 
 export const getShouldUpdateApprovalRequest = (
   isDapp: boolean,
   isSend: boolean,
   isSwapTransaction: boolean,
-): boolean => isDapp || isSend || isSwapTransaction;
+  mobileReturnTxHashAsap: boolean,
+): boolean =>
+  !mobileReturnTxHashAsap && (isDapp || isSend || isSwapTransaction);
 
 const waitForSmartTransactionConfirmationDone = (
   controllerMessenger: ControllerMessenger,
diff --git a/app/util/smart-transactions/smart-publish-hook.test.ts b/app/util/smart-transactions/smart-publish-hook.test.ts
index a495cb5d247..3953ad17ee5 100644
--- a/app/util/smart-transactions/smart-publish-hook.test.ts
+++ b/app/util/smart-transactions/smart-publish-hook.test.ts
@@ -362,6 +362,69 @@ describe('submitSmartTransactionHook', () => {
     );
   });
 
+  it('submits a smart transaction without the smart transaction status page', async () => {
+    withRequest(
+      async ({ request, controllerMessenger, submitSignedTransactionsSpy }) => {
+        request.featureFlags.smartTransactions.mobileReturnTxHashAsap = true;
+        setImmediate(() => {
+          controllerMessenger.publish(
+            'SmartTransactionsController:smartTransaction',
+            {
+              status: 'pending',
+              statusMetadata: {
+                minedHash: '',
+              },
+              uuid: 'uuid',
+            } as SmartTransaction,
+          );
+
+          controllerMessenger.publish(
+            'SmartTransactionsController:smartTransaction',
+            {
+              status: 'success',
+              statusMetadata: {
+                minedHash: transactionHash,
+              },
+              uuid: 'uuid',
+            } as SmartTransaction,
+          );
+        });
+        const result = await submitSmartTransactionHook(request);
+
+        expect(result).toEqual({ transactionHash });
+        const { txParams, chainId } = request.transactionMeta;        
+
+        expect(
+          request.transactionController.approveTransactionsWithSameNonce,
+        ).toHaveBeenCalledWith(
+          [
+            {
+              ...txParams,
+              maxFeePerGas: '0x2fd8a58d7',
+              maxPriorityFeePerGas: '0xaa0f8a94',
+              chainId,
+              value: undefined,
+            },
+          ],
+          { hasNonce: true },
+        );
+        expect(submitSignedTransactionsSpy).toHaveBeenCalledWith({
+          signedTransactions: [createSignedTransaction()],
+          signedCanceledTransactions: [],
+          txParams,
+          transactionMeta: request.transactionMeta,
+        });
+
+        expect(
+          request.approvalController.addAndShowApprovalRequest,
+        ).not.toHaveBeenCalled();
+        expect(
+          request.approvalController.updateRequestState,
+        ).not.toHaveBeenCalled();
+      },
+    );
+  });
+
   describe('MM Swaps', () => {
     it('starts an approval and does not end it if there is an swap tx that requires allowance', async () => {
       withRequest(
diff --git a/app/util/smart-transactions/smart-publish-hook.ts b/app/util/smart-transactions/smart-publish-hook.ts
index 2ed010b3d6f..16ecfa2bdf9 100644
--- a/app/util/smart-transactions/smart-publish-hook.ts
+++ b/app/util/smart-transactions/smart-publish-hook.ts
@@ -94,6 +94,7 @@ class SmartTransactionHook {
 
   #shouldStartApprovalRequest: boolean;
   #shouldUpdateApprovalRequest: boolean;
+  #mobileReturnTxHashAsap: boolean;
 
   constructor(request: SubmitSmartTransactionRequest) {
     const {
@@ -116,6 +117,8 @@ class SmartTransactionHook {
     this.#chainId = transactionMeta.chainId;
     this.#txParams = transactionMeta.txParams;
     this.#controllerMessenger = controllerMessenger;
+    this.#mobileReturnTxHashAsap =
+      this.#featureFlags?.smartTransactions?.mobileReturnTxHashAsap ?? false;
 
     const {
       isDapp,
@@ -143,11 +146,13 @@ class SmartTransactionHook {
       this.#isSend,
       this.#isSwapApproveTx,
       Boolean(approvalIdForPendingSwapApproveTx),
+      this.#mobileReturnTxHashAsap,
     );
     this.#shouldUpdateApprovalRequest = getShouldUpdateApprovalRequest(
       this.#isDapp,
       this.#isSend,
       this.#isSwapTransaction,
+      this.#mobileReturnTxHashAsap,
     );
   }
 
@@ -221,9 +226,7 @@ class SmartTransactionHook {
       );
       throw error;
     } finally {
-      const mobileReturnTxHashAsap =
-        this.#featureFlags?.smartTransactions?.mobileReturnTxHashAsap;
-      if (!mobileReturnTxHashAsap) {
+      if (!this.#mobileReturnTxHashAsap) {
         this.#cleanup();
       }
     }
@@ -266,10 +269,8 @@ class SmartTransactionHook {
     uuid: string,
   ) => {
     let transactionHash: string | undefined | null;
-    const mobileReturnTxHashAsap =
-      this.#featureFlags?.smartTransactions?.mobileReturnTxHashAsap;
 
-    if (mobileReturnTxHashAsap && submitTransactionResponse?.txHash) {
+    if (this.#mobileReturnTxHashAsap && submitTransactionResponse?.txHash) {
       transactionHash = submitTransactionResponse.txHash;
     } else {
       transactionHash = await this.#waitForTransactionHash({
diff --git a/app/util/test/confirm-data-helpers.ts b/app/util/test/confirm-data-helpers.ts
index 2131439442e..09fd96a1285 100644
--- a/app/util/test/confirm-data-helpers.ts
+++ b/app/util/test/confirm-data-helpers.ts
@@ -72,3 +72,39 @@ export const typedSignV1ConfirmationState = {
     },
   },
 };
+
+export const typedSignV3ConfirmationState = {
+  engine: {
+    backgroundState: {
+      ...backgroundState,
+      ApprovalController: {
+        pendingApprovals: {
+          'fb2029e1-b0ab-11ef-9227-05a11087c334': {
+            id: 'fb2029e1-b0ab-11ef-9227-05a11087c334',
+            origin: 'metamask.github.io',
+            type: 'eth_signTypedData',
+            time: 1733143817088,
+            requestData: {
+              data: '{"types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Person":[{"name":"name","type":"string"},{"name":"wallet","type":"address"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person"},{"name":"contents","type":"string"}]},"primaryType":"Mail","domain":{"name":"Ether Mail","version":"1","chainId":1,"verifyingContract":"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"},"message":{"from":{"name":"Cow","wallet":"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"},"to":{"name":"Bob","wallet":"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"},"contents":"Hello, Bob!"}}',
+              from: '0x8eeee1781fd885ff5ddef7789486676961873d12',
+              requestId: 3298650200,
+              meta: {
+                url: 'https://metamask.github.io/test-dapp/',
+                title: 'E2E Test Dapp',
+                icon: { uri: 'https://metamask.github.io/metamask-fox.svg' },
+                analytics: { request_source: 'In-App-Browser' },
+              },
+              origin: 'metamask.github.io',
+              metamaskId: 'fb2029e0-b0ab-11ef-9227-05a11087c334',
+              version: 'V3',
+            },
+            requestState: null,
+            expectsResult: true,
+          },
+        },
+        pendingApprovalCount: 1,
+        approvalFlows: [],
+      },
+    },
+  },
+};
diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
index 65b0315afd7..0191af34f02 100644
--- a/app/util/test/initial-background-state.json
+++ b/app/util/test/initial-background-state.json
@@ -21,7 +21,6 @@
   "AddressBookController": {
     "addressBook": {}
   },
-  "AssetsContractController": {},
   "NftController": {
     "allNftContracts": {},
     "allNfts": {},
@@ -40,8 +39,6 @@
     "tokensChainsCache": {},
     "preventPollingOnNetworkRestart": false
   },
-  "TokenDetectionController": {},
-  "NftDetectionController": {},
   "PPOMController": {
     "storageMetadata": [],
     "versionInfo": []
diff --git a/app/util/test/initial-root-state.ts b/app/util/test/initial-root-state.ts
index 20ed3cd2a88..d7e1c2b64da 100644
--- a/app/util/test/initial-root-state.ts
+++ b/app/util/test/initial-root-state.ts
@@ -7,6 +7,7 @@ import { initialState as transactionMetrics } from '../../core/redux/slices/tran
 import { initialState as originThrottling } from '../../core/redux/slices/originThrottling';
 import initialBackgroundState from './initial-background-state.json';
 import { userInitialState } from '../../reducers/user';
+import { initialNavigationState } from '../../reducers/navigation';
 import { initialState as initialStakingState } from '../../core/redux/slices/staking';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { initialState as initialMultichainSettingsState } from '../../reducers/multichain';
@@ -35,7 +36,7 @@ const initialRootState: RootState = {
   swaps: undefined,
   fiatOrders: initialFiatOrdersState,
   infuraAvailability: undefined,
-  navigation: undefined,
+  navigation: initialNavigationState,
   networkOnboarded: undefined,
   security: initialSecurityState,
   signatureRequest: undefined,
diff --git a/babel.config.js b/babel.config.js
index af4c36a0a77..8b3aa390673 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -23,6 +23,12 @@ module.exports = {
       test: './app/lib/snaps',
       plugins: [['babel-plugin-inline-import', { extensions: ['.html'] }]],
     },
+    // TODO: Remove this once we have a fix for the private methods
+    // Do not apply this plugin globally since it breaks FlatList props.getItem
+    {
+      test: './app/core/redux/ReduxService.ts',
+      plugins: [['@babel/plugin-transform-private-methods', { loose: true }]],
+    },
   ],
   env: {
     production: {
diff --git a/bitrise.yml b/bitrise.yml
index 1a8f3883590..838b9fe67f3 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -1733,7 +1733,7 @@ app:
       MM_NETWORK_UI_REDESIGN_ENABLED: false
     - opts:
         is_expand: false
-      PORTFOLIO_VIEW: false
+      PORTFOLIO_VIEW: true
     - opts:
         is_expand: false
       MM_MULTICHAIN_V1_ENABLED: true
@@ -1781,16 +1781,16 @@ app:
       PROJECT_LOCATION_IOS: ios
     - opts:
         is_expand: false
-      VERSION_NAME: 7.36.0
+      VERSION_NAME: 7.37.0
     - opts:
         is_expand: false
-      VERSION_NUMBER: 1505
+      VERSION_NUMBER: 1512
     - opts:
         is_expand: false
-      FLASK_VERSION_NAME: 7.36.0
+      FLASK_VERSION_NAME: 7.37.0
     - opts:
         is_expand: false
-      FLASK_VERSION_NUMBER: 1505
+      FLASK_VERSION_NUMBER: 1512
     - opts:
         is_expand: false
       ANDROID_APK_LINK: ''
diff --git a/e2e/fixtures/fixture-builder.js b/e2e/fixtures/fixture-builder.js
index 383fa1d01d5..024f90a6c1a 100644
--- a/e2e/fixtures/fixture-builder.js
+++ b/e2e/fixtures/fixture-builder.js
@@ -3,6 +3,10 @@
 import { getGanachePort } from './utils';
 import { merge } from 'lodash';
 import { CustomNetworks, PopularNetworksList } from '../resources/networks.e2e';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+
+export const DEFAULT_FIXTURE_ACCOUNT = '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3';
+
 const DAPP_URL = 'localhost';
 
 /**
@@ -59,18 +63,18 @@ class FixtureBuilder {
           backgroundState: {
             AccountTrackerController: {
               accounts: {
-                '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3': {
+                [DEFAULT_FIXTURE_ACCOUNT]: {
                   balance: '0x0',
                 },
               },
               accountsByChainId: {
                 64: {
-                  '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3': {
+                  [DEFAULT_FIXTURE_ACCOUNT]: {
                     balance: '0x0',
                   },
                 },
                 1: {
-                  '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3': {
+                  [DEFAULT_FIXTURE_ACCOUNT]: {
                     balance: '0x0',
                   },
                 },
@@ -134,7 +138,7 @@ class FixtureBuilder {
                 '{"cipher":"ynNI8tAH4fcpmXo8S88A/3T3Dd1w0LY5ftpL59gW0ObYxovgFhrtKpRe/WD7WU42KwGBNKVicB9W9at4ePgOJGS6IMWr//C3jh0vKQTabkDzDy1ZfSvztRxGpVjmrnU3fC5B0eq/MBMSrgu8Bww309pk5jghyRfzp9YsG0ONo1CXUm2brQo/eRve7i9aDbiGXiEK0ch0BO7AvZPGMhHtYRrrOro4QrDVHGUgAF5SA1LD4dv/2AB8ctHwn4YbUmICieqlhJhprx3CNOJ086g7vPQOr21T4IbvtTumFaTibfoD3GWHQo11CvE04z3cN3rRERriP7bww/tZOe8OAMFGWANkmOJHwPPwEo1NBr6w3GD2VObEmqNhXeNc6rrM23Vm1JU40Hl+lVKubnbT1vujdGLmOpDY0GdekscQQrETEQJfhKlXIT0wwyPoLwR+Ja+GjyOhBr0nfWVoVoVrcTUwAk5pStBMt+5OwDRpP29L1+BL9eMwDgKpjVXRTh4MGagKYmFc6eKDf6jV0Yt9pG+jevv5IuyhwX0TRtfQCGgRTtS7oxhDQPxGqu01rr+aI7vGMfRQpaKEEXEWVmMaqCmktyUV35evK9h/xv1Yif00XBll55ShxN8t2/PnATvZxFKQfjJe5f/monbwf8rpfXHuFoh8M9hzjbcS5eh/TPYZZu1KltpeHSIAh5C+4aFyZw0e1DeAg/wdRO3PhBrVztsHSyISHlRdfEyw7QF4Lemr++2MVR1dTxS2I5mUEHjh+hmp64euH1Vb/RUppXlmE8t1RYYXfcsF2DlRwPswP739E/EpVtY3Syf/zOTyHyrOJBldzw22sauIzt8Q5Fe5qA/hGRWiejjK31P/P5j7wEKY7vrOJB1LWNXHSuSjffx9Ai9E","iv":"d5dc0252424ac0c08ca49ef320d09569","salt":"feAPSGdL4R2MVj2urJFl4A==","lib":"original"}',
               keyrings: [
                 {
-                  accounts: ['0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3'],
+                  accounts: [DEFAULT_FIXTURE_ACCOUNT],
                   index: 0,
                   type: 'HD Key Tree',
                 },
@@ -244,7 +248,7 @@ class FixtureBuilder {
               internalAccounts: {
                 accounts: {
                   '4d7a5e0b-b261-4aed-8126-43972b0fa0a1': {
-                    address: '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3',
+                    address: DEFAULT_FIXTURE_ACCOUNT,
                     id: '4d7a5e0b-b261-4aed-8126-43972b0fa0a1',
                     metadata: {
                       name: 'Account 1',
@@ -270,15 +274,15 @@ class FixtureBuilder {
             PreferencesController: {
               featureFlags: {},
               identities: {
-                '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3': {
-                  address: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
+                [DEFAULT_FIXTURE_ACCOUNT]: {
+                  address: DEFAULT_FIXTURE_ACCOUNT,
                   name: 'Account 1',
                   importTime: 1684232000456,
                 },
               },
               ipfsGateway: 'https://dweb.link/ipfs/',
               lostIdentities: {},
-              selectedAddress: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
+              selectedAddress: DEFAULT_FIXTURE_ACCOUNT,
               useTokenDetection: true,
               useNftDetection: true,
               displayNftMedia: true,
@@ -291,15 +295,15 @@ class FixtureBuilder {
                 featureFlags: {},
                 frequentRpcList: [],
                 identities: {
-                  '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3': {
-                    address: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
+                  [DEFAULT_FIXTURE_ACCOUNT]: {
+                    address: DEFAULT_FIXTURE_ACCOUNT,
                     name: 'Account 1',
                     importTime: 1684232000456,
                   },
                 },
                 ipfsGateway: 'https://dweb.link/ipfs/',
                 lostIdentities: {},
-                selectedAddress: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
+                selectedAddress: DEFAULT_FIXTURE_ACCOUNT,
                 useTokenDetection: true,
                 useNftDetection: false,
                 displayNftMedia: true,
@@ -692,9 +696,8 @@ class FixtureBuilder {
     const { providerConfig } = data;
 
     // Generate a unique key for the new network client ID
-    const newNetworkClientId = `networkClientId${
-      Object.keys(networkController.networkConfigurationsByChainId).length + 1
-    }`;
+    const newNetworkClientId = `networkClientId${Object.keys(networkController.networkConfigurationsByChainId).length + 1
+      }`;
 
     // Define the network configuration
     const networkConfig = {
@@ -746,7 +749,7 @@ class FixtureBuilder {
         caveats: [
           {
             type: 'restrictReturnedAccounts',
-            value: ['0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3'],
+            value: [DEFAULT_FIXTURE_ACCOUNT],
           },
         ],
         date: 1664388714636,
@@ -815,10 +818,9 @@ class FixtureBuilder {
     const fixtures = this.fixture.state.engine.backgroundState;
 
     // Generate a unique key for the new network client ID
-    const newNetworkClientId = `networkClientId${
-      Object.keys(fixtures.NetworkController.networkConfigurationsByChainId)
-        .length + 1
-    }`;
+    const newNetworkClientId = `networkClientId${Object.keys(fixtures.NetworkController.networkConfigurationsByChainId)
+      .length + 1
+      }`;
 
     // Define the Ganache network configuration
     const ganacheNetworkConfig = {
@@ -854,10 +856,9 @@ class FixtureBuilder {
     const sepoliaConfig = CustomNetworks.Sepolia.providerConfig;
 
     // Generate a unique key for the new network client ID
-    const newNetworkClientId = `networkClientId${
-      Object.keys(fixtures.NetworkController.networkConfigurationsByChainId)
-        .length + 1
-    }`;
+    const newNetworkClientId = `networkClientId${Object.keys(fixtures.NetworkController.networkConfigurationsByChainId)
+      .length + 1
+      }`;
 
     // Define the Sepolia network configuration
     const sepoliaNetworkConfig = {
@@ -907,9 +908,8 @@ class FixtureBuilder {
       } = network.providerConfig;
 
       // Generate a unique key for the new network client ID
-      const newNetworkClientId = `networkClientId${
-        Object.keys(networkConfigurationsByChainId).length + 1
-      }`;
+      const newNetworkClientId = `networkClientId${Object.keys(networkConfigurationsByChainId).length + 1
+        }`;
 
       // Define the network configuration
       const networkConfig = {
@@ -970,7 +970,7 @@ class FixtureBuilder {
       keyrings: [
         {
           type: 'HD Key Tree',
-          accounts: ['0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3'],
+          accounts: [DEFAULT_FIXTURE_ACCOUNT],
         },
         {
           type: 'Simple Key Pair',
@@ -983,6 +983,34 @@ class FixtureBuilder {
     return this;
   }
 
+  withTokens(tokens) {
+    merge(this.fixture.state.engine.backgroundState.TokensController, {
+      allTokens: {
+        [CHAIN_IDS.MAINNET]: {
+          [DEFAULT_FIXTURE_ACCOUNT]: tokens,
+        }
+      }
+    });
+    return this;
+  }
+
+  withIncomingTransactionPreferences(incomingTransactionPreferences) {
+    merge(
+      this.fixture.state.engine.backgroundState.PreferencesController,
+      {
+        showIncomingTransactions: incomingTransactionPreferences,
+      },
+    );
+    return this;
+  }
+
+  withTransactions(transactions) {
+    merge(this.fixture.state.engine.backgroundState.TransactionController, {
+      transactions,
+    });
+    return this;
+  }
+
   /**
    * Build and return the fixture object.
    * @returns {Object} - The built fixture object.
diff --git a/e2e/fixtures/fixture-helper.js b/e2e/fixtures/fixture-helper.js
index e83844fd1e7..b8df26fcb3c 100644
--- a/e2e/fixtures/fixture-helper.js
+++ b/e2e/fixtures/fixture-helper.js
@@ -6,7 +6,7 @@ import GanacheSeeder from '../../app/util/test/ganache-seeder';
 import axios from 'axios';
 import path from 'path';
 import createStaticServer from '../create-static-server';
-import { getFixturesServerPort, getLocalTestDappPort, getMockServerPort } from './utils';
+import { DEFAULT_MOCKSERVER_PORT, getFixturesServerPort, getLocalTestDappPort, getMockServerPort } from './utils';
 import Utilities from '../utils/Utilities';
 import { device } from 'detox';
 import TestHelpers from '../helpers';
@@ -106,8 +106,10 @@ export async function withFixtures(options, testSuite) {
 
   const fixtureServer = new FixtureServer();
   let mockServer;
-  const mockServerPort = getMockServerPort();
+  let mockServerPort = DEFAULT_MOCKSERVER_PORT;
+
   if (testSpecificMock) {
+    mockServerPort = getMockServerPort();
     mockServer = await startMockServer(testSpecificMock, mockServerPort);
   }
 
diff --git a/e2e/fixtures/utils.js b/e2e/fixtures/utils.js
index 395c39d73ba..0e8be173fe7 100644
--- a/e2e/fixtures/utils.js
+++ b/e2e/fixtures/utils.js
@@ -2,7 +2,7 @@ import { DEFAULT_GANACHE_PORT } from '../../app/util/test/ganache';
 import { DEFAULT_FIXTURE_SERVER_PORT } from './fixture-server';
 import { DEFAULT_DAPP_SERVER_PORT } from './fixture-helper';
 
-const DEFAULT_MOCKSERVER_PORT = 8000;
+export const DEFAULT_MOCKSERVER_PORT = 8000;
 
 function transformToValidPort(defaultPort, pid) {
   // Improve uniqueness by using a simple transformation
diff --git a/e2e/pages/Browser/BrowserView.js b/e2e/pages/Browser/BrowserView.js
index 25fe57d72b9..bca647e9332 100644
--- a/e2e/pages/Browser/BrowserView.js
+++ b/e2e/pages/Browser/BrowserView.js
@@ -178,7 +178,6 @@ class Browser {
   }
 
   async navigateToURL(url) {
-    await Gestures.waitAndTap(this.clearURLButton);
     await device.disableSynchronization(); // because animations makes typing into the browser slow
 
     await Gestures.typeTextAndHideKeyboard(this.urlInputBoxID, url);
diff --git a/e2e/pages/Browser/NetworkConnectMultiSelector.js b/e2e/pages/Browser/NetworkConnectMultiSelector.js
index 207ef3d10c2..36a9d8f1b02 100644
--- a/e2e/pages/Browser/NetworkConnectMultiSelector.js
+++ b/e2e/pages/Browser/NetworkConnectMultiSelector.js
@@ -3,9 +3,9 @@ import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 
 class NetworkConnectMultiSelector {
-  get container() {
+  get updateButton() {
     return Matchers.getElementByID(
-      NetworkConnectMultiSelectorSelectorsIDs.CONTAINER,
+      NetworkConnectMultiSelectorSelectorsIDs.UPDATE_CHAIN_PERMISSIONS,
     );
   }
 
@@ -15,6 +15,10 @@ class NetworkConnectMultiSelector {
     );
   }
 
+  async tapUpdateButton() {
+    await Gestures.waitAndTap(this.updateButton);
+  }
+
   async tapBackButton() {
     await Gestures.waitAndTap(this.backButton);
   }
diff --git a/e2e/pages/Browser/PermissionSummaryBottomSheet.js b/e2e/pages/Browser/PermissionSummaryBottomSheet.js
index b0248b2b848..9668f35ef4f 100644
--- a/e2e/pages/Browser/PermissionSummaryBottomSheet.js
+++ b/e2e/pages/Browser/PermissionSummaryBottomSheet.js
@@ -3,7 +3,7 @@ import {
   PermissionSummaryBottomSheetSelectorsText,
 } from '../../selectors/Browser/PermissionSummaryBottomSheet.selectors';
 import Matchers from '../../utils/Matchers';
-// import Gestures from '../../utils/Gestures';
+import Gestures from '../../utils/Gestures';
 
 class PermissionSummaryBottomSheet {
   get container() {
@@ -22,6 +22,10 @@ class PermissionSummaryBottomSheet {
       PermissionSummaryBottomSheetSelectorsText.CONNECTED_ACCOUNTS_TEXT,
     );
   }
+
+  async swipeToDismissModal() {
+    await Gestures.swipe(this.container, 'down', 'fast');
+  }
 }
 
 export default new PermissionSummaryBottomSheet();
diff --git a/e2e/pages/Network/NetworkNonPemittedBottomSheet.js b/e2e/pages/Network/NetworkNonPemittedBottomSheet.js
index d40d5d0798c..fc336070b4f 100644
--- a/e2e/pages/Network/NetworkNonPemittedBottomSheet.js
+++ b/e2e/pages/Network/NetworkNonPemittedBottomSheet.js
@@ -8,6 +8,7 @@ import {
   NetworkNonPemittedBottomSheetSelectorsIDs,
   NetworkNonPemittedBottomSheetSelectorsText,
 } from '../../selectors/Network/NetworkNonPemittedBottomSheet.selectors';
+import TestHelpers from '../../helpers';
 
 class NetworkNonPemittedBottomSheet {
   get addThisNetworkTitle() {
@@ -34,6 +35,24 @@ class NetworkNonPemittedBottomSheet {
     );
   }
 
+  get lineaSepoliaNetworkName() {
+    return Matchers.getElementByText(
+      NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
+    );
+  }
+
+  get chooseFromPermittedNetworksButton() {
+    return Matchers.getElementByID(
+      NetworkNonPemittedBottomSheetSelectorsIDs.CHOOSE_FROM_PERMITTED_NETWORKS_BUTTON,
+    );
+  }
+
+  get editPermissionsButton() {
+    return Matchers.getElementByID(
+      NetworkNonPemittedBottomSheetSelectorsIDs.EDIT_PERMISSIONS_BUTTON,
+    );
+  }
+
   async tapAddThisNetworkButton() {
     await Gestures.waitAndTap(this.addThisNetworkButton);
   }
@@ -45,6 +64,18 @@ class NetworkNonPemittedBottomSheet {
   async tapEthereumMainNetNetworkName() {
     await Gestures.waitAndTap(this.ethereumMainNetNetworkName);
   }
+
+  async tapLineaSepoliaNetworkName() {
+    await Gestures.waitAndTap(this.lineaSepoliaNetworkName);
+  }
+
+  async tapChooseFromPermittedNetworksButton() {
+    await Gestures.waitAndTap(this.chooseFromPermittedNetworksButton);
+  }
+
+  async tapEditPermissionsButton() {
+    await Gestures.waitAndTap(this.editPermissionsButton);
+  }
 }
 
 export default new NetworkNonPemittedBottomSheet();
diff --git a/e2e/pages/Transactions/ActivitiesView.js b/e2e/pages/Transactions/ActivitiesView.js
index 1b88464414c..089bb7f7839 100644
--- a/e2e/pages/Transactions/ActivitiesView.js
+++ b/e2e/pages/Transactions/ActivitiesView.js
@@ -1,4 +1,4 @@
-import { ActivitiesViewSelectorsText } from '../../selectors/Transactions/ActivitiesView.selectors';
+import { ActivitiesViewSelectorsIDs, ActivitiesViewSelectorsText } from '../../selectors/Transactions/ActivitiesView.selectors';
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 
@@ -7,6 +7,12 @@ class ActivitiesView {
     return Matchers.getElementByText(ActivitiesViewSelectorsText.TITLE);
   }
 
+  get container() {
+    return Matchers.getElementByID(
+      ActivitiesViewSelectorsIDs.CONTAINER,
+    );
+  }
+
   generateSwapActivityLabel(sourceToken, destinationToken) {
     let title = ActivitiesViewSelectorsText.SWAP;
     title = title.replace('{{sourceToken}}', sourceToken);
@@ -24,6 +30,10 @@ class ActivitiesView {
     const element = this.swapActivity(sourceToken, destinationToken);
     await Gestures.waitAndTap(element);
   }
+
+  async swipeDown() {
+    await Gestures.swipe(this.container, 'down', 'slow', 0.5);
+  }
 }
 
 export default new ActivitiesView();
diff --git a/e2e/pages/swaps/QuoteView.js b/e2e/pages/swaps/QuoteView.js
index 1612dea6c54..dac368cb41f 100644
--- a/e2e/pages/swaps/QuoteView.js
+++ b/e2e/pages/swaps/QuoteView.js
@@ -10,6 +10,10 @@ class QuoteView {
     return Matchers.getElementByText(QuoteViewSelectorText.GET_QUOTES);
   }
 
+  get cancelButton() {
+    return Matchers.getElementByText(QuoteViewSelectorText.CANCEL);
+  }
+
   get sourceToken() {
     return Matchers.getElementByID(QuoteViewSelectorIDs.SOURCE_TOKEN);
   }
@@ -58,6 +62,10 @@ class QuoteView {
     await device.disableSynchronization();
     await Gestures.waitAndTap(this.getQuotes);
   }
+
+  async tapOnCancelButton() {
+    await Gestures.waitAndTap(this.cancelButton);
+  }
 }
 
 export default new QuoteView();
diff --git a/e2e/pages/wallet/WalletView.js b/e2e/pages/wallet/WalletView.js
index 1f054e25ec2..9a808b25cc1 100644
--- a/e2e/pages/wallet/WalletView.js
+++ b/e2e/pages/wallet/WalletView.js
@@ -86,6 +86,26 @@ class WalletView {
     );
   }
 
+  get tokenNetworkFilter() {
+    return Matchers.getElementByID(WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER);
+  }
+
+  get tokenNetworkFilterAll() {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER_ALL,
+    );
+  }
+
+  get tokenNetworkFilterCurrent() {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.TOKEN_NETWORK_FILTER_CURRENT,
+    );
+  }
+
+  get cancelButton() {
+    return Matchers.getElementByText('Cancel');
+  }
+
   async tapCurrentMainWalletAccountActions() {
     await Gestures.waitAndTap(this.currentMainWalletAccountActions);
   }
@@ -165,6 +185,22 @@ class WalletView {
   async tapPortfolio() {
     await Gestures.waitAndTap(this.portfolioButton);
   }
+
+  async tapTokenNetworkFilter() {
+    await Gestures.waitAndTap(this.tokenNetworkFilter);
+  }
+
+  async tapTokenNetworkFilterAll() {
+    await Gestures.waitAndTap(this.tokenNetworkFilterAll);
+  }
+
+  async tapTokenNetworkFilterCurrent() {
+    await Gestures.waitAndTap(this.tokenNetworkFilterCurrent);
+  }
+
+  async tapCancelButton() {
+    await Gestures.waitAndTap(this.cancelButton);
+  }
 }
 
 export default new WalletView();
diff --git a/e2e/selectors/Browser/NetworkConnectMultiSelector.selectors.js b/e2e/selectors/Browser/NetworkConnectMultiSelector.selectors.js
index e818445692b..2f5eb4cc7f5 100644
--- a/e2e/selectors/Browser/NetworkConnectMultiSelector.selectors.js
+++ b/e2e/selectors/Browser/NetworkConnectMultiSelector.selectors.js
@@ -1,4 +1,5 @@
 export const NetworkConnectMultiSelectorSelectorsIDs = {
+  UPDATE_CHAIN_PERMISSIONS: 'multiconnect-connect-network-button',
   BACK_BUTTON: 'sheet-header-back-button',
   CONTAINER: 'network-connect-multi-selector-container',
 };
diff --git a/e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors.js b/e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors.js
index 0024d733ba5..97f1dc9fda3 100644
--- a/e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors.js
+++ b/e2e/selectors/Network/NetworkNonPemittedBottomSheet.selectors.js
@@ -5,8 +5,12 @@ export const NetworkNonPemittedBottomSheetSelectorsText = {
   ADD_THIS_NETWORK_TITLE: enContent.permissions.title_add_network_permission,
   SEPOLIA_NETWORK_NAME: CustomNetworks.Sepolia.providerConfig.nickname,
   ETHEREUM_MAIN_NET_NETWORK_NAME: 'Ethereum Main Network',
+  LINEA_SEPOLIA_NETWORK_NAME: 'Linea Sepolia',
 };
 
 export const NetworkNonPemittedBottomSheetSelectorsIDs = {
   ADD_THIS_NETWORK_BUTTON: 'add-this-network-button',
+  CHOOSE_FROM_PERMITTED_NETWORKS_BUTTON:
+    'choose-from-permitted-networks-button',
+  EDIT_PERMISSIONS_BUTTON: 'edit-permissions-button',
 };
diff --git a/e2e/selectors/Transactions/ActivitiesView.selectors.js b/e2e/selectors/Transactions/ActivitiesView.selectors.js
index 3f352595387..50a3cb95384 100644
--- a/e2e/selectors/Transactions/ActivitiesView.selectors.js
+++ b/e2e/selectors/Transactions/ActivitiesView.selectors.js
@@ -4,6 +4,10 @@ function getSentUnitMessage(unit) {
   return enContent.transactions.sent_unit.replace('{{unit}}', unit);
 }
 
+export const ActivitiesViewSelectorsIDs = {
+  CONTAINER: 'transactions-container',
+};
+
 export const ActivitiesViewSelectorsText = {
   CONFIRM_TEXT: enContent.transaction.confirmed,
   INCREASE_ALLOWANCE_METHOD: enContent.transactions.increase_allowance,
diff --git a/e2e/selectors/swaps/QuoteView.selectors.js b/e2e/selectors/swaps/QuoteView.selectors.js
index cc8ec5a7e72..bb44273d16f 100644
--- a/e2e/selectors/swaps/QuoteView.selectors.js
+++ b/e2e/selectors/swaps/QuoteView.selectors.js
@@ -2,6 +2,7 @@ import enContent from '../../../locales/languages/en.json';
 
 export const QuoteViewSelectorText = {
   GET_QUOTES: enContent.swaps.get_quotes,
+  CANCEL: 'Cancel',
 };
 
 export const QuoteViewSelectorIDs = {
diff --git a/e2e/selectors/wallet/WalletView.selectors.js b/e2e/selectors/wallet/WalletView.selectors.js
index 4586664a92c..8c2e23a9f8a 100644
--- a/e2e/selectors/wallet/WalletView.selectors.js
+++ b/e2e/selectors/wallet/WalletView.selectors.js
@@ -32,6 +32,9 @@ export const WalletViewSelectorsIDs = {
   SORT_ALPHABETICAL: 'sort-alphabetical',
   SORT_BY: 'sort-by',
   NAVBAR_NETWORK_PICKER: 'network-avatar-picker',
+  TOKEN_NETWORK_FILTER: 'token-network-filter',
+  TOKEN_NETWORK_FILTER_ALL: 'token-network-filter-all',
+  TOKEN_NETWORK_FILTER_CURRENT: 'token-network-filter-current',
 };
 
 export const WalletViewSelectorsText = {
diff --git a/e2e/specs/quarantine/suggestedGasApi.mock.failing.js b/e2e/specs/confirmations/suggested-gas-api.mock.spec.js
similarity index 96%
rename from e2e/specs/quarantine/suggestedGasApi.mock.failing.js
rename to e2e/specs/confirmations/suggested-gas-api.mock.spec.js
index 2f078cf1f3b..e2038a25b55 100644
--- a/e2e/specs/quarantine/suggestedGasApi.mock.failing.js
+++ b/e2e/specs/confirmations/suggested-gas-api.mock.spec.js
@@ -50,7 +50,7 @@ describe(
     });
 
     const RECIPIENT = '0x1FDb169Ef12954F20A15852980e1F0C122BfC1D6';
-    const AMOUNT = '0.0003';
+    const AMOUNT = '0.000003';
     const validPrivateKey = Accounts.getAccountPrivateKey();
 
     it('should fallback to legacy gas endpoint & legacy modal when EIP1559 endpoint is down', async () => {
@@ -85,7 +85,7 @@ describe(
           await Assertions.checkIfVisible(
             TransactionConfirmView.editPriorityLegacyModal,
           );
-          await stopMockServer(); //stop mock server to reinstate suggested gas api service
+          await stopMockServer(mockServer); //stop mock server to reinstate suggested gas api service
           await Assertions.checkIfVisible(
             TransactionConfirmView.editPriorityFeeSheetContainer,
             30000,
diff --git a/e2e/specs/identity/account-syncing/sync-after-adding-custom-name-account.spec.js b/e2e/specs/identity/account-syncing/sync-after-adding-custom-name-account.spec.js
index a586d49349a..98931feee82 100644
--- a/e2e/specs/identity/account-syncing/sync-after-adding-custom-name-account.spec.js
+++ b/e2e/specs/identity/account-syncing/sync-after-adding-custom-name-account.spec.js
@@ -18,6 +18,7 @@ import AddAccountBottomSheet from '../../../pages/wallet/AddAccountBottomSheet';
 import AccountActionsBottomSheet from '../../../pages/wallet/AccountActionsBottomSheet';
 import { mockIdentityServices } from '../utils/mocks';
 import { SmokeIdentity } from '../../../tags';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 
 describe(SmokeIdentity('Account syncing'), () => {
   const NEW_ACCOUNT_NAME = 'My third account';
@@ -33,9 +34,13 @@ describe(SmokeIdentity('Account syncing'), () => {
       mockServer,
     );
 
-    userStorageMockttpControllerInstance.setupPath('accounts', mockServer, {
-      getResponse: accountsSyncMockResponse,
-    });
+    userStorageMockttpControllerInstance.setupPath(
+      USER_STORAGE_FEATURE_NAMES.accounts,
+      mockServer,
+      {
+        getResponse: accountsSyncMockResponse,
+      },
+    );
 
     decryptedAccountNames = await Promise.all(
       accountsSyncMockResponse.map(async (response) => {
diff --git a/e2e/specs/identity/account-syncing/sync-after-onboarding.spec.js b/e2e/specs/identity/account-syncing/sync-after-onboarding.spec.js
index 83fdd49c635..4930a9cf1be 100644
--- a/e2e/specs/identity/account-syncing/sync-after-onboarding.spec.js
+++ b/e2e/specs/identity/account-syncing/sync-after-onboarding.spec.js
@@ -16,6 +16,7 @@ import AccountListBottomSheet from '../../../pages/wallet/AccountListBottomSheet
 import Assertions from '../../../utils/Assertions';
 import { mockIdentityServices } from '../utils/mocks';
 import { SmokeIdentity } from '../../../tags';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 
 describe(SmokeIdentity('Account syncing'), () => {
   beforeAll(async () => {
@@ -27,9 +28,13 @@ describe(SmokeIdentity('Account syncing'), () => {
       mockServer,
     );
 
-    userStorageMockttpControllerInstance.setupPath('accounts', mockServer, {
-      getResponse: accountsSyncMockResponse,
-    });
+    userStorageMockttpControllerInstance.setupPath(
+      USER_STORAGE_FEATURE_NAMES.accounts,
+      mockServer,
+      {
+        getResponse: accountsSyncMockResponse,
+      },
+    );
 
     jest.setTimeout(200000);
     await TestHelpers.reverseServerPort();
diff --git a/e2e/specs/identity/utils/mocks.js b/e2e/specs/identity/utils/mocks.js
index a8509c988e0..f8203ffb69c 100644
--- a/e2e/specs/identity/utils/mocks.js
+++ b/e2e/specs/identity/utils/mocks.js
@@ -1,6 +1,7 @@
 import { AuthenticationController } from '@metamask/profile-sync-controller';
 import { UserStorageMockttpController } from './user-storage/userStorageMockttpController';
 import { getDecodedProxiedURL } from './helpers';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 
 const AuthMocks = AuthenticationController.Mocks;
 
@@ -20,8 +21,14 @@ export async function mockIdentityServices(server) {
   const userStorageMockttpControllerInstance =
     new UserStorageMockttpController();
 
-  userStorageMockttpControllerInstance.setupPath('accounts', server);
-  userStorageMockttpControllerInstance.setupPath('networks', server);
+  userStorageMockttpControllerInstance.setupPath(
+    USER_STORAGE_FEATURE_NAMES.accounts,
+    server,
+  );
+  userStorageMockttpControllerInstance.setupPath(
+    USER_STORAGE_FEATURE_NAMES.networks,
+    server,
+  );
 
   return {
     userStorageMockttpControllerInstance,
diff --git a/e2e/specs/identity/utils/user-storage/userStorageMockttpController.js b/e2e/specs/identity/utils/user-storage/userStorageMockttpController.js
index 9438e2a7fc7..8ffafe83d34 100644
--- a/e2e/specs/identity/utils/user-storage/userStorageMockttpController.js
+++ b/e2e/specs/identity/utils/user-storage/userStorageMockttpController.js
@@ -1,16 +1,25 @@
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import {
   determineIfFeatureEntryFromURL,
   getDecodedProxiedURL,
 } from '../helpers';
 
-// TODO: Export user storage schema from @metamask/profile-sync-controller
+const baseUrl =
+  'https://user-storage\\.api\\.cx\\.metamask\\.io\\/api\\/v1\\/userstorage';
+
 export const pathRegexps = {
-  accounts:
-    /https:\/\/user-storage\.api\.cx\.metamask\.io\/api\/v1\/userstorage\/accounts/u,
-  networks:
-    /https:\/\/user-storage\.api\.cx\.metamask\.io\/api\/v1\/userstorage\/networks/u,
-  notifications:
-    /https:\/\/user-storage\.api\.cx\.metamask\.io\/api\/v1\/userstorage\/notifications/u,
+  [USER_STORAGE_FEATURE_NAMES.accounts]: new RegExp(
+    `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+    'u',
+  ),
+  [USER_STORAGE_FEATURE_NAMES.networks]: new RegExp(
+    `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.networks}`,
+    'u',
+  ),
+  [USER_STORAGE_FEATURE_NAMES.notifications]: new RegExp(
+    `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.notifications}`,
+    'u',
+  ),
 };
 
 export class UserStorageMockttpController {
@@ -57,44 +66,68 @@ export class UserStorageMockttpController {
 
     const data = await request.body.getJson();
 
-    const newOrUpdatedSingleOrBatchEntries =
-      isFeatureEntry && typeof data?.data === 'string'
-        ? [
-            {
-              HashedKey: getDecodedProxiedURL(request.url).split('/').pop(),
-              Data: data?.data,
-            },
-          ]
-        : Object.entries(data?.data).map(([key, value]) => ({
-            HashedKey: key,
-            Data: value,
-          }));
-
-    newOrUpdatedSingleOrBatchEntries.forEach((entry) => {
+    // We're handling batch delete inside the PUT method due to API limitations
+    if (data?.batch_delete) {
+      const keysToDelete = data.batch_delete;
+
       const internalPathData = this.paths.get(path);
 
       if (!internalPathData) {
-        return;
+        return {
+          statusCode,
+        };
       }
 
-      const doesThisEntryExist = internalPathData.response?.find(
-        (existingEntry) => existingEntry.HashedKey === entry.HashedKey,
-      );
+      this.paths.set(path, {
+        ...internalPathData,
+        response: internalPathData.response.filter(
+          (entry) => !keysToDelete.includes(entry.HashedKey),
+        ),
+      });
+    }
 
-      if (doesThisEntryExist) {
-        this.paths.set(path, {
-          ...internalPathData,
-          response: internalPathData.response.map((existingEntry) =>
-            existingEntry.HashedKey === entry.HashedKey ? entry : existingEntry,
-          ),
-        });
-      } else {
-        this.paths.set(path, {
-          ...internalPathData,
-          response: [...(internalPathData?.response || []), entry],
-        });
-      }
-    });
+    if (data?.data) {
+      const newOrUpdatedSingleOrBatchEntries =
+        isFeatureEntry && typeof data?.data === 'string'
+          ? [
+              {
+                HashedKey: getDecodedProxiedURL(request.url).split('/').pop(),
+                Data: data?.data,
+              },
+            ]
+          : Object.entries(data?.data).map(([key, value]) => ({
+              HashedKey: key,
+              Data: value,
+            }));
+
+      newOrUpdatedSingleOrBatchEntries.forEach((entry) => {
+        const internalPathData = this.paths.get(path);
+
+        if (!internalPathData) {
+          return;
+        }
+
+        const doesThisEntryExist = internalPathData.response?.find(
+          (existingEntry) => existingEntry.HashedKey === entry.HashedKey,
+        );
+
+        if (doesThisEntryExist) {
+          this.paths.set(path, {
+            ...internalPathData,
+            response: internalPathData.response.map((existingEntry) =>
+              existingEntry.HashedKey === entry.HashedKey
+                ? entry
+                : existingEntry,
+            ),
+          });
+        } else {
+          this.paths.set(path, {
+            ...internalPathData,
+            response: [...(internalPathData?.response || []), entry],
+          });
+        }
+      });
+    }
 
     return {
       statusCode,
diff --git a/e2e/specs/identity/utils/user-storage/userStorageMockttpController.test.js b/e2e/specs/identity/utils/user-storage/userStorageMockttpController.test.js
index 5ea0f1603ca..dc7ee91cfa3 100644
--- a/e2e/specs/identity/utils/user-storage/userStorageMockttpController.test.js
+++ b/e2e/specs/identity/utils/user-storage/userStorageMockttpController.test.js
@@ -1,5 +1,6 @@
 import { getLocal } from 'mockttp';
 import { UserStorageMockttpController } from './userStorageMockttpController';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 
 describe('UserStorageMockttpController', () => {
   let mockServer;
@@ -13,11 +14,17 @@ describe('UserStorageMockttpController', () => {
     it('handles GET requests that have empty response', async () => {
       const controller = new UserStorageMockttpController();
 
-      await controller.setupPath('accounts', mockServer);
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+      );
 
-      const request = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const request = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(request.json).toEqual(null);
     });
@@ -37,13 +44,20 @@ describe('UserStorageMockttpController', () => {
         },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const request = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const request = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(request.json).toEqual(mockedData);
     });
@@ -63,13 +77,20 @@ describe('UserStorageMockttpController', () => {
         },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const request = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const request = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(request.json).toEqual(mockedData);
     });
@@ -89,13 +110,20 @@ describe('UserStorageMockttpController', () => {
         },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const request = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts/7f8a7963423985c50f75f6ad42a6cf4e7eac43a6c55e3c6fcd49d73f01c1471b`,
-      });
+      const request = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}/7f8a7963423985c50f75f6ad42a6cf4e7eac43a6c55e3c6fcd49d73f01c1471b`,
+        },
+      );
 
       expect(request.json).toEqual(mockedData[0]);
     });
@@ -120,24 +148,34 @@ describe('UserStorageMockttpController', () => {
         Data: 'data3',
       };
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const putRequest = await controller.onPut('accounts', {
-        url: `${baseUrl}/accounts/6afbe024087495b4e0d56c4bdfc981c84eba44a7c284d4f455b5db4fcabc2173`,
-        body: {
-          getJson: async () => ({
-            data: mockedAddedData.Data,
-          }),
+      const putRequest = await controller.onPut(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}/6afbe024087495b4e0d56c4bdfc981c84eba44a7c284d4f455b5db4fcabc2173`,
+          body: {
+            getJson: async () => ({
+              data: mockedAddedData.Data,
+            }),
+          },
         },
-      });
+      );
 
       expect(putRequest.statusCode).toEqual(204);
 
-      const getRequest = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(getRequest.json).toEqual([...mockedData, mockedAddedData]);
     });
@@ -162,24 +200,34 @@ describe('UserStorageMockttpController', () => {
         Data: 'data3',
       };
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const putRequest = await controller.onPut('accounts', {
-        url: `${baseUrl}/accounts/c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468`,
-        body: {
-          getJson: async () => ({
-            data: mockedUpdatedData.Data,
-          }),
+      const putRequest = await controller.onPut(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}/c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468`,
+          body: {
+            getJson: async () => ({
+              data: mockedUpdatedData.Data,
+            }),
+          },
         },
-      });
+      );
 
       expect(putRequest.statusCode).toEqual(204);
 
-      const getRequest = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(getRequest.json).toEqual([mockedData[0], mockedUpdatedData]);
     });
@@ -211,29 +259,39 @@ describe('UserStorageMockttpController', () => {
         },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
       const putData = {};
       mockedUpdatedData.forEach((entry) => {
         putData[entry.HashedKey] = entry.Data;
       });
 
-      const putRequest = await controller.onPut('accounts', {
-        url: `${baseUrl}/accounts`,
-        body: {
-          getJson: async () => ({
-            data: putData,
-          }),
+      const putRequest = await controller.onPut(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+          body: {
+            getJson: async () => ({
+              data: putData,
+            }),
+          },
         },
-      });
+      );
 
       expect(putRequest.statusCode).toEqual(204);
 
-      const getRequest = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(getRequest.json).toEqual(mockedUpdatedData);
     });
@@ -253,19 +311,29 @@ describe('UserStorageMockttpController', () => {
         },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
-        getResponse: mockedData,
-      });
+      await controller.setupPath(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        mockServer,
+        {
+          getResponse: mockedData,
+        },
+      );
 
-      const deleteRequest = await controller.onDelete('accounts', {
-        url: `${baseUrl}/accounts/c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468`,
-      });
+      const deleteRequest = await controller.onDelete(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}/c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468`,
+        },
+      );
 
       expect(deleteRequest.statusCode).toEqual(204);
 
-      const getRequest = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          url: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
 
       expect(getRequest.json).toEqual([mockedData[0]]);
     });
@@ -283,22 +351,76 @@ describe('UserStorageMockttpController', () => {
             'c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468',
           Data: 'data2',
         },
+        {
+          HashedKey:
+            'x236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468',
+          Data: 'data3',
+        },
       ];
 
-      await controller.setupPath('accounts', mockServer, {
+      controller.setupPath(USER_STORAGE_FEATURE_NAMES.accounts, mockServer, {
         getResponse: mockedData,
       });
 
-      const deleteRequest = await controller.onDelete('accounts', {
-        url: `${baseUrl}/accounts`,
-      });
+      const deleteRequest = await controller.onPut(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          path: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+          body: {
+            getJson: async () => ({
+              batch_delete: [mockedData[1].HashedKey, mockedData[2].HashedKey],
+            }),
+          },
+        },
+      );
 
       expect(deleteRequest.statusCode).toEqual(204);
 
-      const getRequest = await controller.onGet('accounts', {
-        url: `${baseUrl}/accounts`,
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          path: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
+
+      expect(getRequest.json).toEqual([mockedData[0]]);
+    });
+
+    it('handles entire feature DELETE requests', async () => {
+      const controller = new UserStorageMockttpController();
+      const mockedData = [
+        {
+          HashedKey:
+            '7f8a7963423985c50f75f6ad42a6cf4e7eac43a6c55e3c6fcd49d73f01c1471b',
+          Data: 'data1',
+        },
+        {
+          HashedKey:
+            'c236b92ea7d513b2beda062cb546986961dfa7ca4334a2913f7837e43d050468',
+          Data: 'data2',
+        },
+      ];
+
+      controller.setupPath(USER_STORAGE_FEATURE_NAMES.accounts, mockServer, {
+        getResponse: mockedData,
       });
 
+      const deleteRequest = await controller.onDelete(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          path: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
+
+      expect(deleteRequest.statusCode).toEqual(204);
+
+      const getRequest = await controller.onGet(
+        USER_STORAGE_FEATURE_NAMES.accounts,
+        {
+          path: `${baseUrl}/${USER_STORAGE_FEATURE_NAMES.accounts}`,
+        },
+      );
+
       expect(getRequest.json).toEqual(null);
     });
   });
diff --git a/e2e/specs/multichain/asset-list.spec.js b/e2e/specs/multichain/asset-list.spec.js
new file mode 100644
index 00000000000..ebee82f3168
--- /dev/null
+++ b/e2e/specs/multichain/asset-list.spec.js
@@ -0,0 +1,133 @@
+// 'persists the preferred asset list preference when changing networks'
+
+import { SmokeMultiChain } from '../../tags';
+import WalletView from '../../pages/wallet/WalletView';
+import FixtureBuilder from '../../fixtures/fixture-builder';
+import {
+  loadFixture,
+  startFixtureServer,
+  stopFixtureServer,
+} from '../../fixtures/fixture-helper';
+import FixtureServer from '../../fixtures/fixture-server';
+import { getFixturesServerPort } from '../../fixtures/utils';
+import { loginToApp } from '../../viewHelper';
+import Assertions from '../../utils/Assertions';
+import TokenOverview from '../../pages/wallet/TokenOverview';
+import NetworkEducationModal from '../../pages/Network/NetworkEducationModal';
+import TestHelpers from '../../helpers';
+import SendView from '../../pages/Send/SendView';
+
+import QuoteView from '../../pages/swaps/QuoteView';
+import TabBarComponent from '../../pages/wallet/TabBarComponent';
+
+const fixtureServer = new FixtureServer();
+
+const ETHEREUM_NAME = 'Ethereum';
+const AVAX_NAME = 'AVAX';
+const BNB_NAME = 'BNB';
+
+describe(SmokeMultiChain('Import Tokens'), () => {
+  beforeAll(async () => {
+    await TestHelpers.reverseServerPort();
+    const fixture = new FixtureBuilder().withPopularNetworks().build();
+    await startFixtureServer(fixtureServer);
+    await loadFixture(fixtureServer, { fixture });
+    await TestHelpers.launchApp({
+      launchArgs: { fixtureServerPort: `${getFixturesServerPort()}` },
+    });
+    await loginToApp();
+  });
+
+  afterAll(async () => {
+    await stopFixtureServer(fixtureServer);
+  });
+
+  it('should display tokens across networks when all networks filter is toggled on', async () => {
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterAll();
+    const eth = WalletView.tokenInWallet(ETHEREUM_NAME);
+    const avax = WalletView.tokenInWallet(AVAX_NAME);
+    const bnb = WalletView.tokenInWallet(BNB_NAME);
+    await Assertions.checkIfVisible(eth);
+    await Assertions.checkIfVisible(avax);
+    await Assertions.checkIfVisible(bnb);
+  });
+
+  it('should display tokens of current network when current networks filter is toggled on', async () => {
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterAll();
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterCurrent();
+    const eth = WalletView.tokenInWallet(ETHEREUM_NAME);
+    const avax = WalletView.tokenInWallet(AVAX_NAME);
+    const bnb = WalletView.tokenInWallet(BNB_NAME);
+    await Assertions.checkIfVisible(eth);
+    await Assertions.checkIfNotVisible(avax);
+    await Assertions.checkIfNotVisible(bnb);
+  });
+
+  it('should switch networks when clicking on swap if an asset on a different network is selected', async () => {
+    const BNB_NAME = 'BNB Smart Chain';
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterAll();
+    const bnb = WalletView.tokenInWallet('BNB');
+    await Assertions.checkIfVisible(bnb);
+    await WalletView.tapOnToken('BNB');
+    await Assertions.checkIfVisible(TokenOverview.swapButton);
+    await TokenOverview.tapSwapButton();
+
+    await Assertions.checkIfVisible(NetworkEducationModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkEducationModal.networkName,
+      BNB_NAME,
+    );
+    await NetworkEducationModal.tapGotItButton();
+  });
+
+  it('should switch networks when clicking on send if an asset on a different network is selected', async () => {
+    const ETHEREUM_NAME = 'Ethereum Main Network';
+    await QuoteView.tapOnCancelButton();
+    await TabBarComponent.tapWallet();
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterAll();
+    const ethereum = WalletView.tokenInWallet('Ethereum');
+    await Assertions.checkIfVisible(ethereum);
+    await WalletView.tapOnToken();
+    await Assertions.checkIfVisible(TokenOverview.sendButton);
+    await TokenOverview.tapSendButton();
+
+    await Assertions.checkIfVisible(NetworkEducationModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkEducationModal.networkName,
+      ETHEREUM_NAME,
+    );
+    await NetworkEducationModal.tapGotItButton();
+  });
+
+  it('should allows clicking into the asset details page of native token on another network', async () => {
+    await SendView.tapCancelButton();
+    await TabBarComponent.tapWallet();
+    await WalletView.tapTokenNetworkFilter();
+    await WalletView.tapTokenNetworkFilterAll();
+    await WalletView.tapOnToken('AVAX');
+
+    await Assertions.checkIfVisible(TokenOverview.container);
+    await TokenOverview.tapChartPeriod1d();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod1d);
+    await TokenOverview.tapChartPeriod1w();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod1w);
+    await TokenOverview.tapChartPeriod1m();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod1m);
+    await TokenOverview.tapChartPeriod3m();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod3m);
+    await TokenOverview.tapChartPeriod1y();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod1y);
+    await TokenOverview.tapChartPeriod3y();
+    await Assertions.checkIfVisible(TokenOverview.chartPeriod3y);
+
+    await TokenOverview.scrollOnScreen();
+    await Assertions.checkIfVisible(TokenOverview.receiveButton);
+    await Assertions.checkIfVisible(TokenOverview.sendButton);
+    await Assertions.checkIfVisible(TokenOverview.swapButton);
+  });
+});
diff --git a/e2e/specs/multichain/permission-system-connect-to-non-permitted-chain.spec.js b/e2e/specs/multichain/permission-system-connect-to-non-permitted-chain.spec.js
index debe73260c2..7d5acfe8c50 100644
--- a/e2e/specs/multichain/permission-system-connect-to-non-permitted-chain.spec.js
+++ b/e2e/specs/multichain/permission-system-connect-to-non-permitted-chain.spec.js
@@ -13,13 +13,13 @@ import Browser from '../../pages/Browser/BrowserView';
 import TabBarComponent from '../../pages/wallet/TabBarComponent';
 import NetworkNonPemittedBottomSheet from '../../pages/Network/NetworkNonPemittedBottomSheet';
 import ConnectedAccountsModal from '../../pages/Browser/ConnectedAccountsModal';
+import NetworkConnectMultiSelector from '../../pages/Browser/NetworkConnectMultiSelector';
 
 const fixtureServer = new FixtureServer();
 const SEPOLIA = CustomNetworks.Sepolia.providerConfig.nickname;
-const MAINNET_CHAIN_ID = '0x1';
 
 describe(
-  SmokeMultiChain('Network Permission System, non-permitted chain'),
+  SmokeMultiChain('Network Permission System, non-permitted chain, '),
   () => {
     beforeAll(async () => {
       await TestHelpers.reverseServerPort();
@@ -55,7 +55,9 @@ describe(
 
           // Verify bottom sheet appears
           await TabBarComponent.tapBrowser();
+          await TestHelpers.delay(3000);
           await Browser.navigateToTestDApp();
+          await TestHelpers.delay(3000);
           await Assertions.checkIfVisible(
             NetworkNonPemittedBottomSheet.addThisNetworkTitle,
           );
@@ -70,7 +72,7 @@ describe(
           fixture: new FixtureBuilder()
             .withPermissionControllerConnectedToTestDapp()
             .withChainPermission([
-              MAINNET_CHAIN_ID,
+              '0x1',
               CustomNetworks.Sepolia.providerConfig.chainId,
             ])
             .build(),
@@ -88,6 +90,7 @@ describe(
 
           // Verify no bottom sheet appears
           await TabBarComponent.tapBrowser();
+          await TestHelpers.delay(3000);
           await Browser.navigateToTestDApp();
           await Assertions.checkIfNotVisible(
             NetworkNonPemittedBottomSheet.addThisNetworkTitle,
@@ -118,10 +121,11 @@ describe(
 
           // Add network permission
           await TabBarComponent.tapBrowser();
+          await TestHelpers.delay(3000);
           await Browser.navigateToTestDApp();
           await NetworkNonPemittedBottomSheet.tapAddThisNetworkButton();
 
-          // Verify permission was added by checking that disconnecting both networks shows disconnect all button
+          // Verify the permission was added by checking that disconnecting both networks shows disconnect all button
           await Browser.tapNetworkAvatarButtonOnBrowser();
           await ConnectedAccountsModal.tapManagePermissionsButton();
           await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
@@ -133,5 +137,105 @@ describe(
         },
       );
     });
+
+    it('should allow switching to permitted network when attempting to use non-permitted network', async () => {
+      await withFixtures(
+        {
+          dapp: true,
+          fixture: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withChainPermission([
+              '0x1',
+              CustomNetworks.Sepolia.providerConfig.chainId,
+            ]) // Initialize with Ethereum mainnet and Sepolia
+            .build(),
+          restartDevice: true,
+        },
+        async () => {
+          await loginToApp();
+
+          // Switch to non-permitted network (Linea Sepolia)
+          await TabBarComponent.tapWallet();
+          await WalletView.tapNetworksButtonOnNavBar();
+          await NetworkListModal.scrollToBottomOfNetworkList();
+          await NetworkListModal.changeNetworkTo('Linea Sepolia');
+          await NetworkEducationModal.tapGotItButton();
+
+          // Verify bottom sheet appears and choose from permitted networks
+          await TabBarComponent.tapBrowser();
+          await TestHelpers.delay(3000); // Wait for the browser to load
+          await Browser.navigateToTestDApp();
+          await TestHelpers.delay(3000); // Wait for the toast to disappear
+          await Assertions.checkIfVisible(
+            NetworkNonPemittedBottomSheet.addThisNetworkTitle,
+          );
+          await TestHelpers.delay(3000); // still waiting for the toast to disappear
+          await NetworkNonPemittedBottomSheet.tapChooseFromPermittedNetworksButton();
+
+          // Select Sepolia from permitted networks
+          await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName();
+          await NetworkEducationModal.tapGotItButton();
+
+          // Verify network switched to Sepolia
+          await TabBarComponent.tapWallet();
+          await Assertions.checkIfVisible(WalletView.container);
+          const networkPicker = await WalletView.getNavbarNetworkPicker();
+          await Assertions.checkIfElementHasLabel(networkPicker, SEPOLIA);
+        },
+      );
+    });
+
+    it('should allow adding new network permission through edit permissions', async () => {
+      await withFixtures(
+        {
+          dapp: true,
+          fixture: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withChainPermission() // Initialize with only Ethereum mainnet
+            .build(),
+          restartDevice: true,
+        },
+        async () => {
+          await loginToApp();
+
+          // Switch to non-permitted network (Sepolia)
+          await TabBarComponent.tapWallet();
+          await WalletView.tapNetworksButtonOnNavBar();
+          await NetworkListModal.scrollToBottomOfNetworkList();
+          await NetworkListModal.changeNetworkTo(SEPOLIA);
+          await NetworkEducationModal.tapGotItButton();
+
+          // Verify bottom sheet appears and navigate to edit permissions
+          await TabBarComponent.tapBrowser();
+          await TestHelpers.delay(3000); // Wait for the browser to load
+          await Browser.navigateToTestDApp();
+          await Assertions.checkIfVisible(
+            NetworkNonPemittedBottomSheet.addThisNetworkTitle,
+          );
+          await TestHelpers.delay(3000); // Wait for the toast to disappear
+          await NetworkNonPemittedBottomSheet.tapChooseFromPermittedNetworksButton();
+          await NetworkNonPemittedBottomSheet.tapEditPermissionsButton();
+
+          // Select Linea Sepolia from network selector and update permissions
+          await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
+          await NetworkConnectMultiSelector.tapUpdateButton();
+          await NetworkEducationModal.tapGotItButton();
+
+          // Select Linea Sepolia from permitted networks
+          await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
+          await NetworkEducationModal.tapGotItButton();
+          await TestHelpers.delay(3000); // Wait for the toast to disappear
+
+          // Verify network switched to Linea Sepolia
+          await TabBarComponent.tapWallet();
+          await Assertions.checkIfVisible(WalletView.container);
+          const networkPicker = await WalletView.getNavbarNetworkPicker();
+          await Assertions.checkIfElementHasLabel(
+            networkPicker,
+            'Linea Sepolia',
+          );
+        },
+      );
+    });
   },
 );
diff --git a/e2e/specs/multichain/permission-system-initial-permissions-grant-one-account-and-one-chain.spec.js b/e2e/specs/multichain/permission-system-initial-permissions-grant-one-account-and-one-chain.spec.js
index 289a74492c4..b74049830a6 100644
--- a/e2e/specs/multichain/permission-system-initial-permissions-grant-one-account-and-one-chain.spec.js
+++ b/e2e/specs/multichain/permission-system-initial-permissions-grant-one-account-and-one-chain.spec.js
@@ -10,6 +10,8 @@ import { withFixtures } from '../../fixtures/fixture-helper';
 import { loginToApp } from '../../viewHelper';
 import Assertions from '../../utils/Assertions';
 import ConnectBottomSheet from '../../pages/Browser/ConnectBottomSheet';
+import NetworkNonPemittedBottomSheet from '../../pages/Network/NetworkNonPemittedBottomSheet';
+import NetworkConnectMultiSelector from '../../pages/Browser/NetworkConnectMultiSelector';
 
 describe(SmokeMultiChain('MultiChain Permissions System:'), () => {
   beforeAll(async () => {
@@ -38,4 +40,52 @@ describe(SmokeMultiChain('MultiChain Permissions System:'), () => {
       },
     );
   });
+
+  it('should allow modifying network permissions during initial connection flow', async () => {
+    await withFixtures(
+      {
+        dapp: true,
+        fixture: new FixtureBuilder().withPermissionController().build(),
+        restartDevice: true,
+      },
+      async () => {
+        // Initial setup: Login and navigate to test dapp
+        await loginToApp();
+        await TabBarComponent.tapBrowser();
+        await TestHelpers.delay(3000);
+        await Assertions.checkIfVisible(Browser.browserScreenID);
+        await Browser.navigateToTestDApp();
+
+        // First permission modification: Add Linea Sepolia
+        await TestDApp.connect();
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
+        await NetworkConnectMultiSelector.tapUpdateButton();
+
+        // Second permission modification: Replace Linea Sepolia with Sepolia
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName(); // uncheck Linea Sepolia
+        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName(); // check Sepolia
+        await NetworkConnectMultiSelector.tapUpdateButton();
+
+        // Complete initial connection
+        await ConnectBottomSheet.tapConnectButton();
+
+        // Open network permissions menu
+        await Browser.tapNetworkAvatarButtonOnBrowser();
+        await Assertions.checkIfVisible(ConnectedAccountsModal.title);
+        await ConnectedAccountsModal.tapManagePermissionsButton();
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+        // Verify final permissions state
+        // - Should have only Ethereum Mainnet and Sepolia selected
+        // - Deselecting both should show the disconnect all button
+        await NetworkNonPemittedBottomSheet.tapEthereumMainNetNetworkName();
+        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName();
+        await Assertions.checkIfVisible(
+          ConnectedAccountsModal.disconnectNetworksButton,
+        );
+      },
+    );
+  });
 });
diff --git a/e2e/specs/multichain/permission-system-revoke-single-network.spec.js b/e2e/specs/multichain/permission-system-revoke-single-network.spec.js
index bb03f9f7c80..35717807591 100644
--- a/e2e/specs/multichain/permission-system-revoke-single-network.spec.js
+++ b/e2e/specs/multichain/permission-system-revoke-single-network.spec.js
@@ -27,16 +27,16 @@ describe(SmokeMultiChain('MultiChain Permissions System:'), () => {
         restartDevice: true,
       },
       async () => {
-        //should navigate to browser
+        // Step 1: Navigate to browser view
         await loginToApp();
         await TabBarComponent.tapBrowser();
         await Assertions.checkIfVisible(Browser.browserScreenID);
 
-        //TODO: should re add connecting to an external swap step after detox has been updated
-
+        // Step 2: Navigate to test dApp and open network settings
         await Browser.navigateToTestDApp();
         await Browser.tapNetworkAvatarButtonOnBrowser();
 
+        // Step 3: Navigate through permission management flow
         await ConnectedAccountsModal.tapManagePermissionsButton();
         await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
         await ConnectedAccountsModal.tapSelectAllNetworksButton();
@@ -44,6 +44,7 @@ describe(SmokeMultiChain('MultiChain Permissions System:'), () => {
         await ConnectedAccountsModal.tapDisconnectNetworksButton();
         await ConnectedAccountsModal.tapConfirmDisconnectNetworksButton();
 
+        // Step 4: Verify UI state after permission removal
         await Browser.tapNetworkAvatarButtonOnBrowser();
         await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
         await Assertions.checkIfVisible(NetworkListModal.networkScroll);
diff --git a/e2e/specs/multichain/permission-system-update-chain-permissions.spec.js b/e2e/specs/multichain/permission-system-update-chain-permissions.spec.js
new file mode 100644
index 00000000000..a7e42cf11f7
--- /dev/null
+++ b/e2e/specs/multichain/permission-system-update-chain-permissions.spec.js
@@ -0,0 +1,113 @@
+'use strict';
+import TestHelpers from '../../helpers';
+import { SmokeMultiChain } from '../../tags';
+import Browser from '../../pages/Browser/BrowserView';
+import TabBarComponent from '../../pages/wallet/TabBarComponent';
+import ConnectedAccountsModal from '../../pages/Browser/ConnectedAccountsModal';
+import FixtureBuilder from '../../fixtures/fixture-builder';
+import { withFixtures } from '../../fixtures/fixture-helper';
+import { loginToApp } from '../../viewHelper';
+import Assertions from '../../utils/Assertions';
+import NetworkConnectMultiSelector from '../../pages/Browser/NetworkConnectMultiSelector';
+import NetworkNonPemittedBottomSheet from '../../pages/Network/NetworkNonPemittedBottomSheet';
+import { CustomNetworks } from '../../resources/networks.e2e';
+import WalletView from '../../pages/wallet/WalletView';
+import NetworkEducationModal from '../../pages/Network/NetworkEducationModal';
+import PermissionSummaryBottomSheet from '../../pages/Browser/PermissionSummaryBottomSheet';
+
+describe(SmokeMultiChain('MultiChain Permissions System:'), () => {
+  beforeAll(async () => {
+    jest.setTimeout(150000);
+    await TestHelpers.reverseServerPort();
+  });
+  it('should update chain permissions by granting and revoking network permissions simultaneously', async () => {
+    await withFixtures(
+      {
+        dapp: true,
+        fixture: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withChainPermission([
+            '0x1',
+            CustomNetworks.Sepolia.providerConfig.chainId,
+          ]) // Initialize with Ethereum mainnet and Sepolia
+          .build(),
+        restartDevice: true,
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapBrowser();
+        await Assertions.checkIfVisible(Browser.browserScreenID);
+
+        await Browser.navigateToTestDApp();
+        await Browser.tapNetworkAvatarButtonOnBrowser();
+
+        // Navigate to chain permissions
+        await ConnectedAccountsModal.tapManagePermissionsButton();
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+        // Uncheck Sepolia and check Linea Sepolia
+        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName();
+        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
+
+        // Update permissions
+        await NetworkConnectMultiSelector.tapUpdateButton();
+
+        // Verify changes were saved by checking chain permissions again
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+        // Deselect both networks to verify they were the only ones selected
+        await NetworkNonPemittedBottomSheet.tapEthereumMainNetNetworkName();
+        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
+
+        // Verify the disconnect all button appears (indicating no chains are selected)
+        await Assertions.checkIfVisible(
+          ConnectedAccountsModal.disconnectNetworksButton,
+        );
+      },
+    );
+  });
+
+  it('should fallback to Sepolia when removing permission for active Ethereum Mainnet, verifying fallback priority by having both Sepolia and Linea Sepolia as alternative permitted networks', async () => {
+    await withFixtures(
+      {
+        dapp: true,
+        fixture: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withChainPermission([
+            '0x1', // Ethereum mainnet
+            CustomNetworks.Sepolia.providerConfig.chainId, // Sepolia
+            '0xe705', // Linea Sepolia
+          ])
+          .build(),
+        restartDevice: true,
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapBrowser();
+        await TestHelpers.delay(3000);
+        await Browser.navigateToTestDApp();
+
+        // Open network permissions menu
+        await Browser.tapNetworkAvatarButtonOnBrowser();
+        await ConnectedAccountsModal.tapManagePermissionsButton();
+        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+        // Remove Ethereum Mainnet permission
+        await NetworkNonPemittedBottomSheet.tapEthereumMainNetNetworkName();
+        await NetworkConnectMultiSelector.tapUpdateButton();
+
+        // Handle network education modal and close bottom sheet
+        await NetworkEducationModal.tapGotItButton();
+        await TestHelpers.delay(3000);
+        await PermissionSummaryBottomSheet.swipeToDismissModal();
+        await TestHelpers.delay(3000);
+
+        // Verify network switched to Sepolia in wallet view
+        await TabBarComponent.tapWallet();
+        await Assertions.checkIfVisible(WalletView.container);
+        const networkPicker = await WalletView.getNavbarNetworkPicker();
+        await Assertions.checkIfElementHasLabel(networkPicker, 'Sepolia');
+      },
+    );
+  });
+});
diff --git a/e2e/specs/notifications/utils/mocks.js b/e2e/specs/notifications/utils/mocks.js
index dbf8e8b5e73..72db127ca3a 100644
--- a/e2e/specs/notifications/utils/mocks.js
+++ b/e2e/specs/notifications/utils/mocks.js
@@ -4,6 +4,7 @@ import {
 } from '@metamask/notification-services-controller';
 import { UserStorageMockttpController } from '../../identity/utils/user-storage/userStorageMockttpController';
 import { getDecodedProxiedURL } from './helpers';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 
 const NotificationMocks = NotificationServicesController.Mocks;
 const PushMocks = NotificationServicesPushController.Mocks;
@@ -19,7 +20,10 @@ export async function mockNotificationServices(server) {
   const userStorageMockttpControllerInstance =
     new UserStorageMockttpController();
 
-  userStorageMockttpControllerInstance.setupPath('notifications', server);
+  userStorageMockttpControllerInstance.setupPath(
+    USER_STORAGE_FEATURE_NAMES.notifications,
+    server,
+  );
 
   // Notifications
   mockAPICall(server, NotificationMocks.getMockFeatureAnnouncementResponse());
diff --git a/e2e/specs/settings/fiat-on-testnets.spec.js b/e2e/specs/settings/fiat-on-testnets.spec.js
index d70eb7cfb5a..5ab22fa855b 100644
--- a/e2e/specs/settings/fiat-on-testnets.spec.js
+++ b/e2e/specs/settings/fiat-on-testnets.spec.js
@@ -33,6 +33,7 @@ describe(SmokeAssets('Fiat On Testnets Setting'), () => {
 
         // Switch to Sepolia
         await WalletView.tapNetworksButtonOnNavBar();
+        await NetworkListModal.scrollToBottomOfNetworkList();
         await NetworkListModal.changeNetworkTo(SEPOLIA);
         await NetworkEducationModal.tapGotItButton();
 
diff --git a/e2e/specs/wallet/incoming-transactions.spec.js b/e2e/specs/wallet/incoming-transactions.spec.js
new file mode 100644
index 00000000000..00740c4d67d
--- /dev/null
+++ b/e2e/specs/wallet/incoming-transactions.spec.js
@@ -0,0 +1,217 @@
+'use strict';
+import { SmokeCore } from '../../tags';
+import TestHelpers from '../../helpers';
+import { loginToApp } from '../../viewHelper';
+import Assertions from '../../utils/Assertions';
+import { startMockServer, stopMockServer } from '../../api-mocking/mock-server';
+import { withFixtures } from '../../fixtures/fixture-helper';
+import FixtureBuilder, {
+  DEFAULT_FIXTURE_ACCOUNT,
+} from '../../fixtures/fixture-builder';
+import ActivitiesView from '../../pages/Transactions/ActivitiesView';
+import TabBarComponent from '../../pages/wallet/TabBarComponent';
+import ToastModal from '../../pages/wallet/ToastModal';
+
+const TOKEN_SYMBOL_MOCK = 'ABC';
+const TOKEN_ADDRESS_MOCK = '0x123';
+
+const RESPONSE_STANDARD_MOCK = {
+  hash: '0x123456',
+  timestamp: new Date().toISOString(),
+  chainId: 1,
+  blockNumber: 1,
+  blockHash: '0x2',
+  gas: 1,
+  gasUsed: 1,
+  gasPrice: '1',
+  effectiveGasPrice: '1',
+  nonce: 1,
+  cumulativeGasUsed: 1,
+  methodId: null,
+  value: '1230000000000000000',
+  to: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+  from: '0x2',
+  isError: false,
+  valueTransfers: [],
+};
+
+const RESPONSE_STANDARD_2_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  timestamp: new Date().toISOString(),
+  hash: '0x2',
+  value: '2340000000000000000',
+};
+
+const RESPONSE_TOKEN_TRANSFER_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  to: '0x2',
+  valueTransfers: [
+    {
+      contractAddress: TOKEN_ADDRESS_MOCK,
+      decimal: 18,
+      symbol: TOKEN_SYMBOL_MOCK,
+      from: '0x2',
+      to: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+      amount: '4560000000000000000',
+    },
+  ],
+};
+
+const RESPONSE_OUTGOING_TRANSACTION_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  to: '0x2',
+  from: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+};
+
+function mockAccountsApi(transactions) {
+  return {
+    urlEndpoint: `https://accounts.api.cx.metamask.io/v1/accounts/${DEFAULT_FIXTURE_ACCOUNT}/transactions?networks=0x1&sortDirection=ASC`,
+    response: {
+      data: transactions ?? [RESPONSE_STANDARD_MOCK, RESPONSE_STANDARD_2_MOCK],
+      pageInfo: {
+        count: 2,
+        hasNextPage: false,
+      },
+    },
+    responseCode: 200,
+  };
+}
+
+describe(SmokeCore('Incoming Transactions'), () => {
+  beforeAll(async () => {
+    jest.setTimeout(2500000);
+    await TestHelpers.reverseServerPort();
+  });
+
+  it('displays standard incoming transaction', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder().build(),
+        restartDevice: true,
+        testSpecificMock: {
+          GET: [mockAccountsApi()],
+        },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await Assertions.checkIfTextIsDisplayed('Received ETH');
+        await Assertions.checkIfTextIsDisplayed(/.*1\.23 ETH.*/);
+        await Assertions.checkIfTextIsDisplayed(/.*2\.34 ETH.*/);
+      },
+    );
+  });
+
+  it('displays incoming token transfers', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder()
+          .withTokens([
+            {
+              address: TOKEN_ADDRESS_MOCK,
+              decimals: 18,
+              symbol: TOKEN_SYMBOL_MOCK,
+            },
+          ])
+          .build(),
+        restartDevice: true,
+        testSpecificMock: {
+          GET: [mockAccountsApi([RESPONSE_TOKEN_TRANSFER_MOCK])],
+        },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await Assertions.checkIfTextIsDisplayed('Received ABC');
+        await Assertions.checkIfTextIsDisplayed(/.*4\.56 ABC.*/);
+      },
+    );
+  });
+
+  xit('displays outgoing transactions', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder().build(),
+        restartDevice: true,
+        testSpecificMock: {
+          GET: [mockAccountsApi([RESPONSE_OUTGOING_TRANSACTION_MOCK])],
+        },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await Assertions.checkIfTextIsDisplayed('Sent ETH');
+        await Assertions.checkIfTextIsDisplayed(/.*1\.23 ETH.*/);
+      },
+    );
+  });
+
+  it('displays nothing if incoming transactions disabled', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder()
+          .withIncomingTransactionPreferences({
+            '0x1': false,
+          })
+          .build(),
+        restartDevice: true,
+        testSpecificMock: { GET: [mockAccountsApi()] },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await TestHelpers.delay(2000);
+        await Assertions.checkIfTextIsNotDisplayed('Received ETH');
+      },
+    );
+  });
+
+  it('displays nothing if incoming transaction is a duplicate', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder()
+          .withTransactions([
+            {
+              hash: RESPONSE_STANDARD_MOCK.hash,
+              txParams: {
+                from: RESPONSE_STANDARD_MOCK.from,
+              },
+            },
+          ])
+          .build(),
+        restartDevice: true,
+        testSpecificMock: { GET: [mockAccountsApi([RESPONSE_STANDARD_MOCK])] },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await TestHelpers.delay(2000);
+        await Assertions.checkIfTextIsNotDisplayed('Received ETH');
+      },
+    );
+  });
+
+  xit('displays notification', async () => {
+    await withFixtures(
+      {
+        fixture: new FixtureBuilder().build(),
+        restartDevice: true,
+        testSpecificMock: { GET: [mockAccountsApi()] },
+      },
+      async () => {
+        await loginToApp();
+        await TabBarComponent.tapActivity();
+        await ActivitiesView.swipeDown();
+        await Assertions.checkIfElementToHaveText(
+          await ToastModal.notificationTitle,
+          'You received 1.23 ETH',
+        );
+      },
+    );
+  });
+});
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
index 2941a7e1718..604be1574b1 100644
--- a/ios/MetaMask.xcodeproj/project.pbxproj
+++ b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -1380,7 +1380,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1418,7 +1418,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1449,7 +1449,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1484,7 +1484,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1514,7 +1514,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1547,7 +1547,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1576,7 +1576,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1607,7 +1607,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1731,7 +1731,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1768,7 +1768,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1800,7 +1800,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1505;
+				CURRENT_PROJECT_VERSION = 1512;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1835,7 +1835,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.36.0;
+				MARKETING_VERSION = 7.37.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",
diff --git a/jest.config.js b/jest.config.js
index c04a6c89305..b0974631734 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -6,6 +6,7 @@ process.env.SEGMENT_REGULATIONS_ENDPOINT = 'TestRegulationsEndpoint';
 process.env.MM_FOX_CODE = 'EXAMPLE_FOX_CODE';
 
 process.env.MM_SECURITY_ALERTS_API_ENABLED = 'true';
+process.env.PORTFOLIO_VIEW = 'true';
 process.env.SECURITY_ALERTS_API_URL = 'https://example.com';
 
 process.env.REDESIGNED_SIGNATURE_REQUEST = 'true';
diff --git a/locales/languages/de.json b/locales/languages/de.json
index 7c02a371a66..02a01f48128 100644
--- a/locales/languages/de.json
+++ b/locales/languages/de.json
@@ -439,9 +439,9 @@
     },
     "import": "Importieren",
     "sort_by": "Sortieren nach",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Filtern nach",
+    "current_network": "Aktuelles Netzwerk",
+    "all_networks": "Alle Netzwerke",
     "declining_balance": "Abnehmender Kontostand ({{currency}} hoch-niedrig)",
     "alphabetically": "Alphabetisch (A-Z)",
     "add_to_get_started": "Zum Anfangen Krypto hinzufügen",
@@ -470,6 +470,7 @@
     "learn_more": "Mehr erfahren",
     "add_collectibles": "NFTs importieren",
     "no_transactions": "Sie haben keine Transaktionen!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Senden",
     "deposit_button": "Einzahlen",
     "copy_address": "Kopieren",
@@ -722,18 +723,18 @@
     "now_active": "jetzt aktiv.",
     "network_added": "wurde erfolgreich hinzugefügt",
     "network_deleted": "wurde erfolgreich gelöscht",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Netzwerkgenehmigungen aktualisiert",
     "revoked": "widerrufen.",
     "revoked_all": "Alle Konten widerrufen.",
     "accounts_connected": "Konten verbunden.",
     "account_connected": "Konto verbunden.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Kontengenehmigungen aktualisiert",
     "accounts_disconnected": "Konten getrennt.",
     "account_disconnected": "Konto getrennt.",
     "disconnected": "getrennt.",
     "disconnected_all": "Alle Konten wurden getrennt.",
     "disconnected_from": "Getrennt von {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Genehmigungen aktualisiert",
     "nft_detection_enabled": "Automatische NFT-Erkennung aktiviert"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Swap",
     "bridge": "Bridge",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Kaufen wird für dieses Konto nicht unterstützt",
+      "sell": "Verkaufen wird für dieses Konto nicht unterstützt",
+      "swap": "Swapping wird für dieses Konto nicht unterstützt",
+      "bridge": "Bridging wird für dieses Konto nicht unterstützt",
+      "send": "Senden wird für dieses Konto nicht unterstützt",
+      "action": "Diese Aktion wird für dieses Konto nicht unterstützt"
     },
     "description": "Beschreibung",
     "totalSupply": "Gesamtvorrat",
@@ -1586,7 +1587,7 @@
     "share": "Teilen",
     "bookmark": "Lesezeichen erstellen",
     "add_to_favorites": "Zu Favoriten hinzufügen",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Zu Favoriten gehen",
     "error": "Fehler",
     "cancel": "Stornieren",
     "go_back": "Zurück",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Genehmigen",
     "tx_review_increase_allowance": "Zulage erhöhen",
     "tx_review_set_approval_for_all": "Erlaubnis für alle erteilen",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Staking-Anspruch",
+    "tx_review_staking_deposit": "Staking-Einzahlung",
+    "tx_review_staking_unstake": "Unstaken",
     "sent_ether": "Ether senden",
     "self_sent_ether": "Senden Sie sich selbst Ether.",
     "received_ether": "Ether empfangen",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Ihre Konten einsehen und Transaktionen vorschlagen",
     "requesting_for": "Anfordern für ",
     "requesting_for_accounts": "Anfrage für {{numberOfAccounts}} Konten",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Anfrage für {{numberOfNetworks}} Netzwerke",
+    "n_networks_connect": "{{numberOfNetworks}} verbundene Netzwerke ",
+    "network_connected": "Netzwerk verbunden ",
     "see_your_accounts": "Sehen Sie Ihre Konten ein und schlagen Sie Transaktionen vor",
     "connected_to": "Verbunden mit ",
     "manage_permissions": "Genehmigungen verwalten",
     "edit": "Bearbeiten",
     "cancel": "Abbrechen",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Verstanden",
+    "connection_details_title": "Details zur Verbindung",
+    "connection_details_description": "Sie haben am {{connectionDateTime}} mit dem MetaMask-Browser eine Verbindung zu dieser Website hergestellt",
+    "title_add_network_permission": "Netzwerkgenehmigung hinzufügen",
+    "add_this_network": "Dieses Netzwerk hinzufügen",
+    "permitted_networks": "Genehmigte Netzwerke",
+    "choose_from_permitted_networks": "Aus genehmigten Netzwerken wählen",
+    "this_site_cant": "Diese Website kann nicht mit Ihrem aktuellen Netzwerk verwendet werden. Fügen Sie Netzwerkgenehmigungen hinzu oder wählen Sie ein bereits genehmigtes Netzwerk.",
+    "non_permitted_network_description": "Diese Website kann nicht mit Ihrem aktuellen Netzwerk verwendet werden. Fügen Sie Netzwerkgenehmigungen hinzu oder wählen Sie ein bereits genehmigtes Netzwerk.",
+    "edit_permissions": "Genehmigungen bearbeiten",
+    "permitted_networks_info_sheet_description": "Dies ist eine Liste der von Ihnen zuvor für diese Website genehmigten Netzwerke. Wählen Sie eines aus der Liste aus oder bearbeiten Sie die Netzwerkgenehmigungen für diese Website."
   },
   "select": {
     "cancel": "Stornieren",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Geswappt",
       "label_to": "An"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "{{amount}} {{ticker}} von {{address}} erhalten",
     "nft_sent": "NFT an {{address}} gesendet",
     "erc721_sent": "NFT an {{address}} gesendet",
     "erc1155_sent": "NFT an {{address}} gesendet",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Abhebung abgeschlossen!",
     "error_title": "Hoppla, etwas ist schiefgelaufen :/",
     "received_title": "Sie haben {{amount}}{{assetType}} empfangen.",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Swap abgeschlossen",
+    "erc20_sent_title": "Gelder gesendet",
+    "erc20_received_title": "Gelder empfangen",
+    "eth_sent_title": "Gelder gesendet",
+    "eth_received_title": "Gelder empfangen",
+    "rocketpool_stake_completed_title": "Stake abschließen",
+    "rocketpool_unstake_completed_title": "Unstaken abschließen",
+    "lido_stake_completed_title": "Stake abschließen",
+    "lido_withdrawal_requested_title": "Auszahlung angefordert",
+    "lido_withdrawal_completed_title": "Auszahlung abgeschlossen",
+    "lido_stake_ready_to_be_withdrawn_title": "Stake bereit für die Auszahlung ",
+    "erc721_sent_title": "NFT gesendet",
+    "erc721_received_title": "NFT empfangen",
+    "erc1155_sent_title": "NFT gesendet",
+    "erc1155_received_title": "NFT empfangen",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Zur Ansicht antippen",
     "received_payment_title": "Sofortzahlung empfangen",
     "pending_message": "Warten auf Bestätigung",
     "pending_deposit_message": "Warten auf Abschluss der Einzahlung",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Zum Anzeigen dieser Transaktion tippen",
     "received_message": "Zum Anzeigen dieser Transaktion tippen",
     "received_payment_message": "Sie haben {{amount}} DAI empfangen.",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Sie haben ETH erhalten",
+    "metamask_swap_completed_message": "{{symbolIn}} für {{symbolOut}} geswappt",
+    "erc20_sent_message": "An {{address}} gesendet",
+    "erc20_received_message": "Von {{address}} empfanen",
+    "eth_sent_message": "An {{address}} gesendet",
+    "rocketpool_stake_completed_message": "Gestaked",
+    "rocketpool_unstake_completed_message": "Unstaking abschließen",
+    "lido_stake_completed_message": "Gestaked",
+    "lido_withdrawal_requested_message": "Unstaking angefordert",
+    "lido_withdrawal_completed_message": "Unstaking abschließen",
+    "lido_stake_ready_to_be_withdrawn_message": "Auszahlung angefordert",
     "push_notification_content": {
       "metamask_swap_completed_title": "Swap abgeschlossen",
       "metamask_swap_completed_description": "Ihr MetaMask-Swap war erfolgreich",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Erzählen Sie uns, was passiert ist",
     "bug_report_prompt_description": "Fügen Sie Details hinzu, damit wir herausfinden können, was schiefgelaufen ist.",
     "bug_report_thanks": "Danke! Wir werden bald einen Blick darauf werfen.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Wenn Sie diesen Fehler weiterhin erhalten,",
     "save_seedphrase_2": "speichern Sie Ihre geheime Wiederherstellungsphrase",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "installieren Sie die App erneut. Beachten Sie: Ohne Ihre geheime Wiederherstellungsphrase können Sie Ihre Wallet nicht wiederherstellen.",
     "copied_clipboard": "In die Zwischenablage kopiert",
     "ok": "OK",
     "cancel": "Abbrechen",
     "send": "Senden",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Absenden",
+    "modal_title": "Beschreiben Sie, was vorgefallen ist",
+    "modal_placeholder": "Die Übermittlung von Details, z. B. wie wir den Fehler reproduzieren können, wird uns bei der Behebung des Problems helfen.",
+    "error_message": "Fehlermeldung:",
+    "copy": "Kopieren",
+    "describe": "Beschreiben Sie, was vorgefallen ist",
+    "try_again": "Erneut versuchen",
+    "contact_support": "Support kontaktieren"
   },
   "whats_new": {
     "title": "Was neu ist",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Blindes-Signieren-Fehler",
     "blind_sign_error_message": "Blindes Signieren ist auf Ihrem Ledger-Gerät nicht aktiviert. Bitte aktivieren Sie dies in den Einstellungen.",
     "user_reject_transaction": "Benutzer hat die Transaktion abgelehnt",
-    "user_reject_transaction_message": "Benutzer hat Transaktion auf dem Ledger-Gerät abgelehnt."
+    "user_reject_transaction_message": "Benutzer hat Transaktion auf dem Ledger-Gerät abgelehnt.",
+    "multiple_devices_error_message": "Mehrere Geräte werden derzeit noch nicht unterstützt. Um ein neues Ledger-Gerät hinzuzufügen, müssen Sie ein älteres Gerät entfernen.",
+    "hd_path_error": "HD-Pfad ist ungültig: {{path}}",
+    "unspecified_error_during_connect": "Unbekannter Fehler beim Verbinden der Ledger-Hardware,",
+    "account_name_existed": "Konto {{accountName}} bereits vorhanden"
   },
   "account_actions": {
     "edit_name": "Kontonamen bearbeiten",
@@ -3337,7 +3350,9 @@
     "add_account": "Konto hinzufügen",
     "add_new_account": "Neues Konto hinzufügen",
     "add_hardware_wallet": "Hardware-Wallet hinzufügen",
-    "import_account": "Konto importieren"
+    "import_account": "Konto importieren",
+    "add_bitcoin_account_testnet": "Ein neues Bitcoin-Konto hinzufügen (Testnet)",
+    "add_bitcoin_account_mainnet": "Ein neues Bitcoin-Konto hinzufügen (Beta)"
   },
   "show_nft": {
     "show_nft_title": "NFT anzeigen",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "ETH-Belohnungen verdienen",
     "earn_eth_rewards_description": "Fangen Sie an zu verdienen, sobald Sie Ihren Einsatz leisten. Die Belohnungen werden automatisch erhöht.",
     "flexible_unstaking": "Flexibles Unstaking",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Unstake jederzeit möglich. Die Bearbeitung dauert in der Regel weniger als 3 Tage, kann jedoch bis zu 11 Tage in Anspruch nehmen.",
     "disclaimer": "Staking garantiert keine Belohnungen und birgt Risiken, einschließlich des Verlusts von Geldern.",
     "learn_more": "Mehr erfahren",
     "got_it": "Verstanden",
@@ -3442,7 +3457,7 @@
         "base": "Unstaking von {{amountEth}} ETH im Gange. Kommen Sie zurück in",
         "and": "und",
         "to_claim_it": "um es einzufordern.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Unstaking von {{amountEth}} ETH im Gange. Kehren Sie zur Einforderung in ein paar Tagen zurück."
       },
       "geo_blocked": "Sie befinden sich in einer Region, in der Unstaking und Staking nicht erlaubt ist.",
       "approximately": "ungefähr"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Bis zu {{count}}",
     "unstaking_to": "Unstaken bis",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Max.",
+      "description": "Max. ist der Gesamtbetrag an von Ihnen gehaltenen ETH, abzüglich der für den Einsatz erforderlichen Gas-Gebühr. Es empfiehlt sich, einige zusätzliche ETH in Ihrer Wallet für zukünftige Transaktionen aufzubewahren."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Max. verwenden",
+    "estimated_unstaking_time": "1 bis 11 Tage",
+    "proceed_anyway": "Trotzdem fortfahren",
+    "gas_cost_impact": "Auswirkungen auf Gas-Kosten",
+    "gas_cost_impact_warning": "Achtung: Die Transaktionskosten für Gas belaufen sich auf mehr als 30 % Ihrer Einzahlung."
   },
   "default_settings": {
     "title": "Ihre Wallet ist bereit",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Unstake-Zeit",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "In der Regel dauert das Unstaken Ihrer ETH weniger als 3 Tage, es kann jedoch bis zu 11 Tage in Anspruch nehmen. Die genaue Dauer hängt von dem Betrag, den Sie unstaken, und den ETH-Staking-Aktivitäten ab."
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Ergebnisse haben sich geändert",
+    "description": "Die voraussichtlichen Änderungen dieser Transaktion wurden aktualisiert. Überprüfen Sie diese sorgfältig, bevor Sie fortfahren.",
+    "proceed": "Fortfahren",
+    "reject": "Die Transaktion ablehnen"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Konto zu MetaMask hinzufügen",
+    "input_title": "Kontoname",
+    "add_account_button": "Konto hinzufügen",
+    "name_taken_message": "Dieser Kontoname existiert bereits"
   }
 }
diff --git a/locales/languages/el.json b/locales/languages/el.json
index 3534e629347..88b72057932 100644
--- a/locales/languages/el.json
+++ b/locales/languages/el.json
@@ -439,9 +439,9 @@
     },
     "import": "Εισαγωγή",
     "sort_by": "Ταξινόμηση κατά",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Φιλτράρισμα κατά",
+    "current_network": "Τρέχον δίκτυο",
+    "all_networks": "Όλα τα δίκτυα",
     "declining_balance": "Μειούμενο υπόλοιπο ({{currency}} υψηλό-χαμηλό)",
     "alphabetically": "Αλφαβητικά (Α-Ω)",
     "add_to_get_started": "Προσθέστε κρυπτονομίσματα για να ξεκινήσετε",
@@ -470,6 +470,7 @@
     "learn_more": "Μάθετε περισσότερα",
     "add_collectibles": "Εισαγωγή NFT",
     "no_transactions": "Δεν έχετε συναλλαγές!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Αποστολή",
     "deposit_button": "Κατάθεση",
     "copy_address": "Αντιγραφή",
@@ -722,18 +723,18 @@
     "now_active": "τώρα ενεργοί.",
     "network_added": "προστέθηκε με επιτυχία",
     "network_deleted": "διαγράφηκε με επιτυχία",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Ενημερωμένες άδειες χρήσης δικτύων",
     "revoked": "ανακλήθηκαν.",
     "revoked_all": "Όλοι οι λογαριασμοί ανακλήθηκαν.",
     "accounts_connected": "λογαριασμοί συνδεδεμένοι.",
     "account_connected": "συνδεδεμένος λογαριασμός.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Ενημερωμένες άδειες λογαριασμών",
     "accounts_disconnected": "συνδεδεμένοι λογαριασμοί.",
     "account_disconnected": "ο λογαριασμός αποσυνδέθηκε.",
     "disconnected": "αποσυνδέθηκε.",
     "disconnected_all": "Όλοι οι λογαριασμοί αποσυνδέθηκαν.",
     "disconnected_from": "Αποσυνδέθηκε από το {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Ενημερωμένες άδειες",
     "nft_detection_enabled": "Ενεργοποιήθηκε η αυτόματη ανίχνευση NFT"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Ανταλλαγή",
     "bridge": "Διασύνδεση",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Η αγορά δεν υποστηρίζεται για αυτόν τον λογαριασμό",
+      "sell": "Η πώληση δεν υποστηρίζεται για αυτόν τον λογαριασμό",
+      "swap": "Η ανταλλαγή δεν υποστηρίζεται για αυτόν τον λογαριασμό",
+      "bridge": "Η διασύνδεση δεν υποστηρίζεται για αυτόν τον λογαριασμό",
+      "send": "Η αποστολή δεν υποστηρίζεται για αυτόν τον λογαριασμό",
+      "action": "Αυτή η ενέργεια δεν υποστηρίζεται για αυτόν τον λογαριασμό"
     },
     "description": "Περιγραφή",
     "totalSupply": "Συνολική Προμήθεια",
@@ -1586,7 +1587,7 @@
     "share": "Κοινοποίηση",
     "bookmark": "Σελιδοδείκτης",
     "add_to_favorites": "Προσθήκη στα Αγαπημένα",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Μετάβαση στα Αγαπημένα",
     "error": "Σφάλμα",
     "cancel": "Άκυρο",
     "go_back": "Πίσω",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Έγκριση",
     "tx_review_increase_allowance": "Αύξηση των αποδοχών",
     "tx_review_set_approval_for_all": "Ορίστε την έγκριση για όλους",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Διεκδίκηση πονταρίσματος",
+    "tx_review_staking_deposit": "Κατάθεση πονταρίσματος",
+    "tx_review_staking_unstake": "Ακύρωση πονταρίσματος",
     "sent_ether": "Αποστολή Ether",
     "self_sent_ether": "Στείλτε Ether στον εαυτό σας",
     "received_ether": "Ληφθέντα Ether",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Δείτε τους λογαριασμούς σας και προτείνετε συναλλαγές",
     "requesting_for": "Ζητήθηκε για ",
     "requesting_for_accounts": "Απαιτείται για {{numberOfAccounts}} λογαριασμούς",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Ζητείται για {{numberOfNetworks}} δίκτυα",
+    "n_networks_connect": "{{numberOfNetworks}} δίκτυα συνδεδεμένα ",
+    "network_connected": "δίκτυο συνδεδεμένο ",
     "see_your_accounts": "Δείτε τους λογαριασμούς σας και προτείνετε συναλλαγές",
     "connected_to": "Συνδέθηκε σε ",
     "manage_permissions": "Διαχείριση αδειών",
     "edit": "Επεξεργασία",
     "cancel": "Ακύρωση",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Το κατάλαβα",
+    "connection_details_title": "Λεπτομέρειες σύνδεσης",
+    "connection_details_description": "Συνδεθήκατε σε αυτόν τον ιστότοπο χρησιμοποιώντας το πρόγραμμα περιήγησης του MetaMask στις {{connectionDateTime}}",
+    "title_add_network_permission": "Προσθήκη άδειας χρήσης δικτύου",
+    "add_this_network": "Προσθήκη αυτού του δικτύου",
+    "permitted_networks": "Επιτρεπόμενα δίκτυα",
+    "choose_from_permitted_networks": "Επιλέξτε από τα επιτρεπόμενα δίκτυα",
+    "this_site_cant": "Αυτός ο ιστότοπος δεν μπορεί να χρησιμοποιηθεί με το τρέχον δίκτυό σας. Προσθέστε άδειες χρήσης δικτύου ή επιλέξτε ένα ήδη επιτρεπόμενο δίκτυο.",
+    "non_permitted_network_description": "Αυτός ο ιστότοπος δεν μπορεί να χρησιμοποιηθεί με το τρέχον δίκτυό σας. Προσθέστε άδεια χρήσης δικτύου ή επιλέξτε ένα ήδη επιτρεπόμενο δίκτυο.",
+    "edit_permissions": "Επεξεργασία αδειών",
+    "permitted_networks_info_sheet_description": "Αυτή είναι μια λίστα με τα δίκτυα που έχετε προηγουμένως παραχωρήσει άδειες χρήσης σε αυτόν τον ιστότοπο. Επιλέξτε ένα από τη λίστα ή επεξεργαστείτε τις άδειες χρήσης δικτύου για αυτόν τον ιστότοπο."
   },
   "select": {
     "cancel": "Άκυρο",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Ανταλλαγή",
       "label_to": "Προς"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Λάβατε {{amount}} {{ticker}} από {{address}}",
     "nft_sent": "Αποστολή NFT σε {{address}}",
     "erc721_sent": "Αποστολή NFT σε {{address}}",
     "erc1155_sent": "Αποστολή NFT σε {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Η ανάληψη ολοκληρώθηκε!",
     "error_title": "Ωχ, κάτι πήγε στραβά :/",
     "received_title": "Λάβατε {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Η ανταλλαγή ολοκληρώθηκε",
+    "erc20_sent_title": "Στάλθηκαν κεφάλαια",
+    "erc20_received_title": "Ελήφθη κεφάλαια",
+    "eth_sent_title": "Στάλθηκαν κεφάλαια",
+    "eth_received_title": "Ελήφθη κεφάλαια",
+    "rocketpool_stake_completed_title": "Ολοκλήρωση πονταρίσματος",
+    "rocketpool_unstake_completed_title": "Ολοκλήρωση ακύρωσης πονταρίσματος",
+    "lido_stake_completed_title": "Ολοκλήρωση πονταρίσματος",
+    "lido_withdrawal_requested_title": "Αίτημα ανάληψης",
+    "lido_withdrawal_completed_title": "Η ανάληψη ολοκληρώθηκε",
+    "lido_stake_ready_to_be_withdrawn_title": "Έτοιμο το ποντάρισμα για ανάληψη ",
+    "erc721_sent_title": "Στάλθηκαν NFT",
+    "erc721_received_title": "Ελήφθη NFT",
+    "erc1155_sent_title": "Στάλθηκαν NFT",
+    "erc1155_received_title": "Ελήφθη NFT",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Πατήστε για προβολή",
     "received_payment_title": "Ελήφθη άμεση πληρωμή",
     "pending_message": "Αναμονή για επιβεβαίωση",
     "pending_deposit_message": "Αναμονή για την ολοκλήρωση της κατάθεσης",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Πατήστε για να δείτε τη συναλλαγή",
     "received_message": "Πατήστε για να δείτε τη συναλλαγή",
     "received_payment_message": "Λάβατε {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Λάβατε μερικά ETH",
+    "metamask_swap_completed_message": "Ανταλλάξατε {{symbolIn}} για {{symbolOut}}",
+    "erc20_sent_message": "Στάλθηκαν σε {{address}}",
+    "erc20_received_message": "Λάβατε από {{address}}",
+    "eth_sent_message": "Στάλθηκαν σε {{address}}",
+    "rocketpool_stake_completed_message": "Ποντάρισμα",
+    "rocketpool_unstake_completed_message": "Ολοκλήρωση ακύρωσης πονταρίσματος",
+    "lido_stake_completed_message": "Ποντάρισμα",
+    "lido_withdrawal_requested_message": "Αίτημα ακύρωσης πονταρίσματος",
+    "lido_withdrawal_completed_message": "Ολοκλήρωση ακύρωσης πονταρίσματος",
+    "lido_stake_ready_to_be_withdrawn_message": "Αίτημα ανάληψης",
     "push_notification_content": {
       "metamask_swap_completed_title": "Ολοκληρώθηκε η ανταλλαγή",
       "metamask_swap_completed_description": "Η ανταλλαγή σας στο MetaMask ήταν επιτυχής",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Πείτε μας τι συνέβη",
     "bug_report_prompt_description": "Προσθέστε λεπτομέρειες ώστε να καταλάβουμε τι πήγε στραβά.",
     "bug_report_thanks": "Ευχαριστούμε! Θα το εξετάσουμε σύντομα.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Εάν συνεχίζετε να λαμβάνετε αυτό το σφάλμα,",
     "save_seedphrase_2": "αποθηκεύστε τη Μυστική Φράση Ανάκτησης",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "και εγκαταστήστε ξανά την εφαρμογή. Να θυμάστε: χωρίς τη Μυστική Φράση Ανάκτησης, δεν μπορείτε να επαναφέρετε το πορτοφόλι σας.",
     "copied_clipboard": "Αντιγράφηκε στο πρόχειρο",
     "ok": "Εντάξει",
     "cancel": "Άκυρο",
     "send": "Αποστολή",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Υποβολή",
+    "modal_title": "Περιγράψτε τι έχει συμβεί",
+    "modal_placeholder": "Η παροχή λεπτομερειών, όπως ο τρόπος με τον οποίο μπορούμε να επαναλάβουμε το σφάλμα, θα μας βοηθήσει να διορθώσουμε το πρόβλημα.",
+    "error_message": "Μήνυμα σφάλματος:",
+    "copy": "Αντιγραφή",
+    "describe": "Περιγράψτε τι έχει συμβεί",
+    "try_again": "Προσπαθήστε ξανά",
+    "contact_support": "Επικοινωνήστε με την υποστήριξη"
   },
   "whats_new": {
     "title": "Τι νέο υπάρχει",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Σφάλμα τυφλής υπογραφής",
     "blind_sign_error_message": "Η τυφλή υπογραφή δεν είναι ενεργοποιημένη στη συσκευή σας Ledger. Ενεργοποιήστε την στις ρυθμίσεις.",
     "user_reject_transaction": "Ο χρήστης απέρριψε τη συναλλαγή",
-    "user_reject_transaction_message": "Ο χρήστης έχει απορρίψει τη συναλλαγή στη συσκευή Ledger."
+    "user_reject_transaction_message": "Ο χρήστης έχει απορρίψει τη συναλλαγή στη συσκευή Ledger.",
+    "multiple_devices_error_message": "Δεν υποστηρίζονται ακόμη πολλές συσκευές. Για να προσθέσετε μια νέα συσκευή Ledger, θα πρέπει να αφαιρέσετε μια παλαιότερη.",
+    "hd_path_error": "Η διαδρομή υλικού δεν είναι έγκυρη: {{path}}",
+    "unspecified_error_during_connect": "Απροσδιόριστο σφάλμα κατά τη σύνδεση του υλικού Ledger,",
+    "account_name_existed": "Ο λογαριασμός {{accountName}} υπάρχει ήδη"
   },
   "account_actions": {
     "edit_name": "Επεξεργασία ονόματος λογαριασμού",
@@ -3337,7 +3350,9 @@
     "add_account": "Προσθήκη λογαριασμού",
     "add_new_account": "Προσθήκη νέου λογαριασμού",
     "add_hardware_wallet": "Προσθήκη πορτοφολιού υλικού",
-    "import_account": "Εισαγωγή λογαριασμού"
+    "import_account": "Εισαγωγή λογαριασμού",
+    "add_bitcoin_account_testnet": "Προσθήκη νέου λογαριασμού Bitcoin (Testnet)",
+    "add_bitcoin_account_mainnet": "Προσθήκη νέου λογαριασμού Bitcoin (Beta)"
   },
   "show_nft": {
     "show_nft_title": "Εμφάνιση των NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Κερδίστε ανταμοιβές σε ETH",
     "earn_eth_rewards_description": "Ξεκινήστε να κερδίζετε μόλις βάλετε το ποντάρισμα. Οι ανταμοιβές προκύπτουν αυτόματα.",
     "flexible_unstaking": "Ευέλικτη ακύρωση πονταρίσματος",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Ακύρωση πονταρίσματος ανά πάσα στιγμή. Συνήθως διαρκεί λιγότερο από 3 ημέρες, αλλά μπορεί να χρειαστούν έως και 11 ημέρες για τη διεκπεραίωση.",
     "disclaimer": "Το ποντάρισμα δεν εγγυάται ανταμοιβές και ενέχει κινδύνους, όπως απώλεια κεφαλαίων.",
     "learn_more": "Μάθετε περισσότερα",
     "got_it": "Το κατάλαβα",
@@ -3442,7 +3457,7 @@
         "base": "Ακύρωση πονταρίσματος {{amountEth}} ETH σε εξέλιξη. Ελάτε ξανά σε",
         "and": "και",
         "to_claim_it": "για να τα διεκδικήσετε.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Ακύρωση πονταρίσματος {{amountEth}} ETH σε εξέλιξη. Ελάτε ξανά σε λίγες ημέρες για να το διεκδικήσετε."
       },
       "geo_blocked": "Βρίσκεστε σε περιοχή όπου δεν επιτρέπεται η ακύρωση πονταρίσματος ή το ποντάρισμα.",
       "approximately": "περίπου"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Έως και {{count}}",
     "unstaking_to": "Ακύρωση πονταρίσματος σε",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Μεγ",
+      "description": "Το μέγιστο είναι το συνολικό ποσό των ETH που διαθέτετε, μείον τα τέλη συναλλαγών που απαιτούνται για το ποντάρισμα. Είναι καλή ιδέα να διατηρείτε κάποια επιπλέον ETH στο πορτοφόλι σας για μελλοντικές συναλλαγές."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Χρήση μέγιστου",
+    "estimated_unstaking_time": "1 έως 11 ημέρες",
+    "proceed_anyway": "Συνεχίστε παρόλα αυτά",
+    "gas_cost_impact": "Επιπτώσεις στα έξοδα συναλλαγών",
+    "gas_cost_impact_warning": "Προειδοποίηση: το κόστος των τελών συναλλαγών θα αντιστοιχεί σε περισσότερο από το 30% της κατάθεσής σας."
   },
   "default_settings": {
     "title": "Το πορτοφόλι σας είναι έτοιμο",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Ώρα ακύρωσης πονταρίσματος",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Συνήθως χρειάζονται λιγότερες από 3 ημέρες για την ακύρωση του πονταρίσματος σας σε ETH, αλλά η επεξεργασία μπορεί να διαρκέσει έως και 11 ημέρες. Η ακριβής διάρκεια εξαρτάται από το ποσό της ακύρωσης του πονταρίσματός σας και τη δραστηριότητα πονταρίσματων σε ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Τα αποτελέσματα έχουν αλλάξει",
+    "description": "Οι εκτιμώμενες αλλαγές για αυτή τη συναλλαγή έχουν ενημερωθεί. Ελέγξτε τις προσεκτικά πριν προχωρήσετε.",
+    "proceed": "Συνεχίστε",
+    "reject": "Απορρίψτε τη συναλλαγή"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Προσθήκη λογαριασμού στο MetaMask",
+    "input_title": "Όνομα λογαριασμού",
+    "add_account_button": "Προσθήκη λογαριασμού",
+    "name_taken_message": "Αυτό το όνομα λογαριασμού υπάρχει ήδη"
   }
 }
diff --git a/locales/languages/en.json b/locales/languages/en.json
index b92a0d71dcf..aa11c8578ab 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -470,6 +470,7 @@
     "learn_more": "Learn more",
     "add_collectibles": "Import NFTs",
     "no_transactions": "You have no transactions!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Send",
     "deposit_button": "Deposit",
     "copy_address": "Copy",
diff --git a/locales/languages/es.json b/locales/languages/es.json
index 77d8ec3da9c..1234e6cf0ae 100644
--- a/locales/languages/es.json
+++ b/locales/languages/es.json
@@ -439,9 +439,9 @@
     },
     "import": "Importar",
     "sort_by": "Ordenar por",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Filtrar por",
+    "current_network": "Red actual",
+    "all_networks": "Todas las redes",
     "declining_balance": "Saldo decreciente ({{currency}} alto-bajo)",
     "alphabetically": "Alfabéticamente (A-Z)",
     "add_to_get_started": "Agregue cripto para comenzar",
@@ -470,6 +470,7 @@
     "learn_more": "Más información",
     "add_collectibles": "AGREGAR NFT",
     "no_transactions": "No tiene transacciones.",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Enviar",
     "deposit_button": "Depositar",
     "copy_address": "Copie",
@@ -722,18 +723,18 @@
     "now_active": "activo ahora.",
     "network_added": "se agregó correctamente",
     "network_deleted": "se eliminó correctamente",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Permisos de red actualizados",
     "revoked": "revocada.",
     "revoked_all": "Todas las cuentas revocadas.",
     "accounts_connected": "cuentas conectadas.",
     "account_connected": "cuenta conectada.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Permisos de cuentas actualizados",
     "accounts_disconnected": "cuentas desconectadas.",
     "account_disconnected": "cuenta desconectada.",
     "disconnected": "desconectadas.",
     "disconnected_all": "Todas las cuentas desconectadas.",
     "disconnected_from": "Desconectado de {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Permisos actualizados",
     "nft_detection_enabled": "Autodetección de NFT habilitada"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Intercambiar",
     "bridge": "Bridge",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "No es posible comprar en esta cuenta",
+      "sell": "No es posible vender en esta cuenta",
+      "swap": "No es posible realizar intercambios en esta cuenta",
+      "bridge": "No es posible realizar puentes en esta cuenta",
+      "send": "No es posible enviar en esta cuenta",
+      "action": "Esta acción no se admite en esta cuenta"
     },
     "description": "Descripción",
     "totalSupply": "Suministro total",
@@ -1586,7 +1587,7 @@
     "share": "Compartir",
     "bookmark": "Marcador",
     "add_to_favorites": "Agregar a favoritos",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Ir a favoritos",
     "error": "Error",
     "cancel": "Cancelar",
     "go_back": "Atrás",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Aprobar",
     "tx_review_increase_allowance": "Aumentar la asignación",
     "tx_review_set_approval_for_all": "Establecer aprobación para todos",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Solicitud de staking",
+    "tx_review_staking_deposit": "Depósito en staking",
+    "tx_review_staking_unstake": "Cancelar el staking",
     "sent_ether": "Ether enviado",
     "self_sent_ether": "Ether enviado a usted mismo",
     "received_ether": "Ether recibido",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Ver sus cuentas y sugerir transacciones",
     "requesting_for": "Solicitando ",
     "requesting_for_accounts": "Solicitando {{numberOfAccounts}} cuentas",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Solicitando {{numberOfNetworks}} redes",
+    "n_networks_connect": "{{numberOfNetworks}} redes conectadas ",
+    "network_connected": "red conectada ",
     "see_your_accounts": "Ver sus cuentas y sugerir transacciones",
     "connected_to": "Conectado a ",
     "manage_permissions": "Administrar permisos",
     "edit": "Editar",
     "cancel": "Cancelar",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Entendido",
+    "connection_details_title": "Detalles de la conexión",
+    "connection_details_description": "Se conectó a este sitio utilizando el navegador de MetaMask el {{connectionDateTime}}",
+    "title_add_network_permission": "Agregar permiso de red",
+    "add_this_network": "Agregar esta red",
+    "permitted_networks": "Redes permitidas",
+    "choose_from_permitted_networks": "Elija entre las redes permitidas",
+    "this_site_cant": "Este sitio no se puede utilizar con su red actual. Agregue permisos de red o elija una red ya permitida.",
+    "non_permitted_network_description": "Este sitio no se puede utilizar con su red actual. Agregue permisos de red o elija una red ya permitida.",
+    "edit_permissions": "Editar permisos",
+    "permitted_networks_info_sheet_description": "Esta es una lista de redes a las que previamente ha concedido permisos de uso en este sitio. Seleccione una de la lista o edite los permisos de red para este sitio."
   },
   "select": {
     "cancel": "Cancelar",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Canjeado",
       "label_to": "Para"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Recibió {{amount}} {{ticker}} de {{address}}",
     "nft_sent": "NFT enviado a {{address}}",
     "erc721_sent": "NFT enviado a {{address}}",
     "erc1155_sent": "NFT enviado a {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Retiro completo",
     "error_title": "Lo lamentamos, se produjo un error :/",
     "received_title": "Recibió {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Intercambio finalizado",
+    "erc20_sent_title": "Fondos enviados",
+    "erc20_received_title": "Fondos recibidos",
+    "eth_sent_title": "Fondos enviados",
+    "eth_received_title": "Fondos recibidos",
+    "rocketpool_stake_completed_title": "Staking finalizado",
+    "rocketpool_unstake_completed_title": "Cancelación de staking finalizada",
+    "lido_stake_completed_title": "Staking finalizado",
+    "lido_withdrawal_requested_title": "Retiro solicitado",
+    "lido_withdrawal_completed_title": "Retiro finalizado",
+    "lido_stake_ready_to_be_withdrawn_title": "Staking listo para retiro ",
+    "erc721_sent_title": "NFT enviado",
+    "erc721_received_title": "NFT recibido",
+    "erc1155_sent_title": "NFT enviado",
+    "erc1155_received_title": "NFT recibido",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Toque para ver",
     "received_payment_title": "Pago inmediato recibido",
     "pending_message": "En espera de confirmación",
     "pending_deposit_message": "En espera de que el depósito se complete",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Presionar para ver esta transacción",
     "received_message": "Presionar para ver esta transacción",
     "received_payment_message": "Recibió {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Recibió algo de ETH",
+    "metamask_swap_completed_message": "Se intercambió {{symbolIn}} por {{symbolOut}}",
+    "erc20_sent_message": "Enviado a {{address}}",
+    "erc20_received_message": "Recibido de {{address}}",
+    "eth_sent_message": "Enviado a {{address}}",
+    "rocketpool_stake_completed_message": "Con staking",
+    "rocketpool_unstake_completed_message": "Cancelación de staking finalizada",
+    "lido_stake_completed_message": "Con staking",
+    "lido_withdrawal_requested_message": "Cancelación de staking solicitada",
+    "lido_withdrawal_completed_message": "Cancelación de staking finalizada",
+    "lido_stake_ready_to_be_withdrawn_message": "Retiro solicitado",
     "push_notification_content": {
       "metamask_swap_completed_title": "Intercambio finalizado",
       "metamask_swap_completed_description": "Su intercambio de MetaMask se realizó correctamente",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Cuéntenos que pasó",
     "bug_report_prompt_description": "Agregue detalles para que podamos descubrir qué salió mal.",
     "bug_report_thanks": "¡Gracias! Echaremos un vistazo pronto.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Si sigue recibiendo este error,",
     "save_seedphrase_2": "guarde la frase secreta de recuperación",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "y vuelve a instalar la aplicación. Recuerde: sin su frase secreta de recuperación, no podrá restaurar su monedero.",
     "copied_clipboard": "Copiado en el Portapapeles",
     "ok": "Aceptar",
     "cancel": "Cancelar",
     "send": "Enviar",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Enviar",
+    "modal_title": "Describa lo sucedido",
+    "modal_placeholder": "Compartir detalles como la forma de reproducir el error nos ayudará a solucionar el problema.",
+    "error_message": "Mensaje de error:",
+    "copy": "Copiar",
+    "describe": "Describa lo sucedido",
+    "try_again": "Vuelva a intentarlo",
+    "contact_support": "Contacte a soporte"
   },
   "whats_new": {
     "title": "Novedades",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Error de firma ciega",
     "blind_sign_error_message": "La firma ciega no está habilitada en su dispositivo Ledger. Habilítela en la configuración.",
     "user_reject_transaction": "El usuario rechazó la transacción",
-    "user_reject_transaction_message": "El usuario rechazó la transacción en el dispositivo Ledger."
+    "user_reject_transaction_message": "El usuario rechazó la transacción en el dispositivo Ledger.",
+    "multiple_devices_error_message": "Aún no se admiten múltiples dispositivos. Para agregar un nuevo dispositivo Ledger, tendrá que eliminar uno anterior.",
+    "hd_path_error": "La ruta HD no es válida: {{path}}",
+    "unspecified_error_during_connect": "Error no especificado al conectar el dispositivo Ledger,",
+    "account_name_existed": "Ya existe la cuenta {{accountName}}"
   },
   "account_actions": {
     "edit_name": "Editar nombre de la cuenta",
@@ -3337,7 +3350,9 @@
     "add_account": "Añadir cuenta",
     "add_new_account": "Añadir una nueva cuenta",
     "add_hardware_wallet": "Añadir monedero físico",
-    "import_account": "Importar cuenta"
+    "import_account": "Importar cuenta",
+    "add_bitcoin_account_testnet": "Añadir una nueva cuenta de Bitcoin (Testnet)",
+    "add_bitcoin_account_mainnet": "Añadir una nueva cuenta de Bitcoin (Beta)"
   },
   "show_nft": {
     "show_nft_title": "Mostrar NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Gane recompensas de ETH",
     "earn_eth_rewards_description": "Comience a ganar tan pronto como haga staking. Las recompensas se capitalizan automáticamente.",
     "flexible_unstaking": "Unstaking flexible",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Cancele el staking en cualquier momento. Por lo general, tarda menos de 3 días, pero puede tardar hasta 11 días en procesarse.",
     "disclaimer": "El staking no garantiza recompensas e implica riesgos, incluida la pérdida de fondos.",
     "learn_more": "Más información",
     "got_it": "Entendido",
@@ -3442,7 +3457,7 @@
         "base": "Unstaking de {{amountEth}} ETH en curso. Vuelva en",
         "and": "y",
         "to_claim_it": "para reclamarlo.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Cancelación de staking de {{amountEth}} ETH en curso. Vuelva en unos días para reclamarlo."
       },
       "geo_blocked": "Usted se encuentra en una región donde no está permitido hacer o dejar de hacer staking.",
       "approximately": "aproximadamente"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Hasta {{count}}",
     "unstaking_to": "Cancelar el staking para",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Máx.",
+      "description": "Máx. es la cantidad total de ETH que tiene, menos la tarifa de gas necesaria para hacer staking. Es conveniente que guarde algo de ETH extra en su monedero para futuras transacciones."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Usar máx.",
+    "estimated_unstaking_time": "De 1 a 11 días",
+    "proceed_anyway": "Continuar de todos modos",
+    "gas_cost_impact": "Impacto en el costo del gas",
+    "gas_cost_impact_warning": "Advertencia: el costo del gas de la transacción representará más del 30 % de su depósito."
   },
   "default_settings": {
     "title": "Su monedero está listo",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Tiempo para cancelar el staking",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Por lo general, el proceso de cancelar el staking de su ETH tarda menos de 3 días, pero puede tardar hasta 11 días. La duración exacta depende de la cantidad que cancele y de la actividad de staking de ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Los resultados cambiaron",
+    "description": "Se actualizaron los cambios estimados para esta transacción. Revíselos detenidamente antes de continuar.",
+    "proceed": "Continuar",
+    "reject": "Rechazar la transacción"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Agregar cuenta a MetaMask",
+    "input_title": "Nombre de la cuenta",
+    "add_account_button": "Agregar cuenta",
+    "name_taken_message": "Este nombre de cuenta ya existe"
   }
 }
diff --git a/locales/languages/fr.json b/locales/languages/fr.json
index 6639e3d0060..5f8fc8bc382 100644
--- a/locales/languages/fr.json
+++ b/locales/languages/fr.json
@@ -439,9 +439,9 @@
     },
     "import": "Importer",
     "sort_by": "Trier par",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Filtrer par",
+    "current_network": "Réseau actuel",
+    "all_networks": "Tous les réseaux",
     "declining_balance": "Solde décroissant ({{currency}} du solde le plus élevé au solde le moins élevé)",
     "alphabetically": "Par ordre alphabétique (de A à Z)",
     "add_to_get_started": "Ajoutez un crypto-actif pour commencer",
@@ -470,6 +470,7 @@
     "learn_more": "En savoir plus",
     "add_collectibles": "Importer des NFT",
     "no_transactions": "Vous n’avez aucune transaction !",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Envoyer",
     "deposit_button": "Dépôt",
     "copy_address": "Copiez",
@@ -722,18 +723,18 @@
     "now_active": "maintenant actif.",
     "network_added": "a été ajouté avec succès",
     "network_deleted": "a été supprimé",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Les autorisations réseau ont été mises à jour",
     "revoked": "révoqué.",
     "revoked_all": "Tous les comptes ont été révoqués.",
     "accounts_connected": "comptes connectés.",
     "account_connected": "compte connecté.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Les autorisations des comptes ont été mises à jour",
     "accounts_disconnected": "comptes déconnectés.",
     "account_disconnected": "compte déconnecté.",
     "disconnected": "déconnecté.",
     "disconnected_all": "Tous les comptes ont été déconnectés.",
     "disconnected_from": "Déconnecté de {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Autorisations mises à jour",
     "nft_detection_enabled": "Détection automatique des NFT activée"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Échanger",
     "bridge": "Passerelle",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Impossible d’effectuer un achat en utilisant ce compte",
+      "sell": "Impossible d’effectuer une vente en utilisant ce compte",
+      "swap": "Impossible d’effectuer un swap en utilisant ce compte",
+      "bridge": "Impossible d’établir une passerelle en utilisant ce compte",
+      "send": "Impossible d’effectuer un envoi en utilisant ce compte",
+      "action": "Cette action ne peut pas être effectuée en utilisant ce compte"
     },
     "description": "Description",
     "totalSupply": "Offre totale",
@@ -1586,7 +1587,7 @@
     "share": "Partager",
     "bookmark": "Favori",
     "add_to_favorites": "Ajouter aux Favoris",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Accéder aux Favoris",
     "error": "Erreur",
     "cancel": "Annuler",
     "go_back": "Retour",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Approuver",
     "tx_review_increase_allowance": "Augmenter la provision",
     "tx_review_set_approval_for_all": "Définir l’approbation pour tous",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Réclamation de staking",
+    "tx_review_staking_deposit": "Dépôt de staking",
+    "tx_review_staking_unstake": "Déstaker",
     "sent_ether": "Ether envoyé(s)",
     "self_sent_ether": "Ether envoyé(s) à vous-même",
     "received_ether": "Ether reçu(s)",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Consulter vos comptes et suggérer des transactions",
     "requesting_for": "Demande de ",
     "requesting_for_accounts": "Demande concernant {{numberOfAccounts}} comptes",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Demande concernant {{numberOfNetworks}} réseaux",
+    "n_networks_connect": "{{numberOfNetworks}} réseaux connectés ",
+    "network_connected": "réseau connecté ",
     "see_your_accounts": "Consultez vos comptes et suggérez des transactions",
     "connected_to": "Connecté à ",
     "manage_permissions": "Gérer les autorisations",
     "edit": "Modifier",
     "cancel": "Annuler",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "D’accord",
+    "connection_details_title": "Détails de la connexion",
+    "connection_details_description": "Vous vous êtes connecté à ce site le {{connectionDateTime}} en utilisant le navigateur MetaMask",
+    "title_add_network_permission": "Ajouter une autorisation réseau",
+    "add_this_network": "Ajouter ce réseau",
+    "permitted_networks": "Réseaux autorisés",
+    "choose_from_permitted_networks": "Choisissez parmi les réseaux autorisés",
+    "this_site_cant": "Ce site ne peut pas être utilisé avec le réseau que vous utilisez actuellement. Ajoutez des autorisations réseau ou choisissez un réseau déjà autorisé.",
+    "non_permitted_network_description": "Ce site ne peut pas être utilisé avec le réseau que vous utilisez actuellement. Ajoutez des autorisations réseau ou choisissez un réseau déjà autorisé.",
+    "edit_permissions": "Modifier les autorisations",
+    "permitted_networks_info_sheet_description": "Voici la liste de réseaux que vous avez précédemment autorisés à utiliser sur ce site. Sélectionnez un réseau de cette liste ou modifiez les autorisations réseau pour ce site."
   },
   "select": {
     "cancel": "Annuler",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Échangé",
       "label_to": "À"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "A reçu {{amount}} {{ticker}} de {{address}}",
     "nft_sent": "A envoyé un NFT à {{address}}",
     "erc721_sent": "A envoyé un NFT à {{address}}",
     "erc1155_sent": "A envoyé un NFT à {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Retrait effectué !",
     "error_title": "Oups ! Nous avons rencontré un problème :/",
     "received_title": "Vous avez reçu {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Swap terminé",
+    "erc20_sent_title": "Fonds envoyés",
+    "erc20_received_title": "Fonds reçus",
+    "eth_sent_title": "Fonds envoyés",
+    "eth_received_title": "Fonds reçus",
+    "rocketpool_stake_completed_title": "Stake terminé",
+    "rocketpool_unstake_completed_title": "Déstaking terminé",
+    "lido_stake_completed_title": "Stake terminé",
+    "lido_withdrawal_requested_title": "Retrait demandé",
+    "lido_withdrawal_completed_title": "Retrait effectué",
+    "lido_stake_ready_to_be_withdrawn_title": "Stake prêt à être retiré ",
+    "erc721_sent_title": "NFT envoyé",
+    "erc721_received_title": "NFT reçu",
+    "erc1155_sent_title": "NFT envoyé",
+    "erc1155_received_title": "NFT reçu",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Appuyez pour l’afficher",
     "received_payment_title": "Paiement instantané reçu",
     "pending_message": "En attente de confirmation",
     "pending_deposit_message": "En attente de réalisation du dépôt",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Appuyez pour voir cette transaction",
     "received_message": "Appuyez pour voir cette transaction",
     "received_payment_message": "Vous avez reçu {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Vous avez reçu des ETH",
+    "metamask_swap_completed_message": "A échangé {{symbolIn}} contre {{symbolOut}}",
+    "erc20_sent_message": "Envoyé à {{address}}",
+    "erc20_received_message": "Reçu de {{address}}",
+    "eth_sent_message": "Envoyé à {{address}}",
+    "rocketpool_stake_completed_message": "Staké",
+    "rocketpool_unstake_completed_message": "Déstaking terminé",
+    "lido_stake_completed_message": "Staké",
+    "lido_withdrawal_requested_message": "Déstaking demandé",
+    "lido_withdrawal_completed_message": "Déstaking terminé",
+    "lido_stake_ready_to_be_withdrawn_message": "Retrait demandé",
     "push_notification_content": {
       "metamask_swap_completed_title": "Swap terminé",
       "metamask_swap_completed_description": "Votre swap MetaMask a été effectué",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Dites-nous ce qui s’est passé",
     "bug_report_prompt_description": "Ajoutez des détails pour que nous puissions identifier le problème.",
     "bug_report_thanks": "Merci. Nous y jetterons un coup d’œil très prochainement.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Si vous continuez à obtenir cette erreur,",
     "save_seedphrase_2": "conservez votre phrase secrète de récupération en lieu sûr",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "et réinstallez l’application. N’oubliez pas que vous avez besoin de votre phrase secrète de récupération pour restaurer votre portefeuille.",
     "copied_clipboard": "Copié dans le presse-papiers",
     "ok": "OK",
     "cancel": "Annuler",
     "send": "Envoyer",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Soumettre",
+    "modal_title": "Décrivez ce qui s’est passé",
+    "modal_placeholder": "Le fait de partager des détails tels que la façon dont nous pouvons reproduire le bogue nous aidera à résoudre le problème.",
+    "error_message": "Message d’erreur :",
+    "copy": "Copier",
+    "describe": "Décrivez ce qui s’est passé",
+    "try_again": "Réessayez",
+    "contact_support": "Contacter l’assistance"
   },
   "whats_new": {
     "title": "Nouveautés",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Erreur de signature aveugle",
     "blind_sign_error_message": "La signature aveugle n’est pas activée sur votre appareil Ledger. Veuillez l’activer dans les paramètres.",
     "user_reject_transaction": "L’utilisateur a refusé la transaction",
-    "user_reject_transaction_message": "L’utilisateur a refusé la transaction sur l’appareil Ledger."
+    "user_reject_transaction_message": "L’utilisateur a refusé la transaction sur l’appareil Ledger.",
+    "multiple_devices_error_message": "Il y a plusieurs appareils qui ne sont pas encore pris en charge. Pour ajouter un nouvel appareil Ledger, vous devrez supprimer un ancien appareil.",
+    "hd_path_error": "Le chemin HD n’est pas valide : {{path}}",
+    "unspecified_error_during_connect": "Erreur non spécifiée lors de la connexion du matériel Ledger,",
+    "account_name_existed": "Le compte {{accountName}} existe déjà"
   },
   "account_actions": {
     "edit_name": "Modifier le nom du compte",
@@ -3337,7 +3350,9 @@
     "add_account": "Ajouter un compte",
     "add_new_account": "Ajouter un nouveau compte",
     "add_hardware_wallet": "Ajouter un portefeuille matériel",
-    "import_account": "Importer le compte"
+    "import_account": "Importer le compte",
+    "add_bitcoin_account_testnet": "Ajouter un nouveau compte Bitcoin (Testnet)",
+    "add_bitcoin_account_mainnet": "Ajouter un nouveau compte Bitcoin (Bêta)"
   },
   "show_nft": {
     "show_nft_title": "Afficher le NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Obtenez des ETH en récompense",
     "earn_eth_rewards_description": "Commencez à dégager des bénéfices dès que vous stakez. Les récompenses s’accumulent automatiquement.",
     "flexible_unstaking": "Déstaking flexible",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Déstakez à tout moment. Le traitement des demandes de déstaking prend généralement moins de 3 jours, mais peut prendre jusqu’à 11 jours.",
     "disclaimer": "Le staking comporte des risques et peut entrainer la perte de fonds. De plus, les récompenses liées au staking ne sont pas garanties.",
     "learn_more": "En savoir plus",
     "got_it": "D’accord",
@@ -3442,7 +3457,7 @@
         "base": "{{amountEth}} ETH sont en train d'être déstakés. Revenez dans",
         "and": "et",
         "to_claim_it": "pour les réclamer.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "{{amountEth}} ETH sont en train d’être déstakés. Revenez dans quelques jours pour les réclamer."
       },
       "geo_blocked": "Vous vous trouvez dans une région où l’unstaking ou le staking n’est pas autorisé.",
       "approximately": "environ"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Jusqu’à {{count}}",
     "unstaking_to": "Déstaking pour",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Maximum",
+      "description": "Le maximum est le montant total d’ETH que vous possédez moins les frais de gaz nécessaires pour le staking. Nous vous conseillons de garder un peu d’ETH dans votre portefeuille pour effectuer de futures transactions."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Utiliser max",
+    "estimated_unstaking_time": "1 à 11 jours",
+    "proceed_anyway": "Continuer quand même",
+    "gas_cost_impact": "Impact du coût du gaz",
+    "gas_cost_impact_warning": "Attention : le coût du gaz de la transaction représente plus de 30 % de votre dépôt."
   },
   "default_settings": {
     "title": "Votre portefeuille est prêt",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Délai de déstaking",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Le traitement des demandes de déstaking prend généralement moins de 3 jours, mais peut prendre jusqu’à 11 jours. La durée exacte dépend du montant que vous déstakez et de l’activité de staking d’ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Les résultats ont changé",
+    "description": "Les changements estimés pour cette transaction ont été mis à jour. Examinez-les attentivement avant de continuer.",
+    "proceed": "Continuer",
+    "reject": "Refuser la transaction"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Ajouter un compte à MetaMask",
+    "input_title": "Nom du compte",
+    "add_account_button": "Ajouter un compte",
+    "name_taken_message": "Ce nom de compte existe déjà"
   }
 }
diff --git a/locales/languages/hi.json b/locales/languages/hi.json
index bb5575486cf..28ff5eca751 100644
--- a/locales/languages/hi.json
+++ b/locales/languages/hi.json
@@ -439,9 +439,9 @@
     },
     "import": "इंपोर्ट करें",
     "sort_by": "इसके अनुसार क्रमबद्ध करें",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "इसके द्वारा फिल्टर",
+    "current_network": "वर्तमान नेटवर्क",
+    "all_networks": "सभी नेटवर्क",
     "declining_balance": "घटता हुआ बैलेंस ({{currency}} उच्च-निम्न)",
     "alphabetically": "वर्णानुक्रम में (A-Z)",
     "add_to_get_started": "शुरू करने के लिए क्रिप्टो जोड़ें",
@@ -470,6 +470,7 @@
     "learn_more": "ज्यादा जानें।",
     "add_collectibles": "NFT इम्पोर्ट करें",
     "no_transactions": "आपके पास कोई लेन-देन नहीं है!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "भेजें",
     "deposit_button": "जमा करें",
     "copy_address": "कॉपी करें",
@@ -722,18 +723,18 @@
     "now_active": "अब सक्रिय है",
     "network_added": "सफलतापूर्वक जोड़ा गया",
     "network_deleted": "सफलतापूर्वक डिलीट किया गया",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "नेटवर्क अनुमतियाँ अपडेट की गईं",
     "revoked": "निरस्त किया हुआ।",
     "revoked_all": "सभी खाते निरस्त कर दिए गए।",
     "accounts_connected": "खाते कनेक्ट किए गए।",
     "account_connected": "अकाउंट कनेक्ट किया गया।",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "अकाउंट अनुमतियाँ अपडेट की गईं",
     "accounts_disconnected": "अकाउंट्स डिसकनेक्ट किए गए।",
     "account_disconnected": "अकाउंट डिसकनेक्ट किया गया।",
     "disconnected": "डिसकनेक्ट किया गया।",
     "disconnected_all": "सभी अकाउंट्स डिसकनेक्ट किए गए।",
     "disconnected_from": "{{dappHostName}} से डिस्कनेक्ट किया गया",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "अनुमतियाँ अपडेट की गईं",
     "nft_detection_enabled": "NFT ऑटोडिटेक्शन चालू किया गया"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "स्वैप",
     "bridge": "ब्रिज",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "इस अकाउंट के लिए खरीदारी सपोर्ट नहीं करती है",
+      "sell": "इस अकाउंट के लिए बेचना सपोर्ट नहीं करती है",
+      "swap": "इस अकाउंट के लिए स्वैप करना सपोर्ट नहीं करती है",
+      "bridge": "इस अकाउंट के लिए ब्रिज करना सपोर्ट नहीं करती है",
+      "send": "इस अकाउंट के लिए भेजना सपोर्ट नहीं करती है",
+      "action": "यह एक्शन इस अकाउंट के लिए सपोर्ट नहीं करती है"
     },
     "description": "विवरण",
     "totalSupply": "कुल आपूर्ति",
@@ -1586,7 +1587,7 @@
     "share": "साझा करें",
     "bookmark": "बुकमार्क",
     "add_to_favorites": "पसंदीदा में जोड़े",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "पसंदीदा पर जाएं",
     "error": "ओह!",
     "cancel": "रद्द करें",
     "go_back": "वापस जाएं",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "स्वीकृति दें",
     "tx_review_increase_allowance": "भत्ता बढ़ाएं",
     "tx_review_set_approval_for_all": "सभी के लिए एप्रूवल सेट करें",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "दावा ठोकना",
+    "tx_review_staking_deposit": "डिपॉज़िट स्टेक करना",
+    "tx_review_staking_unstake": "अनस्टेक करें",
     "sent_ether": "Ether भेजे गए",
     "self_sent_ether": "खुद को Ether भेजें",
     "received_ether": "Ether प्राप्त किया",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "आपके अकाउंट को देखकर ट्रांसेक्शन का सुझाव देना",
     "requesting_for": "के लिए अनुरोध कर रहे हैं ",
     "requesting_for_accounts": "{{numberOfAccounts}} अकाउंट्स के लिए अनुरोध की जा रही है",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "{{numberOfNetworks}} नेटवर्क के लिए अनुरोध की जा रही है",
+    "n_networks_connect": "{{numberOfNetworks}} नेटवर्क कनेक्ट किए गए ",
+    "network_connected": "नेटवर्क कनेक्ट किया गया ",
     "see_your_accounts": "आपके अकाउंट को देखकर ट्रांसेक्शन का सुझाव दें",
     "connected_to": "से जुड़ा हुआ ",
     "manage_permissions": "अनुमतियाँ प्रबंधित करें",
     "edit": "बदलें",
     "cancel": "कैंसिल करें",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "समझ गए",
+    "connection_details_title": "कनेक्शन विवरण",
+    "connection_details_description": "आप {{connectionDateTime}} पर MetaMask ब्राउज़र का उपयोग करके इस साइट से कनेक्टेड हैं",
+    "title_add_network_permission": "नेटवर्क अनुमति जोड़ें",
+    "add_this_network": "इस नेटवर्क को जोड़ें",
+    "permitted_networks": "अनुमत नेटवर्क",
+    "choose_from_permitted_networks": "अनुमत नेटवर्क में से चुनें",
+    "this_site_cant": "इस साइट का उपयोग आपके वर्तमान नेटवर्क के साथ नहीं किया जा सकता। नेटवर्क अनुमतियाँ जोड़ें या पहले से अनुमत नेटवर्क चुनें।",
+    "non_permitted_network_description": "इस साइट का उपयोग आपके वर्तमान नेटवर्क के साथ नहीं किया जा सकता। नेटवर्क अनुमतियाँ जोड़ें या पहले से अनुमत नेटवर्क चुनें।",
+    "edit_permissions": "अनुमतियाँ बदलें",
+    "permitted_networks_info_sheet_description": "यह उन नेटवर्कों की सूची है जिन्हें आपने पहले इस साइट पर उपयोग करने की अनुमति दी है। सूची में से किसी एक का चयन करें या इस साइट के लिए नेटवर्क अनुमतियाँ बदलें।"
   },
   "select": {
     "cancel": "रद्द करें",
@@ -2182,7 +2191,7 @@
       "label_swapped": "स्वैप किया गया",
       "label_to": "को"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "{{address}} से {{amount}} {{ticker}} प्राप्त हुआ",
     "nft_sent": "NFT को {{address}} पर भेजा गया",
     "erc721_sent": "NFT को {{address}} पर भेजा गया",
     "erc1155_sent": "NFT को {{address}} पर भेजा गया",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "निकासी पूरा!",
     "error_title": "ओह, कुछ गलत हुआ :/",
     "received_title": "आपने {{amount}} {{assetType}}प्राप्त किया",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "स्वैप पूरा हुआ",
+    "erc20_sent_title": "फंड भेजे गए",
+    "erc20_received_title": "फंड प्राप्त किए गए",
+    "eth_sent_title": "फंड भेजे गए",
+    "eth_received_title": "फंड प्राप्त किए गए",
+    "rocketpool_stake_completed_title": "स्टेक पूरा हुआ",
+    "rocketpool_unstake_completed_title": "अनस्टेक पूरा हुआ",
+    "lido_stake_completed_title": "स्टेक पूरा हुआ",
+    "lido_withdrawal_requested_title": "विदड्रॉवल का अनुरोध किया गया",
+    "lido_withdrawal_completed_title": "विदड्रॉवल पूरा हुआ",
+    "lido_stake_ready_to_be_withdrawn_title": "स्टेक विदड्रॉवल के लिए तैयार है ",
+    "erc721_sent_title": "NFT भेजा गया",
+    "erc721_received_title": "NFT प्राप्त किया गया",
+    "erc1155_sent_title": "NFT भेजा गया",
+    "erc1155_received_title": "NFT प्राप्त किया गया",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "देखने के लिए टैप करें",
     "received_payment_title": "तात्कालिक भुगतान प्राप्त किया",
     "pending_message": "पुष्टिकरण का इंतजार करना",
     "pending_deposit_message": "जमा पूरा होने का इंतजार करना",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "इस लेन-देन को देखने के लिए टैप करें",
     "received_message": "इस लेन-देन को देखने के लिए टैप करें",
     "received_payment_message": "आपने {{amount}} DAI प्राप्त किया",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "आपको कुछ ETH प्राप्त हुए",
+    "metamask_swap_completed_message": "{{symbolIn}} को {{symbolOut}} के लिए स्वैप किया गया",
+    "erc20_sent_message": "{{address}} पर भेजा गया",
+    "erc20_received_message": "{{address}} से प्राप्त हुआ",
+    "eth_sent_message": "{{address}} पर भेजा गया",
+    "rocketpool_stake_completed_message": "स्टेक किया गया",
+    "rocketpool_unstake_completed_message": "अनस्टेकिंग पूरा हुआ",
+    "lido_stake_completed_message": "स्टेक किया गया",
+    "lido_withdrawal_requested_message": "अनस्टेकिंग का अनुरोध किया गया",
+    "lido_withdrawal_completed_message": "अनस्टेकिंग पूरा हुआ",
+    "lido_stake_ready_to_be_withdrawn_message": "विदड्रॉवल का अनुरोध किया गया",
     "push_notification_content": {
       "metamask_swap_completed_title": "स्वैप पूरा हुआ",
       "metamask_swap_completed_description": "आपका MetaMask स्वैप सफल रहा",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "हमें बताएं कि क्या हुआ",
     "bug_report_prompt_description": "विवरण जोड़ें ताकि हम पता लगा सकें कि क्या गलत हुआ।",
     "bug_report_thanks": "धन्यवाद! हम जल्द ही नज़र डालेंगे।",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "यदि आपको यह गड़बड़ी (एरर) मिलती रहती है,",
     "save_seedphrase_2": "अपने सीक्रेट रिकवरी फ्रेज को सहेजें",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "और ऐप को दोबारा इंस्टॉल करें। याद रखें: आपके सीक्रेट रिकवरी फ्रेज़ के बिना, आप अपना वॉलेट रिस्टोर नहीं कर सकते।",
     "copied_clipboard": "क्लिपबोर्ड पर नकल ",
     "ok": "ठीक है",
     "cancel": "कैंसिल करें",
     "send": "भेजें",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "सबमिट करें",
+    "modal_title": "वर्णन करें कि क्या हुआ",
+    "modal_placeholder": "हम बग को कैसे फिर से उत्पन्न कर सकते हैं जैसे विवरण साझा करने से हमें समस्या को ठीक करने में मदद मिलेगी।",
+    "error_message": "गड़बड़ी संबंधी संदेश:",
+    "copy": "कॉपी करें",
+    "describe": "वर्णन करें कि क्या हुआ",
+    "try_again": "फिर से कोशिश करें",
+    "contact_support": "सपोर्ट टीम से कॉन्टेक्ट करें"
   },
   "whats_new": {
     "title": "नया क्या है",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "ब्लाइंड साइनिंग संबंधी गड़बड़ी",
     "blind_sign_error_message": "आपके Ledger डिवाइस पर ब्लाइंड साइनिंग चालू नहीं है। कृपया इसे सेटिंग्स में चालू करें।",
     "user_reject_transaction": "उपयोगकर्ता ने ट्रांसेक्शन को रिजेक्ट कर दिया",
-    "user_reject_transaction_message": "उपयोगकर्ता ने Ledger डिवाइस पर ट्रांसेक्शन को रिजेक्ट कर दिया है।"
+    "user_reject_transaction_message": "उपयोगकर्ता ने Ledger डिवाइस पर ट्रांसेक्शन को रिजेक्ट कर दिया है।",
+    "multiple_devices_error_message": "एकाधिक डिवाइस अभी तक सपोर्ट नहीं करती हैं। एक नया Ledger डिवाइस जोड़ने के लिए, आपको एक पुराना डिवाइस हटाना होगा।",
+    "hd_path_error": "HD पाथ ग़लत है: {{path}}",
+    "unspecified_error_during_connect": "Ledger हार्डवेयर कनेक्ट करते समय अनजानी गड़बड़ी हुई,",
+    "account_name_existed": "अकाउंट {{accountName}} पहले से मौजूद है"
   },
   "account_actions": {
     "edit_name": "खाते का नाम संपादित करें",
@@ -3337,7 +3350,9 @@
     "add_account": "खाता जोड़ें",
     "add_new_account": "नया खाता जोड़ें",
     "add_hardware_wallet": "हार्डवेयर वॉलेट जोड़ें",
-    "import_account": "अकाउंट इम्पोर्ट करें"
+    "import_account": "अकाउंट इम्पोर्ट करें",
+    "add_bitcoin_account_testnet": "एक नया Bitcoin अकाउंट - टैस्टनेट (testnet) जोड़ें",
+    "add_bitcoin_account_mainnet": "एक नया Bitcoin अकाउंट (बीटा) जोड़ें"
   },
   "show_nft": {
     "show_nft_title": "NFT दिखाएं",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "ETH पुरस्कार अर्जित करें",
     "earn_eth_rewards_description": "स्टेक करते ही कमाई शुरू करें। पुरस्कार स्वचालित रूप से संयोजित होते हैं।",
     "flexible_unstaking": "लचीला अनस्टेकिंग",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "कभी भी अनस्टेक करें। आमतौर पर 3 दिन से कम समय लगता है, लेकिन प्रोसेस होने में 11 दिन तक का समय लग सकता है।",
     "disclaimer": "स्टेकिंग पुरस्कार की गारंटी नहीं देती है और इसमें धन की हानि सहित जोखिम शामिल होते हैं।",
     "learn_more": "ज़्यादा जानें",
     "got_it": "समझ गए",
@@ -3442,7 +3457,7 @@
         "base": "{{amountEth}} ETH अनस्टेकिंग प्रोग्रेस में है। वापस आएं",
         "and": "और",
         "to_claim_it": "इसे क्लेम करें।",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "{{amountEth}} ETH अनस्टेकिंग प्रोग्रेस में है। इसे क्लेम करने के लिए कुछ दिन में वापस आएं।"
       },
       "geo_blocked": "आप ऐसे क्षेत्र में स्थित हैं जहां अनस्टेकिंग या स्टेकिंग की अनुमति नहीं है।",
       "approximately": "लगभग"
@@ -3462,14 +3477,14 @@
     "up_to_n": "{{count}} तक",
     "unstaking_to": "इसपर अनस्टेक किया जा रहा है",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "मैक्स",
+      "description": "मैक्स आपके पास मौजूद ETH की कुल राशि है, जिसमें स्टेक करने के लिए आवश्यक गैस फीस घटा दिया गया है। भविष्य के ट्रांसेक्शन के लिए अपने वॉलेट में कुछ अतिरिक्त ETH रखना एक अच्छा विचार है।"
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "मैक्स का उपयोग करें",
+    "estimated_unstaking_time": "1 से 11 दिन",
+    "proceed_anyway": "कैसे भी आगे बढ़ें",
+    "gas_cost_impact": "गैस लागत संबंधी प्रभाव",
+    "gas_cost_impact_warning": "चेतावनी: ट्रांसेक्शन गैस लागत आपकी डिपॉज़िट की 30% से अधिक होगी।"
   },
   "default_settings": {
     "title": "आपका वॉलेट तैयार है",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "अनस्टेक करने का समय",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "आपके ETH को अनस्टेक करने में आम तौर पर 3 दिन से कम समय लगता है, लेकिन इसे प्रोसेस होने में 11 दिन तक का समय लग सकता है। सटीक अवधि आपके द्वारा अनस्टेक की गई राशि और ETH स्टेकिंग संबंधी गतिविधि पर निर्भर करती है"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "परिणाम बदल गए हैं",
+    "description": "इस ट्रांसेक्शन के लिए अनुमानित परिवर्तन अपडेट कर दिए गए हैं। आगे बढ़ने से पहले उनकी बारीकी से समीक्षा करें।",
+    "proceed": "आगे बढ़ें",
+    "reject": "ट्रांसेक्शन को रिजेक्ट करें"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "MetaMask में अकाउंट जोड़ें",
+    "input_title": "अकाउंट का नाम",
+    "add_account_button": "अकाउंट जोड़ें",
+    "name_taken_message": "यह अकाउंट नाम पहले से मौजूद है"
   }
 }
diff --git a/locales/languages/id.json b/locales/languages/id.json
index d48afddc7d6..32131492cab 100644
--- a/locales/languages/id.json
+++ b/locales/languages/id.json
@@ -439,9 +439,9 @@
     },
     "import": "Impor",
     "sort_by": "Urutkan sesuai",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Filter berdasarkan",
+    "current_network": "Jaringan Saat Ini",
+    "all_networks": "Semua Jaringan",
     "declining_balance": "Saldo menurun ({{currency}} tinggi-rendah)",
     "alphabetically": "Sesuai abjad (A-Z)",
     "add_to_get_started": "Tambahkan kripto untuk memulai",
@@ -470,6 +470,7 @@
     "learn_more": "Pelajari selengkapnya",
     "add_collectibles": "Impor NFT",
     "no_transactions": "Belum ada transaksi!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Kirim",
     "deposit_button": "Deposit",
     "copy_address": "Salin",
@@ -722,18 +723,18 @@
     "now_active": "sekarang aktif.",
     "network_added": "berhasil ditambahkan",
     "network_deleted": "berhasil dihapus",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Izin jaringan diperbarui",
     "revoked": "dicabut.",
     "revoked_all": "Semua akun dicabut.",
     "accounts_connected": "akun terhubung.",
     "account_connected": "akun terhubung.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Izin akun diperbarui",
     "accounts_disconnected": "akun terputus koneksinya.",
     "account_disconnected": "akun terputus koneksinya.",
     "disconnected": "koneksi terputus.",
     "disconnected_all": "Semua akun terputus koneksinya.",
     "disconnected_from": "Koneksi dari {{dappHostName}} terputus",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Izin diperbarui",
     "nft_detection_enabled": "Autodeteksi NFT diaktifkan"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Tukar",
     "bridge": "Bridge",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Pembelian tidak didukung untuk akun ini",
+      "sell": "Penjualan tidak didukung untuk akun ini",
+      "swap": "Swap tidak didukung untuk akun ini",
+      "bridge": "Bridge tidak didukung untuk akun ini",
+      "send": "Pengiriman tidak didukung untuk akun ini",
+      "action": "Tindakan ini tidak didukung untuk akun ini"
     },
     "description": "Deskripsi",
     "totalSupply": "Jumlah Pasokan",
@@ -1586,7 +1587,7 @@
     "share": "Bagikan",
     "bookmark": "Bookmark",
     "add_to_favorites": "Tambahkan ke Favorit",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Buka Favorit",
     "error": "Kesalahan",
     "cancel": "Batal",
     "go_back": "Kembali",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Setujui",
     "tx_review_increase_allowance": "Tingkatkan Persetujuan",
     "tx_review_set_approval_for_all": "Atur Persetujuan Untuk Semua",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Klaim Stake",
+    "tx_review_staking_deposit": "Deposit Stake",
+    "tx_review_staking_unstake": "Batalkan stake",
     "sent_ether": "Mengirim Ether",
     "self_sent_ether": "Mengirim Ether ke Diri Sendiri",
     "received_ether": "Menerima Ether",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Melihat akun Anda dan menyarankan transaksi",
     "requesting_for": "Meminta untuk ",
     "requesting_for_accounts": "Meminta {{numberOfAccounts}} akun",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Meminta {{numberOfNetworks}} jaringan",
+    "n_networks_connect": "{{numberOfNetworks}} jaringan terhubung ",
+    "network_connected": "jaringan terhubung ",
     "see_your_accounts": "Melihat akun Anda dan menyarankan transaksi",
     "connected_to": "Terhubung dengan ",
     "manage_permissions": "Kelola Izin",
     "edit": "Edit",
     "cancel": "Batal",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Mengerti",
+    "connection_details_title": "Detail Koneksi",
+    "connection_details_description": "Anda terhubung ke situs ini menggunakan browser MetaMask pada {{connectionDateTime}}",
+    "title_add_network_permission": "Tambahkan izin jaringan",
+    "add_this_network": "Tambahkan jaringan ini",
+    "permitted_networks": "Jaringan yang diizinkan",
+    "choose_from_permitted_networks": "Pilih dari jaringan yang diizinkan",
+    "this_site_cant": "Situs ini tidak dapat digunakan bersama dengan jaringan Anda saat ini. Tambahkan izin jaringan atau pilih jaringan yang sudah diizinkan.",
+    "non_permitted_network_description": "Situs ini tidak dapat digunakan bersama dengan jaringan Anda saat ini. Tambahkan izin jaringan atau pilih jaringan yang sudah diizinkan.",
+    "edit_permissions": "Edit izin",
+    "permitted_networks_info_sheet_description": "Ini merupakan daftar jaringan yang sebelumnya telah Anda beri izin untuk digunakan di situs ini. Pilih satu dari daftar atau edit izin jaringan untuk situs ini."
   },
   "select": {
     "cancel": "Batal",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Ditukar",
       "label_to": "Ke"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Menerima {{amount}} {{ticker}} dari {{address}}",
     "nft_sent": "Mengirim NFT ke {{address}}",
     "erc721_sent": "Mengirim NFT ke {{address}}",
     "erc1155_sent": "Mengirim NFT ke {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Penarikan Selesai!",
     "error_title": "Ups! Terjadi kesalahan :/",
     "received_title": "Anda menerima {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Swap selesai",
+    "erc20_sent_title": "Dana terkirim",
+    "erc20_received_title": "Dana diterima",
+    "eth_sent_title": "Dana terkirim",
+    "eth_received_title": "Dana diterima",
+    "rocketpool_stake_completed_title": "Stake selesai",
+    "rocketpool_unstake_completed_title": "Pembatalan stake selesai",
+    "lido_stake_completed_title": "Stake selesai",
+    "lido_withdrawal_requested_title": "Permintaan penarikan",
+    "lido_withdrawal_completed_title": "Penarikan selesai",
+    "lido_stake_ready_to_be_withdrawn_title": "Stake siap untuk penarikan ",
+    "erc721_sent_title": "NFT terkirim",
+    "erc721_received_title": "NFT diterima",
+    "erc1155_sent_title": "NFT terkirim",
+    "erc1155_received_title": "NFT diterima",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Ketuk untuk melihat",
     "received_payment_title": "Pembayaran instan diterima",
     "pending_message": "Menunggu konfirmasi",
     "pending_deposit_message": "Menunggu deposit selesai",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Ketuk untuk melihat transaksi ini",
     "received_message": "Ketuk untuk melihat transaksi ini",
     "received_payment_message": "Anda menerima {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Anda menerima beberapa ETH",
+    "metamask_swap_completed_message": "Menukar {{symbolIn}} dengan {{symbolOut}}",
+    "erc20_sent_message": "Dikirim ke {{address}}",
+    "erc20_received_message": "Diterima dari {{address}}",
+    "eth_sent_message": "Dikirim ke {{address}}",
+    "rocketpool_stake_completed_message": "Di-stake",
+    "rocketpool_unstake_completed_message": "Pembatalan stake selesai",
+    "lido_stake_completed_message": "Di-stake",
+    "lido_withdrawal_requested_message": "Permintaan pembatalan stake",
+    "lido_withdrawal_completed_message": "Pembatalan stake selesai",
+    "lido_stake_ready_to_be_withdrawn_message": "Permintaan penarikan",
     "push_notification_content": {
       "metamask_swap_completed_title": "Swap selesai",
       "metamask_swap_completed_description": "Swap MetaMask berhasil",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Beri tahu kami hal yang terjadi",
     "bug_report_prompt_description": "Tambahkan detail sehingga kami dapat mengetahui apa yang salah.",
     "bug_report_thanks": "Terima kasih! Kami akan segera memeriksanya.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Jika kesalahan ini terus muncul,",
     "save_seedphrase_2": "simpan Frasa Pemulihan Rahasia",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "dan instal ulang aplikasinya. Ingat: tanpa Frasa Pemulihan Rahasia, Anda tidak dapat memulihkan dompet.",
     "copied_clipboard": "Disalin ke papan klip",
     "ok": "Oke",
     "cancel": "Batalkan",
     "send": "Kirim",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Kirim",
+    "modal_title": "Jelaskan yang terjadi",
+    "modal_placeholder": "Berbagi detail seperti cara kami dapat mereproduksi bug akan membantu kami memperbaiki masalah tersebut.",
+    "error_message": "Pesan kesalahan:",
+    "copy": "Salin",
+    "describe": "Jelaskan yang terjadi",
+    "try_again": "Coba lagi",
+    "contact_support": "Hubungi dukungan"
   },
   "whats_new": {
     "title": "Yang baru",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Kesalahan penandatanganan buta",
     "blind_sign_error_message": "Penandatanganan buta tidak diaktifkan pada perangkat Ledger Anda. Aktifkan di pengaturan.",
     "user_reject_transaction": "Pengguna menolak transaksi",
-    "user_reject_transaction_message": "Pengguna telah menolak transaksi pada perangkat Ledger."
+    "user_reject_transaction_message": "Pengguna telah menolak transaksi pada perangkat Ledger.",
+    "multiple_devices_error_message": "Beberapa perangkat belum didukung. Untuk menambahkan perangkat Ledger baru, Anda harus menghapus perangkat lama.",
+    "hd_path_error": "Jalur HD tidak valid: {{path}}",
+    "unspecified_error_during_connect": "Kesalahan tak dikenali saat menghubungkan Perangkat Keras Ledger,",
+    "account_name_existed": "Akun {{accountName}} sudah ada"
   },
   "account_actions": {
     "edit_name": "Edit nama akun",
@@ -3337,7 +3350,9 @@
     "add_account": "Tambahkan akun",
     "add_new_account": "Tambahkan akun baru",
     "add_hardware_wallet": "Tambahkan dompet perangkat keras",
-    "import_account": "Impor akun"
+    "import_account": "Impor akun",
+    "add_bitcoin_account_testnet": "Tambahkan Akun Bitcoin baru (Testnet)",
+    "add_bitcoin_account_mainnet": "Tambahkan Akun Bitcoin baru (Beta)"
   },
   "show_nft": {
     "show_nft_title": "Tampilkan NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Dapatkan reward ETH",
     "earn_eth_rewards_description": "Mulailah menghasilkan segera setelah Anda melakukan stake. Reward akan terkumpul secara otomatis.",
     "flexible_unstaking": "Pembatalan stake yang fleksibel",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Batalkan stake setiap saat. Biasanya waktu yang diperlukan kurang dari 3 hari, tetapi butuh waktu hingga 11 hari untuk memprosesnya.",
     "disclaimer": "Stake tidak menjamin reward, dan melibatkan risiko termasuk hilangnya dana.",
     "learn_more": "Selengkapnya",
     "got_it": "Mengerti",
@@ -3442,7 +3457,7 @@
         "base": "Pembatalan stake {{amountEth}} ETH sedang berlangsung. Kembali lagi dalam",
         "and": "dan",
         "to_claim_it": "untuk mengeklaimnya.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Pembatalan stake {{amountEth}} ETH sedang berlangsung. Kembalilah dalam beberapa hari untuk mengeklaimnya."
       },
       "geo_blocked": "Anda berada di wilayah tempat pembatalan stake maupun stake tidak diizinkan.",
       "approximately": "sekitar"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Hingga {{count}}",
     "unstaking_to": "Batalkan stake ke",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Maks",
+      "description": "Maks merupakan jumlah total ETH yang Anda miliki, dikurangi biaya gas yang diperlukan untuk melakukan stake. Sebaiknya simpan sejumlah ETH tambahan di dompet Anda untuk transaksi di masa mendatang."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Gunakan maks",
+    "estimated_unstaking_time": "1 sampai 11 hari",
+    "proceed_anyway": "Tetap lanjutkan",
+    "gas_cost_impact": "Dampak biaya gas",
+    "gas_cost_impact_warning": "Peringatan: biaya gas transaksi akan mencapai lebih dari 30% dari deposit Anda."
   },
   "default_settings": {
     "title": "Dompet Anda sudah siap",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Waktu pembatalan stake",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Biasanya diperlukan waktu kurang dari 3 hari untuk membatalkan stake ETH, tetapi butuh waktu hingga 11 hari untuk memprosesnya. Durasi pastinya bergantung pada jumlah stake yang dibatalkan dan aktivitas stake ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Hasil telah berubah",
+    "description": "Estimasi perubahan untuk transaksi ini telah diperbarui. Tinjau dengan saksama sebelum melanjutkan.",
+    "proceed": "Lanjutkan",
+    "reject": "Tolak transaksi"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Tambahkan akun ke MetaMask",
+    "input_title": "Nama akun",
+    "add_account_button": "Tambahkan akun",
+    "name_taken_message": "Nama akun ini sudah ada"
   }
 }
diff --git a/locales/languages/ja.json b/locales/languages/ja.json
index 38fa89f78e4..abeb31db3fb 100644
--- a/locales/languages/ja.json
+++ b/locales/languages/ja.json
@@ -439,9 +439,9 @@
     },
     "import": "インポート",
     "sort_by": "並べ替え基準",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "絞り込み条件：",
+    "current_network": "現在のネットワーク",
+    "all_networks": "すべてのネットワーク",
     "declining_balance": "残高降順 ({{currency}} 高→低)",
     "alphabetically": "アルファベット順 (A～Z)",
     "add_to_get_started": "開始するには仮想通貨を追加してください",
@@ -470,6 +470,7 @@
     "learn_more": "詳細",
     "add_collectibles": "NFTをインポート",
     "no_transactions": "トランザクションがありません！",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "送信",
     "deposit_button": "入金",
     "copy_address": "コピー",
@@ -722,18 +723,18 @@
     "now_active": "有効になりました。",
     "network_added": "が追加されました",
     "network_deleted": "が削除されました",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "ネットワークのアクセス許可が更新されました",
     "revoked": "取り消されました。",
     "revoked_all": "すべてのアカウントが取り消されました。",
     "accounts_connected": "アカウントが接続されました。",
     "account_connected": "アカウントが接続されました。",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "アカウントのアクセス許可が更新されました",
     "accounts_disconnected": "アカウントの接続が解除されました。",
     "account_disconnected": "アカウントの接続が解除されました。",
     "disconnected": "接続が解除されました。",
     "disconnected_all": "すべてのアカウントの接続が解除されました。",
     "disconnected_from": "{{dappHostName}}への接続を解除",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "アクセス許可が更新されました",
     "nft_detection_enabled": "NFTの自動検出が有効になりました"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "スワップ",
     "bridge": "ブリッジ",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "このアカウントでは購入はサポートされていません",
+      "sell": "このアカウントでは売却はサポートされていません",
+      "swap": "このアカウントではスワップはサポートされていません",
+      "bridge": "このアカウントではブリッジはサポートされていません",
+      "send": "このアカウントでは送金はサポートされていません",
+      "action": "このアカウントではこの操作はサポートされていません"
     },
     "description": "説明",
     "totalSupply": "合計供給量",
@@ -1586,7 +1587,7 @@
     "share": "共有",
     "bookmark": "ブックマーク",
     "add_to_favorites": "お気に入りに追加",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "お気に入りに移動",
     "error": "エラー",
     "cancel": "キャンセル",
     "go_back": "戻る",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "承認",
     "tx_review_increase_allowance": "許容額を増やす",
     "tx_review_set_approval_for_all": "すべてを承認に設定",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "ステーキングの請求",
+    "tx_review_staking_deposit": "ステーキングのデポジット",
+    "tx_review_staking_unstake": "ステーキングを解除",
     "sent_ether": "送信されたイーサ",
     "self_sent_ether": "自分に送信されたイーサ",
     "received_ether": "受け取ったイーサ",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "アカウントを確認しトランザクションを提案する",
     "requesting_for": "次の要求:",
     "requesting_for_accounts": "{{numberOfAccounts}}個のアカウントをリクエストしています",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "{{numberOfNetworks}}個のネットワークをリクエストしています",
+    "n_networks_connect": "{{numberOfNetworks}}個のネットワークに接続しました ",
+    "network_connected": "ネットワークに接続しました",
     "see_your_accounts": "アカウントを確認しトランザクションを提案する",
     "connected_to": "接続先: ",
     "manage_permissions": "アクセス許可の管理",
     "edit": "編集",
     "cancel": "キャンセル",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "了解",
+    "connection_details_title": "接続の詳細",
+    "connection_details_description": "{{connectionDateTime}}にMetaMaskブラウザを使用してこのサイトに接続しました",
+    "title_add_network_permission": "ネットワークのアクセス許可を追加",
+    "add_this_network": "このネットワークを追加",
+    "permitted_networks": "許可されたネットワーク",
+    "choose_from_permitted_networks": "許可されたネットワークから選択",
+    "this_site_cant": "このサイトは現在のネットワークでは使用できません。ネットワークのアクセス許可を追加するか、すでに許可されているネットワークを選択してください。",
+    "non_permitted_network_description": "このサイトは現在のネットワークでは使用できません。ネットワークのアクセス許可を追加するか、すでに許可されているネットワークを選択してください。",
+    "edit_permissions": "アクセス許可を編集",
+    "permitted_networks_info_sheet_description": "これは、以前このサイトで使用するためにアクセス許可を与えたネットワークのリストです。このリストから1つ選択するか、このサイトへのネットワークのアクセス許可を編集してください。"
   },
   "select": {
     "cancel": "キャンセル",
@@ -2182,7 +2191,7 @@
       "label_swapped": "スワップしました",
       "label_to": "送り先"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "{{address}}から{{amount}} {{ticker}}を受け取りました",
     "nft_sent": "{{address}}にNFTを送りました",
     "erc721_sent": "{{address}}にNFTを送りました",
     "erc1155_sent": "{{address}}にNFTを送りました",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "出金完了！",
     "error_title": "問題が発生しました  :/",
     "received_title": "{{amount}}{{assetType}}受け取りました",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "スワップが完了しました",
+    "erc20_sent_title": "送金されました",
+    "erc20_received_title": "資金を受け取りました",
+    "eth_sent_title": "送金されました",
+    "eth_received_title": "資金を受け取りました",
+    "rocketpool_stake_completed_title": "ステーキングが完了しました",
+    "rocketpool_unstake_completed_title": "ステーキングの解除が完了しました",
+    "lido_stake_completed_title": "ステーキングが完了しました",
+    "lido_withdrawal_requested_title": "出金がリクエストされました",
+    "lido_withdrawal_completed_title": "出金が完了しました",
+    "lido_stake_ready_to_be_withdrawn_title": "ステークの出金準備が完了しました ",
+    "erc721_sent_title": "NFTが送られました",
+    "erc721_received_title": "NFTを受け取りました",
+    "erc1155_sent_title": "NFTが送られました",
+    "erc1155_received_title": "NFTを受け取りました",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "タップして表示",
     "received_payment_title": "インスタントペイメントを受け取りました",
     "pending_message": "承認待ち",
     "pending_deposit_message": "入金の完了待ち",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "このトランザクションを表示するにはタップしてください",
     "received_message": "このトランザクションを表示するにはタップしてください",
     "received_payment_message": "{{amount}}DAI受け取りました",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "ETHを受け取りました",
+    "metamask_swap_completed_message": "{{symbolIn}}を{{symbolOut}}にスワップしました",
+    "erc20_sent_message": "{{address}}に送りました",
+    "erc20_received_message": "{{address}}から受け取りました",
+    "eth_sent_message": "{{address}}に送りました",
+    "rocketpool_stake_completed_message": "ステーキングしました",
+    "rocketpool_unstake_completed_message": "ステーキングの解除が完了しました",
+    "lido_stake_completed_message": "ステーキングしました",
+    "lido_withdrawal_requested_message": "ステーキングの解除がリクエストされました",
+    "lido_withdrawal_completed_message": "ステーキングの解除が完了しました",
+    "lido_stake_ready_to_be_withdrawn_message": "出金がリクエストされました",
     "push_notification_content": {
       "metamask_swap_completed_title": "スワップが完了しました",
       "metamask_swap_completed_description": "MetaMaskスワップに成功しました",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "何が起きたのか教えてください",
     "bug_report_prompt_description": "何が問題だったか調査できるよう、詳細を追加してください。",
     "bug_report_thanks": "ありがとうございます！すぐに調査いたします。",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "このエラーが引き続き発生する場合、",
     "save_seedphrase_2": "シークレットリカバリーフレーズを保存",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "アプリを再インストールしてください。なお、シークレットリカバリーフレーズがないとウォレットを復元できませんのでご注意ください。",
     "copied_clipboard": "クリップボードにコピーされました",
     "ok": "OK",
     "cancel": "キャンセル",
     "send": "送金",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "送信",
+    "modal_title": "発生した問題についてご説明ください",
+    "modal_placeholder": "バグを再現する方法などの詳細をお知らせいただくと、問題の解決に役立ちます。",
+    "error_message": "エラーメッセージ：",
+    "copy": "コピー",
+    "describe": "発生した問題についてご説明ください",
+    "try_again": "再試行",
+    "contact_support": "サポートへのお問い合わせ"
   },
   "whats_new": {
     "title": "新機能",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "ブラインド署名エラー",
     "blind_sign_error_message": "ご使用のLedgerデバイスでブラインド署名が有効になっていません。設定で有効にしてください。",
     "user_reject_transaction": "ユーザーがトランザクションを拒否しました",
-    "user_reject_transaction_message": "ユーザーがLedgerデバイスでトランザクションを拒否しました。"
+    "user_reject_transaction_message": "ユーザーがLedgerデバイスでトランザクションを拒否しました。",
+    "multiple_devices_error_message": "複数のデバイスはまだサポートされていません。新しいLedgerデバイスを追加するには、旧デバイスを削除してください。",
+    "hd_path_error": "HDパスが無効です: {{path}}",
+    "unspecified_error_during_connect": "Ledgerハードウェアの接続中に予期せぬエラーが発生しました。",
+    "account_name_existed": "アカウント{{accountName}}はすでに存在します"
   },
   "account_actions": {
     "edit_name": "アカウント名を編集",
@@ -3337,7 +3350,9 @@
     "add_account": "アカウントを追加",
     "add_new_account": "新しいアカウントを追加",
     "add_hardware_wallet": "ハードウェアウォレットを追加",
-    "import_account": "アカウントをインポート"
+    "import_account": "アカウントをインポート",
+    "add_bitcoin_account_testnet": "新しいビットコインアカウントを追加 (テストネット)",
+    "add_bitcoin_account_mainnet": "新しいビットコインアカウントを追加 (ベータ)"
   },
   "show_nft": {
     "show_nft_title": "NFTを表示",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "ETHの報酬を獲得",
     "earn_eth_rewards_description": "ステーキングすればすぐに収益が得られます。報酬は自動的に複利で支払われます。",
     "flexible_unstaking": "柔軟にステーキングを解除可能",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "いつでもステーキングを解除できます。処理は通常3日以内で完了しますが、最大11日かかる場合もあります。",
     "disclaimer": "ステーキングは報酬を保証するものではなく、資金の喪失を含むリスクを伴います。",
     "learn_more": "詳細",
     "got_it": "了解",
@@ -3442,7 +3457,7 @@
         "base": "{{amountEth}} ETHのステーキングを解除しています。",
         "and": "後に戻ってきて",
         "to_claim_it": "請求してください。",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "{{amountEth}}ETHのステーキングを解除しています。数日後に再度アクセスして請求してください。"
       },
       "geo_blocked": "ステーキングの解除またはステーキングが許可されていない地域にいます。",
       "approximately": "約"
@@ -3462,14 +3477,14 @@
     "up_to_n": "最大{{count}}",
     "unstaking_to": "ステーキングの解除先:",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "最大額",
+      "description": "最大額は、保有するETHの合計額から、ステーキングに必要なガス代を差し引いた額です。今後のトランザクションのために、ウォレットに予備のETHを残しておくことをお勧めします。"
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "最大額を使用",
+    "estimated_unstaking_time": "1～11日",
+    "proceed_anyway": "承知の上で続ける",
+    "gas_cost_impact": "ガス代の影響",
+    "gas_cost_impact_warning": "警告：トランザクションのガス代が入金額の30%を超えます。"
   },
   "default_settings": {
     "title": "ウォレットの準備ができました",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "ステーキングの解除時間",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "通常、ETHのステーキング解除は3日以内で完了しますが、処理に最大11日かかる場合もあります。正確な処理期間は、ステーキングを解除する金額とETHのステーキング状況によって異なります。"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "結果が変更になりました",
+    "description": "このトランザクションの予測される増減額が更新されました。先に進む前によく確認してください。",
+    "proceed": "先に進む",
+    "reject": "トランザクションを拒否"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "アカウントをMetaMaskに追加",
+    "input_title": "アカウント名",
+    "add_account_button": "アカウントを追加",
+    "name_taken_message": "このアカウント名はすでに存在します"
   }
 }
diff --git a/locales/languages/ko.json b/locales/languages/ko.json
index d3ca23a79ae..21a3e54da25 100644
--- a/locales/languages/ko.json
+++ b/locales/languages/ko.json
@@ -439,9 +439,9 @@
     },
     "import": "가져오기",
     "sort_by": "정렬 기준",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "필터링 기준:",
+    "current_network": "현재 네트워크",
+    "all_networks": "모든 네트워크",
     "declining_balance": "잔액 내림차순({{currency}} 높은순-낮은순)",
     "alphabetically": "알파벳순(A-Z)",
     "add_to_get_started": "암호화폐를 추가하여 시작하세요",
@@ -470,6 +470,7 @@
     "learn_more": "더 알아보기",
     "add_collectibles": "NFT 가져오기",
     "no_transactions": "트랜잭션이 없습니다!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "보내기",
     "deposit_button": "예금",
     "copy_address": "복사",
@@ -722,18 +723,18 @@
     "now_active": "지금 활성화됨.",
     "network_added": "(을)를 성공적으로 추가했습니다",
     "network_deleted": "이(가) 삭제되었습니다",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "네트워크 권한 업데이트됨",
     "revoked": "취소됨.",
     "revoked_all": "모든 계정이 취소되었습니다.",
     "accounts_connected": "계정이 연결되었습니다.",
     "account_connected": "계정이 연결되었습니다.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "계정 권한 업데이트됨",
     "accounts_disconnected": "계정 연결이 해제되었습니다.",
     "account_disconnected": "계정 연결이 해제되었습니다.",
     "disconnected": "연결 해제됨",
     "disconnected_all": "모든 계정 연결 해제됨",
     "disconnected_from": "{{dappHostName}}(으)로부터 연결 해제",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "권한 업데이트됨",
     "nft_detection_enabled": "NFT 자동 감지 켜짐"
   },
   "connect_qr_hardware": {
@@ -1048,8 +1049,8 @@
         "remove_account_snap_warning": {
           "title": "Snap 제거",
           "description": "이 Snap을 제거하면 MetaMask에서 다음 계정들이 제거됩니다.",
-          "remove_account_snap_alert_description_1": "이 Snap을",
-          "remove_account_snap_alert_description_2": "제거하려면 다음을 입력하세요.",
+          "remove_account_snap_alert_description_1": "유형",
+          "remove_account_snap_alert_description_2": "Snap을 제거하기 위한",
           "banner_title": "제거하기 전에 이 Snap으로 생성된 계정에 직접 접근할 수 있는지 확인하세요",
           "cancel_button": "취소",
           "continue_button": "계속",
@@ -1268,12 +1269,12 @@
     "swap": "스와프",
     "bridge": "브릿지",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "이 계정에서는 매수가 지원되지 않음",
+      "sell": "이 계정에서는 매도가 지원되지 않음",
+      "swap": "이 계정에서는 스왑이 지원되지 않음",
+      "bridge": "이 계정에서는 브릿징이 지원되지 않음",
+      "send": "이 계정에서는 전송이 지원되지 않음",
+      "action": "이 계정에서는 이 작업이 지원되지 않습니다"
     },
     "description": "설명",
     "totalSupply": "총 공급",
@@ -1586,7 +1587,7 @@
     "share": "공유",
     "bookmark": "북마크",
     "add_to_favorites": "즐겨찾기에 추가",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "즐겨찾기로 이동",
     "error": "오류",
     "cancel": "취소",
     "go_back": "뒤로 돌아가기",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "승인",
     "tx_review_increase_allowance": "한도 증가",
     "tx_review_set_approval_for_all": "모두 승인 설정",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "스테이킹 청구",
+    "tx_review_staking_deposit": "스테이킹 입금",
+    "tx_review_staking_unstake": "언스테이크",
     "sent_ether": "보낸 에테르",
     "self_sent_ether": "나에게 보낸 에테르",
     "received_ether": "받은 에테르",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "계정 보기 및 트랜잭션 제안",
     "requesting_for": "요청 중: ",
     "requesting_for_accounts": "계정 {{numberOfAccounts}}개 요청 중",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "네트워크 {{numberOfNetworks}}개 요청 중",
+    "n_networks_connect": "네트워크 {{numberOfNetworks}}개 연결됨",
+    "network_connected": "네트워크 연결됨",
     "see_your_accounts": "계정 보기 및 트랜잭션 제안",
     "connected_to": "다음에 연결됨: ",
     "manage_permissions": "권한 관리",
     "edit": "편집",
     "cancel": "취소",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "확인",
+    "connection_details_title": "연결 세부 정보",
+    "connection_details_description": "{{connectionDateTime}}에 MetaMask 브라우저를 이용해 이 사이트에 접속했습니다",
+    "title_add_network_permission": "네트워크 권한 추가",
+    "add_this_network": "이 네트워크 추가",
+    "permitted_networks": "허용된 네트워크",
+    "choose_from_permitted_networks": "허용된 네트워크에서 선택",
+    "this_site_cant": "현재 네트워크에서는 이 사이트를 사용할 수 없습니다. 네트워크 권한을 추가하거나 이미 허용된 네트워크를 선택하세요.",
+    "non_permitted_network_description": "현재 네트워크에서는 이 사이트를 사용할 수 없습니다. 네트워크 권한을 추가하거나 이미 허용된 네트워크를 선택하세요.",
+    "edit_permissions": "권한 수정",
+    "permitted_networks_info_sheet_description": "이는 이전에 이 사이트에서 사용할 수 있는 권한을 부여한 네트워크 목록입니다. 목록에서 한 사이트를 선택하거나 이 사이트에 대한 네트워크 권한을 수정하세요."
   },
   "select": {
     "cancel": "취소",
@@ -2182,7 +2191,7 @@
       "label_swapped": "스왑됨",
       "label_to": "수신:"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "{{address}}에서 {{amount}} {{ticker}} 받음",
     "nft_sent": "{{address}}(으)로 NFT 전송함",
     "erc721_sent": "{{address}}(으)로 NFT 전송함",
     "erc1155_sent": "{{address}}(으)로 NFT 전송함",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "인출 완료!",
     "error_title": "앗, 문제가 발생했습니다 :/",
     "received_title": "{{amount}}의 {{assetType}}(을)를 받았습니다",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "스왑 완료",
+    "erc20_sent_title": "자금 전송됨",
+    "erc20_received_title": "자금 받음",
+    "eth_sent_title": "자금 전송됨",
+    "eth_received_title": "자금 받음",
+    "rocketpool_stake_completed_title": "스테이킹 완료",
+    "rocketpool_unstake_completed_title": "언스테이킹 완료",
+    "lido_stake_completed_title": "스테이킹 완료",
+    "lido_withdrawal_requested_title": "출금 요청됨",
+    "lido_withdrawal_completed_title": "출금 완료",
+    "lido_stake_ready_to_be_withdrawn_title": "스테이킹이 출금 준비됨",
+    "erc721_sent_title": "NFT 전송됨",
+    "erc721_received_title": "NFT 받음",
+    "erc1155_sent_title": "NFT 전송됨",
+    "erc1155_received_title": "NFT 받음",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "탭하여 보기",
     "received_payment_title": "즉시 결제됨",
     "pending_message": "컨펌을 기다리는 중",
     "pending_deposit_message": "입금 완료 대기 중",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "눌러서 이 트랜잭션을 확인하세요",
     "received_message": "눌러서 이 트랜잭션을 확인하세요",
     "received_payment_message": "{{amount}} DAI를 받았습니다",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "일부 ETH를 받았습니다",
+    "metamask_swap_completed_message": "{{symbolIn}}을(를) {{symbolOut}}(으)로 스왑함",
+    "erc20_sent_message": "{{address}}(으)로 전송됨",
+    "erc20_received_message": "{{address}}에서 받음",
+    "eth_sent_message": "{{address}}(으)로 전송됨",
+    "rocketpool_stake_completed_message": "스테이킹 완료",
+    "rocketpool_unstake_completed_message": "언스테이킹 완료",
+    "lido_stake_completed_message": "스테이킹 완료",
+    "lido_withdrawal_requested_message": "언스테이킹 요청됨",
+    "lido_withdrawal_completed_message": "언스테이킹 완료",
+    "lido_stake_ready_to_be_withdrawn_message": "출금 요청됨",
     "push_notification_content": {
       "metamask_swap_completed_title": "스왑 완료",
       "metamask_swap_completed_description": "MetaMask 스왑이 완료되었습니다",
@@ -2292,7 +2301,7 @@
     "wallet": "지갑",
     "web3": "웹3",
     "staking_provider": "스테이킹 공급자",
-    "network_fee_not_available": "네트워크 수수료를 사용할 수 없음",
+    "network_fee_not_available": "네트워크 수수료 확인할 수 없음",
     "empty": {
       "title": "표시할 항목이 없습니다",
       "message": "지갑에 활동이 있으면 여기서 알림을 확인할 수 있습니다. "
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "어떤 오류인지 알려주세요",
     "bug_report_prompt_description": "무엇이 잘못되었는지 파악할 수 있도록 세부 정보를 추가하세요.",
     "bug_report_thanks": "감사합니다! 곧 확인하겠습니다.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "이 오류가 계속 발생하면,",
     "save_seedphrase_2": "비밀복구구문을 저장하고",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "앱을 재설치하세요. 중요: 비밀복구구문이 없으면 지갑을 복구할 수 없습니다.",
     "copied_clipboard": "클립보드에 복사되었습니다",
     "ok": "확인",
     "cancel": "취소",
     "send": "전송",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "제출",
+    "modal_title": "오류에 대해 설명해 주세요",
+    "modal_placeholder": "버그를 재현할 수 있는 방법 등 자세한 정보를 알려주시면 문제를 해결하는 데 도움이 됩니다.",
+    "error_message": "오류 메시지:",
+    "copy": "복사",
+    "describe": "오류에 대해 설명해 주세요",
+    "try_again": "다시 시도",
+    "contact_support": "문의하기"
   },
   "whats_new": {
     "title": "새로운 소식",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "블라인드 서명 오류",
     "blind_sign_error_message": "Ledger 장치에서 블라인드 서명이 활성화되어 있지 않습니다. 설정에서 활성화해 주세요.",
     "user_reject_transaction": "사용자가 트랜잭션을 거부했습니다",
-    "user_reject_transaction_message": "사용자가 Ledger 장치에서 트랜잭션을 거부했습니다."
+    "user_reject_transaction_message": "사용자가 Ledger 장치에서 트랜잭션을 거부했습니다.",
+    "multiple_devices_error_message": "다중 장치는 아직 지원되지 않습니다. 새 Ledger 장치를 추가하려면 이전 이전 장치를 제거해야 합니다.",
+    "hd_path_error": "HD 경로가 유효하지 않습니다: {{path}}",
+    "unspecified_error_during_connect": "Ledger 하드웨어 연결 시 불특정 오류가 발생했습니다,",
+    "account_name_existed": "{{accountName}} 계정이 이미 존재합니다"
   },
   "account_actions": {
     "edit_name": "계정 이름 편집",
@@ -3337,7 +3350,9 @@
     "add_account": "계정 추가",
     "add_new_account": "신규 계정 추가",
     "add_hardware_wallet": "하드웨어 지갑 추가",
-    "import_account": "계정 가져오기"
+    "import_account": "계정 가져오기",
+    "add_bitcoin_account_testnet": "새 비트코인 계정(테스트넷) 추가",
+    "add_bitcoin_account_mainnet": "새 비트코인 계정(베타) 추가"
   },
   "show_nft": {
     "show_nft_title": "NFT 표시",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "ETH 보상 획득",
     "earn_eth_rewards_description": "스테이킹하는 즉시 적립을 시작하세요. 보상은 복리로 자동 적립됩니다.",
     "flexible_unstaking": "유연한 언스테이킹",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "언제든지 언스테이킹할 수 있습니다. 보통 3일 이내에 처리되지만, 최대 11일까지 소요될 수 있습니다.",
     "disclaimer": "스테이킹은 보상을 보장하지 않으며 자금 손실 등의 위험이 있습니다.",
     "learn_more": "더 보기",
     "got_it": "확인",
@@ -3442,7 +3457,7 @@
         "base": "{{amountEth}} ETH 언스테이킹이 진행 중입니다. 나중에",
         "and": "돌아와서",
         "to_claim_it": "청구하세요.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "{{amountEth}} ETH 언스테이킹이 진행 중입니다. 며칠 후에 다시 방문하여 청구하세요."
       },
       "geo_blocked": "언스테이킹 또는 스테이킹이 허용되지 않는 지역에 거주하고 있습니다.",
       "approximately": "대략"
@@ -3462,14 +3477,14 @@
     "up_to_n": "최대 {{count}}",
     "unstaking_to": "언스테이킹 대상",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "최대",
+      "description": "최대는 보유한 ETH 총액에서 스테이킹에 필요한 가스비를 뺀 것입니다. 향후 트랜잭션을 위해 지갑에 여분의 ETH를 보관해 두는 것이 좋습니다."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "최대 사용",
+    "estimated_unstaking_time": "1일~11일",
+    "proceed_anyway": "계속 진행",
+    "gas_cost_impact": "가스 비용 영향",
+    "gas_cost_impact_warning": "경고: 트랜잭션의 가스 비용이 입금액의 30% 이상을 차지하게 됩니다."
   },
   "default_settings": {
     "title": "지갑이 준비되었습니다",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "언스테이킹 시간",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "보통 ETH 언스테이킹은 3일 이내에 처리되지만, 최대 11일까지 걸릴 수도 있습니다. 정확한 기간은 언스테이킹 금액과 ETH 스테이킹 활동에 따라 달라집니다."
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "결과가 변경되었습니다",
+    "description": "이 트랜잭션의 예상 변경 사항이 업데이트되었습니다. 계속 진행하기 전에 자세히 검토하세요.",
+    "proceed": "진행",
+    "reject": "트랜잭션 거부"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "MetaMask에 계정 추가",
+    "input_title": "계정 이름",
+    "add_account_button": "계정 추가",
+    "name_taken_message": "이미 존재하는 계정 이름입니다"
   }
 }
diff --git a/locales/languages/pt.json b/locales/languages/pt.json
index bdffcfbb85b..7f4891b9004 100644
--- a/locales/languages/pt.json
+++ b/locales/languages/pt.json
@@ -439,9 +439,9 @@
     },
     "import": "Importar",
     "sort_by": "Classificar por",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Filtrar por",
+    "current_network": "Redes atuais",
+    "all_networks": "Todas as redes",
     "declining_balance": "Saldo decrescente ({{currency}} alto-baixo)",
     "alphabetically": "Em ordem alfabética (A-Z)",
     "add_to_get_started": "Adicione criptomoedas para começar",
@@ -470,6 +470,7 @@
     "learn_more": "Saiba mais",
     "add_collectibles": "Importar NFTs",
     "no_transactions": "Você não tem nenhuma transação!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Enviar",
     "deposit_button": "Depositar",
     "copy_address": "Copiar",
@@ -722,18 +723,18 @@
     "now_active": "agora ativa.",
     "network_added": "foi adicionada com sucesso",
     "network_deleted": "foi excluída com sucesso",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Permissões de rede atualizadas",
     "revoked": "revogada.",
     "revoked_all": "Todas as contas revogadas.",
     "accounts_connected": "contas conectadas.",
     "account_connected": "conta conectada.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Permissões de contas atualizadas",
     "accounts_disconnected": "contas desconectadas.",
     "account_disconnected": "conta desconectada.",
     "disconnected": "desconectada.",
     "disconnected_all": "Todas as contas estão desconectadas.",
     "disconnected_from": "Desconectado do {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Permissões atualizadas",
     "nft_detection_enabled": "Detecção automática de NFT ativada"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Troca",
     "bridge": "Ponte",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Não há suporte para compras nesta conta",
+      "sell": "Não há suporte para vendas nesta conta",
+      "swap": "Não há suporte para swaps nesta conta",
+      "bridge": "Não há suporte para pontes nesta conta",
+      "send": "Não há suporte para envios nesta conta",
+      "action": "Não há suporte para esta ação nesta conta"
     },
     "description": "Descrição",
     "totalSupply": "Emissão total",
@@ -1586,7 +1587,7 @@
     "share": "Compartilhar",
     "bookmark": "Favoritos",
     "add_to_favorites": "Adicionar aos favoritos",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Ir aos favoritos",
     "error": "Erro",
     "cancel": "Cancelar",
     "go_back": "Voltar",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Aprovar",
     "tx_review_increase_allowance": "Aumentar permissão",
     "tx_review_set_approval_for_all": "Definir aprovação para todos",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Solicitação de staking",
+    "tx_review_staking_deposit": "Depósito em staking",
+    "tx_review_staking_unstake": "Retirar do staking",
     "sent_ether": "Ethers enviados",
     "self_sent_ether": "Ethers enviados a si mesmo",
     "received_ether": "Ethers recebidos",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Ver suas contas e sugerir transações",
     "requesting_for": "Solicitando para ",
     "requesting_for_accounts": "Solicitando {{numberOfAccounts}} contas",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Solicitando para {{numberOfNetworks}} redes",
+    "n_networks_connect": "{{numberOfNetworks}} redes conectadas ",
+    "network_connected": "rede conectada",
     "see_your_accounts": "Ver suas contas e sugerir transações",
     "connected_to": "Conectado ao ",
     "manage_permissions": "Gerenciar permissões",
     "edit": "Editar",
     "cancel": "Cancelar",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Entendi",
+    "connection_details_title": "Detalhes da conexão",
+    "connection_details_description": "Você se conectou a este site usando o navegador da MetaMask em {{connectionDateTime}}",
+    "title_add_network_permission": "Adicionar permissão de rede",
+    "add_this_network": "Adicionar esta rede",
+    "permitted_networks": "Redes permitidas",
+    "choose_from_permitted_networks": "Escolha entre as redes permitidas",
+    "this_site_cant": "Este site não pode ser usado com a sua rede atual. Adicione permissões de rede ou escolha uma rede já permitida.",
+    "non_permitted_network_description": "Este site não pode ser usado com a sua rede atual. Adicione permissões de rede ou escolha uma rede já permitida.",
+    "edit_permissions": "Editar permissões",
+    "permitted_networks_info_sheet_description": "Esta é uma lista de redes às quais você já concedeu permissões para uso neste site. Selecione uma rede na lista ou edite as permissões de rede para este site."
   },
   "select": {
     "cancel": "Cancelar",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Trocado",
       "label_to": "Para"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Recebeu {{amount}} {{ticker}} de {{address}}",
     "nft_sent": "Enviou NFT para {{address}}",
     "erc721_sent": "Enviou NFT para {{address}}",
     "erc1155_sent": "Enviou NFT para {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Retirada concluída!",
     "error_title": "Ops, ocorreu um erro :/",
     "received_title": "Você recebeu {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Swap concluído",
+    "erc20_sent_title": "Fundos enviados",
+    "erc20_received_title": "Fundos recebidos",
+    "eth_sent_title": "Fundos enviados",
+    "eth_received_title": "Fundos recebidos",
+    "rocketpool_stake_completed_title": "Staking concluído",
+    "rocketpool_unstake_completed_title": "Retirada de staking concluída",
+    "lido_stake_completed_title": "Staking concluído",
+    "lido_withdrawal_requested_title": "Saque solicitado",
+    "lido_withdrawal_completed_title": "Saque concluído",
+    "lido_stake_ready_to_be_withdrawn_title": "Staking pronto para ser sacado ",
+    "erc721_sent_title": "NFT enviado",
+    "erc721_received_title": "NFT recebido",
+    "erc1155_sent_title": "NFT enviado",
+    "erc1155_received_title": "NFT recebido",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Toque para ver",
     "received_payment_title": "Pagamento instantâneo recebido",
     "pending_message": "Aguardando confirmação",
     "pending_deposit_message": "Aguardando conclusão do depósito",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Toque para ver essa transação",
     "received_message": "Toque para ver essa transação",
     "received_payment_message": "Você recebeu {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Você recebeu algum ETH",
+    "metamask_swap_completed_message": "Realizado swap de {{symbolIn}} por {{symbolOut}}",
+    "erc20_sent_message": "Enviou para {{address}}",
+    "erc20_received_message": "Recebeu de {{address}}",
+    "eth_sent_message": "Enviou para {{address}}",
+    "rocketpool_stake_completed_message": "Em staking",
+    "rocketpool_unstake_completed_message": "Retirada de staking concluída",
+    "lido_stake_completed_message": "Em staking",
+    "lido_withdrawal_requested_message": "Retirada de staking solicitada",
+    "lido_withdrawal_completed_message": "Retirada de staking concluída",
+    "lido_stake_ready_to_be_withdrawn_message": "Saque solicitado",
     "push_notification_content": {
       "metamask_swap_completed_title": "Troca concluída",
       "metamask_swap_completed_description": "Sua troca na MetaMask foi bem-sucedida",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Conte-nos o que aconteceu",
     "bug_report_prompt_description": "Adicione detalhes para que possamos descobrir o que deu errado.",
     "bug_report_thanks": "Obrigado! Vamos verificar em breve.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Se continuar recebendo este erro,",
     "save_seedphrase_2": "salve sua Frase de Recuperação Secreta",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "e reinstale o app. Lembre-se: sem sua Frase de Recuperação Secreta, você não consegue restaurar sua carteira.",
     "copied_clipboard": "Copiada para a área de transferência",
     "ok": "OK",
     "cancel": "Cancelar",
     "send": "Enviar",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Enviar",
+    "modal_title": "Descreva o que aconteceu",
+    "modal_placeholder": "Compartilhar detalhes como a forma de reproduzir o erro nos ajudará a corrigir o problema.",
+    "error_message": "Mensagem de erro:",
+    "copy": "Copiar",
+    "describe": "Descreva o que aconteceu",
+    "try_again": "Tentar novamente",
+    "contact_support": "Falar com o suporte"
   },
   "whats_new": {
     "title": "Novidades",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Erro de assinatura cega",
     "blind_sign_error_message": "A assinatura cega não está habilitada em seu dispositivo Ledger. Acesse as configurações para habilitá-la.",
     "user_reject_transaction": "O usuário rejeitou a transação",
-    "user_reject_transaction_message": "O usuário rejeitou a transação no dispositivo Ledger."
+    "user_reject_transaction_message": "O usuário rejeitou a transação no dispositivo Ledger.",
+    "multiple_devices_error_message": "Ainda não há suporte a múltiplos dispositivos. Para adicionar um novo dispositivo Ledger, você precisará remover o antigo.",
+    "hd_path_error": "O caminho HD é inválido: {{path}}",
+    "unspecified_error_during_connect": "Erro não especificado ao conectar o hardware Ledger,",
+    "account_name_existed": "A conta {{accountName}} já existe"
   },
   "account_actions": {
     "edit_name": "Editar nome da conta",
@@ -3337,7 +3350,9 @@
     "add_account": "Adicionar conta",
     "add_new_account": "Adicionar nova conta",
     "add_hardware_wallet": "Adicionar carteira de hardware",
-    "import_account": "Importar conta"
+    "import_account": "Importar conta",
+    "add_bitcoin_account_testnet": "Adicionar uma nova conta Bitcoin (testnet)",
+    "add_bitcoin_account_mainnet": "Adicionar uma nova conta Bitcoin (beta)"
   },
   "show_nft": {
     "show_nft_title": "Exibir NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Ganhe recompensas em ETH",
     "earn_eth_rewards_description": "Comece a ganhar assim que fizer staking. As recompensas são automáticas e compostas.",
     "flexible_unstaking": "Retirada flexível de staking",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Retire do staking quando quiser. Normalmente, leva menos de 3 dias, mas pode levar até 11 dias para processar.",
     "disclaimer": "O staking não garante recompensas e envolve riscos, incluindo perda de fundos.",
     "learn_more": "Saiba mais",
     "got_it": "Entendi",
@@ -3442,7 +3457,7 @@
         "base": "Retirando {{amountEth}} ETH do staking. Volte em",
         "and": "e",
         "to_claim_it": "para solicitar.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Retirando {{amountEth}} ETH do staking. Volte em alguns dias para solicitá-lo."
       },
       "geo_blocked": "Você está localizado em uma região onde não é permitido retirar ou fazer staking.",
       "approximately": "aproximadamente"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Até {{count}}",
     "unstaking_to": "Retirada de staking para",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Máx.",
+      "description": "Máx. é o valor total de ETH que você tem, menos a taxa de gás necessária para o staking. É uma boa ideia guardar algum ETH extra em sua carteira para futuras transações."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Usar máx.",
+    "estimated_unstaking_time": "1 a 11 dias",
+    "proceed_anyway": "Prosseguir mesmo assim",
+    "gas_cost_impact": "Impacto no custo do gás",
+    "gas_cost_impact_warning": "Aviso: o custo de gás da transação representará mais de 30% do seu depósito."
   },
   "default_settings": {
     "title": "Sua carteira está pronta",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Prazo para retirada de staking",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Normalmente leva menos de 3 dias para retirar seu ETH do staking, mas pode levar até 11 dias para processar. O período exato depende do valor que você retirar do staking e da atividade de staking de ETH."
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Os resultados mudaram",
+    "description": "As mudanças estimadas para esta transação foram atualizadas. Revise com atenção antes de prosseguir.",
+    "proceed": "Prosseguir",
+    "reject": "Rejeitar a transação"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Adicionar conta à MetaMask",
+    "input_title": "Nome da conta",
+    "add_account_button": "Adicionar conta",
+    "name_taken_message": "Este nome de conta já existe"
   }
 }
diff --git a/locales/languages/ru.json b/locales/languages/ru.json
index c3e0c38e8fb..44cbd3e2bdf 100644
--- a/locales/languages/ru.json
+++ b/locales/languages/ru.json
@@ -439,9 +439,9 @@
     },
     "import": "Импорт",
     "sort_by": "Сортировать по",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Фильтровать по",
+    "current_network": "Текущая сеть",
+    "all_networks": "Все сети",
     "declining_balance": "Уменьшающийся баланс (максимум-минимум {{currency}})",
     "alphabetically": "По алфавиту (A-Z/А-Я)",
     "add_to_get_started": "Добавьте криптовалюту, чтобы начать",
@@ -470,6 +470,7 @@
     "learn_more": "Подробнее",
     "add_collectibles": "Импорт NFT",
     "no_transactions": "У вас нет транзакций!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Отправить",
     "deposit_button": "Депозит",
     "copy_address": "Копировать",
@@ -722,18 +723,18 @@
     "now_active": "сейчас активен.",
     "network_added": "успешно добавлена",
     "network_deleted": "успешно удален",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Сетевые разрешения обновлены",
     "revoked": "отозван.",
     "revoked_all": "Все счета отозваны.",
     "accounts_connected": "счета подключены.",
     "account_connected": "счет подключен.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Разрешения для счетов обновлены",
     "accounts_disconnected": "счета отключены.",
     "account_disconnected": "счет отключен.",
     "disconnected": "отключен.",
     "disconnected_all": "Все счета отключены.",
     "disconnected_from": "Отключен(-а) от {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Разрешения обновлены",
     "nft_detection_enabled": "Автоопределение NFT включено"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Своп",
     "bridge": "Мост",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Этот счет не поддерживает покупку",
+      "sell": "Этот счет не поддерживает продажу",
+      "swap": "Этот счет не поддерживает обмен",
+      "bridge": "Этот счет не поддерживает создание моста",
+      "send": "Этот счет не поддерживает отправку",
+      "action": "Этот счет не поддерживает создание данное действие"
     },
     "description": "Описание",
     "totalSupply": "Общий объем предложения",
@@ -1586,7 +1587,7 @@
     "share": "Поделиться",
     "bookmark": "Закладка",
     "add_to_favorites": "Добавить в Избранное",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Перейти в Избранное",
     "error": "Ошибка",
     "cancel": "Отмена",
     "go_back": "Назад",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Одобрить",
     "tx_review_increase_allowance": "Увеличить допуск",
     "tx_review_set_approval_for_all": "Одобрить все",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Получение стейкинга",
+    "tx_review_staking_deposit": "Депозит для стейкинга",
+    "tx_review_staking_unstake": "Отменить стейкинг",
     "sent_ether": "Отправлен эфир",
     "self_sent_ether": "Отправил(-а) себе эфир",
     "received_ether": "Получен эфир",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Просматривать ваши счета и предлагать транзакции",
     "requesting_for": "Запрашивается для ",
     "requesting_for_accounts": "Запрос {{numberOfAccounts}} счетов",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Выполняется запрос к {{numberOfNetworks}} сетям",
+    "n_networks_connect": "Подключено {{numberOfNetworks}} сети(-ей) ",
+    "network_connected": "сеть подключена ",
     "see_your_accounts": "Просматривать ваши счета и предлагать транзакции",
     "connected_to": "Подключен к ",
     "manage_permissions": "Управление разрешениями",
     "edit": "Изменить",
     "cancel": "Отмена",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Понятно",
+    "connection_details_title": "Сведения о подключении",
+    "connection_details_description": "Вы подключились к этому сайту с помощью браузера MetaMask {{connectionDateTime}}",
+    "title_add_network_permission": "Добавить сетевое разрешение",
+    "add_this_network": "Добавить эту сеть",
+    "permitted_networks": "Разрешенные сети",
+    "choose_from_permitted_networks": "Выбрать из разрешенных сетей",
+    "this_site_cant": "Этот сайт нельзя использовать в вашей текущей сети. Добавьте сетевые разрешения или выберите уже разрешенную сеть.",
+    "non_permitted_network_description": "Этот сайт нельзя использовать в вашей текущей сети. Добавьте сетевые разрешения или выберите уже разрешенную сеть.",
+    "edit_permissions": "Изменить разрешения",
+    "permitted_networks_info_sheet_description": "Это список сетей, которым вы ранее предоставили разрешения на использование на этом сайте. Выберите один из списка или измените сетевые разрешения для этого сайта."
   },
   "select": {
     "cancel": "Отмена",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Обмен выполнен",
       "label_to": "В"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Получено {{amount}} {{ticker}} от {{address}}",
     "nft_sent": "Отправил(-а) NFT на {{address}}",
     "erc721_sent": "Отправил(-а) NFT на {{address}}",
     "erc1155_sent": "Отправил(-а) NFT на {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Вывод средств завершен!",
     "error_title": "Ой, что-то пошло не так :/",
     "received_title": "Вы получили {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Обмен выполнен",
+    "erc20_sent_title": "Средства отправлены",
+    "erc20_received_title": "Средства получены",
+    "eth_sent_title": "Средства отправлены",
+    "eth_received_title": "Средства получены",
+    "rocketpool_stake_completed_title": "Стейкинг завершен",
+    "rocketpool_unstake_completed_title": "Отмена стейкинга завершена",
+    "lido_stake_completed_title": "Стейкинг завершен",
+    "lido_withdrawal_requested_title": "Запрошен вывод средств",
+    "lido_withdrawal_completed_title": "Вывод средств завершен",
+    "lido_stake_ready_to_be_withdrawn_title": "Стейкинг готов к выводу ",
+    "erc721_sent_title": "NFT отправлен",
+    "erc721_received_title": "NFT получен",
+    "erc1155_sent_title": "NFT отправлен",
+    "erc1155_received_title": "NFT получен",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Нажмите для просмотра",
     "received_payment_title": "Получен мгновенный платеж",
     "pending_message": "Ожидает подтверждения",
     "pending_deposit_message": "Ожидание завершения внесения депозита",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Нажмите для просмотра этой транзакции",
     "received_message": "Нажмите для просмотра этой транзакции",
     "received_payment_message": "Вы получили {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Вы получили немного ETH",
+    "metamask_swap_completed_message": "{{symbolIn}} обменян на {{symbolOut}}",
+    "erc20_sent_message": "Отправлено на {{address}}",
+    "erc20_received_message": "Получено от {{address}}",
+    "eth_sent_message": "Отправлено на {{address}}",
+    "rocketpool_stake_completed_message": "В стейкинге",
+    "rocketpool_unstake_completed_message": "Отмена стейкинга завершена",
+    "lido_stake_completed_message": "В стейкинге",
+    "lido_withdrawal_requested_message": "Запрошена отмена стейкинга",
+    "lido_withdrawal_completed_message": "Отмена стейкинга завершена",
+    "lido_stake_ready_to_be_withdrawn_message": "Запрошен вывод средств",
     "push_notification_content": {
       "metamask_swap_completed_title": "Своп выполнен",
       "metamask_swap_completed_description": "Ваш своп MetaMask успешно выполнен",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Расскажите нам, что случилось",
     "bug_report_prompt_description": "Добавьте детали, чтобы мы могли понять, что пошло не так.",
     "bug_report_thanks": "Спасибо! Мы скоро рассмотрим этот вопрос.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Если вы продолжаете получать эту ошибку,",
     "save_seedphrase_2": "сохраните свою секретную фразу для восстановления",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "и переустановите приложение. Помните: без секретной фразы для восстановления вы не сможете восстановить свой кошелек.",
     "copied_clipboard": "Скопирована в буфер обмена",
     "ok": "ОК",
     "cancel": "Отмена",
     "send": "Отправить",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Отправить",
+    "modal_title": "Опишите, что произошло",
+    "modal_placeholder": "Предоставление подробной информации, например, о том, как мы можем воспроизвести ошибку, поможет нам решить проблему.",
+    "error_message": "Сообщение об ошибке:",
+    "copy": "Копировать",
+    "describe": "Опишите, что произошло",
+    "try_again": "Повторить попытку",
+    "contact_support": "Связаться со службой поддержки"
   },
   "whats_new": {
     "title": "Что нового",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Ошибка слепого подписания",
     "blind_sign_error_message": "Слепое подписание не включено на вашем устройстве Ledger. Включите его в настройках.",
     "user_reject_transaction": "Пользователь отклонил транзакцию",
-    "user_reject_transaction_message": "Пользователь отклонил транзакцию на устройстве Ledger."
+    "user_reject_transaction_message": "Пользователь отклонил транзакцию на устройстве Ledger.",
+    "multiple_devices_error_message": "Несколько устройств пока не поддерживаются. Чтобы добавить новое устройство Ledger, вам необходимо удалить старое.",
+    "hd_path_error": "Неверный путь к оборудованию: {{path}}",
+    "unspecified_error_during_connect": "Неизвестная ошибка при подключении оборудования Ledger,",
+    "account_name_existed": "Счет {{accountName}} уже существует"
   },
   "account_actions": {
     "edit_name": "Изменить имя счета",
@@ -3337,7 +3350,9 @@
     "add_account": "Добавить счет",
     "add_new_account": "Добавить новый счет",
     "add_hardware_wallet": "Добавить аппаратный кошелек",
-    "import_account": "Импорт счета"
+    "import_account": "Импорт счета",
+    "add_bitcoin_account_testnet": "Добавить новый счет Биткойн (тестнет)",
+    "add_bitcoin_account_mainnet": "Добавить новый счет Биткойн (бета-версия)"
   },
   "show_nft": {
     "show_nft_title": "Показать NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Зарабатывайте вознаграждения в ETH",
     "earn_eth_rewards_description": "Начните зарабатывать сразу же после начала стейкинга. Вознаграждения суммируются автоматически.",
     "flexible_unstaking": "Гибкая отмена стейкинга",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Отменяйте стейкинг в любое время. Обычно обработка занимает менее 3 дней, но может занять до 11 дней.",
     "disclaimer": "Стейкинг не гарантирует вознаграждение и сопряжен с рисками, включая потерю средств.",
     "learn_more": "Подробнее",
     "got_it": "Понятно",
@@ -3442,7 +3457,7 @@
         "base": "Выполняется отмена стейкинга {{amountEth}}. Возвращайтесь через",
         "and": "и",
         "to_claim_it": "для востребования.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Выполняется отмена стейкинга {{amountEth}} ETH. Возвращайтесь через несколько дней для их получения."
       },
       "geo_blocked": "Вы находитесь в регионе, где отмена стейкинга или стейкинг запрещен(-а).",
       "approximately": "примерно"
@@ -3462,14 +3477,14 @@
     "up_to_n": "До {{count}}",
     "unstaking_to": "Отмена стейкинга в",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Максимум",
+      "description": "«Максимум» — это общая сумма ETH, которая у вас есть, за вычетом комиссии за газ, необходимой для стейкинга. Рекомендуется сохранить немного ETH в своем кошельке для будущих транзакций."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Использовать максимум",
+    "estimated_unstaking_time": "от 1 до 11 дней",
+    "proceed_anyway": "Все равно продолжить",
+    "gas_cost_impact": "Влияние стоимости газа",
+    "gas_cost_impact_warning": "Внимание: стоимость газа за транзакцию составит более 30% от вашего депозита."
   },
   "default_settings": {
     "title": "Ваш кошелек готов",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Время отмены стейкинга",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Обычно отмена стейкинга вашего ETH занимает менее 3 дней, но обработка может занять до 11 дней. Точная продолжительность зависит от суммы, которую вы выподите из стейкинга и активности по стейкингу в ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Результаты изменились",
+    "description": "Предполагаемые изменения для этой транзакции обновлены. Прежде чем продолжить, внимательно просмотрите их.",
+    "proceed": "Продолжить",
+    "reject": "Отклонить транзакцию"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Добавить счет в MetaMask",
+    "input_title": "Имя счета",
+    "add_account_button": "Добавить счет",
+    "name_taken_message": "Имя этого счета уже существует"
   }
 }
diff --git a/locales/languages/tl.json b/locales/languages/tl.json
index f0588e1f4b8..2638e7ef384 100644
--- a/locales/languages/tl.json
+++ b/locales/languages/tl.json
@@ -439,9 +439,9 @@
     },
     "import": "I-import",
     "sort_by": "I-sort ayon sa",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "I-filter ayon sa",
+    "current_network": "Kasalukuyang Network",
+    "all_networks": "Lahat ng Network",
     "declining_balance": "Bumababa ang balanse ({{currency}} high-low)",
     "alphabetically": "Paalpabeto (A-Z)",
     "add_to_get_started": "Magdagdag ng crypto upang makapagsimula",
@@ -470,6 +470,7 @@
     "learn_more": "Matuto pa",
     "add_collectibles": "Mag-import ng mga NFT",
     "no_transactions": "Wala kang transaksyon!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Magpadala",
     "deposit_button": "Magdeposito",
     "copy_address": "Kopyahin",
@@ -722,18 +723,18 @@
     "now_active": "aktibo ngayon.",
     "network_added": "matagumpay na naidagdag",
     "network_deleted": "matagumpay na natanggal",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Na-update ang mga pahintulot sa network",
     "revoked": "binawi.",
     "revoked_all": "Ang lahat ng account ay binawi.",
     "accounts_connected": "mga account na konektado.",
     "account_connected": "nakakonekta na ang account.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Na-update ang mga pahintulot sa mga account",
     "accounts_disconnected": "nadiskonekta na ang mga account.",
     "account_disconnected": "nadiskonekta na ang account.",
     "disconnected": "nadiskonekta.",
     "disconnected_all": "Nadiskonekta ang lahat ng account.",
     "disconnected_from": "Nadiskonekta mula sa {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Na-update ang mga pahintulot",
     "nft_detection_enabled": "Pinagana ang autodetection ng NFT"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "I-swap",
     "bridge": "Bridge",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Hindi sinusuportahan ang pagbili para sa account na ito",
+      "sell": "Hindi sinusuportahan ang pagbebenta para sa account na ito",
+      "swap": "Hindi sinusuportahan ang pag-swap para sa account na ito",
+      "bridge": "Hindi sinusuportahan ang pag-bridge para sa account na ito",
+      "send": "Hindi sinusuportahan ang pagpapadala para sa account na ito",
+      "action": "Hindi sinusuportahan ang aksyong ito para sa account na ito"
     },
     "description": "Deskripsyon",
     "totalSupply": "Kabuuang Supply",
@@ -1586,7 +1587,7 @@
     "share": "Ibahagi",
     "bookmark": "Bookmark",
     "add_to_favorites": "Idagdag sa Mga Paborito",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Pumunta sa Mga Paborito",
     "error": "Error",
     "cancel": "Kanselahin",
     "go_back": "Bumalik",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Aprubahan",
     "tx_review_increase_allowance": "Dagdag na Allowance",
     "tx_review_set_approval_for_all": "Itakda ang Pag-apruba Para sa Lahat",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Claim sa Pag-stake",
+    "tx_review_staking_deposit": "Deposito sa Pag-stake",
+    "tx_review_staking_unstake": "I-unstake",
     "sent_ether": "Nagpadala ng Ether",
     "self_sent_ether": "Nagpadala ka sa sarili mo ng Ether",
     "received_ether": "Nakatanggap ng Ether",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Tingnan ang mga account mo at magmungkahi ng mga transaksyon",
     "requesting_for": "Humihiling para sa ",
     "requesting_for_accounts": "Hinihiling para sa {{numberOfAccounts}} (na) account",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Humihiling para sa {{numberOfNetworks}} (na) network",
+    "n_networks_connect": "{{numberOfNetworks}} (na) network ang konektado ",
+    "network_connected": "konektado ang network ",
     "see_your_accounts": "Tingnan ang mga account mo at magmungkahi ng mga transaksyon",
     "connected_to": "Nakakonekta sa ",
     "manage_permissions": "Pamahalaan ang mga Pahintulot",
     "edit": "I-edit",
     "cancel": "Kanselahin",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Nakuha ko",
+    "connection_details_title": "Mga Detalye ng Koneksyon",
+    "connection_details_description": "Kumonekta ka sa site na ito gamit ang MetaMask browser noong {{connectionDateTime}}",
+    "title_add_network_permission": "Magdagdag ng pahintulot ng network",
+    "add_this_network": "Idagdag ang network na ito",
+    "permitted_networks": "Mga pinapahintulutang network",
+    "choose_from_permitted_networks": "Pumili mula sa mga pinahihintulutang network",
+    "this_site_cant": "Hindi magagamit ang site na ito sa kasalukuyan mong network. Magdagdag ng mga pahintulot sa network o pumili ng dati nang pinahihintulutang network.",
+    "non_permitted_network_description": "Hindi magagamit ang site na ito sa kasalukuyan mong network. Magdagdag ng mga pahintulot sa network o pumili ng dati nang pinahihintulutang network.",
+    "edit_permissions": "Mag-edit ng mga pahintulot",
+    "permitted_networks_info_sheet_description": "Isa itong listahan ng mga network na binigyan mo ng mga pahintulot na gamitin sa site na ito. Pumili ng isa mula sa listahan o i-edit ang mga pahintulot sa network para sa site na ito."
   },
   "select": {
     "cancel": "Kanselahin",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Nai-swap",
       "label_to": "Sa/Kay"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Nakatanggap ng {{amount}} {{ticker}} mula sa {{address}}",
     "nft_sent": "Ipinadala ang NFT sa {{address}}",
     "erc721_sent": "Ipinadala ang NFT sa {{address}}",
     "erc1155_sent": "Ipinadala ang NFT sa {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Tapos nang Mag-withdraw!",
     "error_title": "Ooops, nagkaproblema :/",
     "received_title": "Nakatanggap ka ng {{amount}}{{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Nakumpleto ang pag-swap",
+    "erc20_sent_title": "Naipadala ang pondo",
+    "erc20_received_title": "Natanggap ang pondo",
+    "eth_sent_title": "Naipadala ang pondo",
+    "eth_received_title": "Natanggap ang pondo",
+    "rocketpool_stake_completed_title": "Nakumpleto ang pag-stake",
+    "rocketpool_unstake_completed_title": "Nakumpleto ang pag-unstake",
+    "lido_stake_completed_title": "Nakumpleto ang pag-stake",
+    "lido_withdrawal_requested_title": "Hiniling ang pag-withdraw",
+    "lido_withdrawal_completed_title": "Nakumpleto ang pag-withdraw",
+    "lido_stake_ready_to_be_withdrawn_title": "Handa nang i-withdraw ang stake ",
+    "erc721_sent_title": "Naipadala ang NFT",
+    "erc721_received_title": "Natanggap ang NFT",
+    "erc1155_sent_title": "Naipadala ang NFT",
+    "erc1155_received_title": "Natanggap ang NFT",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "I-tap para tingnan",
     "received_payment_title": "Natanggap ang instant na bayad",
     "pending_message": "Naghihintay ng kumpirmasyon",
     "pending_deposit_message": "Hinihintay na matapos magdeposito",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Mag-tap para tingnan ang transaksyong ito",
     "received_message": "Mag-tap para tingnan ang transaksyong ito",
     "received_payment_message": "Nakatanggap ka ng {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Nakatanggap ka ng ilang ETH",
+    "metamask_swap_completed_message": "Nai-swap ang {{symbolIn}} sa {{symbolOut}}",
+    "erc20_sent_message": "Ipinadala sa {{address}}",
+    "erc20_received_message": "Natanggap mula sa {{address}}",
+    "eth_sent_message": "Ipinadala sa {{address}}",
+    "rocketpool_stake_completed_message": "Nai-stake",
+    "rocketpool_unstake_completed_message": "Nakumpleto ang pag-unstake",
+    "lido_stake_completed_message": "Nai-stake",
+    "lido_withdrawal_requested_message": "Hiniling ang pag-unstake",
+    "lido_withdrawal_completed_message": "Nakumpleto ang pag-unstake",
+    "lido_stake_ready_to_be_withdrawn_message": "Hiniling ang pag-withdraw",
     "push_notification_content": {
       "metamask_swap_completed_title": "Nakumpleto ang pag-swap",
       "metamask_swap_completed_description": "Matagumpay ang Pag-swap mo sa MetaMask",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Sabihin mo sa amin kung anong nangyari",
     "bug_report_prompt_description": "Magdagdag ng mga detalye upang malaman namin ano ang nangyari.",
     "bug_report_thanks": "Salamat! Titingnan namin ito sa lalong madaling panahon.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Kung patuloy mong nakukuha ang error na ito,",
     "save_seedphrase_2": "i-save ang iyong Lihim na Parirala sa Pagbawi",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "at i-install ulit ang app. Tandaan: kung wala kang Lihim na Parirala sa Pagbawi, hindi mo maibabalik ang wallet mo.",
     "copied_clipboard": "Nakopya sa clipboard",
     "ok": "OK",
     "cancel": "Kanselahin",
     "send": "Ipadala",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Isumite",
+    "modal_title": "Ilarawan kung ano ang nangyari",
+    "modal_placeholder": "Matutulungan mo kaming ayusin ang problema kapag nagbahagi ka ng mga detalye gaya ng kung paano namin mare-reproduce ang bug.",
+    "error_message": "Mensahe ng error:",
+    "copy": "Kopyahin",
+    "describe": "Ilarawan kung ano ang nangyari",
+    "try_again": "Subukan ulit",
+    "contact_support": "Makipag-ugnayan sa suporta"
   },
   "whats_new": {
     "title": "Ano'ng bago",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Nag-error ang blind signing",
     "blind_sign_error_message": "Hindi pinapagana ang blind signing sa Ledger device mo. Pakisuyong paganahin ito sa settings.",
     "user_reject_transaction": "Tinanggihan ng user ang transaksyon",
-    "user_reject_transaction_message": "Tinanggihan ng user ang transaksyon sa Ledger device."
+    "user_reject_transaction_message": "Tinanggihan ng user ang transaksyon sa Ledger device.",
+    "multiple_devices_error_message": "Hindi pa sinusuportahan ang maraming device. Para magdagdag ng bagong Ledger device, kakailanganin mong mag-alis ng lumang device.",
+    "hd_path_error": "HD Path is invalid: {{path}}",
+    "unspecified_error_during_connect": "Unspecified error when connect Ledger Hardware,",
+    "account_name_existed": "Account {{accountName}} already exists"
   },
   "account_actions": {
     "edit_name": "I-edit ang pangalan ng account",
@@ -3337,7 +3350,9 @@
     "add_account": "Magdagdag ng account",
     "add_new_account": "Magdagdag ng bagong account",
     "add_hardware_wallet": "Magdagdag ng wallet na hardware",
-    "import_account": "Mag-import ng account"
+    "import_account": "Mag-import ng account",
+    "add_bitcoin_account_testnet": "Add a new Bitcoin Account (Testnet)",
+    "add_bitcoin_account_mainnet": "Add a new Bitcoin Account (Beta)"
   },
   "show_nft": {
     "show_nft_title": "Ipakita ang NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Kumita ng mga ETH reward",
     "earn_eth_rewards_description": "Simulang kumita sa sandaling mag-stake ka. Awtomatikong dumadagdag ang mga reward.",
     "flexible_unstaking": "Flexible na pag-unstake",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Mag-unstake anumang oras. Karaniwang wala pang 3 araw ang itinatagal nito, pero maaaring abutin nang hanggang 11 araw para maproseso.",
     "disclaimer": "Hindi iginagarantiya sa pag-stake ang mga reward, at may kasangkot na panganib kabilang ang pagkalugi ng mga pondo.",
     "learn_more": "Matuto pa",
     "got_it": "Nakuha ko",
@@ -3442,7 +3457,7 @@
         "base": "Kasalukuyang isinasagawa ang pag-unstake ng {{amountEth}} ETH. Bumalik pagkalipas ng",
         "and": "at",
         "to_claim_it": "para i-claim ito.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Kasalukuyang isinasagawa ang pag-unstake ng {{amountEth}} ETH. Bumalik pagkatapos ng ilang araw para i-claim ito."
       },
       "geo_blocked": "Nasa isang rehiyon ka kung saan hindi pinahihintulutan ang pag-unstake o pag-stake.",
       "approximately": "humigit-kumulang"
@@ -3463,13 +3478,13 @@
     "unstaking_to": "Pag-unstake sa",
     "max_modal": {
       "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "description": "Ang max ay ang kabuuang halaga ng ETH na mayroon ka, na babawasan ng bayad sa gas na kailangan para mag-stake. Mainam na magtabi ng ilang ekstrang ETH sa wallet mo para sa mga transaksyon sa hinaharap."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Gamitin ang max",
+    "estimated_unstaking_time": "1 hanggang 11 araw",
+    "proceed_anyway": "Magpatuloy pa rin",
+    "gas_cost_impact": "Epekto ng gastos sa gas",
+    "gas_cost_impact_warning": "Babala: Aabot sa higit sa 30% ng deposito mo ang bayad sa gas ng transaksyon."
   },
   "default_settings": {
     "title": "Handa na ang iyong Wallet",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Oras ng pag-unstake",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Karaniwang wala pang 3 araw ang itatagal para ma-unstake ang ETH mo, pero puwedeng umabot nang hanggang 11 araw para maproseso ito. Nakadepende ang eksaktong tagal sa halaga ia-unstake mo at aktibidad ng pag-stake ng ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Nagbago ang mga resulta",
+    "description": "Na-update na ang mga tinatayang pagbabago para sa transaksyong ito. Suriin ang mga ito nang mabuti bago magpatuloy.",
+    "proceed": "Magpatuloy",
+    "reject": "Tanggihan ang transaksyon"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Idagdag ang account sa MetaMask",
+    "input_title": "Pangalan ng account",
+    "add_account_button": "Magdagdag ng account",
+    "name_taken_message": "May ganito nang pangalan ng account"
   }
 }
diff --git a/locales/languages/tr.json b/locales/languages/tr.json
index a4ac3edbd71..e32ee63ce93 100644
--- a/locales/languages/tr.json
+++ b/locales/languages/tr.json
@@ -439,9 +439,9 @@
     },
     "import": "İçe aktar",
     "sort_by": "Şuna göre sırala",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Farklı filtrele",
+    "current_network": "Geçerli Ağ",
+    "all_networks": "Tüm Ağlar",
     "declining_balance": "Azalan bakiye ({{currency}} yüksek-düşük)",
     "alphabetically": "Alfabetik olarak (A-Z)",
     "add_to_get_started": "Başlamak için kripto ekleyin",
@@ -470,6 +470,7 @@
     "learn_more": "Daha fazlasını öğren",
     "add_collectibles": "NFT'leri içe aktar",
     "no_transactions": "Hiç işleminiz yok!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Gönder",
     "deposit_button": "Para Yatır",
     "copy_address": "Hata",
@@ -722,18 +723,18 @@
     "now_active": "şimdi aktif.",
     "network_added": "başarılı bir şekilde eklendi",
     "network_deleted": "başarılı bir şekilde silindi",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Ağ izinleri güncellendi",
     "revoked": "iptal edildi.",
     "revoked_all": "Tüm hesaplar iptal edildi.",
     "accounts_connected": "hesap bağlandı.",
     "account_connected": "hesap bağlandı.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Hesap izinleri güncellendi",
     "accounts_disconnected": "hesabın bağlantısı kesildi.",
     "account_disconnected": "hesabın bağlantısı kesildi.",
     "disconnected": "bağlantısı kesildi.",
     "disconnected_all": "Tüm hesapların bağlantısı kesildi.",
     "disconnected_from": "{{dappHostName}} ile bağlantı kesildi",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "İzinler güncellendi",
     "nft_detection_enabled": "NFT otomatik algılama etkinleştirildi"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Kaydır",
     "bridge": "Köprü",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Bu hesap için satın alma desteklenmiyor",
+      "sell": "Bu hesap için satma desteklenmiyor",
+      "swap": "Bu hesap için swap desteklenmiyor",
+      "bridge": "Bu hesap için köprü desteklenmiyor",
+      "send": "Bu hesap için gönderme desteklenmiyor",
+      "action": "Bu hesap için bu işlem desteklenmiyor"
     },
     "description": "Açıklama",
     "totalSupply": "Toplam Arz",
@@ -1586,7 +1587,7 @@
     "share": "Paylaş",
     "bookmark": "Yer İmi",
     "add_to_favorites": "Favorilere Ekle",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Favorilere Git",
     "error": "Hata",
     "cancel": "İptal",
     "go_back": "Geri git",
@@ -1656,8 +1657,8 @@
     "tx_review_approve": "Onayla",
     "tx_review_increase_allowance": "Ödeneği Artır",
     "tx_review_set_approval_for_all": "Tümüne Onay Ver",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
+    "tx_review_staking_claim": "Stake Yapma Talebi",
+    "tx_review_staking_deposit": "Stake Para Yatırma",
     "tx_review_staking_unstake": "Unstake",
     "sent_ether": "Ether Gönderdi",
     "self_sent_ether": "Sana Ether Gönderdi",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Hesaplarınızı görmek ve işlem önermek",
     "requesting_for": "Talep: ",
     "requesting_for_accounts": "{{numberOfAccounts}} hesap için talep ediliyor",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "{{numberOfNetworks}} ağ için talep ediliyor",
+    "n_networks_connect": "{{numberOfNetworks}} ağ bağlı ",
+    "network_connected": "ağ bağlı ",
     "see_your_accounts": "Hesaplarınızı görün ve işlem önerin",
     "connected_to": "Şuraya bağlanıldı: ",
     "manage_permissions": "İzinleri Yönet",
     "edit": "Düzenle",
     "cancel": "İptal",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Anladım",
+    "connection_details_title": "Bağlantı Bilgileri",
+    "connection_details_description": "Bu siteye {{connectionDateTime}} itibariyle MetaMask tarayıcısını kullanarak bağlandınız",
+    "title_add_network_permission": "Ağ izni ekle",
+    "add_this_network": "Bu ağı ekle",
+    "permitted_networks": "İzin verilen ağlar",
+    "choose_from_permitted_networks": "İzin verilen ağlardan seçiminizi yapın",
+    "this_site_cant": "Bu site geçerli ağınızla kullanılamaz. Ağ izinlerini ekleyin veya halihazırda izin verilmiş bir ağı seçin.",
+    "non_permitted_network_description": "Bu site geçerli ağınızla kullanılamaz. Ağ izinlerini ekleyin veya halihazırda izin verilmiş bir ağ seçin.",
+    "edit_permissions": "İzinleri düzenle",
+    "permitted_networks_info_sheet_description": "Bu, daha önce bu sitede kullanılmasına izin verdiğiniz ağların bir listesidir. Listeden bir ağı seçin veya bu site için ağ izinlerinin düzenleyin."
   },
   "select": {
     "cancel": "İptal",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Swap yapılan:",
       "label_to": "Alıcı"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "{{address}} adresinden {{amount}} {{ticker}} alındı",
     "nft_sent": "NFT alıcısı: {{address}}",
     "erc721_sent": "NFT alıcısı: {{address}}",
     "erc1155_sent": "NFT alıcısı: {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Para Çekme İşlemi Tamamlandı!",
     "error_title": "Hay aksi, bir şeyler ters gitti :/",
     "received_title": "{{amount}} {{assetType}} aldınız",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Swap tamamlandı",
+    "erc20_sent_title": "Para gönderildi",
+    "erc20_received_title": "Para alındı",
+    "eth_sent_title": "Para gönderildi",
+    "eth_received_title": "Para alındı",
+    "rocketpool_stake_completed_title": "Stake tamamlandı",
+    "rocketpool_unstake_completed_title": "Unstake tamamlandı",
+    "lido_stake_completed_title": "Stake tamamlandı",
+    "lido_withdrawal_requested_title": "Para çekme talep edildi",
+    "lido_withdrawal_completed_title": "Para çekme işlemi tamamlandı",
+    "lido_stake_ready_to_be_withdrawn_title": "Stake para çekme işlemine hazır ",
+    "erc721_sent_title": "NFT gönderildi",
+    "erc721_received_title": "NFT alındı",
+    "erc1155_sent_title": "NFT gönderildi",
+    "erc1155_received_title": "NFT alındı",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Görüntülemek için dokunun",
     "received_payment_title": "Anında ödeme alındı",
     "pending_message": "Onay bekleniyor",
     "pending_deposit_message": "Yatırma işleminin tamamlanması bekleniyor",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Bu işlemi görüntülemek için dokunun",
     "received_message": "Bu işlemi görüntülemek için dokunun",
     "received_payment_message": "{{amount}} DAI aldınız",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Bir miktar ETH aldınız",
+    "metamask_swap_completed_message": "{{symbolIn}} - {{symbolOut}} swap işlemi gerçekleştirildi",
+    "erc20_sent_message": "{{address}} adresine gönderildi",
+    "erc20_received_message": "{{address}} adresinden alındı",
+    "eth_sent_message": "{{address}} adresine gönderildi",
+    "rocketpool_stake_completed_message": "Stake edildi",
+    "rocketpool_unstake_completed_message": "Unstake tamamlandı",
+    "lido_stake_completed_message": "Stake edildi",
+    "lido_withdrawal_requested_message": "Unstake talep edildi",
+    "lido_withdrawal_completed_message": "Unstake tamamlandı",
+    "lido_stake_ready_to_be_withdrawn_message": "Para çekme talep edildi",
     "push_notification_content": {
       "metamask_swap_completed_title": "Swap tamamlandı",
       "metamask_swap_completed_description": "MetaMask Swap başarılı oldu",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Ne olduğunu bize söyleyin",
     "bug_report_prompt_description": "Neyin ters gittiğini anlayabilmemiz için ayrıntıları ekleyin.",
     "bug_report_thanks": "Teşekkürler! Kısa bir süre sonra inceleyeceğiz.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Bu hatayı almaya devam ederseniz",
     "save_seedphrase_2": "Gizli Kurtarma İfadenizi kaydedin",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "ve uygulamayı tekrar yükleyin. Unutmayın: Gizli Kurtarma İfadeniz olmadan cüzdanınızı geri yükleyemezsiniz.",
     "copied_clipboard": "Panoya kopyalandı",
     "ok": "Tamam",
     "cancel": "İptal",
     "send": "Gönder",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Gönder",
+    "modal_title": "Ne olduğunu açıklayın",
+    "modal_placeholder": "Hatayı nasıl tekrarlayabileceğimiz gibi ayrıntıların paylaşılması problemi düzeltmemize yardımcı olacaktır.",
+    "error_message": "Hata mesajı:",
+    "copy": "Kopyala",
+    "describe": "Ne olduğunu açıklayın",
+    "try_again": "Tekrar deneyin",
+    "contact_support": "Destek ile iletişim kurun"
   },
   "whats_new": {
     "title": "Yenilikler",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Kör imzalama hatası",
     "blind_sign_error_message": "Kör imzalama Ledger cihazınızda etkinleştirilmemiş. Lütfen ayarlar kısmında etkinleştirin.",
     "user_reject_transaction": "Kullanıcı işlemi reddetti",
-    "user_reject_transaction_message": "Kullanıcı Ledger cihazında işlemi reddetti."
+    "user_reject_transaction_message": "Kullanıcı Ledger cihazında işlemi reddetti.",
+    "multiple_devices_error_message": "Birden fazla cihaz henüz desteklenmiyor. Yeni bir Ledger cihaz eklemek için eskisini kaldırmanız gereklidir.",
+    "hd_path_error": "HD Yolu geçersiz: {{path}}",
+    "unspecified_error_during_connect": "Ledger Donanımı bağlanırken belirtilmemiş hata,",
+    "account_name_existed": "{{accountName}} adlı hesap zaten mevcut"
   },
   "account_actions": {
     "edit_name": "Hesap adını düzenleyin",
@@ -3337,7 +3350,9 @@
     "add_account": "Hesap ekleyin",
     "add_new_account": "Yeni hesap ekleyin",
     "add_hardware_wallet": "Donanım cüzdanı ekleyin",
-    "import_account": "Hesabı içe aktar"
+    "import_account": "Hesabı içe aktar",
+    "add_bitcoin_account_testnet": "Yeni bir Bitcoin Hesabı ekle (Test Ağı)",
+    "add_bitcoin_account_mainnet": "Yeni bir Bitcoin Hesabı Ekle (Beta)"
   },
   "show_nft": {
     "show_nft_title": "NFT'yi göster",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "ETH ödüllerini kazan",
     "earn_eth_rewards_description": "Stake eder etmez kazanmaya başlayın. Ödüller otomatik olarak birleştirilir.",
     "flexible_unstaking": "Esnek unstake",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Dilediğiniz zaman unstake edin. Gerçekleşmesi genellikle 3 günden kısa sürer ancak 11 güne kadar da sürebilir.",
     "disclaimer": "Stake, ödülleri garanti etmez ve para kaybını da içeren riskler taşır.",
     "learn_more": "Daha fazla bilgi edinin",
     "got_it": "Anladım",
@@ -3442,7 +3457,7 @@
         "base": "{{amountEth}} ETH unstake işlemi sürüyor. Şu kadar süre sonra tekrar gelin:",
         "and": "ve",
         "to_claim_it": "alın.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "{{amountEth}} ETH unstake işlemi devam ediyor. Almak için birkaç gün sonra tekrar gelin."
       },
       "geo_blocked": "Unstake veya stake işlemlerine izin verilmeyen bir bölgedesiniz.",
       "approximately": "yaklaşık"
@@ -3462,14 +3477,14 @@
     "up_to_n": "En fazla {{count}}",
     "unstaking_to": "Unstake alıcısı",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Maksimum",
+      "description": "Maksimum, sahip olduğunuz toplam ETH tutarından stake edilmesi gereken gaz ücretinin düşülmüş halidir. Gelecekteki işlemler için cüzdanınızda bir miktar ekstra ETH tutmanız iyi bir fikir olacaktır."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Maksimumu kullan",
+    "estimated_unstaking_time": "1 ila 11 gün",
+    "proceed_anyway": "Yine de devam et",
+    "gas_cost_impact": "Gaz maliyeti etkisi",
+    "gas_cost_impact_warning": "Uyarı: İşlemin gaz maliyeti yatırdığınız paranın %30'undan fazlası olacaktır."
   },
   "default_settings": {
     "title": "Cüzdanınız hazır",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Unstake zamanı",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "ETH'nizin unstake işlemi genellikle 3 günden kısa sürer ancak gerçekleşmesi 11 güne kadar sürebilir. Tam süre, unstake ettiğiniz tutara ve ETH stake faaliyetine bağlıdır"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Sonuçlar değişti",
+    "description": "Bu işlem için tahmin edilen değişiklikler güncellendi. Devam etmeden önce dikkatle inceleyin.",
+    "proceed": "Devam et",
+    "reject": "İşlemi reddet"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "MetaMask'e hesap ekleyin",
+    "input_title": "Hesap adı",
+    "add_account_button": "Hesap ekleyin",
+    "name_taken_message": "Bu hesap adı zaten mevcut"
   }
 }
diff --git a/locales/languages/vi.json b/locales/languages/vi.json
index f065c68b4a0..03ce4f2e941 100644
--- a/locales/languages/vi.json
+++ b/locales/languages/vi.json
@@ -439,9 +439,9 @@
     },
     "import": "Nhập",
     "sort_by": "Sắp xếp theo",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "Lọc theo",
+    "current_network": "Mạng hiện tại",
+    "all_networks": "Tất cả mạng",
     "declining_balance": "Số dư giảm dần ({{currency}} từ cao đến thấp)",
     "alphabetically": "Thứ tự bảng chữ cái (A – Z)",
     "add_to_get_started": "Thêm tiền mã hóa để bắt đầu",
@@ -470,6 +470,7 @@
     "learn_more": "Tìm hiểu thêm",
     "add_collectibles": "Nhập NFT",
     "no_transactions": "Bạn không có giao dịch nào!",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "Gửi",
     "deposit_button": "Nạp",
     "copy_address": "Sao chép",
@@ -722,18 +723,18 @@
     "now_active": "đang hoạt động.",
     "network_added": "đã được thêm thành công",
     "network_deleted": "đã xóa thành công",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "Đã cập nhật quyền truy cập mạng",
     "revoked": "đã bị thu hồi.",
     "revoked_all": "Tất cả tài khoản đã bị thu hồi.",
     "accounts_connected": "tài khoản đã được kết nối.",
     "account_connected": "tài khoản đã kết nối.",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "Đã cập nhật quyền truy cập tài khoản",
     "accounts_disconnected": "tài khoản đã ngắt kết nối.",
     "account_disconnected": "tài khoản đã ngắt kết nối.",
     "disconnected": "đã ngắt kết nối.",
     "disconnected_all": "Đã ngắt kết nối tất cả các tài khoản.",
     "disconnected_from": "Ngắt kết nối khỏi {{dappHostName}}",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "Đã cập nhật quyền",
     "nft_detection_enabled": "Tính năng tự động phát hiện NFT đã được bật"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "Hoán đổi",
     "bridge": "Cầu nối",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "Không hỗ trợ mua cho tài khoản này",
+      "sell": "Không hỗ trợ bán cho tài khoản này",
+      "swap": "Không hỗ trợ hoán đổi cho tài khoản này",
+      "bridge": "Không hỗ trợ cầu nối cho tài khoản này",
+      "send": "Không hỗ trợ gửi cho tài khoản này",
+      "action": "Hành động này không được hỗ trợ cho tài khoản này"
     },
     "description": "Mô tả",
     "totalSupply": "Tổng cung",
@@ -1586,7 +1587,7 @@
     "share": "Chia sẻ",
     "bookmark": "Dấu trang",
     "add_to_favorites": "Thêm vào mục Ưa thích",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "Đến mục Ưa thích",
     "error": "Lỗi",
     "cancel": "Hủy",
     "go_back": "Lùi",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "Chấp thuận",
     "tx_review_increase_allowance": "Tăng hạn mức",
     "tx_review_set_approval_for_all": "Thiết lập phê duyệt tất cả",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "Nhận tài sản ký gửi",
+    "tx_review_staking_deposit": "Nạp tài sản ký gửi",
+    "tx_review_staking_unstake": "Hủy ký gửi",
     "sent_ether": "Đã gửi Ether",
     "self_sent_ether": "Đã gửi Ether cho chính bạn",
     "received_ether": "Đã nhận Ether",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "Xem tài khoản của bạn và đề xuất giao dịch",
     "requesting_for": "Yêu cầu cho ",
     "requesting_for_accounts": "Đang yêu cầu cho {{numberOfAccounts}} tài khoản",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "Đang yêu cầu cho {{numberOfNetworks}} mạng",
+    "n_networks_connect": "Đã kết nối {{numberOfNetworks}} mạng ",
+    "network_connected": "đã kết nối mạng ",
     "see_your_accounts": "Xem tài khoản của bạn và đề xuất giao dịch",
     "connected_to": "Đã kết nối với ",
     "manage_permissions": "Quản lý quyền",
     "edit": "Chỉnh sửa",
     "cancel": "Hủy",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "Đã hiểu",
+    "connection_details_title": "Chi tiết kết nối",
+    "connection_details_description": "Bạn đã kết nối với trang web này bằng trình duyệt MetaMask vào {{connectionDateTime}}",
+    "title_add_network_permission": "Thêm quyền truy cập mạng",
+    "add_this_network": "Thêm mạng này",
+    "permitted_networks": "Mạng được cho phép",
+    "choose_from_permitted_networks": "Chọn từ các mạng được cho phép",
+    "this_site_cant": "Không thể sử dụng trang web này với mạng hiện tại của bạn. Thêm quyền truy cập mạng hoặc chọn một mạng đã được cho phép.",
+    "non_permitted_network_description": "Không thể sử dụng trang web này với mạng hiện tại của bạn. Thêm quyền truy cập mạng hoặc chọn một mạng đã được cho phép.",
+    "edit_permissions": "Chỉnh sửa quyền",
+    "permitted_networks_info_sheet_description": "Đây là danh sách các mạng mà bạn đã cấp quyền sử dụng trên trang web này trước đây. Chọn một mạng từ danh sách hoặc chỉnh sửa quyền truy cập mạng cho trang web này."
   },
   "select": {
     "cancel": "Hủy",
@@ -2182,7 +2191,7 @@
       "label_swapped": "Đã hoán đổi",
       "label_to": "Đến"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "Đã nhận {{amount}} {{ticker}} từ {{address}}",
     "nft_sent": "Đã gửi NFT đến {{address}}",
     "erc721_sent": "Đã gửi NFT đến {{address}}",
     "erc1155_sent": "Đã gửi NFT đến {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "Rút tiền hoàn tất!",
     "error_title": "Rất tiếc, đã xảy ra lỗi :/",
     "received_title": "Bạn đã nhận {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "Đã hoàn tất hoán đổi",
+    "erc20_sent_title": "Đã gửi tiền",
+    "erc20_received_title": "Đã nhận tiền",
+    "eth_sent_title": "Đã gửi tiền",
+    "eth_received_title": "Đã nhận tiền",
+    "rocketpool_stake_completed_title": "Hoàn tất ký gửi",
+    "rocketpool_unstake_completed_title": "Hoàn tất hủy ký gửi",
+    "lido_stake_completed_title": "Hoàn tất ký gửi",
+    "lido_withdrawal_requested_title": "Đã yêu cầu rút tiền",
+    "lido_withdrawal_completed_title": "Đã hoàn tất rút tiền",
+    "lido_stake_ready_to_be_withdrawn_title": "Tài sản ký gửi đã sẵn sàng để rút ",
+    "erc721_sent_title": "Đã gửi NFT",
+    "erc721_received_title": "Đã nhận NFT",
+    "erc1155_sent_title": "Đã gửi NFT",
+    "erc1155_received_title": "Đã nhận NFT",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "Nhấn để xem",
     "received_payment_title": "Đã nhận tiền thanh toán ngay",
     "pending_message": "Đang đợi xác nhận",
     "pending_deposit_message": "Đang đợi hoàn tất quá trình nạp tiền",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "Chạm để xem giao dịch này",
     "received_message": "Chạm để xem giao dịch này",
     "received_payment_message": "Bạn đã nhận {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "Bạn đã nhận được một ít ETH",
+    "metamask_swap_completed_message": "Đã hoán đổi {{symbolIn}} thành {{symbolOut}}",
+    "erc20_sent_message": "Đã gửi đến {{address}}",
+    "erc20_received_message": "Đã nhận từ {{address}}",
+    "eth_sent_message": "Đã gửi đến {{address}}",
+    "rocketpool_stake_completed_message": "Đã ký gửi",
+    "rocketpool_unstake_completed_message": "Hoàn tất hủy ký gửi",
+    "lido_stake_completed_message": "Đã ký gửi",
+    "lido_withdrawal_requested_message": "Đã yêu cầu hủy ký gửi",
+    "lido_withdrawal_completed_message": "Hoàn tất hủy ký gửi",
+    "lido_stake_ready_to_be_withdrawn_message": "Đã yêu cầu rút tiền",
     "push_notification_content": {
       "metamask_swap_completed_title": "Hoán đổi hoàn tất",
       "metamask_swap_completed_description": "Quá trình Hoán đổi MetaMask của bạn đã thành công",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "Ghi rõ vấn đề gì đã xảy ra",
     "bug_report_prompt_description": "Thêm thông tin để chúng tôi biết vấn đề gì đã xảy ra.",
     "bug_report_thanks": "Xin cảm ơn! Chúng tôi sẽ sớm xem xét.",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "Nếu bạn tiếp tục gặp lỗi này,",
     "save_seedphrase_2": "hãy lưu Cụm từ khôi phục bí mật của bạn",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "và cài đặt lại ứng dụng. Lưu ý: nếu không có Cụm từ khôi phục bí mật, bạn không thể khôi phục ví của mình.",
     "copied_clipboard": "Đã sao chép vào bộ nhớ đệm",
     "ok": "OK",
     "cancel": "Hủy",
     "send": "Gửi",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "Gửi",
+    "modal_title": "Mô tả những gì đã xảy ra",
+    "modal_placeholder": "Chia sẻ thông tin chi tiết như cách chúng tôi có thể tái hiện lỗi để giúp chúng tôi khắc phục vấn đề.",
+    "error_message": "Thông báo lỗi:",
+    "copy": "Sao chép",
+    "describe": "Mô tả những gì đã xảy ra",
+    "try_again": "Thử lại",
+    "contact_support": "Liên hệ bộ phận hỗ trợ"
   },
   "whats_new": {
     "title": "Xem tính năng mới",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "Lỗi ký mù",
     "blind_sign_error_message": "Ký mù chưa được bật trên thiết bị Ledger của bạn. Vui lòng bật trong phần cài đặt.",
     "user_reject_transaction": "Người dùng đã từ chối giao dịch",
-    "user_reject_transaction_message": "Người dùng đã từ chối giao dịch trên thiết bị Ledger."
+    "user_reject_transaction_message": "Người dùng đã từ chối giao dịch trên thiết bị Ledger.",
+    "multiple_devices_error_message": "Chưa hỗ trợ nhiều thiết bị. Để thêm thiết bị Ledger mới, bạn cần gỡ bỏ thiết bị cũ hơn.",
+    "hd_path_error": "Đường dẫn HD không hợp lệ: {{path}}",
+    "unspecified_error_during_connect": "Lỗi không xác định khi kết nối với Ví cứng Ledger,",
+    "account_name_existed": "Tài khoản {{accountName}} đã tồn tại"
   },
   "account_actions": {
     "edit_name": "Chỉnh sửa tên tài khoản",
@@ -3337,7 +3350,9 @@
     "add_account": "Thêm tài khoản",
     "add_new_account": "Thêm tài khoản mới",
     "add_hardware_wallet": "Thêm ví cứng",
-    "import_account": "Nhập tài khoản"
+    "import_account": "Nhập tài khoản",
+    "add_bitcoin_account_testnet": "Thêm Tài khoản Bitcoin mới (Mạng thử nghiệm)",
+    "add_bitcoin_account_mainnet": "Thêm Tài khoản Bitcoin mới (Beta)"
   },
   "show_nft": {
     "show_nft_title": "Hiển thị NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "Kiếm phần thưởng ETH",
     "earn_eth_rewards_description": "Bắt đầu kiếm tiền ngay khi bạn ký gửi. Phần thưởng sẽ tự động cộng dồn.",
     "flexible_unstaking": "Hủy ký gửi linh hoạt",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "Hủy ký gửi bất cứ lúc nào. Thường mất ít hơn 3 ngày, nhưng có thể mất đến 11 ngày để xử lý.",
     "disclaimer": "Việc ký gửi không đảm bảo bạn sẽ nhận được phần thưởng và đi kèm với nhiều rủi ro, bao gồm cả mất tiền.",
     "learn_more": "Tìm hiểu thêm",
     "got_it": "Đã hiểu",
@@ -3442,7 +3457,7 @@
         "base": "Đang tiến hành hủy ký gửi {{amountEth}} ETH. Hãy quay lại sau",
         "and": "và",
         "to_claim_it": "để nhận.",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "Đang tiến hành hủy ký gửi {{amountEth}} ETH. Hãy quay lại sau vài ngày để nhận."
       },
       "geo_blocked": "Bạn đang ở trong khu vực không được phép ký gửi hoặc hủy ký gửi.",
       "approximately": "khoảng"
@@ -3462,14 +3477,14 @@
     "up_to_n": "Tối đa {{count}}",
     "unstaking_to": "Hủy ký gửi",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "Tối đa",
+      "description": "Tối đa là tổng số ETH bạn có, trừ phí gas cần thiết để ký gửi. Tốt nhất là giữ lại một ít ETH trong ví cho các giao dịch trong tương lai."
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "Sử dụng tối đa",
+    "estimated_unstaking_time": "1 đến 11 ngày",
+    "proceed_anyway": "Vẫn tiếp tục",
+    "gas_cost_impact": "Tác động của chi phí gas",
+    "gas_cost_impact_warning": "Cảnh báo: chi phí gas cho giao dịch sẽ chiếm hơn 30% khoản tiền gửi của bạn."
   },
   "default_settings": {
     "title": "Ví của bạn đã sẵn sàng",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "Thời gian hủy ký gửi",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "Thông thường mất ít hơn 3 ngày để hủy ký gửi ETH của bạn, nhưng có thể mất đến 11 ngày để xử lý. Thời gian chính xác phụ thuộc vào số lượng bạn hủy ký gửi và hoạt động ký gửi ETH"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "Kết quả đã thay đổi",
+    "description": "Các thay đổi ước tính cho giao dịch này đã được cập nhật. Hãy xem xét kỹ trước khi tiếp tục.",
+    "proceed": "Tiếp tục",
+    "reject": "Từ chối giao dịch"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "Thêm tài khoản vào MetaMask",
+    "input_title": "Tên tài khoản",
+    "add_account_button": "Thêm tài khoản",
+    "name_taken_message": "Tên tài khoản này đã tồn tại"
   }
 }
diff --git a/locales/languages/zh.json b/locales/languages/zh.json
index 8370f2577e7..648d2e195e7 100644
--- a/locales/languages/zh.json
+++ b/locales/languages/zh.json
@@ -439,9 +439,9 @@
     },
     "import": "导入",
     "sort_by": "排序方式",
-    "filter_by": "Filter by",
-    "current_network": "Current Network",
-    "all_networks": "All Networks",
+    "filter_by": "筛选方式",
+    "current_network": "当前网络",
+    "all_networks": "所有网络",
     "declining_balance": "余额降序（{{currency}} 高-低）",
     "alphabetically": "按字母顺序（A-Z）",
     "add_to_get_started": "请添加加密货币以开始",
@@ -470,6 +470,7 @@
     "learn_more": "了解更多",
     "add_collectibles": "添加收藏品",
     "no_transactions": "您没有交易！",
+    "switch_network_to_view_transactions": "Please switch network to view transactions",
     "send_button": "发送",
     "deposit_button": "保证金",
     "copy_address": "复制",
@@ -722,18 +723,18 @@
     "now_active": "现处于活动状态。",
     "network_added": "已成功添加",
     "network_deleted": "已成功删除",
-    "network_permissions_updated": "Network permissions updated",
+    "network_permissions_updated": "网络许可已更新",
     "revoked": "已撤销。",
     "revoked_all": "已撤销所有账户。",
     "accounts_connected": "账户已连接。",
     "account_connected": "账户已连接。",
-    "accounts_permissions_updated": "Accounts permissions updated",
+    "accounts_permissions_updated": "账户许可已更新",
     "accounts_disconnected": "账户已断开连接。",
     "account_disconnected": "账户已断开连接。",
     "disconnected": "已断开连接。",
     "disconnected_all": "所有账户都已断开连接。",
     "disconnected_from": "已从 {{dappHostName}} 断开连接",
-    "permissions_updated": "Permissions updated",
+    "permissions_updated": "许可已更新",
     "nft_detection_enabled": "已启用 NFT 自动检测"
   },
   "connect_qr_hardware": {
@@ -1268,12 +1269,12 @@
     "swap": "兑换",
     "bridge": "跨链桥",
     "disabled_button": {
-      "buy": "Buying not supported for this account",
-      "sell": "Selling not supported for this account",
-      "swap": "Swapping not supported for this account",
-      "bridge": "Bridging not supported for this account",
-      "send": "Sending not supported for this account",
-      "action": "This action is not supported for this account"
+      "buy": "此账户不支持买入",
+      "sell": "此账户不支持卖出",
+      "swap": "此账户不支持兑换",
+      "bridge": "此账户不支持跨链桥",
+      "send": "此账户不支持发送",
+      "action": "此账户不支持此操作"
     },
     "description": "描述",
     "totalSupply": "总供给量",
@@ -1586,7 +1587,7 @@
     "share": "共享",
     "bookmark": "书签",
     "add_to_favorites": "添加到收藏夹",
-    "go_to_favorites": "Go to Favorites",
+    "go_to_favorites": "转到收藏夹",
     "error": "错误",
     "cancel": "取消",
     "go_back": "返回",
@@ -1656,9 +1657,9 @@
     "tx_review_approve": "批准",
     "tx_review_increase_allowance": "增加限额",
     "tx_review_set_approval_for_all": "设置批准所有",
-    "tx_review_staking_claim": "Staking Claim",
-    "tx_review_staking_deposit": "Staking Deposit",
-    "tx_review_staking_unstake": "Unstake",
+    "tx_review_staking_claim": "质押申请",
+    "tx_review_staking_deposit": "质押保证金",
+    "tx_review_staking_unstake": "解除质押",
     "sent_ether": "已发送以太币",
     "self_sent_ether": "已向自己发送以太币",
     "received_ether": "已接收以太币",
@@ -1847,17 +1848,25 @@
     "wants_to_see_your_accounts": "查看您的账户并建议交易",
     "requesting_for": "请求 ",
     "requesting_for_accounts": "请求 {{numberOfAccounts}} 个账户",
-    "requesting_for_networks": "Requesting for {{numberOfNetworks}} networks",
-    "n_networks_connect": "{{numberOfNetworks}} networks connected ",
-    "network_connected": "network connected ",
+    "requesting_for_networks": "请求 {{numberOfNetworks}} 个网络",
+    "n_networks_connect": "{{numberOfNetworks}} 个网络已连接 ",
+    "network_connected": "网络已连接 ",
     "see_your_accounts": "查看您的账户并建议交易",
     "connected_to": "已连接到 ",
     "manage_permissions": "管理权限",
     "edit": "编辑",
     "cancel": "取消",
-    "got_it": "Got it",
-    "connection_details_title": "Connection Details",
-    "connection_details_description": "You connected to this site using the MetaMask browser on {{connectionDateTime}}"
+    "got_it": "知道了",
+    "connection_details_title": "连接详细信息",
+    "connection_details_description": "您于 {{connectionDateTime}} 使用 MetaMask 浏览器连接到此网站",
+    "title_add_network_permission": "添加网络许可",
+    "add_this_network": "添加此网络",
+    "permitted_networks": "获得许可的网络",
+    "choose_from_permitted_networks": "选择获得许可的网络",
+    "this_site_cant": "此网站无法与您当前的网络一起使用。请添加网络许可或选择已经获得许可的网络。",
+    "non_permitted_network_description": "此网站无法与您当前的网络一起使用。请添加网络许可或选择已经获得许可的网络。",
+    "edit_permissions": "编辑许可",
+    "permitted_networks_info_sheet_description": "这是您以前在此网站上授予使用许可的网络列表。从列表中选择一个或编辑此网站的网络许可。"
   },
   "select": {
     "cancel": "取消",
@@ -2182,7 +2191,7 @@
       "label_swapped": "已兑换",
       "label_to": "至"
     },
-    "received_from": "Received {{amount}} {{ticker}} from {{address}}",
+    "received_from": "已从 {{address}} 收到 {{amount}} {{ticker}}",
     "nft_sent": "已发送 NFT 至 {{address}}",
     "erc721_sent": "已发送 NFT 至 {{address}}",
     "erc1155_sent": "已发送 NFT 至 {{address}}",
@@ -2199,23 +2208,23 @@
     "success_withdrawal_title": "提取完成！",
     "error_title": "糟糕，出问题了:/",
     "received_title": "您已收到 {{amount}} {{assetType}}",
-    "metamask_swap_completed_title": "Swap completed",
-    "erc20_sent_title": "Funds sent",
-    "erc20_received_title": "Funds received",
-    "eth_sent_title": "Funds sent",
-    "eth_received_title": "Funds received",
-    "rocketpool_stake_completed_title": "Stake complete",
-    "rocketpool_unstake_completed_title": "Unstake complete",
-    "lido_stake_completed_title": "Stake complete",
-    "lido_withdrawal_requested_title": "Withdrawal requested",
-    "lido_withdrawal_completed_title": "Withdrawal completed",
-    "lido_stake_ready_to_be_withdrawn_title": "Stake ready for withdrawal ",
-    "erc721_sent_title": "NFT sent",
-    "erc721_received_title": "NFT received",
-    "erc1155_sent_title": "NFT sent",
-    "erc1155_received_title": "NFT received",
+    "metamask_swap_completed_title": "兑换已完成",
+    "erc20_sent_title": "已发送资金",
+    "erc20_received_title": "已收到资金",
+    "eth_sent_title": "已发送资金",
+    "eth_received_title": "已收到资金",
+    "rocketpool_stake_completed_title": "质押完成",
+    "rocketpool_unstake_completed_title": "解除质押完成",
+    "lido_stake_completed_title": "质押完成",
+    "lido_withdrawal_requested_title": "已请求提取",
+    "lido_withdrawal_completed_title": "提取已完成",
+    "lido_stake_ready_to_be_withdrawn_title": "已准备好提取质押 ",
+    "erc721_sent_title": "NFT 已发送",
+    "erc721_received_title": "NFT 已收到",
+    "erc1155_sent_title": "NFT 已发送",
+    "erc1155_received_title": "NFT 已收到",
     "default_message_title": "MetaMask",
-    "default_message_description": "Tap to view",
+    "default_message_description": "点按以查看",
     "received_payment_title": "已收到即时付款",
     "pending_message": "正在等待确认",
     "pending_deposit_message": "正在等待保证金完成",
@@ -2231,17 +2240,17 @@
     "cancelled_message": "点按以查看此交易",
     "received_message": "点按以查看此交易",
     "received_payment_message": "您已收到 {{amount}} DAI",
-    "eth_received_message": "You received some ETH",
-    "metamask_swap_completed_message": "Swapped {{symbolIn}} for {{symbolOut}}",
-    "erc20_sent_message": "Sent to {{address}}",
-    "erc20_received_message": "Received from {{address}}",
-    "eth_sent_message": "Sent to {{address}}",
-    "rocketpool_stake_completed_message": "Staked",
-    "rocketpool_unstake_completed_message": "Unstaking complete",
-    "lido_stake_completed_message": "Staked",
-    "lido_withdrawal_requested_message": "Unstaking requested",
-    "lido_withdrawal_completed_message": "Unstaking complete",
-    "lido_stake_ready_to_be_withdrawn_message": "Withdrawal requested",
+    "eth_received_message": "您已收到一些 ETH",
+    "metamask_swap_completed_message": "已用 {{symbolIn}} 兑换 {{symbolOut}}",
+    "erc20_sent_message": "已发送至 {{address}}",
+    "erc20_received_message": "已从 {{address}} 收到",
+    "eth_sent_message": "已发送至 {{address}}",
+    "rocketpool_stake_completed_message": "已质押",
+    "rocketpool_unstake_completed_message": "解除质押完成",
+    "lido_stake_completed_message": "已质押",
+    "lido_withdrawal_requested_message": "已请求解除质押",
+    "lido_withdrawal_completed_message": "解除质押完成",
+    "lido_stake_ready_to_be_withdrawn_message": "已请求提取",
     "push_notification_content": {
       "metamask_swap_completed_title": "兑换已完成",
       "metamask_swap_completed_description": "您的 MetaMask 兑换已成功",
@@ -2910,21 +2919,21 @@
     "bug_report_prompt_title": "告诉我们发生了什么",
     "bug_report_prompt_description": "添加详细信息，以便我们能够找出问题所在。",
     "bug_report_thanks": "谢谢！我们很快会查看。",
-    "save_seedphrase_1": "If you keep getting this error,",
+    "save_seedphrase_1": "如果您总是遇到此错误，",
     "save_seedphrase_2": "请保存您的助记词",
-    "save_seedphrase_3": "and re-install the app. Remember: without your Secret Recovery Phrase, you can't restore your wallet.",
+    "save_seedphrase_3": "然后重新安装应用程序。记住：没有私钥助记词，则无法恢复您的钱包。",
     "copied_clipboard": "已复制到剪贴板",
     "ok": "确定",
     "cancel": "取消",
     "send": "发送",
-    "submit": "Submit",
-    "modal_title": "Describe what happened",
-    "modal_placeholder": "Sharing details like how we can reproduce the bug will help us fix the problem.",
-    "error_message": "Error message:",
-    "copy": "Copy",
-    "describe": "Describe what happened",
-    "try_again": "Try again",
-    "contact_support": "Contact support"
+    "submit": "提交",
+    "modal_title": "请描述所发生的问题",
+    "modal_placeholder": "分享如何重现错误等详细信息将有助于我们解决问题。",
+    "error_message": "错误消息：",
+    "copy": "复制",
+    "describe": "请描述所发生的问题",
+    "try_again": "请重试",
+    "contact_support": "联系支持团队"
   },
   "whats_new": {
     "title": "最新动态",
@@ -3329,7 +3338,11 @@
     "blind_sign_error": "盲签错误",
     "blind_sign_error_message": "您的 Ledger 设备上未启用盲签。请在设置中启用。",
     "user_reject_transaction": "用户已拒绝交易",
-    "user_reject_transaction_message": "用户已拒绝 Ledger 设备上的交易。"
+    "user_reject_transaction_message": "用户已拒绝 Ledger 设备上的交易。",
+    "multiple_devices_error_message": "暂不支持多个设备。要添加新的 Ledger 设备，您需要删除旧设备。",
+    "hd_path_error": "HD 路径无效：{{path}}",
+    "unspecified_error_during_connect": "连接 Ledger 硬件时出现未明确说明的错误，",
+    "account_name_existed": "账户{{accountName}}已存在"
   },
   "account_actions": {
     "edit_name": "编辑账户名",
@@ -3337,7 +3350,9 @@
     "add_account": "添加账户",
     "add_new_account": "添加新账户",
     "add_hardware_wallet": "添加硬件钱包",
-    "import_account": "导入账户"
+    "import_account": "导入账户",
+    "add_bitcoin_account_testnet": "添加新的比特币账户（测试网）",
+    "add_bitcoin_account_mainnet": "添加新的比特币账户（测试版）"
   },
   "show_nft": {
     "show_nft_title": "显示NFT",
@@ -3411,7 +3426,7 @@
     "earn_eth_rewards": "赚取 ETH 奖励",
     "earn_eth_rewards_description": "质押后，即刻开始赚取奖励。奖励自动计算。",
     "flexible_unstaking": "灵活解除质押",
-    "flexible_unstaking_description": "Unstake anytime. Typically takes less than 3 days, but can take up to 11 days to process.",
+    "flexible_unstaking_description": "随时解除质押。通常需要不到 3 天的时间，但处理过程最多可能需要 11 天。",
     "disclaimer": "质押并不能保证回报，而且涉及包括资金损失在内的风险。",
     "learn_more": "了解详情",
     "got_it": "知道了",
@@ -3442,7 +3457,7 @@
         "base": "正在解除 {{amountEth}} ETH 质押。请返回",
         "and": "并",
         "to_claim_it": "领取。",
-        "default": "Unstaking {{amountEth}} ETH in progress. Come back in a few days to claim it."
+        "default": "正在解除 {{amountEth}} ETH 质押。请几天后返回领取。"
       },
       "geo_blocked": "您所在的地区不允许解除质押或质押。",
       "approximately": "大约"
@@ -3462,14 +3477,14 @@
     "up_to_n": "最高达 {{count}}",
     "unstaking_to": "解除质押到",
     "max_modal": {
-      "title": "Max",
-      "description": "Max is the total amount of ETH you have, minus the gas fee required to stake. It’s a good idea to keep some extra ETH in your wallet for future transactions."
+      "title": "最大值",
+      "description": "最大值是您拥有的 ETH 总额减去质押所需的燃料费。不妨在您的钱包里多存一些 ETH 以备将来交易。"
     },
-    "use_max": "Use max",
-    "estimated_unstaking_time": "1 to 11 days",
-    "proceed_anyway": "Proceed anyway",
-    "gas_cost_impact": "Gas cost impact",
-    "gas_cost_impact_warning": "Warning: the transaction gas cost will account for more than 30% of your deposit."
+    "use_max": "使用最大值",
+    "estimated_unstaking_time": "1 - 11 天",
+    "proceed_anyway": "仍然继续",
+    "gas_cost_impact": "燃料成本影响",
+    "gas_cost_impact_warning": "警告：交易燃料成本将占您的保证金的 30% 以上。"
   },
   "default_settings": {
     "title": "您的钱包已准备就绪",
@@ -3547,7 +3562,7 @@
     },
     "unstaking_time": {
       "title": "解除质押时间",
-      "tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
+      "tooltip": "通常需要不到 3 天的时间来解除 ETH 质押，但处理过程最多可能需要 11 天。确切的持续时间取决于您解除质押的金额以及 ETH 的质押活动"
     }
   },
   "confirm": {
@@ -3571,9 +3586,15 @@
     }
   },
   "change_in_simulation_modal": {
-    "title": "Results have changed",
-    "description": "Estimated changes for this transaction have been updated. Review them closely before proceeding.",
-    "proceed": "Proceed",
-    "reject": "Reject the transaction"
+    "title": "结果已发生变化",
+    "description": "此交易的预计更改已更新。继续之前请仔细审查。",
+    "proceed": "继续",
+    "reject": "拒绝交易"
+  },
+  "snap_account_custom_name_approval": {
+    "title": "将账户添加到 MetaMask",
+    "input_title": "账户名称",
+    "add_account_button": "添加账户",
+    "name_taken_message": "此账户名已存在"
   }
 }
diff --git a/package.json b/package.json
index beed86b2ccf..3e56519d100 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "7.36.0",
+  "version": "7.37.0",
   "private": true,
   "scripts": {
     "audit:ci": "./scripts/yarn-audit.sh",
@@ -154,13 +154,13 @@
     "@metamask/assets-controllers": "^45.1.1",
     "@metamask/base-controller": "^7.0.1",
     "@metamask/bitcoin-wallet-snap": "^0.8.2",
-    "@metamask/composable-controller": "^3.0.0",
+    "@metamask/composable-controller": "^10.0.0",
     "@metamask/controller-utils": "^11.3.0",
     "@metamask/design-tokens": "^4.0.0",
     "@metamask/eth-hd-keyring": "^9.0.0",
     "@metamask/eth-json-rpc-filters": "^8.0.0",
     "@metamask/eth-json-rpc-middleware": "^11.0.2",
-    "@metamask/eth-ledger-bridge-keyring": "^6.0.0",
+    "@metamask/eth-ledger-bridge-keyring": "^8.0.0",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^8.0.0",
     "@metamask/eth-snap-keyring": "^5.0.1",
@@ -168,21 +168,21 @@
     "@metamask/ethjs-contract": "^0.4.1",
     "@metamask/ethjs-query": "^0.7.1",
     "@metamask/ethjs-unit": "^0.3.0",
-    "@metamask/gas-fee-controller": "^21.0.0",
+    "@metamask/gas-fee-controller": "^22.0.2",
     "@metamask/json-rpc-middleware-stream": "^8.0.2",
     "@metamask/key-tree": "^9.0.0",
     "@metamask/keyring-api": "^10.1.0",
     "@metamask/keyring-controller": "^19.0.1",
     "@metamask/logging-controller": "^6.0.1",
     "@metamask/message-signing-snap": "^0.3.3",
-    "@metamask/network-controller": "^21.0.0",
-    "@metamask/notification-services-controller": "^0.11.0",
+    "@metamask/network-controller": "^22.1.0",
+    "@metamask/notification-services-controller": "^0.15.0",
     "@metamask/permission-controller": "^11.0.0",
     "@metamask/phishing-controller": "^12.0.3",
     "@metamask/post-message-stream": "^8.0.0",
-    "@metamask/ppom-validator": "0.35.1",
+    "@metamask/ppom-validator": "0.36.0",
     "@metamask/preferences-controller": "^15.0.1",
-    "@metamask/profile-sync-controller": "^1.0.0",
+    "@metamask/profile-sync-controller": "^3.0.0",
     "@metamask/react-native-actionsheet": "2.4.2",
     "@metamask/react-native-button": "^3.0.0",
     "@metamask/react-native-payments": "^2.0.0",
@@ -192,8 +192,8 @@
     "@metamask/rpc-errors": "^7.0.1",
     "@metamask/scure-bip39": "^2.1.0",
     "@metamask/sdk-communication-layer": "0.29.0-wallet",
-    "@metamask/selected-network-controller": "^18.0.2",
-    "@metamask/signature-controller": "^22.0.0",
+    "@metamask/selected-network-controller": "^19.0.0",
+    "@metamask/signature-controller": "^23.1.0",
     "@metamask/slip44": "^4.1.0",
     "@metamask/smart-transactions-controller": "^15.0.0",
     "@metamask/snaps-controllers": "^9.15.0",
@@ -204,7 +204,7 @@
     "@metamask/stake-sdk": "^0.3.0",
     "@metamask/swappable-obj-proxy": "^2.1.0",
     "@metamask/swaps-controller": "^11.0.0",
-    "@metamask/transaction-controller": "^41.0.0",
+    "@metamask/transaction-controller": "^42.0.0",
     "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.6",
     "@notifee/react-native": "^9.0.0",
@@ -496,6 +496,7 @@
     "react-native-svg-transformer": "^1.0.0",
     "react-test-renderer": "18.2.0",
     "redux-flipper": "^2.0.3",
+    "redux-saga-test-plan": "^4.0.6",
     "regenerator-runtime": "0.13.9",
     "rn-nodeify": "10.3.0",
     "serve-handler": "^6.1.5",
@@ -596,8 +597,9 @@
       "ganache>@trufflesuite/uws-js-unofficial>utf-8-validate": false,
       "@react-native-firebase/app>firebase>@firebase/firestore>@grpc/proto-loader>protobufjs": false,
       "appium": false,
-      "appium>@appium/support>sharp": false
+      "appium>@appium/support>sharp": false,
+      "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false
     }
   },
   "packageManager": "yarn@1.22.22"
-}
+}
\ No newline at end of file
diff --git a/patches/@metamask+assets-controllers+45.1.1.patch b/patches/@metamask+assets-controllers+45.1.1.patch
index 43cd9a9f607..106e984e11c 100644
--- a/patches/@metamask+assets-controllers+45.1.1.patch
+++ b/patches/@metamask+assets-controllers+45.1.1.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@metamask/assets-controllers/dist/NftController.cjs b/node_modules/@metamask/assets-controllers/dist/NftController.cjs
-index 6ccbe9c..f725852 100644
+index 6ccbe9c..49270d6 100644
 --- a/node_modules/@metamask/assets-controllers/dist/NftController.cjs
 +++ b/node_modules/@metamask/assets-controllers/dist/NftController.cjs
 @@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
@@ -150,7 +150,7 @@ index 6ccbe9c..f725852 100644
          }
      }
 diff --git a/node_modules/@metamask/assets-controllers/dist/NftController.d.cts b/node_modules/@metamask/assets-controllers/dist/NftController.d.cts
-index a34725f..12487d6 100644
+index a34725f..21e9d20 100644
 --- a/node_modules/@metamask/assets-controllers/dist/NftController.d.cts
 +++ b/node_modules/@metamask/assets-controllers/dist/NftController.d.cts
 @@ -108,6 +108,7 @@ export type NftMetadata = {
@@ -161,3 +161,109 @@ index a34725f..12487d6 100644
      collection?: Collection;
      address?: string;
      attributes?: Attributes[];
+diff --git a/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.cjs b/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.cjs
+index c5aa814..83c0664 100644
+--- a/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.cjs
++++ b/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.cjs
+@@ -220,50 +220,57 @@ _TokenDetectionController_intervalId = new WeakMap(), _TokenDetectionController_
+     // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+     // eslint-disable-next-line @typescript-eslint/no-misused-promises
+     this.messagingSystem.subscribe('KeyringController:unlock', async () => {
+-        __classPrivateFieldSet(this, _TokenDetectionController_isUnlocked, true, "f");
+-        await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this);
+-    });
+-    this.messagingSystem.subscribe('KeyringController:lock', () => {
+-        __classPrivateFieldSet(this, _TokenDetectionController_isUnlocked, false, "f");
+-        __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_stopPolling).call(this);
+-    });
+-    this.messagingSystem.subscribe('TokenListController:stateChange', 
+-    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+-    async ({ tokensChainsCache }) => {
+-        const isEqualValues = __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_compareTokensChainsCache).call(this, tokensChainsCache, __classPrivateFieldGet(this, _TokenDetectionController_tokensChainsCache, "f"));
+-        if (!isEqualValues) {
+-            await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this);
+-        }
+-    });
+-    this.messagingSystem.subscribe('PreferencesController:stateChange', 
+-    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+-    async ({ useTokenDetection }) => {
+-        const selectedAccount = __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_getSelectedAccount).call(this);
+-        const isDetectionChangedFromPreferences = __classPrivateFieldGet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, "f") !== useTokenDetection;
+-        __classPrivateFieldSet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, useTokenDetection, "f");
+-        if (isDetectionChangedFromPreferences) {
+-            await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
+-                selectedAddress: selectedAccount.address,
+-            });
+-        }
+-    });
+-    this.messagingSystem.subscribe('AccountsController:selectedEvmAccountChange', 
+-    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+-    async (selectedAccount) => {
+-        const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
+-        const chainIds = Object.keys(networkConfigurationsByChainId);
+-        const isSelectedAccountIdChanged = __classPrivateFieldGet(this, _TokenDetectionController_selectedAccountId, "f") !== selectedAccount.id;
+-        if (isSelectedAccountIdChanged) {
+-            __classPrivateFieldSet(this, _TokenDetectionController_selectedAccountId, selectedAccount.id, "f");
+-            await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
+-                selectedAddress: selectedAccount.address,
+-                chainIds,
+-            });
+-        }
+-    });
++      const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
++      const chainIds = Object.keys(networkConfigurationsByChainId);
++      __classPrivateFieldSet(this, _TokenDetectionController_isUnlocked, true, "f");
++      await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, { chainIds });
++  });
++  this.messagingSystem.subscribe('KeyringController:lock', () => {
++      __classPrivateFieldSet(this, _TokenDetectionController_isUnlocked, false, "f");
++      __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_stopPolling).call(this);
++  });
++  this.messagingSystem.subscribe('TokenListController:stateChange',
++  // TODO: Either fix this lint violation or explain why it's necessary to ignore.
++  // eslint-disable-next-line @typescript-eslint/no-misused-promises
++  async ({ tokensChainsCache }) => {
++      const isEqualValues = __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_compareTokensChainsCache).call(this, tokensChainsCache, __classPrivateFieldGet(this, _TokenDetectionController_tokensChainsCache, "f"));
++      if (!isEqualValues) {
++          const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
++          const chainIds = Object.keys(networkConfigurationsByChainId);
++          await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, { chainIds });
++      }
++  });
++  this.messagingSystem.subscribe('PreferencesController:stateChange',
++  // TODO: Either fix this lint violation or explain why it's necessary to ignore.
++  // eslint-disable-next-line @typescript-eslint/no-misused-promises
++  async ({ useTokenDetection }) => {
++      const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
++      const selectedAccount = __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_getSelectedAccount).call(this);
++      const isDetectionChangedFromPreferences = __classPrivateFieldGet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, "f") !== useTokenDetection;
++      __classPrivateFieldSet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, useTokenDetection, "f");
++      const chainIds = Object.keys(networkConfigurationsByChainId);
++      if (isDetectionChangedFromPreferences) {
++          await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
++              selectedAddress: selectedAccount.address,
++              chainIds,
++          });
++      }
++  });
++  this.messagingSystem.subscribe('AccountsController:selectedEvmAccountChange',
++  // TODO: Either fix this lint violation or explain why it's necessary to ignore.
++  // eslint-disable-next-line @typescript-eslint/no-misused-promises
++  async (selectedAccount) => {
++      const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
++      const chainIds = Object.keys(networkConfigurationsByChainId);
++      const isSelectedAccountIdChanged = __classPrivateFieldGet(this, _TokenDetectionController_selectedAccountId, "f") !== selectedAccount.id;
++      if (isSelectedAccountIdChanged) {
++          __classPrivateFieldSet(this, _TokenDetectionController_selectedAccountId, selectedAccount.id, "f");
++          await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
++              selectedAddress: selectedAccount.address,
++              chainIds,
++          });
++      }
++  });
+ }, _TokenDetectionController_stopPolling = function _TokenDetectionController_stopPolling() {
+     if (__classPrivateFieldGet(this, _TokenDetectionController_intervalId, "f")) {
+         clearInterval(__classPrivateFieldGet(this, _TokenDetectionController_intervalId, "f"));
diff --git a/scripts/build.sh b/scripts/build.sh
index 4d17078437c..1ea006cd97b 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -226,7 +226,7 @@ buildAndroidRun(){
 	remapEnvVariableLocal
 	prebuild_android
 	#react-native run-android --port=$WATCHER_PORT --variant=prodDebug --active-arch-only
-	npx expo run:android --no-install --port $WATCHER_PORT --variant 'prodDebug'
+	npx expo run:android --no-install --port $WATCHER_PORT --variant 'prodDebug' --device
 }
 
 buildAndroidDevBuild(){
diff --git a/yarn.lock b/yarn.lock
index 9b1a57a6cad..99a215534f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4443,14 +4443,6 @@
     single-call-balance-checker-abi "^1.0.0"
     uuid "^8.3.2"
 
-"@metamask/base-controller@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-3.2.3.tgz#7436a14f6789acf0814952dabaa70ee4fb7d473c"
-  integrity sha512-k66oZe7BOEx0D5N5X8feE/32QlrUTmiEHHAZU/yCac2+VHllJOCEQV/cTeaAtgepnEf8O7SskvYZN+eIjgS99w==
-  dependencies:
-    "@metamask/utils" "^8.1.0"
-    immer "^9.0.6"
-
 "@metamask/base-controller@^7.0.1", "@metamask/base-controller@^7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-7.0.2.tgz#bf908858215cd4f7d072b3b0f7f0946cf886ee49"
@@ -4486,19 +4478,19 @@
     "@metamask/utils" "^8.2.0"
     "@types/eslint" "^8.44.7"
 
-"@metamask/composable-controller@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@metamask/composable-controller/-/composable-controller-3.0.3.tgz#9644a65c482996ee033eae34e169eb9713e4a33e"
-  integrity sha512-dF8emJGwJi66Uhk+VoBaQpl5+DT3+cT/g/IBZ6pg4cbAu8L/kXuS3sw8JEKFskkaSVy/can8qgcBY5zU4LfeUA==
+"@metamask/composable-controller@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/composable-controller/-/composable-controller-10.0.0.tgz#f2b9d1e6abc6c21f93f51ccf3c7408c3b7cb508f"
+  integrity sha512-0cShYc2CSBUKbzyI6pzQUyjG9vnVjgpv7Ydnba/uzUkOaylVxN7uyruSz2nO22TIWVsKQsH8mS+LIYC1fOJjsQ==
   dependencies:
-    "@metamask/base-controller" "^3.2.3"
+    "@metamask/base-controller" "^7.0.2"
 
 "@metamask/contract-metadata@^2.4.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-2.5.0.tgz#33921fa9c15eb1863f55dcd5f75467ae15614ebb"
   integrity sha512-+j7jEcp0P1OUMEpa/OIwfJs/ahBC/akwgWxaRTSWX2SWABvlUKBVRMtslfL94Qj2wN2xw8xjaUy5nSHqrznqDA==
 
-"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.4.1", "@metamask/controller-utils@^11.4.3", "@metamask/controller-utils@^11.4.4":
+"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.4.1", "@metamask/controller-utils@^11.4.4":
   version "11.4.4"
   resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.4.4.tgz#6e43e4cf53d34dad225bab8aaf4e7efcb1fe7623"
   integrity sha512-0/gKC6jxlj8KRzi0RjGDQnml6l4b46Da/AIqnGJMOC59zl4qD5UN1GM+mq7L5duw/m8sSHa7VbL1hL0l7Cw1pg==
@@ -4636,10 +4628,10 @@
     "@metamask/utils" "^10.0.0"
     uuid "^8.3.2"
 
-"@metamask/eth-ledger-bridge-keyring@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-6.0.0.tgz#f62b6f3e286bdd3369c9360aa14300f86a24427c"
-  integrity sha512-xPNE/ZpmzwILnZ3a1JrcScSMdIL650fFPtrmf/7ZJRCyUlOoVWETpqUdSesLROC5WZBs8Ao1lus6YfTTqIsu6w==
+"@metamask/eth-ledger-bridge-keyring@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-8.0.0.tgz#f425443dfe3e00f2e4f17ef57c9d0c3990c3e69f"
+  integrity sha512-HqdLXGKJOMIDVheep1kLhc7MfY4NGmgOYM886XIh7dcEdX0WuaujvOPfaJ4IKEKMPBbFr6wsOYY31KvZ3s+9ew==
   dependencies:
     "@ethereumjs/rlp" "^5.0.2"
     "@ethereumjs/tx" "^4.2.0"
@@ -4784,17 +4776,17 @@
     is-hex-prefixed "1.0.0"
     strip-hex-prefix "1.0.0"
 
-"@metamask/gas-fee-controller@^21.0.0":
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-21.0.0.tgz#1cd21f3d33b097adb9c2d9bea17ac5ee72b491e6"
-  integrity sha512-34/AORJFpaHgr1jtzIk1/SzGSw7sYZL49kww7x7tW9wZcxV7r8rPZ5K25TveORzZtdfEsz1CVZjO4iEM8B4Lwg==
+"@metamask/gas-fee-controller@^22.0.2":
+  version "22.0.2"
+  resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-22.0.2.tgz#6e092c3579d3b041ea252364a81190d8968cec5e"
+  integrity sha512-VaJHNWHL2mdswOIRrz5zes/recHRiXUG5sa5Co1eMFxpHQoX57ciFQ4J8rWsBP4P7H6a8MOB0TNFkn2fYCvpRg==
   dependencies:
-    "@metamask/base-controller" "^7.0.1"
-    "@metamask/controller-utils" "^11.3.0"
+    "@metamask/base-controller" "^7.0.2"
+    "@metamask/controller-utils" "^11.4.4"
     "@metamask/eth-query" "^4.0.0"
     "@metamask/ethjs-unit" "^0.3.0"
-    "@metamask/polling-controller" "^11.0.0"
-    "@metamask/utils" "^9.1.0"
+    "@metamask/polling-controller" "^12.0.2"
+    "@metamask/utils" "^10.0.0"
     "@types/bn.js" "^5.1.5"
     "@types/uuid" "^8.3.0"
     bn.js "^5.2.1"
@@ -4891,37 +4883,6 @@
     uuid "^9.0.1"
     webextension-polyfill "^0.12.0"
 
-"@metamask/keyring-api@^8.1.3":
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/@metamask/keyring-api/-/keyring-api-8.1.3.tgz#53e6a68236b88592db5bd43cf7e0d7e97dfad818"
-  integrity sha512-Ztm4G/U5hc+GKS/VOnqLWYVh2O26lFQ03bNpeufrfKq7regydIqYuHFcSowbQyj7xCZqKPsvl9jxhKdYIxvCXQ==
-  dependencies:
-    "@metamask/snaps-sdk" "^6.5.1"
-    "@metamask/superstruct" "^3.1.0"
-    "@metamask/utils" "^9.2.1"
-    "@types/uuid" "^9.0.8"
-    bech32 "^2.0.0"
-    uuid "^9.0.1"
-
-"@metamask/keyring-controller@^18.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-18.0.0.tgz#48d5a441cd798cef840c5bf6334d53b6e37dc938"
-  integrity sha512-SIvjDUvt9U+fqge3ao0qZYfWrlBVf/NI/nFOwp9Q8IFpPsZYHKpbLahLfviunR/KItBul7vTzWBIN/FtQo/eLg==
-  dependencies:
-    "@ethereumjs/util" "^8.1.0"
-    "@keystonehq/metamask-airgapped-keyring" "^0.14.1"
-    "@metamask/base-controller" "^7.0.2"
-    "@metamask/browser-passworder" "^4.3.0"
-    "@metamask/eth-hd-keyring" "^7.0.4"
-    "@metamask/eth-sig-util" "^8.0.0"
-    "@metamask/eth-simple-keyring" "^6.0.5"
-    "@metamask/keyring-api" "^8.1.3"
-    "@metamask/message-manager" "^11.0.1"
-    "@metamask/utils" "^10.0.0"
-    async-mutex "^0.5.0"
-    ethereumjs-wallet "^1.0.1"
-    immer "^9.0.6"
-
 "@metamask/keyring-controller@^19.0.1":
   version "19.0.1"
   resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-19.0.1.tgz#6fee40a46a780a720f4c864ea779673569be06a7"
@@ -4950,7 +4911,7 @@
     "@metamask/controller-utils" "^11.3.0"
     uuid "^8.3.2"
 
-"@metamask/message-manager@^11.0.1", "@metamask/message-manager@^11.0.2":
+"@metamask/message-manager@^11.0.2":
   version "11.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/message-manager/-/message-manager-11.0.2.tgz#805ac8d2184c56d973a787bdc7c9571024348ce6"
   integrity sha512-j8DgWn7ACfwZtLFqeAYx4U/TquBEtcPYa81LjhoZYK39W/MQVr4ZKAmGEKxKRruMLz50GX7ciOEZU9SBtPBAog==
@@ -4986,36 +4947,13 @@
   resolved "https://registry.yarnpkg.com/@metamask/mobile-provider/-/mobile-provider-3.0.0.tgz#8a6a5a0874c8cbe4b468f63dfc57117d207f9595"
   integrity sha512-XwFJk0rd9lAZR5xS3VC7ypEhD7DvZR2gi2Ch6PHnODIqeS9Te3OdVKK5+jHI4his8v/zs6LWdFdlRtx5/jL96w==
 
-"@metamask/network-controller@^21.0.0":
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-21.1.0.tgz#766598a7e854a86bcb5f94af6c7bbc7f67820d02"
-  integrity sha512-AyGumRyUtuQAkYJ/7f/KSPqwc+vndUP20BE0NbGo2hVfMS/IOdvUj2Dz+c8+LnqkO6JfyuQ7BVJiMy5JnMucJw==
-  dependencies:
-    "@metamask/base-controller" "^7.0.1"
-    "@metamask/controller-utils" "^11.3.0"
-    "@metamask/eth-block-tracker" "^11.0.2"
-    "@metamask/eth-json-rpc-infura" "^10.0.0"
-    "@metamask/eth-json-rpc-middleware" "^15.0.0"
-    "@metamask/eth-json-rpc-provider" "^4.1.5"
-    "@metamask/eth-query" "^4.0.0"
-    "@metamask/json-rpc-engine" "^10.0.0"
-    "@metamask/rpc-errors" "^7.0.0"
-    "@metamask/swappable-obj-proxy" "^2.2.0"
-    "@metamask/utils" "^9.1.0"
-    async-mutex "^0.5.0"
-    immer "^9.0.6"
-    loglevel "^1.8.1"
-    reselect "^5.1.1"
-    uri-js "^4.4.1"
-    uuid "^8.3.2"
-
-"@metamask/network-controller@^22.0.2":
-  version "22.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-22.0.2.tgz#d6f5464d26bc9b68731cc5c7ec32845f63d1fcf0"
-  integrity sha512-DfcDdmtVRp7TrtbvaSFX+98jE/KSorhTy/znWOpe1zt60q6v3+SVttT2LJlZpvpk0hyiDPNBO4lmk3AOovR2/w==
+"@metamask/network-controller@^22.1.0":
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-22.1.0.tgz#b4c81a31fc52147d12131bfb16c77c1c1cfbe43c"
+  integrity sha512-wvP2HUBQCWvlvBkuhqMNtd6+D/cJa343ABFLfCLNrQsk8QjdHPFw/QDIqC+QXTPxyrPWw9GL5akaLb//rmO1NA==
   dependencies:
     "@metamask/base-controller" "^7.0.2"
-    "@metamask/controller-utils" "^11.4.3"
+    "@metamask/controller-utils" "^11.4.4"
     "@metamask/eth-block-tracker" "^11.0.2"
     "@metamask/eth-json-rpc-infura" "^10.0.0"
     "@metamask/eth-json-rpc-middleware" "^15.0.0"
@@ -5026,6 +4964,7 @@
     "@metamask/swappable-obj-proxy" "^2.2.0"
     "@metamask/utils" "^10.0.0"
     async-mutex "^0.5.0"
+    fast-deep-equal "^3.1.3"
     immer "^9.0.6"
     loglevel "^1.8.1"
     reselect "^5.1.1"
@@ -5040,16 +4979,16 @@
     "@ethersproject/providers" "^5.7.2"
     async-mutex "^0.3.1"
 
-"@metamask/notification-services-controller@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.11.0.tgz#6f1f8553e73bbaa5e3631c772efc34640264ff81"
-  integrity sha512-2QplJt1gqdPkhnHN6+C1E8MrcdZh1JgoDf9YnL2WsuCmMFlpujYD7mW7lRInBnCrPbKliHgF96oOT0D5gFigoA==
+"@metamask/notification-services-controller@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.15.0.tgz#d846fa49df62838a8ae48e80a8fee098730f06b0"
+  integrity sha512-RJtCI0GkVLStmhNoq9QNqSQNag6gD37iWU/qU19ds5PujSrtmfS5t2Sk6YRNV3SkRrfiIFrhGDToUDBDBu13OA==
   dependencies:
     "@contentful/rich-text-html-renderer" "^16.5.2"
-    "@metamask/base-controller" "^7.0.1"
-    "@metamask/controller-utils" "^11.3.0"
-    "@metamask/utils" "^9.1.0"
-    bignumber.js "^4.1.0"
+    "@metamask/base-controller" "^7.0.2"
+    "@metamask/controller-utils" "^11.4.4"
+    "@metamask/utils" "^10.0.0"
+    bignumber.js "^9.1.2"
     firebase "^10.11.0"
     loglevel "^1.8.1"
     uuid "^8.3.2"
@@ -5124,18 +5063,6 @@
     fastest-levenshtein "^1.0.16"
     punycode "^2.1.1"
 
-"@metamask/polling-controller@^11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-11.0.0.tgz#3de28c27a9be5d85879cf9bd35d03a62dbf8932c"
-  integrity sha512-fXG60Ft7lYgqC8lV8m4FL18hU4K2NnsPzoWTm1Lhen2cysLbgAzqxxGdeIFEMaDiCzcvEtLuEffY8FDKCM0ewQ==
-  dependencies:
-    "@metamask/base-controller" "^7.0.1"
-    "@metamask/controller-utils" "^11.3.0"
-    "@metamask/utils" "^9.1.0"
-    "@types/uuid" "^8.3.0"
-    fast-json-stable-stringify "^2.1.0"
-    uuid "^8.3.2"
-
 "@metamask/polling-controller@^12.0.0", "@metamask/polling-controller@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-12.0.2.tgz#de37ff5f4f997d57d4da34b0c6574d2eba3184e0"
@@ -5156,10 +5083,10 @@
     "@metamask/utils" "^9.0.0"
     readable-stream "3.6.2"
 
-"@metamask/ppom-validator@0.35.1":
-  version "0.35.1"
-  resolved "https://registry.yarnpkg.com/@metamask/ppom-validator/-/ppom-validator-0.35.1.tgz#9ccece28f9f8947caef575849ef41f2ca15baa13"
-  integrity sha512-iaJRIFUXNBeuQwy+6B10mkPJDAmhvSyu5PAehSNSj+J2Q7Vy3AJe9GWI5t62j3IeDnwuny+Av+x/T+iI5D/b8w==
+"@metamask/ppom-validator@0.36.0":
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/@metamask/ppom-validator/-/ppom-validator-0.36.0.tgz#cc8ace84ead3521c1b079650fa4169d1020bc070"
+  integrity sha512-9PN+QZpQCq0ctu0b7LeHFWeZQ5phKavVQ7t0tp2ZYtea6ql7zayjDhZQitoFUEHN3R6BuHxn5ORfDGFJgNDL9Q==
   dependencies:
     "@metamask/base-controller" "^7.0.1"
     "@metamask/controller-utils" "^11.3.0"
@@ -5178,17 +5105,17 @@
     "@metamask/base-controller" "^7.0.2"
     "@metamask/controller-utils" "^11.4.4"
 
-"@metamask/profile-sync-controller@^1.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/profile-sync-controller/-/profile-sync-controller-1.0.2.tgz#877a04cdcda2441bd30ac996581f520b4b4f3c53"
-  integrity sha512-mFZtnmMR040QxnZx8U7hs/UVToBZxPxJCB+QWnUkkSUZ/rk2Yq1nWepxJEgxxrdyb4goHGzFGFUId+Fr0ezBjg==
+"@metamask/profile-sync-controller@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/profile-sync-controller/-/profile-sync-controller-3.0.0.tgz#52cdb1f370ba6c8ce580fb9f9d1e9a5b1f8b9014"
+  integrity sha512-OlNOlWcHLlX4QNKR/J0O4IwgtO46EYA3OPzntmDk7zlFtd3I61qooE3EnRWH6aYPQsf7GcsM2aP44cKVJyV4mg==
   dependencies:
     "@metamask/base-controller" "^7.0.2"
-    "@metamask/keyring-api" "^8.1.3"
-    "@metamask/keyring-controller" "^18.0.0"
-    "@metamask/network-controller" "^22.0.2"
-    "@metamask/snaps-sdk" "^6.5.0"
-    "@metamask/snaps-utils" "^8.1.1"
+    "@metamask/keyring-api" "^10.1.0"
+    "@metamask/keyring-controller" "^19.0.1"
+    "@metamask/network-controller" "^22.1.0"
+    "@metamask/snaps-sdk" "^6.7.0"
+    "@metamask/snaps-utils" "^8.3.0"
     "@noble/ciphers" "^0.5.2"
     "@noble/hashes" "^1.4.0"
     immer "^9.0.6"
@@ -5310,26 +5237,26 @@
     utf-8-validate "^5.0.2"
     uuid "^8.3.2"
 
-"@metamask/selected-network-controller@^18.0.2":
-  version "18.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/selected-network-controller/-/selected-network-controller-18.0.2.tgz#a6bd7916c47307999cada50d8e5d3d839a29246c"
-  integrity sha512-0a0uAW3EH56zWuDtCw5al6PcwWjDEsy4ydoUV77+Ko8h46WsS8gbV4VpoKAN+MJpihty0LVM8J6whT3Z5qP7iQ==
+"@metamask/selected-network-controller@^19.0.0":
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/selected-network-controller/-/selected-network-controller-19.0.0.tgz#7c950e051d6848ac5cdcf980f90196a0772425ef"
+  integrity sha512-ijCFHwZN+73VskJU+X0AoSlCTycgLveEjwUoycUeajmUuZyLV5KLLVYPKTk0Pd/aQAaO2tL9yZi0/geazNGV7A==
   dependencies:
     "@metamask/base-controller" "^7.0.1"
     "@metamask/json-rpc-engine" "^10.0.0"
     "@metamask/swappable-obj-proxy" "^2.2.0"
-    "@metamask/utils" "^9.1.0"
+    "@metamask/utils" "^10.0.0"
 
-"@metamask/signature-controller@^22.0.0":
-  version "22.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-22.0.0.tgz#a52c79881aae4b47fecfc2c2b1f2d0e1e649e240"
-  integrity sha512-k4Kvq4tdFDWLiFiNijUeOGVQj10PfNp5R6DCPXwMgQnJqmUBXM14i/kMN4lU7rRsieYhQdXRVOQZ3/5r3wCstg==
+"@metamask/signature-controller@^23.1.0":
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-23.1.0.tgz#45b3b545e5a4e890ff41a737b6526cb08fd9f1b3"
+  integrity sha512-HPUDjVjsZ/HU5QZlmllh1yN2Z1+VhqjTPmzxqXBqD28iKYwUU0YEMN+Jahyh9Ukl7BH/UgzGaaHytGXJ1Xf2Xw==
   dependencies:
     "@metamask/base-controller" "^7.0.2"
-    "@metamask/controller-utils" "^11.4.3"
+    "@metamask/controller-utils" "^11.4.4"
     "@metamask/eth-sig-util" "^8.0.0"
     "@metamask/utils" "^10.0.0"
-    jsonschema "^1.2.4"
+    jsonschema "^1.4.1"
     lodash "^4.17.21"
     uuid "^8.3.2"
 
@@ -5442,7 +5369,7 @@
     fast-xml-parser "^4.3.4"
     superstruct "^1.0.3"
 
-"@metamask/snaps-sdk@^6.11.0", "@metamask/snaps-sdk@^6.13.0", "@metamask/snaps-sdk@^6.5.0", "@metamask/snaps-sdk@^6.5.1", "@metamask/snaps-sdk@^6.7.0":
+"@metamask/snaps-sdk@^6.11.0", "@metamask/snaps-sdk@^6.13.0", "@metamask/snaps-sdk@^6.7.0":
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/@metamask/snaps-sdk/-/snaps-sdk-6.13.0.tgz#cbfef71253264efd4e0ef4606f89e93f83885816"
   integrity sha512-WXNt0XZSnmgbwgETL0RiRvl0CMa78ZA1zLS0olK8QR/+9zcPCSrh68v1lVAa+LcctvzpRJ8NiRAar2fRBthqyw==
@@ -5453,7 +5380,7 @@
     "@metamask/superstruct" "^3.1.0"
     "@metamask/utils" "^10.0.0"
 
-"@metamask/snaps-utils@^8.1.1", "@metamask/snaps-utils@^8.3.0", "@metamask/snaps-utils@^8.6.0", "@metamask/snaps-utils@^8.6.1":
+"@metamask/snaps-utils@^8.3.0", "@metamask/snaps-utils@^8.6.0", "@metamask/snaps-utils@^8.6.1":
   version "8.6.1"
   resolved "https://registry.yarnpkg.com/@metamask/snaps-utils/-/snaps-utils-8.6.1.tgz#9f3b52f9b00a93ce9e3f22e79066fea0d6df458a"
   integrity sha512-R6Gj6Im5gV09kjkSH9vDKrvsqNGaFGbSAl95fhlQBW3QevLaMbvAF4bCfhA3YCfsEYZUWsgplYpCjX78q2jvBA==
@@ -5518,10 +5445,10 @@
   resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-8.9.0.tgz#bac680e8f0007b3a11440f7e311674d6457d37ed"
   integrity sha512-N/WfmdrzJm+xbpuqJsfMrlrAhiNDsllIpwt9gDDeEKDlQAfJnMtT9xvOvBJbXY7zgMdtGZuD+KY64jNKabbuVQ==
 
-"@metamask/transaction-controller@^41.0.0":
-  version "41.1.0"
-  resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-41.1.0.tgz#ad226b3f754750a064175075554b60a0d755a7f3"
-  integrity sha512-5u7tnl7WOY+Nuw8zXoeIikW7zQSxHduYsXDs2kJSAJo0qaOnFBgER031bqB23TIX2nLh8MR8vPf3Ft5ZBr7/UQ==
+"@metamask/transaction-controller@^42.0.0":
+  version "42.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-42.0.0.tgz#f5c035d018b7f72e4b21757bd075c6863a6301ca"
+  integrity sha512-lITyvFsrjUhJox5CypaT7B80Bs5VxOziul2dcSBJFrD56vOX46ijq7FelTGbuSegJ+hlc+BUIsSSmhMiSDgHhw==
   dependencies:
     "@ethereumjs/common" "^3.2.0"
     "@ethereumjs/tx" "^4.2.0"
@@ -5579,7 +5506,7 @@
     semver "^7.3.8"
     superstruct "^1.0.3"
 
-"@metamask/utils@^8.1.0", "@metamask/utils@^8.2.0", "@metamask/utils@^8.3.0":
+"@metamask/utils@^8.2.0", "@metamask/utils@^8.3.0":
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-8.5.0.tgz#ddd0d4012d5191809404c97648a837ea9962cceb"
   integrity sha512-I6bkduevXb72TIM9q2LRO63JSsF9EXduh3sBr9oybNX2hNNpr/j1tEjXrsG0Uabm4MJ1xkGAQEMwifvKZIkyxQ==
@@ -12772,11 +12699,6 @@ big-integer@1.6.x:
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
   integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
 
-bignumber.js@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
-  integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
-
 bignumber.js@^7.2.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
@@ -17952,6 +17874,11 @@ fsevents@^2.3.2, fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
+fsm-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fsm-iterator/-/fsm-iterator-1.1.0.tgz#337de45de19eb205788cf02e3a955ec206760dec"
+  integrity sha512-hg47CNYdIGJ5m9WSKh617LHRdvJo4PiF0VkncFLwPVxKvBEQfSPd1qx/xLV/eSusewEu0C8eUFrsLsWlBgIcOg==
+
 ftp-response-parser@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ftp-response-parser/-/ftp-response-parser-1.0.1.tgz#3b9d33f8edd5fb8e4700b8f778c462e5b1581f89"
@@ -20666,10 +20593,10 @@ jsonpath-plus@^7.2.0:
   resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz#7ad94e147b3ed42f7939c315d2b9ce490c5a3899"
   integrity sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==
 
-jsonschema@^1.2.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2"
-  integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw==
+jsonschema@^1.2.4, jsonschema@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
+  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -21263,6 +21190,11 @@ lodash.isequal@4.5.0, lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
+
 lodash.isobject@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
@@ -25685,6 +25617,15 @@ redux-persist@6.0.0:
   resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8"
   integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
 
+redux-saga-test-plan@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/redux-saga-test-plan/-/redux-saga-test-plan-4.0.6.tgz#0e50a68f63083fbda4bb20cc087833d5b84ace77"
+  integrity sha512-ESdbFoDWCeJ/EiFdUNSCGtA2CC9tnuvHDm6k06gVFa98EIeR2hpzFkGk9kJ1/hpMUnYFp+OOEEITIrZeDYBfFg==
+  dependencies:
+    fsm-iterator "^1.1.0"
+    lodash.isequal "^4.5.0"
+    lodash.ismatch "^4.4.0"
+
 redux-saga@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.3.0.tgz#a59ada7c28010189355356b99738c9fcb7ade30e"