From 3887186e7675ed9410c1b27468221715ccf13925 Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Wed, 17 Jul 2024 13:38:14 -0400
Subject: [PATCH] Update yarn resolutions for `snaps-{sdk,utils}`

---
 package.json                                     |  4 ++--
 .../src/AccountsController.ts                    |  3 ++-
 yarn.lock                                        | 16 ++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 4afa42ce1fe..195da6c908f 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
     "pre-push": "yarn lint"
   },
   "resolutions": {
-    "@metamask/snaps-sdk": "github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6",
-    "@metamask/snaps-utils": "github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6",
+    "@metamask/snaps-sdk": "github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012",
+    "@metamask/snaps-utils": "github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012",
     "tsup@^8.0.2": "patch:tsup@npm%3A8.0.2#./.yarn/patches/tsup-npm-8.0.2-86e40f68a7.patch"
   },
   "devDependencies": {
diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts
index 9148b8c513c..560623095d1 100644
--- a/packages/accounts-controller/src/AccountsController.ts
+++ b/packages/accounts-controller/src/AccountsController.ts
@@ -423,7 +423,8 @@ export class AccountsController extends BaseController<
         ...account,
         metadata: { ...account.metadata, name: accountName },
       };
-      // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
+      // Error is flaky. Leaving commented `ts-expect-error` directive so it can be re-enabled if needed.
+      // // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
       currentState.internalAccounts.accounts[accountId] = internalAccount;
     });
   }
diff --git a/yarn.lock b/yarn.lock
index 1f05d0f53a5..f62dc9402c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3772,22 +3772,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6":
+"@metamask/snaps-sdk@github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012":
   version: 6.0.0
-  resolution: "@metamask/snaps-sdk@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-sdk&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6"
+  resolution: "@metamask/snaps-sdk@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012"
   dependencies:
     "@metamask/key-tree": "npm:^9.1.2"
     "@metamask/providers": "npm:17.0.0"
     "@metamask/rpc-errors": "npm:^6.3.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.0.0"
-  checksum: 10/aba1cec053caf1a460bf143fa340f4722f97dbcf325bef7e0203cd0823b4411ab2da0bf945d54293a89cd3847d40057f2a524324e8d15897cfaf59b7b6acbe12
+    "@metamask/utils": "npm:^9.1.0"
+  checksum: 10/8a5ef3e62935150f0e2c4e17a87baf9f90779ea3fd530b8ae81cfb5c67bbfbeae6dc9c390dd208d950f421dec4f98732d8b391f3b5fa330377db8eda69d83659
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6":
+"@metamask/snaps-utils@github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012":
   version: 7.7.0
-  resolution: "@metamask/snaps-utils@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-utils&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6"
+  resolution: "@metamask/snaps-utils@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
@@ -3799,7 +3799,7 @@ __metadata:
     "@metamask/snaps-registry": "npm:^3.2.1"
     "@metamask/snaps-sdk": "npm:^6.0.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.0.0"
+    "@metamask/utils": "npm:^9.1.0"
     "@noble/hashes": "npm:^1.3.1"
     "@scure/base": "npm:^1.1.1"
     chalk: "npm:^4.1.2"
@@ -3812,7 +3812,7 @@ __metadata:
     semver: "npm:^7.5.4"
     ses: "npm:^1.1.0"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/27e70d9c0450ae93ef6268fc26d62054bbd1c61b05d1237c5e888177956652aabca290f49ec7de34421dd311d6ed41691cdf9b611b6d28cbc17dffa672f89307
+  checksum: 10/73c2a2f41c91d4dd56a7bad48c3e95c80557f44742a4c2731c945f1ccb30dad4260f733cf2a8fbc6c643085499ac71ee3ec4af334944dc16819f844577cc9cda
   languageName: node
   linkType: hard