Merge branch 'develop' of github.com:MetaMask/metamask-extension into…

… flaky-fix-window-token-allowance
MetaMask · Jun 14, 2024 · 1b1d283 · 1b1d283
2 parents a9e2169 + 2aaf565
commit 1b1d283
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 301 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -269,6 +269,7 @@ module.exports = {
       excludedFiles: [
         'app/scripts/controllers/app-state.test.js',
         'app/scripts/controllers/mmi-controller.test.js',
+        'app/scripts/controllers/metametrics.test.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/controllers/preferences.test.js',
         'app/scripts/lib/**/*.test.js',
@@ -300,6 +301,7 @@ module.exports = {
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/app-state.test.js',
         'app/scripts/controllers/mmi-controller.test.ts',
+        'app/scripts/controllers/metametrics.test.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/controllers/preferences.test.js',
         'app/scripts/lib/**/*.test.js',

diff --git a/.mocharc.js b/.mocharc.js
@@ -8,6 +8,7 @@ module.exports = {
     './app/scripts/controllers/app-state.test.js',
     './app/scripts/controllers/permissions/**/*.test.js',
     './app/scripts/controllers/mmi-controller.test.ts',
+    './app/scripts/controllers/metametrics.test.js',
     './app/scripts/controllers/preferences.test.js',
     './app/scripts/constants/error-utils.test.js',
     './app/scripts/metamask-controller.test.js',