From 10ccbfc68d5e780792a0caffc93f381c20aa89e3 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 1 Sep 2023 15:51:40 +0200
Subject: [PATCH] Fix v11 RC issues following merge (#20690)

* Update LavaMoat policies

* Update sentry mask

* Update snapshots
---
 app/scripts/lib/setupSentry.js                    | 15 +++++++++++++++
 lavamoat/browserify/main/policy.json              |  4 +++-
 ...errors-after-init-opt-in-background-state.json | 12 ++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index befecf21c..d4ed6eb60 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -82,6 +82,9 @@ export const SENTRY_BACKGROUND_STATE = {
   CachedBalancesController: {
     cachedBalances: false,
   },
+  CronjobController: {
+    jobs: false,
+  },
   CurrencyController: {
     conversionDate: true,
     conversionRate: true,
@@ -146,6 +149,9 @@ export const SENTRY_BACKGROUND_STATE = {
     allNfts: false,
     ignoredNfts: false,
   },
+  NotificationController: {
+    notifications: false,
+  },
   OnboardingController: {
     completedOnboarding: true,
     firstTimeFlowType: true,
@@ -213,6 +219,15 @@ export const SENTRY_BACKGROUND_STATE = {
       userOptIn: true,
     },
   },
+  SnapController: {
+    snapErrors: false,
+    snapStates: false,
+    snaps: false,
+  },
+  SnapsRegistry: {
+    database: false,
+    lastUpdated: false,
+  },
   SubjectMetadataController: {
     subjectMetadata: false,
   },
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 0e1a7b0eb..1487df47a 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1997,7 +1997,9 @@
       "packages": {
         "@metamask/snaps-controllers>concat-stream>readable-stream": true,
         "browserify>buffer": true,
-        "pumpify>inherits": true
+        "browserify>concat-stream>typedarray": true,
+        "pumpify>inherits": true,
+        "terser>source-map-support>buffer-from": true
       }
     },
     "@metamask/snaps-controllers>concat-stream>readable-stream": {
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
index 02bd3f9da..d4e531e65 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -43,7 +43,7 @@
   },
   "BackupController": "undefined",
   "CachedBalancesController": { "cachedBalances": "object" },
-  "CronjobController": "object",
+  "CronjobController": { "jobs": "object" },
   "CurrencyController": {
     "conversionDate": "number",
     "conversionRate": 1700,
@@ -112,7 +112,7 @@
     "allNfts": "object",
     "ignoredNfts": "object"
   },
-  "NotificationController": "object",
+  "NotificationController": { "notifications": "object" },
   "OnboardingController": {
     "seedPhraseBackedUp": true,
     "firstTimeFlowType": "import",
@@ -172,8 +172,12 @@
       "smartTransactions": "object"
     }
   },
-  "SnapController": "object",
-  "SnapsRegistry": "object",
+  "SnapController": {
+    "snapErrors": "object",
+    "snaps": "object",
+    "snapStates": "object"
+  },
+  "SnapsRegistry": { "database": "object", "lastUpdated": "object" },
   "SubjectMetadataController": { "subjectMetadata": "object" },
   "SwapsController": {
     "swapsState": {