From a2e0b01c5b9c2cc9a6d1bc560e96e68a315ac209 Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:53:53 +0100
Subject: [PATCH] chore: bump `@metamask/preferences-controller` to `^14.0.0`
 (#28778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR bumps `@metamask/preferences-controller` to `^14.0.0`

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28778?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28491

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../controllers/preferences-controller.ts        |  9 ++++++---
 package.json                                     |  2 +-
 yarn.lock                                        | 16 ++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index dce2ef3d0512..d705be4c3180 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -124,10 +124,14 @@ export type Preferences = {
   shouldShowAggregatedBalancePopover: boolean;
 };
 
-// Omitting showTestNetworks and smartTransactionsOptInStatus, as they already exists here in Preferences type
+// Omitting properties that already exist in the PreferencesState, as part of the preferences property.
 export type PreferencesControllerState = Omit<
   PreferencesState,
-  'showTestNetworks' | 'smartTransactionsOptInStatus'
+  | 'showTestNetworks'
+  | 'smartTransactionsOptInStatus'
+  | 'privacyMode'
+  | 'tokenSortConfig'
+  | 'useMultiRpcMigration'
 > & {
   useBlockie: boolean;
   useNonceField: boolean;
@@ -135,7 +139,6 @@ export type PreferencesControllerState = Omit<
   dismissSeedBackUpReminder: boolean;
   overrideContentSecurityPolicyHeader: boolean;
   useMultiAccountBalanceChecker: boolean;
-  useSafeChainsListValidation: boolean;
   use4ByteResolution: boolean;
   useCurrencyRateCheck: boolean;
   useRequestQueue: boolean;
diff --git a/package.json b/package.json
index bf715e753f61..baffa0c6373b 100644
--- a/package.json
+++ b/package.json
@@ -467,7 +467,7 @@
     "@metamask/eth-json-rpc-provider": "^4.1.6",
     "@metamask/forwarder": "^1.1.0",
     "@metamask/phishing-warning": "^4.1.0",
-    "@metamask/preferences-controller": "^13.0.2",
+    "@metamask/preferences-controller": "^14.0.0",
     "@metamask/test-bundler": "^1.0.0",
     "@metamask/test-dapp": "8.13.0",
     "@octokit/core": "^3.6.0",
diff --git a/yarn.lock b/yarn.lock
index 159ea9658db7..4fbf80a01a15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6080,15 +6080,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/preferences-controller@npm:^13.0.2":
-  version: 13.0.3
-  resolution: "@metamask/preferences-controller@npm:13.0.3"
+"@metamask/preferences-controller@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "@metamask/preferences-controller@npm:14.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^7.0.1"
-    "@metamask/controller-utils": "npm:^11.3.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.3"
   peerDependencies:
-    "@metamask/keyring-controller": ^17.0.0
-  checksum: 10/d922c2e603c7a1ef0301dcfc7d5b6aa0bbdd9c318f0857fbbc9e95606609ae806e69c46231288953ce443322039781404565a46fe42bdfa731c4f0da20448d32
+    "@metamask/keyring-controller": ^18.0.0
+  checksum: 10/cc1fdfe4dc6f4c058c518b59f13b7badd0de92e04e143aec6787be3a8807364d545dcb26172dd005e0d6865b06614b963385f0863a3e2a04d234bd6d33474942
   languageName: node
   linkType: hard
 
@@ -26581,7 +26581,7 @@ __metadata:
     "@metamask/polling-controller": "npm:^11.0.0"
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/ppom-validator": "npm:0.35.1"
-    "@metamask/preferences-controller": "npm:^13.0.2"
+    "@metamask/preferences-controller": "npm:^14.0.0"
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
     "@metamask/profile-sync-controller": "npm:^2.0.0"
     "@metamask/providers": "npm:^18.2.0"