Merge branch 'main' into n3ps/fix-confirmation-snap

Author: n3ps

.yarn/patches/@metamask-assets-controllers-patch-0229f60576.patch

@@ -0,0 +1,106 @@
+diff --git a/dist/CurrencyRateController.cjs b/dist/CurrencyRateController.cjs
+index 9329fa3772bad655112451929bd107d99d95b34e..57683eb3b5501085f8d12fabdf0720ced0479ba8 100644
+--- a/dist/CurrencyRateController.cjs
++++ b/dist/CurrencyRateController.cjs
+@@ -42,6 +42,7 @@ const defaultState = {
+         },
+     },
+ };
++const boundedPrecisionNumber = (value, precision = 9) => Number(value.toFixed(precision));
+ /**
+  * Controller that passively polls on a set interval for an exchange rate from the current network
+  * asset to the user's preferred currency.
+@@ -169,8 +170,12 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+             const rate = priceApiExchangeRatesResponse[fetchedCurrency.toLowerCase()];
+             acc[nativeCurrency] = {
+                 conversionDate: rate !== undefined ? Date.now() / 1000 : null,
+-                conversionRate: rate?.value ? Number(1 / rate?.value) : null,
+-                usdConversionRate: rate?.usd ? Number(1 / rate?.usd) : null,
++                conversionRate: rate?.value
++                    ? boundedPrecisionNumber(1 / rate.value)
++                    : null,
++                usdConversionRate: rate?.usd
++                    ? boundedPrecisionNumber(1 / rate.usd)
++                    : null,
+             };
+             return acc;
+         }, {});
+@@ -211,7 +216,9 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+             return {
+                 nativeCurrency,
+                 conversionDate: tokenPrice ? Date.now() / 1000 : null,
+-                conversionRate: tokenPrice?.price ?? null,
++                conversionRate: tokenPrice?.price
++                    ? boundedPrecisionNumber(tokenPrice.price)
++                    : null,
+                 usdConversionRate: null, // Token prices service doesn't provide USD rate in this context
+             };
+         }));
+@@ -232,8 +239,12 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+         const ratesFromTokenPricesService = ratesFromTokenPrices.reduce((acc, rate) => {
+             acc[rate.nativeCurrency] = {
+                 conversionDate: rate.conversionDate,
+-                conversionRate: rate.conversionRate,
+-                usdConversionRate: rate.usdConversionRate,
++                conversionRate: rate.conversionRate
++                    ? boundedPrecisionNumber(rate.conversionRate)
++                    : null,
++                usdConversionRate: rate.usdConversionRate
++                    ? boundedPrecisionNumber(rate.usdConversionRate)
++                    : null,
+             };
+             return acc;
+         }, {});
+diff --git a/dist/CurrencyRateController.mjs b/dist/CurrencyRateController.mjs
+index d9c312e93b9ea6d37ad55321b2588248a61e5442..62280a33f6f67efcc173b5699b4f9bb13eea1c05 100644
+--- a/dist/CurrencyRateController.mjs
++++ b/dist/CurrencyRateController.mjs
+@@ -39,6 +39,7 @@ const defaultState = {
+         },
+     },
+ };
++const boundedPrecisionNumber = (value, precision = 9) => Number(value.toFixed(precision));
+ /**
+  * Controller that passively polls on a set interval for an exchange rate from the current network
+  * asset to the user's preferred currency.
+@@ -165,8 +166,12 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+             const rate = priceApiExchangeRatesResponse[fetchedCurrency.toLowerCase()];
+             acc[nativeCurrency] = {
+                 conversionDate: rate !== undefined ? Date.now() / 1000 : null,
+-                conversionRate: rate?.value ? Number(1 / rate?.value) : null,
+-                usdConversionRate: rate?.usd ? Number(1 / rate?.usd) : null,
++                conversionRate: rate?.value
++                    ? boundedPrecisionNumber(1 / rate.value)
++                    : null,
++                usdConversionRate: rate?.usd
++                    ? boundedPrecisionNumber(1 / rate.usd)
++                    : null,
+             };
+             return acc;
+         }, {});
+@@ -207,7 +212,9 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+             return {
+                 nativeCurrency,
+                 conversionDate: tokenPrice ? Date.now() / 1000 : null,
+-                conversionRate: tokenPrice?.price ?? null,
++                conversionRate: tokenPrice?.price
++                    ? boundedPrecisionNumber(tokenPrice.price)
++                    : null,
+                 usdConversionRate: null, // Token prices service doesn't provide USD rate in this context
+             };
+         }));
+@@ -228,8 +235,12 @@ _CurrencyRateController_tokenPricesService = new WeakMap(), _CurrencyRateControl
+         const ratesFromTokenPricesService = ratesFromTokenPrices.reduce((acc, rate) => {
+             acc[rate.nativeCurrency] = {
+                 conversionDate: rate.conversionDate,
+-                conversionRate: rate.conversionRate,
+-                usdConversionRate: rate.usdConversionRate,
++                conversionRate: rate.conversionRate
++                    ? boundedPrecisionNumber(rate.conversionRate)
++                    : null,
++                usdConversionRate: rate.usdConversionRate
++                    ? boundedPrecisionNumber(rate.usdConversionRate)
++                    : null,
+             };
+             return acc;
+         }, {});

.yarnrc.yml

@@ -46,6 +46,7 @@ npmAuditIgnoreAdvisories:
   # Material UI dependencies are planned for removal
   - '@material-ui/core (deprecation)'
   - '@material-ui/styles (deprecation)'
+  - '@material-ui/pickers (deprecation)'
 
   # Dependencies brought in by @truffle/decoder that are deprecated:
   - 'cids (deprecation)' # via @ensdomains/content-hash

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.12.1]
+
+### Fixed
+
+- Adds bounds to currencyRates (#38591)
+
 ## [13.12.0]
 
 ### Added
@@ -1391,7 +1397,8 @@ authorized by the user.` error until the user fully revoked dapp
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.12.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.12.1...HEAD
+[13.12.1]: https://github.com/MetaMask/metamask-extension/compare/v13.12.0...v13.12.1
 [13.12.0]: https://github.com/MetaMask/metamask-extension/compare/v13.11.2...v13.12.0
 [13.11.2]: https://github.com/MetaMask/metamask-extension/compare/v13.11.1...v13.11.2
 [13.11.1]: https://github.com/MetaMask/metamask-extension/compare/v13.11.0...v13.11.1

app/_locales/en/messages.json

@@ -15,7 +15,6 @@ import { finished } from 'readable-stream';
 import log from 'loglevel';
 import browser from 'webextension-polyfill';
 import { isObject, hasProperty } from '@metamask/utils';
-import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { ExtensionPortStream } from 'extension-port-stream';
 import { withResolvers } from '../../shared/lib/promise-with-resolvers';
 import { FirstTimeFlowType } from '../../shared/constants/onboarding';
@@ -109,8 +108,6 @@ const lazyListener =
 
 // eslint-disable-next-line @metamask/design-tokens/color-no-hex
 const BADGE_COLOR_APPROVAL = '#0376C9';
-// eslint-disable-next-line @metamask/design-tokens/color-no-hex
-const BADGE_COLOR_NOTIFICATION = '#D73847';
 const BADGE_MAX_COUNT = 9;
 
 const inTest = process.env.IN_TEST;
@@ -1455,16 +1452,12 @@ export function setupController(
    */
   function updateBadge() {
     const pendingApprovalCount = getPendingApprovalCount();
-    const unreadNotificationsCount = getUnreadNotificationsCount();
 
     let label = '';
-    let badgeColor = BADGE_COLOR_APPROVAL;
+    const badgeColor = BADGE_COLOR_APPROVAL;
 
     if (pendingApprovalCount) {
       label = getBadgeLabel(pendingApprovalCount, BADGE_MAX_COUNT);
-    } else if (unreadNotificationsCount > 0) {
-      label = getBadgeLabel(unreadNotificationsCount, BADGE_MAX_COUNT);
-      badgeColor = BADGE_COLOR_NOTIFICATION;
     }
 
     try {
@@ -1495,55 +1488,6 @@ export function setupController(
     }
   }
 
-  function getUnreadNotificationsCount() {
-    try {
-      const { isNotificationServicesEnabled, isFeatureAnnouncementsEnabled } =
-        controller.notificationServicesController.state;
-
-      const snapNotificationCount = Object.values(
-        controller.notificationServicesController.state
-          .metamaskNotificationsList,
-      ).filter(
-        (notification) =>
-          notification.type ===
-            NotificationServicesController.Constants.TRIGGER_TYPES.SNAP &&
-          notification.readDate === null,
-      ).length;
-
-      const featureAnnouncementCount = isFeatureAnnouncementsEnabled
-        ? controller.notificationServicesController.state.metamaskNotificationsList.filter(
-            (notification) =>
-              !notification.isRead &&
-              notification.type ===
-                NotificationServicesController.Constants.TRIGGER_TYPES
-                  .FEATURES_ANNOUNCEMENT,
-          ).length
-        : 0;
-
-      const walletNotificationCount = isNotificationServicesEnabled
-        ? controller.notificationServicesController.state.metamaskNotificationsList.filter(
-            (notification) =>
-              !notification.isRead &&
-              notification.type !==
-                NotificationServicesController.Constants.TRIGGER_TYPES
-                  .FEATURES_ANNOUNCEMENT &&
-              notification.type !==
-                NotificationServicesController.Constants.TRIGGER_TYPES.SNAP,
-          ).length
-        : 0;
-
-      const unreadNotificationsCount =
-        snapNotificationCount +
-        featureAnnouncementCount +
-        walletNotificationCount;
-
-      return unreadNotificationsCount;
-    } catch (error) {
-      console.error('Failed to get unread notifications count:', error);
-      return 0;
-    }
-  }
-
   notificationManager.on(
     NOTIFICATION_MANAGER_EVENTS.POPUP_CLOSED,
     ({ automaticallyClosed }) => {