Merge branch 'develop' into 19692-reduce-gas-limit-fallback-from-95-t…

…o-35-of-the-block-gas-limit-to-improve-how-we-handle-failed-gas-limit-estimations
MetaMask · Oct 18, 2024 · a930a84 · a930a84
2 parents f5d9f57 + 36bde61
commit a930a84
Show file tree

Hide file tree

Showing 46 changed files with 2,154 additions and 1,329 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -307,7 +307,7 @@ module.exports = {
     {
       files: [
         '**/__snapshots__/*.snap',
-        'app/scripts/controllers/app-state.test.js',
+        'app/scripts/controllers/app-state-controller.test.ts',
         'app/scripts/controllers/mmi-controller.test.ts',
         'app/scripts/controllers/alert-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',