Merge remote-tracking branch 'origin/main' into feat/metadata-access-token

Author: lwin-kyaw

app/_locales/en/messages.json

@@ -3,8 +3,7 @@
 // We don't usually `import` files into `app-init.js` because we need to load
 // "chunks" via `importScripts`; but in this case `promise-with-resolvers` file
 // is so small we won't ever have a problem with these two files being "split".
-// Import to set up global `Promise.withResolvers` polyfill
-import '../../shared/lib/promise-with-resolvers';
+import { withResolvers } from '../../shared/lib/promise-with-resolvers';
 
 // Represents if importAllScripts has been run
 // eslint-disable-next-line
@@ -200,7 +199,7 @@ const registerInPageContentScript = async () => {
  *
  * @type {PromiseWithResolvers<chrome.runtime.InstalledDetails>}
  */
-const deferredOnInstalledListener = Promise.withResolvers();
+const deferredOnInstalledListener = withResolvers();
 globalThis.stateHooks.onInstalledListener = deferredOnInstalledListener.promise;
 
 /**

app/_locales/en_GB/messages.json

@@ -14,8 +14,7 @@ import browser from 'webextension-polyfill';
 import { isObject, hasProperty } from '@metamask/utils';
 import PortStream from 'extension-port-stream';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
-// Import to set up global `Promise.withResolvers` polyfill
-import '../../shared/lib/promise-with-resolvers';
+import { withResolvers } from '../../shared/lib/promise-with-resolvers';
 import { FirstTimeFlowType } from '../../shared/constants/onboarding';
 
 import {
@@ -200,7 +199,7 @@ let rejectInitialization;
  * state of application initialization (or re-initialization).
  */
 function setGlobalInitializers() {
-  const deferred = Promise.withResolvers();
+  const deferred = withResolvers();
   isInitialized = deferred.promise;
   resolveInitialization = deferred.resolve;
   rejectInitialization = deferred.reject;

app/scripts/app-init.js

@@ -49,6 +49,7 @@ describe('UserStorageControllerInit', () => {
     expect(UserStorageControllerClassMock).toHaveBeenCalledWith({
       messenger: requestMock.controllerMessenger,
       state: requestMock.persistedState.UserStorageController,
+      trace: expect.any(Function),
       config: {
         accountSyncing: {
           maxNumberOfAccountsToAdd: 100,

app/scripts/background.js

@@ -10,6 +10,7 @@ import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
+import { trace } from '../../../../shared/lib/trace';
 
 /**
  * Initialize the UserStorage controller.
@@ -27,6 +28,8 @@ export const UserStorageControllerInit: ControllerInitFunction<
   const controller = new UserStorageController({
     messenger: controllerMessenger,
     state: persistedState.UserStorageController as UserStorageControllerState,
+    // @ts-expect-error Controller uses string for names rather than enum
+    trace,
     config: {
       accountSyncing: {
         maxNumberOfAccountsToAdd: isProduction() ? undefined : 100,

app/scripts/controller-init/identity/user-storage-controller-init.test.ts

@@ -104,11 +104,6 @@ export function getUserStorageControllerMessenger(
       'AccountsController:listAccounts',
       'AccountsController:updateAccountMetadata',
       'AccountsController:updateAccounts',
-      // Network Controller Requests
-      'NetworkController:getState',
-      'NetworkController:addNetwork',
-      'NetworkController:removeNetwork',
-      'NetworkController:updateNetwork',
       // Address Book Controller Requests
       'AddressBookController:list',
       'AddressBookController:set',

app/scripts/controller-init/identity/user-storage-controller-init.ts

@@ -1,5 +1,6 @@
 import { type DebounceSettings, type DebouncedFunc, debounce } from 'lodash';
 import log from 'loglevel';
+import { withResolvers } from '../../../shared/lib/promise-with-resolvers';
 
 export type { DebounceSettings } from 'lodash';
 
@@ -115,7 +116,7 @@ export class OperationSafener<O extends Op = Op> {
       // rejection from running `this.#bouncer.flush()` *is* an unhandled
       // rejection; we want it to bubble up to the process/window's
       // `unhandledRejection` listener, i.e., Sentry.
-      const { promise, resolve } = Promise.withResolvers<void>();
+      const { promise, resolve } = withResolvers<void>();
       finalInvocation.finally(resolve);
       this.#evacuating = promise;
     } else {

app/scripts/controller-init/messengers/identity/user-storage-controller-messenger.ts

@@ -105,7 +105,10 @@ describe('requestEthereumAccountsHandler', () => {
     it('blocks subsequent requests if there is currently a request waiting for the wallet to be unlocked', async () => {
       const { handler, getUnlockPromise, getAccounts, end, response } =
         createMockedHandler();
-      const { promise, resolve } = Promise.withResolvers<void>();
+      // `withResolvers` is supported by Node.js LTS. It's optional in global type due to older
+      // browser support.
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const { promise, resolve } = Promise.withResolvers!<void>();
       getUnlockPromise.mockReturnValue(promise);
       getAccounts.mockReturnValue(['0xdead', '0xbeef']);
 

app/scripts/lib/operation-safener.ts

@@ -84,7 +84,7 @@ describe('CorruptionHandler.handleStateCorruptionError', () => {
                   method: '__INVALID__',
                 },
               });
-            } else if (message.data.method === 'RELOAD') {
+            } else if (message.data.method === 'RELOAD_WINDOW') {
               reloadFn(ui);
             }
           });