Merge branch 'develop' into 24178-bug-not-ellipsing-long-nft-id-withi…

…n-simulations
MetaMask · Jun 19, 2024 · f9fd048 · f9fd048
2 parents 3b25f23 + 038f3d6
commit f9fd048
Show file tree

Hide file tree

Showing 9 changed files with 355 additions and 240 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/swaps.test.js',
         'app/scripts/controllers/metametrics.test.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/controllers/preferences.test.js',
@@ -301,6 +302,7 @@ module.exports = {
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/app-state.test.js',
         'app/scripts/controllers/mmi-controller.test.ts',
+        'app/scripts/controllers/swaps.test.js',
         'app/scripts/controllers/metametrics.test.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/controllers/preferences.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/swaps.test.js',
     './app/scripts/controllers/metametrics.test.js',
     './app/scripts/controllers/preferences.test.js',
     './app/scripts/constants/error-utils.test.js',