Merge branch 'develop' into fix-permit-dataTree-should-not-break-with…

…-no-decimals
MetaMask · Aug 14, 2024 · 2e94356 · 2e94356
2 parents d4e60ac + bef5b8f
commit 2e94356
Show file tree

Hide file tree

Showing 79 changed files with 2,662 additions and 3,935 deletions.
diff --git a/...ps-controllers-npm-8.4.0-574cd5a8a9.patch → ...ps-controllers-npm-9.2.0-09a31bab4f.patch b/...ps-controllers-npm-8.4.0-574cd5a8a9.patch → ...ps-controllers-npm-9.2.0-09a31bab4f.patch
@@ -1,5 +1,5 @@
 diff --git a/package.json b/package.json
-index 6dedde043d1bd5fc195e72b3e06ec37cf6532476..3986b5b0c1f3bf7ff49e023c934bed26f44735ae 100644
+index 7e70a2db3606d673d92d38a2755e155bf2af5fd3..67cff443e63bd04e5699279d8101ef4ec547e9cb 100644
 --- a/package.json
 +++ b/package.json
 @@ -9,7 +9,7 @@

diff --git a/app/scripts/controllers/authentication/auth-snap-requests.ts b/app/scripts/controllers/authentication/auth-snap-requests.ts