diff --git a/.yarn/patches/lavamoat-core-npm-14.2.0-c453f4f755.patch b/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch
similarity index 100%
rename from .yarn/patches/lavamoat-core-npm-14.2.0-c453f4f755.patch
rename to .yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch
diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js
index 1b259d9f6dd9..d6e980e1be95 100644
--- a/app/scripts/controllers/mmi-controller.js
+++ b/app/scripts/controllers/mmi-controller.js
@@ -345,7 +345,7 @@ export default class MMIController extends EventEmitter {
 
     // FIXME: status maps are not a thing anymore
     this.custodyController.storeCustodyStatusMap(
-      custodian.name,
+      custodian.envName,
       keyring.getStatusMap(),
     );
 
diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index 77052b05e483..be997cdf1e98 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -58,18 +58,21 @@ export default function setupEnsIpfsResolver({
     const ipfsGateway = getIpfsGateway();
     const useAddressBarEnsResolution = getUseAddressBarEnsResolution();
 
-    if (!useAddressBarEnsResolution || ipfsGateway === '') {
-      return;
-    }
+    const ensSiteUrl = `https://app.ens.domains/name/${name}`;
 
-    browser.tabs.update(tabId, { url: `loading.html` });
+    // We cannot show this if useAddressBarEnsResolution is off...
+    if (useAddressBarEnsResolution && ipfsGateway) {
+      browser.tabs.update(tabId, { url: 'loading.html' });
+    }
 
-    let url = `https://app.ens.domains/name/${name}`;
+    let url = ensSiteUrl;
 
     // If we're testing ENS domain resolution support,
     // we assume the ENS domains URL
     if (process.env.IN_TEST) {
-      browser.tabs.update(tabId, { url });
+      if (useAddressBarEnsResolution || ipfsGateway) {
+        browser.tabs.update(tabId, { url });
+      }
       return;
     }
 
@@ -79,6 +82,12 @@ export default function setupEnsIpfsResolver({
         name,
       });
       if (type === 'ipfs-ns' || type === 'ipns-ns') {
+        // If the ENS is via IPFS and that setting is disabled,
+        // Do not resolve the ENS
+        if (ipfsGateway === '') {
+          url = null;
+          return;
+        }
         const resolvedUrl = `https://${hash}.${type.slice(
           0,
           4,
@@ -121,7 +130,15 @@ export default function setupEnsIpfsResolver({
     } catch (err) {
       console.warn(err);
     } finally {
-      browser.tabs.update(tabId, { url });
+      // Only forward to destination URL if a URL exists and
+      // useAddressBarEnsResolution is properly
+      if (
+        url &&
+        (useAddressBarEnsResolution ||
+          (!useAddressBarEnsResolution && url !== ensSiteUrl))
+      ) {
+        browser.tabs.update(tabId, { url });
+      }
     }
   }
 }
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 86e66c5feecd..0d117f87e475 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -115,6 +115,9 @@ export const SENTRY_BACKGROUND_STATE = {
     keyrings: false,
     keyringTypes: false,
   },
+  LoggingController: {
+    logs: false,
+  },
   MetaMetricsController: {
     eventsBeforeMetricsOptIn: false,
     fragments: false,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 76cf19085ea4..c6e13786de92 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -57,12 +57,12 @@ import {
   SelectedNetworkController,
   createSelectedNetworkMiddleware,
 } from '@metamask/selected-network-controller';
+import { LoggingController } from '@metamask/logging-controller';
 
 ///: BEGIN:ONLY_INCLUDE_IN(snaps)
 import { encrypt, decrypt } from '@metamask/browser-passworder';
 import { RateLimitController } from '@metamask/rate-limit-controller';
 import { NotificationController } from '@metamask/notification-controller';
-
 import {
   CronjobController,
   JsonSnapsRegistry,
@@ -347,6 +347,13 @@ export default class MetamaskController extends EventEmitter {
       ],
     });
 
+    this.loggingController = new LoggingController({
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'LoggingController',
+      }),
+      state: initState.LoggingController,
+    });
+
     ///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
     this.mmiConfigurationController = new MmiConfigurationController({
       initState: initState.MmiConfigurationController,
@@ -369,23 +376,22 @@ export default class MetamaskController extends EventEmitter {
     if (initState.NetworkController) {
       initialNetworkControllerState = initState.NetworkController;
     } else if (process.env.IN_TEST) {
+      const networkConfig = {
+        chainId: CHAIN_IDS.LOCALHOST,
+        nickname: 'Localhost 8545',
+        rpcPrefs: {},
+        rpcUrl: 'http://localhost:8545',
+        ticker: 'ETH',
+        id: 'networkConfigurationId',
+      };
       initialNetworkControllerState = {
         providerConfig: {
-          chainId: CHAIN_IDS.LOCALHOST,
-          nickname: 'Localhost 8545',
-          rpcPrefs: {},
-          rpcUrl: 'http://localhost:8545',
-          ticker: 'ETH',
+          ...networkConfig,
           type: 'rpc',
         },
         networkConfigurations: {
           networkConfigurationId: {
-            chainId: CHAIN_IDS.LOCALHOST,
-            nickname: 'Localhost 8545',
-            rpcPrefs: {},
-            rpcUrl: 'http://localhost:8545',
-            ticker: 'ETH',
-            networkConfigurationId: 'networkConfigurationId',
+            ...networkConfig,
           },
         },
       };
@@ -1103,6 +1109,8 @@ export default class MetamaskController extends EventEmitter {
         'SnapController:snapInstalled',
         'SnapController:snapUpdated',
         'SnapController:snapRemoved',
+        'SnapController:snapEnabled',
+        'SnapController:snapDisabled',
       ],
       allowedActions: [
         `${this.permissionController.name}:getPermissions`,
@@ -1720,6 +1728,7 @@ export default class MetamaskController extends EventEmitter {
       NftController: this.nftController,
       PhishingController: this.phishingController,
       SelectedNetworkController: this.selectedNetworkController,
+      LoggingController: this.loggingController,
       ///: BEGIN:ONLY_INCLUDE_IN(snaps)
       SnapController: this.snapController,
       CronjobController: this.cronjobController,
@@ -1768,6 +1777,7 @@ export default class MetamaskController extends EventEmitter {
         SmartTransactionsController: this.smartTransactionsController,
         NftController: this.nftController,
         SelectedNetworkController: this.selectedNetworkController,
+        LoggingController: this.loggingController,
         ///: BEGIN:ONLY_INCLUDE_IN(snaps)
         SnapController: this.snapController,
         CronjobController: this.cronjobController,
@@ -2716,6 +2726,7 @@ export default class MetamaskController extends EventEmitter {
       ),
       dismissNotifications: this.dismissNotifications.bind(this),
       markNotificationsAsRead: this.markNotificationsAsRead.bind(this),
+      updateCaveat: this.updateCaveat.bind(this),
       ///: END:ONLY_INCLUDE_IN
       ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
       updateSnapRegistry: this.preferencesController.updateSnapRegistry.bind(
diff --git a/builds.yml b/builds.yml
index 70ec3ffe77d2..f1d5e8144d7a 100644
--- a/builds.yml
+++ b/builds.yml
@@ -58,7 +58,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.38.3-flask.1/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.39.0-flask.1/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -77,7 +77,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.38.3-flask.1/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.39.0-flask.1/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 892374ab6499..a6eca099ed40 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -922,25 +922,39 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": true,
         "@metamask/eth-json-rpc-middleware>clone": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
       "globals": {
         "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true
       },
       "packages": {
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@metamask/eth-json-rpc-middleware>clone": {
@@ -1614,6 +1628,12 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/logging-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/logo": {
       "globals": {
         "addEventListener": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index b26b2be02723..bede398269d4 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -993,25 +993,39 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": true,
         "@metamask/eth-json-rpc-middleware>clone": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
       "globals": {
         "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true
       },
       "packages": {
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@metamask/eth-json-rpc-middleware>clone": {
@@ -1765,6 +1779,12 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/logging-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/logo": {
       "globals": {
         "addEventListener": true,
@@ -2053,20 +2073,7 @@
     },
     "@metamask/rpc-methods-flask>@metamask/snaps-ui": {
       "packages": {
-        "@metamask/rpc-methods-flask>@metamask/snaps-ui>@metamask/utils": true,
-        "superstruct": true
-      }
-    },
-    "@metamask/rpc-methods-flask>@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
+        "@metamask/rpc-methods-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
@@ -2211,6 +2218,7 @@
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/snaps-controllers-flask>@metamask/post-message-stream": true,
         "@metamask/snaps-controllers-flask>@metamask/rpc-methods": true,
+        "@metamask/snaps-controllers-flask>@metamask/snaps-registry": true,
         "@metamask/snaps-controllers-flask>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "@metamask/snaps-controllers-flask>concat-stream": true,
@@ -2219,11 +2227,10 @@
         "@metamask/snaps-controllers>gunzip-maybe": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
-        "pump": true
+        "stream-browserify": true
       }
     },
     "@metamask/snaps-controllers-flask>@metamask/post-message-stream": {
@@ -2268,20 +2275,14 @@
     },
     "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui": {
       "packages": {
-        "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui>@metamask/utils": true,
+        "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
-    "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/snaps-controllers-flask>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
+        "@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
@@ -2553,26 +2554,6 @@
         "@metamask/snaps-utils-flask>is-svg>fast-xml-parser>strnum": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
-      "packages": {
-        "@metamask/key-tree>@noble/secp256k1": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
-        "superstruct": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 87616d548685..873139ec3333 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -993,25 +993,39 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": true,
         "@metamask/eth-json-rpc-middleware>clone": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
       "globals": {
         "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true
       },
       "packages": {
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@metamask/eth-json-rpc-middleware>clone": {
@@ -1765,6 +1779,12 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/logging-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/logo": {
       "globals": {
         "addEventListener": true,
@@ -2069,20 +2089,7 @@
     },
     "@metamask/rpc-methods-flask>@metamask/snaps-ui": {
       "packages": {
-        "@metamask/rpc-methods-flask>@metamask/snaps-ui>@metamask/utils": true,
-        "superstruct": true
-      }
-    },
-    "@metamask/rpc-methods-flask>@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
+        "@metamask/rpc-methods-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
@@ -2227,6 +2234,7 @@
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/snaps-controllers-flask>@metamask/post-message-stream": true,
         "@metamask/snaps-controllers-flask>@metamask/rpc-methods": true,
+        "@metamask/snaps-controllers-flask>@metamask/snaps-registry": true,
         "@metamask/snaps-controllers-flask>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "@metamask/snaps-controllers-flask>concat-stream": true,
@@ -2235,11 +2243,10 @@
         "@metamask/snaps-controllers>gunzip-maybe": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
-        "pump": true
+        "stream-browserify": true
       }
     },
     "@metamask/snaps-controllers-flask>@metamask/post-message-stream": {
@@ -2284,20 +2291,14 @@
     },
     "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui": {
       "packages": {
-        "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui>@metamask/utils": true,
+        "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
-    "@metamask/snaps-controllers-flask>@metamask/rpc-methods>@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/snaps-controllers-flask>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
+        "@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/snaps-controllers-flask>@metamask/utils": true,
         "superstruct": true
       }
     },
@@ -2569,26 +2570,6 @@
         "@metamask/snaps-utils-flask>is-svg>fast-xml-parser>strnum": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
-      "packages": {
-        "@metamask/key-tree>@noble/secp256k1": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
-        "superstruct": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 76635c854c9f..b338c1e8f697 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -922,25 +922,39 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": true,
         "@metamask/eth-json-rpc-middleware>clone": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
       "globals": {
         "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true
       },
       "packages": {
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@metamask/eth-json-rpc-middleware>clone": {
@@ -1614,6 +1628,12 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/logging-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/logo": {
       "globals": {
         "addEventListener": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 26fbe0e3e7eb..99beea63a6c4 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1062,25 +1062,39 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": true,
         "@metamask/eth-json-rpc-middleware>clone": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
       "globals": {
         "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true
       },
       "packages": {
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@metamask/eth-json-rpc-middleware>clone": {
@@ -1754,6 +1768,12 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/logging-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/logo": {
       "globals": {
         "addEventListener": true,
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index ed581042a3e6..baf15bfb8aa7 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -1049,6 +1049,7 @@
       "globals": {
         "__dirname": true,
         "__filename.slice": true,
+        "console.error": true,
         "console.warn": true,
         "process.cwd": true,
         "setTimeout": true
@@ -1059,6 +1060,7 @@
         "@lavamoat/lavapack>readable-stream": true,
         "@lavamoat/lavapack>umd": true,
         "browserify>JSONStream": true,
+        "eslint>espree": true,
         "lavamoat>json-stable-stringify": true,
         "lavamoat>lavamoat-core": true,
         "through2": true
@@ -6306,14 +6308,10 @@
     "lavamoat>@lavamoat/aa": {
       "builtin": {
         "fs.readFileSync": true,
-        "fs.statSync": true,
         "path.dirname": true,
         "path.join": true,
         "path.relative": true
       },
-      "globals": {
-        "performantResolve": true
-      },
       "packages": {
         "brfs>resolve": true
       }
diff --git a/package.json b/package.json
index 6e4c8291fdbd..b3902602b561 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "request@^2.83.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
     "request@^2.88.2": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
     "request@^2.85.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
-    "lavamoat-core@^14.2.0": "patch:lavamoat-core@npm%3A14.2.0#./.yarn/patches/lavamoat-core-npm-14.2.0-c453f4f755.patch",
+    "lavamoat-core@npm:^14.4.1": "patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch",
     "@metamask/keyring-controller@^7.4.0": "patch:@metamask/keyring-controller@npm%3A7.4.0#~/.yarn/patches/@metamask-keyring-controller-npm-7.4.0-5dd5df31c7.patch",
     "@metamask/signature-controller@^5.3.0": "patch:@metamask/signature-controller@npm%3A5.3.0#./.yarn/patches/@metamask-signature-controller-npm-5.3.0-225628460b.patch",
     "semver@7.3.7": "^7.5.4",
@@ -226,7 +226,7 @@
     "@lavamoat/snow": "^1.5.0",
     "@material-ui/core": "^4.11.0",
     "@metamask-institutional/custody-controller": "^0.2.12",
-    "@metamask-institutional/custody-keyring": "^1.0.1",
+    "@metamask-institutional/custody-keyring": "^1.0.2",
     "@metamask-institutional/extension": "^0.3.5",
     "@metamask-institutional/institutional-features": "^1.2.4",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
@@ -254,11 +254,12 @@
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/key-tree": "^9.0.0",
     "@metamask/keyring-controller": "^7.4.0",
+    "@metamask/logging-controller": "^1.0.1",
     "@metamask/logo": "^3.1.1",
     "@metamask/message-manager": "^7.3.0",
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/name-controller": "^1.0.0",
-    "@metamask/network-controller": "^12.1.1",
+    "@metamask/network-controller": "^12.2.0",
     "@metamask/notification-controller": "^3.0.0",
     "@metamask/obs-store": "^8.1.0",
     "@metamask/permission-controller": "^4.0.0",
@@ -268,7 +269,7 @@
     "@metamask/providers": "^11.1.0",
     "@metamask/rate-limit-controller": "^3.0.0",
     "@metamask/rpc-methods": "^1.0.2",
-    "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.38.2-flask.1",
+    "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.38.3-flask.1",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "^1.0.0",
@@ -276,11 +277,11 @@
     "@metamask/slip44": "^3.0.0",
     "@metamask/smart-transactions-controller": "^4.0.0",
     "@metamask/snaps-controllers": "^1.0.2",
-    "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.38.3-flask.1",
+    "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.39.0-flask.1",
     "@metamask/snaps-ui": "^1.0.2",
-    "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.37.4-flask.1",
+    "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.37.5-flask.1",
     "@metamask/snaps-utils": "^1.0.2",
-    "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.38.3-flask.1",
+    "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.38.4-flask.1",
     "@metamask/subject-metadata-controller": "^2.0.0",
     "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
@@ -364,7 +365,7 @@
     "redux-thunk": "^2.3.0",
     "remove-trailing-slash": "^0.1.1",
     "reselect": "^3.0.1",
-    "ses": "^0.18.7",
+    "ses": "^0.18.8",
     "single-call-balance-checker-abi": "^1.0.0",
     "unicode-confusables": "^0.1.1",
     "uuid": "^8.3.2",
@@ -384,7 +385,7 @@
     "@babel/register": "^7.5.5",
     "@ethersproject/bignumber": "^5.7.0",
     "@lavamoat/allow-scripts": "^2.3.1",
-    "@lavamoat/lavapack": "^5.2.0",
+    "@lavamoat/lavapack": "^5.2.4",
     "@metamask/auto-changelog": "^2.1.0",
     "@metamask/eslint-config": "^9.0.0",
     "@metamask/eslint-config-jest": "^9.0.0",
@@ -508,9 +509,9 @@
     "jsdom": "^16.7.0",
     "junit-report-merger": "^4.0.0",
     "koa": "^2.7.0",
-    "lavamoat": "^7.1.0",
-    "lavamoat-browserify": "^15.7.0",
-    "lavamoat-viz": "^6.0.9",
+    "lavamoat": "^7.1.2",
+    "lavamoat-browserify": "^15.7.4",
+    "lavamoat-viz": "^6.0.11",
     "lockfile-lint": "^4.10.6",
     "loose-envify": "^1.4.0",
     "madge": "^6.1.0",
diff --git a/test/e2e/tests/ipfs-ens-resolution.spec.js b/test/e2e/tests/ipfs-ens-resolution.spec.js
index 73b2f70d66b8..ba7a1357d283 100644
--- a/test/e2e/tests/ipfs-ens-resolution.spec.js
+++ b/test/e2e/tests/ipfs-ens-resolution.spec.js
@@ -31,7 +31,7 @@ describe('Settings', function () {
     await driver.quit();
   });
 
-  it('Does not lookup IPFS data for ENS Domain when switched off', async function () {
+  it('Does not fetch ENS data for ENS Domain when ENS and IPFS switched off', async function () {
     let server;
 
     await withFixtures(
@@ -54,7 +54,10 @@ describe('Settings', function () {
         await driver.clickElement({ text: 'Settings', tag: 'div' });
         await driver.clickElement({ text: 'Security & privacy', tag: 'div' });
 
-        // turns off IPFS domain resolution
+        // turns off IPFS setting
+        await driver.clickElement('[data-testid="ipfsToggle"] .toggle-button');
+
+        // turns off ENS domain resolution
         await driver.clickElement(
           '[data-testid="ipfs-gateway-resolution-container"] .toggle-button',
         );
diff --git a/test/e2e/tests/ipfs-toggle.spec.js b/test/e2e/tests/ipfs-toggle.spec.js
index 0fc6392e57fd..9a7a537dbaf5 100644
--- a/test/e2e/tests/ipfs-toggle.spec.js
+++ b/test/e2e/tests/ipfs-toggle.spec.js
@@ -59,7 +59,9 @@ describe('Settings', function () {
         });
 
         // should render image now
-        const nftImage = await driver.findElement('[data-testid="nft-image"]');
+        const nftImage = await driver.findVisibleElement(
+          '[data-testid="nft-image"]',
+        );
         assert.equal(await nftImage.isDisplayed(), true);
       },
     );
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 c53998494f8b..6325ba3e6376 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
@@ -71,6 +71,9 @@
     "keyringTypes": "object",
     "keyrings": "object"
   },
+  "LoggingController": {
+    "logs": "object"
+  },
   "MetaMetricsController": {
     "participateInMetaMetrics": true,
     "metaMetricsId": "fake-metrics-id",
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
index f598c876d217..31aa72b082ee 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -193,7 +193,8 @@
     "ensResolutionsByAddress": "object",
     "pendingApprovals": "object",
     "pendingApprovalCount": "number",
-    "approvalFlows": "object"
+    "approvalFlows": "object",
+    "logs": "object"
   },
   "send": "object",
   "swaps": "object",
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 0cb8e636ced3..efe57253ec6e 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -69,6 +69,13 @@ const AssetList = ({ onClickAsset }) => {
   return (
     <>
       {process.env.MULTICHAIN ? <BalanceOverview /> : null}
+      {detectedTokens.length > 0 &&
+        !isTokenDetectionInactiveOnNonMainnetSupportedNetwork && (
+          <DetectedTokensBanner
+            actionButtonOnClick={() => setShowDetectedTokens(true)}
+            margin={4}
+          />
+        )}
       <TokenListItem
         onClick={() => onClickAsset(nativeCurrency)}
         title={nativeCurrency}
@@ -92,13 +99,6 @@ const AssetList = ({ onClickAsset }) => {
           });
         }}
       />
-      {detectedTokens.length > 0 &&
-      !isTokenDetectionInactiveOnNonMainnetSupportedNetwork ? (
-        <DetectedTokensBanner
-          actionButtonOnClick={() => setShowDetectedTokens(true)}
-          margin={4}
-        />
-      ) : null}
       <Box marginTop={detectedTokens.length > 0 ? 0 : 4}>
         <ImportTokenLink margin={4} marginBottom={2} />
       </Box>
diff --git a/ui/components/app/nft-default-image/nft-default-image.js b/ui/components/app/nft-default-image/nft-default-image.js
index 9d70df63fe2c..c85b0cabab27 100644
--- a/ui/components/app/nft-default-image/nft-default-image.js
+++ b/ui/components/app/nft-default-image/nft-default-image.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import {
   Display,
   AlignItems,
@@ -11,12 +11,10 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { ButtonLink, Box } from '../../component-library';
 import { showIpfsModal } from '../../../store/actions';
-import { getIpfsGateway } from '../../../selectors';
 
 export default function NftDefaultImage({ className, clickable }) {
   const t = useI18nContext();
   const dispatch = useDispatch();
-  const isIpfsEnabled = useSelector(getIpfsGateway);
 
   return (
     <Box
@@ -30,7 +28,7 @@ export default function NftDefaultImage({ className, clickable }) {
       justifyContent={JustifyContent.Center}
       borderRadius={BorderRadius.LG}
     >
-      {!isIpfsEnabled && (
+      {clickable && (
         <ButtonLink
           block
           className="nft-default__button"
@@ -49,6 +47,7 @@ export default function NftDefaultImage({ className, clickable }) {
 NftDefaultImage.propTypes = {
   /**
    * Controls the css class for the cursor hover
+   * It determines if we need to show the button on default image or not
    */
   clickable: PropTypes.bool,
   /**
diff --git a/ui/components/app/nft-default-image/nft-default-image.stories.js b/ui/components/app/nft-default-image/nft-default-image.stories.js
index 02959ebefdbc..6a309be23b81 100644
--- a/ui/components/app/nft-default-image/nft-default-image.stories.js
+++ b/ui/components/app/nft-default-image/nft-default-image.stories.js
@@ -11,10 +11,15 @@ export default {
   },
 };
 
-export const DefaultStory = (args) => (
+const Template = (args) => (
   <div style={{ width: 200, height: 200 }}>
     <NftDefaultImage {...args} />
   </div>
 );
 
-DefaultStory.storyName = 'Default';
+export const DefaultStory = Template.bind({});
+
+export const WithShowButton = Template.bind({});
+WithShowButton.args = {
+  clickable: true,
+};
diff --git a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
index 947973a70e0d..8b1a3aff08da 100644
--- a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
+++ b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
@@ -50,13 +50,13 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = `
           data-testid="nft-item"
         >
           <div
-            class="mm-box mm-badge-wrapper nft-item__badge-wrapper mm-box--display-block"
+            class="mm-box mm-badge-wrapper nft-item__badge-wrapper nft-item__badge-wrapper__clickable mm-box--display-block"
           >
             <img
               alt="MUNK #1 1"
               class="mm-box nft-item__item nft-item__item-image mm-box--display-block mm-box--justify-content-center"
               data-testid="nft-image"
-              src="ipfs://QmTSZUNt8AKyDabkyXXXP4oHWDnaVXgNdXoJGEyaYzLbeL"
+              src="https://bafybeiclzx7zfjvuiuwobn5ip3ogc236bjqfjzoblumf4pau4ep6dqramu.ipfs.dweb.link"
             />
             <div
               class="mm-box mm-badge-wrapper__badge-container"
diff --git a/ui/components/app/nft-details/nft-details.js b/ui/components/app/nft-details/nft-details.js
index 62d05031034b..7603c9156e1a 100644
--- a/ui/components/app/nft-details/nft-details.js
+++ b/ui/components/app/nft-details/nft-details.js
@@ -86,6 +86,7 @@ export default function NftDetails({ nft }) {
   );
   const nftImageAlt = getNftImageAlt(nft);
   const nftImageURL = getAssetImageURL(imageOriginal ?? image, ipfsGateway);
+  const isImageHosted = image?.startsWith('https:');
 
   const formattedTimestamp = formatDate(
     new Date(lastSale?.event_timestamp).getTime(),
@@ -187,12 +188,13 @@ export default function NftDetails({ nft }) {
           <Box className="nft-details__nft-item">
             <NftItem
               nftImageURL={nftImageURL}
-              src={image}
+              src={isImageHosted ? image : nftImageURL}
               alt={image ? nftImageAlt : ''}
               name={name}
               tokenId={tokenId}
               networkName={currentChain.nickname}
               networkSrc={currentChain.rpcPrefs?.imageUrl}
+              clickable
             />
           </Box>
           <Box
diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/nfts-items/nfts-items.js
index ff044f4c2d7f..c9b7e80fb56e 100644
--- a/ui/components/app/nfts-items/nfts-items.js
+++ b/ui/components/app/nfts-items/nfts-items.js
@@ -22,6 +22,7 @@ import {
   getIpfsGateway,
   getSelectedAddress,
   getCurrentNetwork,
+  getOpenSeaEnabled,
 } from '../../../selectors';
 import { ASSET_ROUTE } from '../../../helpers/constants/routes';
 import { getAssetImageURL } from '../../../helpers/utils/util';
@@ -53,6 +54,7 @@ export default function NftsItems({
   const currentChain = useSelector(getCurrentNetwork);
   const t = useI18nContext();
   const ipfsGateway = useSelector(getIpfsGateway);
+  const openSeaEnabled = useSelector(getOpenSeaEnabled);
 
   useEffect(() => {
     if (
@@ -90,6 +92,21 @@ export default function NftsItems({
   const history = useHistory();
 
   const renderCollectionImage = (collectionImage, collectionName) => {
+    if (collectionImage?.startsWith('ipfs') && !ipfsGateway) {
+      return (
+        <div className="nfts-items__collection-image-alt">
+          {collectionName?.[0]?.toUpperCase() ?? null}
+        </div>
+      );
+    }
+    if (!openSeaEnabled && !collectionImage?.startsWith('ipfs')) {
+      return (
+        <div className="nfts-items__collection-image-alt">
+          {collectionName?.[0]?.toUpperCase() ?? null}
+        </div>
+      );
+    }
+
     if (collectionImage) {
       return (
         <img
@@ -170,9 +187,13 @@ export default function NftsItems({
           <Box display={DISPLAY.FLEX} flexWrap={FLEX_WRAP.WRAP} gap={4}>
             {nfts.map((nft, i) => {
               const { image, address, tokenId, name, imageOriginal } = nft;
-              const nftImage = getAssetImageURL(imageOriginal, ipfsGateway);
+              const nftImage = getAssetImageURL(
+                imageOriginal ?? image,
+                ipfsGateway,
+              );
               const nftImageAlt = getNftImageAlt(nft);
-              const nftImageURL = imageOriginal?.includes('ipfs')
+              const isImageHosted = image.startsWith('https:');
+              const nftImageURL = imageOriginal?.startsWith('ipfs')
                 ? nftImage
                 : image;
 
@@ -188,7 +209,7 @@ export default function NftsItems({
                   <NftItem
                     nftImageURL={nftImageURL}
                     alt={nftImageAlt}
-                    src={image}
+                    src={isImageHosted ? image : nftImage}
                     name={name}
                     tokenId={tokenId}
                     networkName={currentChain.nickname}
diff --git a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
index 255a2643175c..3bc95be4636f 100644
--- a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
+++ b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
@@ -452,7 +452,7 @@ export const ImportTokensModal = ({ onClose }) => {
                                 className="import-tokens-modal__autodetect"
                                 onClick={() => {
                                   history.push(
-                                    `${SECURITY_ROUTE}#advanced-settings-autodetect-tokens`,
+                                    `${SECURITY_ROUTE}#auto-detect-tokens`,
                                   );
                                   onClose();
                                 }}
@@ -505,11 +505,12 @@ export const ImportTokensModal = ({ onClose }) => {
                             <ButtonLink
                               type="link"
                               key="import-token-token-detection-announcement"
-                              onClick={() =>
+                              onClick={() => {
                                 history.push(
-                                  `${SECURITY_ROUTE}#advanced-settings-autodetect-tokens`,
-                                )
-                              }
+                                  `${SECURITY_ROUTE}#auto-detect-tokens`,
+                                );
+                                onClose();
+                              }}
                             >
                               {t('inYourSettings')}
                             </ButtonLink>,
diff --git a/ui/components/multichain/nft-item/nft-item.js b/ui/components/multichain/nft-item/nft-item.js
index a0fc767ef3f5..cbf6251bf2ec 100644
--- a/ui/components/multichain/nft-item/nft-item.js
+++ b/ui/components/multichain/nft-item/nft-item.js
@@ -34,6 +34,25 @@ export const NftItem = ({
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
   const isIpfsEnabled = useSelector(getIpfsGateway);
   const isIpfsURL = nftImageURL?.includes('ipfs:');
+  const renderNftBasedonSrc = src ? (
+    <Box
+      className="nft-item__item nft-item__item-image"
+      data-testid="nft-image"
+      as="img"
+      src={src}
+      alt={alt}
+      display={Display.Block}
+      justifyContent={JustifyContent.center}
+    />
+  ) : (
+    <NftDefaultImage
+      className="nft-item__default-image"
+      data-testid="nft-default-image"
+      name={name}
+      tokenId={tokenId}
+    />
+  );
+
   return (
     <Box
       className="nft-item__container"
@@ -65,15 +84,7 @@ export const NftItem = ({
         }
       >
         {isIpfsEnabled ? (
-          <Box
-            className="nft-item__item nft-item__item-image"
-            data-testid="nft-image"
-            as="img"
-            src={src}
-            alt={alt}
-            display={Display.Block}
-            justifyContent={JustifyContent.center}
-          />
+          <>{renderNftBasedonSrc}</>
         ) : (
           <>
             {isIpfsURL ? (
@@ -85,15 +96,7 @@ export const NftItem = ({
                 clickable={clickable}
               />
             ) : (
-              <Box
-                className="nft-item__item nft-item__item-image"
-                data-testid="nft-image"
-                as="img"
-                src={src}
-                alt={alt}
-                display={Display.Block}
-                justifyContent={JustifyContent.center}
-              />
+              <>{renderNftBasedonSrc}</>
             )}
           </>
         )}
diff --git a/ui/components/ui/pulse-loader/pulse-loader.js b/ui/components/ui/pulse-loader/pulse-loader.js
index d4d542d71c16..227a07e49475 100644
--- a/ui/components/ui/pulse-loader/pulse-loader.js
+++ b/ui/components/ui/pulse-loader/pulse-loader.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 export default function PulseLoader() {
   return (
-    <div className="pulse-loader">
+    <div className="pulse-loader" data-testid="pulse-loader">
       <div className="pulse-loader__loading-dot-one" />
       <div className="pulse-loader__loading-dot-two" />
       <div className="pulse-loader__loading-dot-three" />
diff --git a/ui/helpers/utils/institutional/find-by-custodian-name.ts b/ui/helpers/utils/institutional/find-by-custodian-name.ts
index 52a05b3b7b27..bdd58d0cbcd2 100644
--- a/ui/helpers/utils/institutional/find-by-custodian-name.ts
+++ b/ui/helpers/utils/institutional/find-by-custodian-name.ts
@@ -24,7 +24,7 @@ export function findCustodianByDisplayName(
   }
 
   for (const custodian of custodians) {
-    const custodianName = custodian.name.toLowerCase();
+    const custodianName = custodian.envName.toLowerCase();
 
     if (formatedDisplayName.includes(custodianName)) {
       return custodian;
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
index 678bbf4540f3..882d32dc4dd9 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
@@ -228,7 +228,7 @@ describe('Confirm Transaction Base', () => {
     mockedStore.metamask.mmiConfiguration = {
       custodians: [
         {
-          name: 'saturn-dev',
+          envName: 'saturn-dev',
           displayName: 'Saturn Custody',
           isNoteToTraderSupported: true,
         },
diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js
index b3269b2ad607..d08e07d7fe1a 100644
--- a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js
+++ b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js
@@ -10,7 +10,7 @@ import {
 import { I18nContext } from '../../../contexts/i18n';
 import {
   Button,
-  BUTTON_VARIANT,
+  ButtonVariant,
   Box,
   Text,
   Modal,
@@ -78,7 +78,7 @@ const ConfirmConnectCustodianModal = ({
             </Button>
             <Button
               paddingTop={3}
-              variant={BUTTON_VARIANT.LINK}
+              variant={ButtonVariant.Link}
               onClick={onModalClose}
             >
               {t('cancel')}
@@ -95,5 +95,5 @@ export default ConfirmConnectCustodianModal;
 ConfirmConnectCustodianModal.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   custodianName: PropTypes.string.isRequired,
-  custodianURL: PropTypes.string.isRequired,
+  custodianURL: PropTypes.string,
 };
diff --git a/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap b/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap
index 525078513a3f..f5edc5bb2ec0 100644
--- a/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap
+++ b/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap
@@ -1,98 +1,77 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CustodyPage renders CustodyPage 1`] = `
-<div>
+exports[`CustodyPage renders jwt token list when first custodian is selected, showing the jwt form and testing the sorting function 1`] = `
+<ul
+  width="full"
+>
   <div
-    class="pulse-loader"
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--rounded-sm mm-box--border-color-border-default box--border-style-solid box--border-width-1"
   >
     <div
-      class="pulse-loader__loading-dot-one"
-    />
-    <div
-      class="pulse-loader__loading-dot-two"
-    />
-    <div
-      class="pulse-loader__loading-dot-three"
-    />
+      class="mm-box mm-box--display-flex mm-box--align-items-center"
+    >
+      <img
+        alt="Saturn Custody A"
+        height="32"
+        src="https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg"
+        width="32"
+      />
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-text-default"
+      >
+        Saturn Custody A
+      </p>
+    </div>
+    <button
+      class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+      data-testid="custody-connect-button"
+    >
+      Select
+    </button>
   </div>
-</div>
-`;
-
-exports[`CustodyPage renders CustodyPage 2`] = `
-<div>
   <div
-    class="mm-box page-container"
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--rounded-sm mm-box--border-color-border-default box--border-style-solid box--border-width-1"
   >
-    
-    
     <div
-      class="mm-box page-container__content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+      class="mm-box mm-box--display-flex mm-box--align-items-center"
     >
-      <div
-        class="mm-box mm-box--margin-top-4 mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center"
-      >
-        <button
-          aria-label="Back"
-          class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
-        >
-          <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/arrow-left.svg');"
-          />
-        </button>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-        >
-          Back
-        </p>
-      </div>
-      <h4
-        class="mm-box mm-text mm-text--body-lg-medium mm-box--margin-top-4 mm-box--color-text-default"
-      >
-        Custodial Accounts
-      </h4>
-      <h6
-        class="mm-box mm-text mm-text--body-md mm-box--margin-top-2 mm-box--margin-bottom-5 mm-box--color-text-default"
+      <img
+        alt="Saturn Custody B"
+        height="32"
+        src="https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg"
+        width="32"
+      />
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-text-default"
       >
-        Please choose the custodian you want to connect in order to add or refresh a token.
-      </h6>
-      <div
-        class="mm-box"
+        Saturn Custody B
+      </p>
+    </div>
+    <button
+      class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+      data-testid="custody-connect-button"
+    >
+      Select
+    </button>
+  </div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--rounded-sm mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+  >
+    <div
+      class="mm-box mm-box--display-flex mm-box--align-items-center"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-text-default"
       >
-        <ul
-          width="full"
-        >
-          <div
-            class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--rounded-sm mm-box--border-color-border-default box--border-style-solid box--border-width-1"
-          >
-            <div
-              class="mm-box mm-box--display-flex mm-box--align-items-center"
-            >
-              <img
-                alt="Saturn Custody"
-                height="32"
-                src="https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg"
-                width="32"
-              />
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-text-default"
-              >
-                Saturn Custody
-              </p>
-            </div>
-            <button
-              class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
-              data-testid="custody-connect-button"
-            >
-              Select
-            </button>
-          </div>
-        </ul>
-      </div>
+        Saturn Custody C
+      </p>
     </div>
-    
+    <button
+      class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+      data-testid="custody-connect-button"
+    >
+      Select
+    </button>
   </div>
-</div>
+</ul>
 `;
-
-exports[`CustodyPage renders CustodyPage 3`] = `<div />`;
diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js
index 5d078b03b5b5..094d0a5f6016 100644
--- a/ui/pages/institutional/custody/custody.js
+++ b/ui/pages/institutional/custody/custody.js
@@ -7,7 +7,6 @@ import React, {
 } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { v4 as uuidv4 } from 'uuid';
 import { isEqual } from 'lodash';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
@@ -18,8 +17,8 @@ import {
   Label,
   IconName,
   IconSize,
-  BUTTON_SIZES,
-  BUTTON_VARIANT,
+  ButtonSize,
+  ButtonVariant,
   Box,
   Text,
 } from '../../../components/component-library';
@@ -55,6 +54,8 @@ import PulseLoader from '../../../components/ui/pulse-loader/pulse-loader';
 import ConfirmConnectCustodianModal from '../confirm-connect-custodian-modal';
 import { findCustodianByDisplayName } from '../../../helpers/utils/institutional/find-by-custodian-name';
 
+const GK8_DISPLAY_NAME = 'gk8';
+
 const CustodyPage = () => {
   const t = useI18nContext();
   const history = useHistory();
@@ -88,26 +89,18 @@ const CustodyPage = () => {
   const [accounts, setAccounts] = useState();
   const address = useSelector(getSelectedAddress);
   const connectRequest = connectRequests ? connectRequests[0] : undefined;
+  const isCheckBoxSelected =
+    accounts && Object.keys(selectedAccounts).length === accounts.length;
 
   const custodianButtons = useMemo(() => {
     const custodianItems = [];
 
-    const sortedCustodians = [...custodians].sort(function (a, b) {
-      const nameA = a.name.toLowerCase();
-      const nameB = b.name.toLowerCase();
-
-      if (nameA < nameB) {
-        return -1;
-      }
-      if (nameA > nameB) {
-        return 1;
-      }
-      return 0;
-    });
+    const sortedCustodians = [...custodians].sort((a, b) =>
+      a.envName.toLowerCase().localeCompare(b.envName.toLowerCase()),
+    );
 
     function shouldShowInProduction(custodian) {
       return (
-        custodian &&
         'production' in custodian &&
         !custodian.production &&
         process.env.METAMASK_ENVIRONMENT === 'production'
@@ -115,19 +108,59 @@ const CustodyPage = () => {
     }
 
     function isHidden(custodian) {
-      return custodian && 'hidden' in custodian && custodian.hidden;
+      return 'hidden' in custodian && custodian.hidden;
     }
 
     function isNotSelectedCustodian(custodian) {
       return (
-        custodian &&
-        'name' in custodian &&
+        'envName' in custodian &&
         connectRequest &&
         Object.keys(connectRequest).length &&
-        custodian.name !== selectedCustodianName
+        custodian.envName !== selectedCustodianName
       );
     }
 
+    async function handleButtonClick(custodian) {
+      try {
+        const custodianByDisplayName = findCustodianByDisplayName(
+          custodian.displayName,
+          custodians,
+        );
+
+        const jwtListValue = await dispatch(
+          mmiActions.getCustodianJWTList(custodian.envName),
+        );
+
+        setSelectedCustodianName(custodian.envName);
+        setSelectedCustodianDisplayName(custodian.displayName);
+        setSelectedCustodianImage(custodian.iconUrl);
+        setApiUrl(custodian.apiUrl);
+        setCurrentJwt(jwtListValue[0] || '');
+        setJwtList(jwtListValue);
+
+        // open confirm Connect Custodian modal except for gk8
+        if (
+          custodianByDisplayName?.displayName?.toLocaleLowerCase() ===
+          GK8_DISPLAY_NAME
+        ) {
+          setSelectedCustodianType(custodian.type);
+        } else {
+          setMatchedCustodian(custodianByDisplayName);
+          setIsConfirmConnectCustodianModalVisible(true);
+        }
+
+        trackEvent({
+          category: MetaMetricsEventCategory.MMI,
+          event: MetaMetricsEventName.CustodianSelected,
+          properties: {
+            custodian: custodian.envName,
+          },
+        });
+      } catch (error) {
+        console.error('Error:', error);
+      }
+    }
+
     sortedCustodians.forEach((custodian) => {
       if (
         shouldShowInProduction(custodian) ||
@@ -139,7 +172,7 @@ const CustodyPage = () => {
 
       custodianItems.push(
         <Box
-          key={uuidv4()}
+          key={custodian.envName}
           display={Display.Flex}
           flexDirection={FlexDirection.Row}
           justifyContent={JustifyContent.spaceBetween}
@@ -162,46 +195,9 @@ const CustodyPage = () => {
           </Box>
 
           <Button
-            size={BUTTON_SIZES.SM}
+            size={ButtonSize.Sm}
             data-testid="custody-connect-button"
-            onClick={async () => {
-              try {
-                const custodianByDisplayName = findCustodianByDisplayName(
-                  custodian.displayName,
-                  custodians,
-                );
-                const jwtListValue = await dispatch(
-                  mmiActions.getCustodianJWTList(custodian.name),
-                );
-                setSelectedCustodianName(custodian.name);
-                setSelectedCustodianDisplayName(custodian.displayName);
-                setSelectedCustodianImage(custodian.iconUrl);
-                setApiUrl(custodian.apiUrl);
-                setCurrentJwt(jwtListValue[0] || '');
-                setJwtList(jwtListValue);
-
-                // open confirm Connect Custodian modal except for gk8
-                if (
-                  custodianByDisplayName.displayName.toLocaleLowerCase() ===
-                  'gk8'
-                ) {
-                  setSelectedCustodianType(custodian.type);
-                } else {
-                  setMatchedCustodian(custodianByDisplayName);
-                  setIsConfirmConnectCustodianModalVisible(true);
-                }
-
-                trackEvent({
-                  category: MetaMetricsEventCategory.MMI,
-                  event: MetaMetricsEventName.CustodianSelected,
-                  properties: {
-                    custodian: custodian.name,
-                  },
-                });
-              } catch (error) {
-                console.error('Error:', error);
-              }
-            }}
+            onClick={() => handleButtonClick(custodian)}
           >
             {t('select')}
           </Button>
@@ -222,25 +218,27 @@ const CustodyPage = () => {
 
   const handleConnectError = useCallback(
     (e) => {
-      let errorMessage;
-      const detailedError = e.message.split(':');
-
-      if (detailedError.length > 1 && !isNaN(parseInt(detailedError[0], 10))) {
-        if (parseInt(detailedError[0], 10) === 401) {
-          // Authentication Error
-          errorMessage =
-            'Authentication error. Please ensure you have entered the correct token';
+      const getErrorMessage = (error) => {
+        const detailedError = error.message.split(':');
+        const errorCode = parseInt(detailedError[0], 10);
+
+        if (detailedError.length > 1 && !isNaN(errorCode)) {
+          switch (errorCode) {
+            case 401:
+              return 'Authentication error. Please ensure you have entered the correct token';
+            default:
+              return null;
+          }
         }
-      }
 
-      if (/Network Error/u.test(e.message)) {
-        errorMessage =
-          'Network error. Please ensure you have entered the correct API URL';
-      }
+        if (/Network Error/u.test(error.message)) {
+          return 'Network error. Please ensure you have entered the correct API URL';
+        }
 
-      if (!errorMessage) {
-        errorMessage = e.message;
-      }
+        return error.message;
+      };
+
+      const errorMessage = getErrorMessage(e);
 
       setConnectError(
         `Something went wrong connecting your custodian account. Error details: ${errorMessage}`,
@@ -382,7 +380,12 @@ const CustodyPage = () => {
   return (
     <Box className="page-container">
       {connectError && (
-        <Text textAlign={TextAlign.Center} marginTop={3} padding={[2, 7, 5]}>
+        <Text
+          data-testid="connect-error"
+          textAlign={TextAlign.Center}
+          marginTop={3}
+          padding={[2, 7, 5]}
+        >
           {connectError}
         </Text>
       )}
@@ -391,8 +394,10 @@ const CustodyPage = () => {
           {selectError}
         </Text>
       )}
+
       {!accounts && !selectedCustodianType && (
         <Box
+          data-testid="connect-custodial-account"
           padding={4}
           display={Display.Flex}
           flexDirection={FlexDirection.Column}
@@ -447,6 +452,7 @@ const CustodyPage = () => {
               marginTop={4}
             >
               <ButtonIcon
+                data-testid="custody-back-button"
                 ariaLabel={t('back')}
                 iconName={IconName.ArrowLeft}
                 size={IconSize.Sm}
@@ -492,9 +498,10 @@ const CustodyPage = () => {
             ) : (
               <Box display={Display.Flex} gap={4}>
                 <Button
+                  data-testid="custody-cancel-button"
                   block
-                  variant={BUTTON_VARIANT.SECONDARY}
-                  size={BUTTON_SIZES.LG}
+                  variant={ButtonVariant.Secondary}
+                  size={ButtonSize.Lg}
                   onClick={cancelConnectCustodianToken}
                 >
                   {t('cancel')}
@@ -502,7 +509,7 @@ const CustodyPage = () => {
                 <Button
                   block
                   data-testid="jwt-form-connect-button"
-                  size={BUTTON_SIZES.LG}
+                  size={ButtonSize.Lg}
                   onClick={async () => {
                     try {
                       setConnectError('');
@@ -560,12 +567,13 @@ const CustodyPage = () => {
             <input
               type="checkbox"
               id="selectAllAccounts"
+              data-testid={`select-all-accounts-selected-${isCheckBoxSelected}`}
               name="selectAllAccounts"
               marginRight={2}
               marginLeft={2}
               value={{}}
               onChange={(e) => setSelectAllAccounts(e)}
-              checked={Object.keys(selectedAccounts).length === accounts.length}
+              checked={isCheckBoxSelected}
             />
             <Label htmlFor="selectAllAccounts">{t('selectAllAccounts')}</Label>
           </Box>
@@ -598,7 +606,7 @@ const CustodyPage = () => {
             onAddAccounts={async () => {
               try {
                 const selectedCustodian = custodians.find(
-                  (custodian) => custodian.name === selectedCustodianName,
+                  (custodian) => custodian.envName === selectedCustodianName,
                 );
 
                 await dispatch(
@@ -622,9 +630,10 @@ const CustodyPage = () => {
                 history.push({
                   pathname: CUSTODY_ACCOUNT_DONE_ROUTE,
                   state: {
-                    imgSrc: selectedCustodian.iconUrl,
+                    imgSrc: selectedCustodian && selectedCustodian.iconUrl,
                     title: t('custodianAccountAddedTitle', [
-                      selectedCustodian.displayName,
+                      (selectedCustodian && selectedCustodian.displayName) ||
+                        'Custodian',
                     ]),
                     description: t('custodianAccountAddedDesc'),
                   },
@@ -679,8 +688,8 @@ const CustodyPage = () => {
           <Box as="footer" className="page-container__footer" padding={4}>
             <Button
               block
-              size={BUTTON_SIZES.LG}
-              type={BUTTON_VARIANT.SECONDARY}
+              size={ButtonSize.Lg}
+              type={ButtonVariant.Secondary}
               onClick={() => history.push(DEFAULT_ROUTE)}
             >
               {t('close')}
diff --git a/ui/pages/institutional/custody/custody.test.js b/ui/pages/institutional/custody/custody.test.js
index e0cdc16585f8..800e6a0956d1 100644
--- a/ui/pages/institutional/custody/custody.test.js
+++ b/ui/pages/institutional/custody/custody.test.js
@@ -5,29 +5,26 @@ import thunk from 'redux-thunk';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import CustodyPage from '.';
 
-const mockedReturnedValue = jest.fn().mockReturnValue({ type: 'TYPE' });
-const mockedGetCustodianJWTList = jest.fn().mockReturnValue({ type: 'TYPE' });
+const mockedConnectCustodyAddresses = jest
+  .fn()
+  .mockReturnValue({ type: 'TYPE' });
+const mockedGetCustodianJWTList = jest
+  .fn()
+  .mockImplementation(() => async (dispatch) => {
+    const jwtList = ['jwt1', 'jwt2', 'jwt3'];
+    dispatch({ type: 'TYPE', payload: jwtList });
+    return jwtList;
+  });
 
-const mockedGetCustodianAccounts = jest.fn().mockReturnValue(async () => null);
+const mockedGetCustodianAccounts = jest.fn().mockReturnValue({ type: 'TYPE' });
 const mockedGetCustodianToken = jest.fn().mockReturnValue('testJWT');
 
-const mockedGetCustodianConnectRequest = jest.fn().mockReturnValue({
-  type: 'TYPE',
-  custodian: 'saturn',
-  token: 'token',
-  apiUrl: 'url',
-  custodianType: undefined,
-  custodianName: 'saturn',
-});
-
 jest.mock('../../../store/institutional/institution-background', () => ({
   mmiActionsFactory: () => ({
-    getCustodianConnectRequest: mockedGetCustodianConnectRequest,
     getCustodianToken: mockedGetCustodianToken,
     getCustodianAccounts: mockedGetCustodianAccounts,
-    getCustodianAccountsByAddress: mockedReturnedValue,
     getCustodianJWTList: mockedGetCustodianJWTList,
-    connectCustodyAddresses: mockedReturnedValue,
+    connectCustodyAddresses: mockedConnectCustodyAddresses,
   }),
 }));
 
@@ -35,6 +32,9 @@ describe('CustodyPage', function () {
   const mockStore = {
     metamask: {
       providerConfig: { chainId: 0x1, type: 'test' },
+      institutionalFeatures: {
+        connectRequests: [],
+      },
       mmiConfiguration: {
         portfolio: {
           enabled: true,
@@ -42,16 +42,30 @@ describe('CustodyPage', function () {
         },
         custodians: [
           {
-            type: 'Saturn',
-            name: 'saturn',
+            type: 'GK8',
+            envName: 'gk8',
+            apiUrl: 'https://saturn-custody.dev.metamask-institutional.io',
+            iconUrl:
+              'https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg',
+            displayName: 'gk8',
+            production: true,
+            refreshTokenUrl: null,
+            isNoteToTraderSupported: false,
+            version: 1,
+            website: 'test website',
+          },
+          {
+            type: 'Saturn B',
+            envName: 'Saturn Custody B',
             apiUrl: 'https://saturn-custody.dev.metamask-institutional.io',
             iconUrl:
               'https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg',
-            displayName: 'Saturn Custody',
+            displayName: 'Saturn Custody B',
             production: true,
             refreshTokenUrl: null,
             isNoteToTraderSupported: false,
             version: 1,
+            website: 'test website',
           },
         ],
       },
@@ -69,36 +83,373 @@ describe('CustodyPage', function () {
 
   const store = configureMockStore([thunk])(mockStore);
 
-  it('renders CustodyPage', async () => {
-    const { container } = renderWithProvider(<CustodyPage />, store);
+  it('renders the list of custodians in mmiController when there is no accounts from connectRequest', async () => {
+    act(() => {
+      renderWithProvider(<CustodyPage />, store);
+    });
+
+    await waitFor(() => {
+      const connectCustodyBtn = screen.getAllByTestId('custody-connect-button');
+      expect(connectCustodyBtn[0]).toBeDefined();
+    });
+  });
+
+  it('renders jwt token list when there is no accounts and custodian is selected from the list of custodians in mmiController', async () => {
+    act(() => {
+      renderWithProvider(<CustodyPage />, store);
+    });
+
+    await waitFor(() => {
+      const custodyBtns = screen.getAllByTestId('custody-connect-button');
+      fireEvent.click(custodyBtns[0]);
+    });
+
+    expect(screen.getByTestId('jwt-form-connect-button')).toBeInTheDocument();
+    expect(mockedGetCustodianJWTList).toHaveBeenCalled();
+  });
+
+  it('renders jwt token list when first custodian is selected, showing the jwt form and testing the sorting function', async () => {
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        mmiConfiguration: {
+          ...mockStore.metamask.mmiConfiguration,
+          custodians: [
+            {
+              ...mockStore.metamask.mmiConfiguration.custodians[0],
+              envName: 'Saturn Custody B',
+              displayName: 'Saturn Custody B',
+              website: 'test website',
+            },
+            {
+              ...mockStore.metamask.mmiConfiguration.custodians[1],
+              envName: 'Saturn Custody A',
+              displayName: 'Saturn Custody A',
+              website: 'test website',
+            },
+            {
+              ...mockStore.metamask.mmiConfiguration.custodians[2],
+              envName: 'Saturn Custody C',
+              displayName: 'Saturn Custody C',
+              website: 'test website',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
 
     await waitFor(() => {
-      expect(container).toMatchSnapshot();
+      // Saturn Custody A will be the first one to appear
+      const saturnCustodyA = screen.getByText('Saturn Custody A');
+      const parentContainer = saturnCustodyA.closest('ul');
+      expect(parentContainer).toMatchSnapshot();
+    });
+  });
+
+  it('renders PulseLoader when loading state is true', async () => {
+    mockedGetCustodianToken.mockImplementation(
+      () => new Promise((resolve) => resolve(null)),
+    );
+    mockedGetCustodianAccounts.mockImplementation(
+      () => new Promise((resolve) => resolve(null)),
+    );
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, store);
+      expect(screen.getByTestId('pulse-loader')).toBeDefined();
     });
   });
 
-  it('opens connect custody without any custody selected', async () => {
-    const { getByTestId } = renderWithProvider(<CustodyPage />, store);
+  it('renders custody accounts list when I have accounts from connectRequest', async () => {
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      const accounts = [
+        {
+          name: 'Saturn Test Name',
+          address: '0x123',
+          balance: '0x1',
+          custodianDetails: 'custodianDetails',
+          labels: [{ key: 'key', value: 'testLabels' }],
+          chanId: 'chanId',
+        },
+      ];
+      dispatch({ type: 'TYPE', payload: accounts });
+      return accounts;
+    });
+
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [
+            {
+              token: 'token',
+              environment: 'Saturn A',
+              service: 'Saturn A',
+              apiUrl: 'url',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
 
     await waitFor(() => {
-      expect(getByTestId('custody-connect-button')).toBeDefined();
+      expect(
+        screen.getByTestId('select-all-accounts-selected-false'),
+      ).toBeDefined();
+      expect(screen.getByText('0x123')).toBeDefined();
+      expect(screen.getByText('testLabels')).toBeDefined();
+      expect(screen.getByText('Saturn Test Name')).toBeDefined();
     });
   });
 
-  it('calls getCustodianJwtList on custody select when connect btn is click and clicks connect button and shows the redirect to custodian modal', async () => {
+  it('renders custodian list, initiates connect custodian, displays jwt token list, clicks connect button, and finally shows "no accounts available" message', async () => {
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      const accounts = [];
+      dispatch({ type: 'TYPE', payload: accounts });
+      return accounts;
+    });
+
     act(() => {
       renderWithProvider(<CustodyPage />, store);
     });
 
     await waitFor(() => {
-      const custodyBtn = screen.getByTestId('custody-connect-button');
-      fireEvent.click(custodyBtn);
+      const custodyBtns = screen.getAllByTestId('custody-connect-button');
+      fireEvent.click(custodyBtns[0]);
     });
 
     await waitFor(() => {
-      expect(
-        screen.getByTestId('confirm-connect-custodian-modal'),
-      ).toBeInTheDocument();
+      const connectBtn = screen.getByTestId('jwt-form-connect-button');
+      fireEvent.click(connectBtn);
+    });
+
+    expect(screen.getByTestId('custody-accounts-empty')).toBeDefined();
+  });
+
+  it('renders the list of custodians in mmiController when the user clicks on cancel button', async () => {
+    act(() => {
+      renderWithProvider(<CustodyPage />, store);
+    });
+
+    await waitFor(() => {
+      const custodyBtns = screen.getAllByTestId('custody-connect-button');
+      fireEvent.click(custodyBtns[0]);
+    });
+
+    act(() => {
+      const custodyCancelBtn = screen.getAllByTestId('custody-cancel-button');
+      fireEvent.click(custodyCancelBtn[0]);
     });
+
+    expect(screen.getByTestId('connect-custodial-account')).toBeDefined();
+  });
+
+  it('should select all accounts when "Select All Accounts" checkbox is clicked', async () => {
+    // Mock the accounts
+    const accounts = [
+      {
+        name: 'Saturn Test Name',
+        address: '0x123',
+        balance: '0x1',
+        custodianDetails: 'custodianDetails',
+        labels: [{ key: 'key', value: 'testLabels' }],
+        chanId: 'chanId',
+      },
+    ];
+
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      dispatch({ type: 'TYPE', payload: accounts });
+      return accounts;
+    });
+
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [
+            {
+              token: 'token',
+              environment: 'Saturn A',
+              service: 'Saturn A',
+              apiUrl: 'url',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
+
+    act(() => {
+      const checkbox = screen.getByTestId('select-all-accounts-selected-false');
+      fireEvent.click(checkbox);
+    });
+
+    expect(
+      screen.getByTestId('select-all-accounts-selected-true'),
+    ).toBeChecked();
+  });
+
+  it('handles connection errors correctly', async () => {
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      dispatch({ type: 'TYPE', payload: [] });
+      throw new Error('Test Error');
+    });
+
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [
+            {
+              token: 'token',
+              environment: 'Saturn A',
+              service: 'Saturn A',
+              apiUrl: 'url',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('connect-error')).toBeDefined();
+      expect(screen.getByTestId('connect-error')).toHaveTextContent(
+        'Test Error',
+      );
+    });
+  });
+
+  it('handles authentication errors correctly', async () => {
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      dispatch({ type: 'TYPE', payload: [] });
+      throw new Error('401: Unauthorized');
+    });
+
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [
+            {
+              token: 'token',
+              environment: 'Saturn A',
+              service: 'Saturn A',
+              apiUrl: 'url',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('connect-error')).toBeDefined();
+      expect(screen.getByTestId('connect-error')).toHaveTextContent(
+        'Authentication error. Please ensure you have entered the correct token',
+      );
+    });
+  });
+
+  it('handles network errors correctly', async () => {
+    mockedGetCustodianAccounts.mockImplementation(() => async (dispatch) => {
+      dispatch({ type: 'TYPE', payload: [] });
+      throw new Error('Network Error');
+    });
+
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [
+            {
+              token: 'token',
+              environment: 'Saturn A',
+              service: 'Saturn A',
+              apiUrl: 'url',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('connect-error')).toBeDefined();
+      expect(screen.getByTestId('connect-error')).toHaveTextContent(
+        'Network error. Please ensure you have entered the correct API URL',
+      );
+    });
+  });
+
+  it('does open confirm Connect Custodian modal when custodian display name is not gk8', async () => {
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        mmiConfiguration: {
+          ...mockStore.metamask.mmiConfiguration,
+          custodians: [
+            {
+              ...mockStore.metamask.mmiConfiguration.custodians[0],
+              displayName: 'Saturn Custody B',
+            },
+          ],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    act(() => {
+      renderWithProvider(<CustodyPage />, newStore);
+    });
+
+    await waitFor(() => {
+      const custodyBtns = screen.getAllByTestId('custody-connect-button');
+      fireEvent.click(custodyBtns[0]);
+    });
+
+    expect(
+      screen.queryByTestId('confirm-connect-custodian-modal'),
+    ).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap b/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap
index 7a26cdb3506d..65cf56afe8ee 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap
+++ b/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap
@@ -40,6 +40,7 @@ exports[`Interactive Replacement Token Page should reject if there are errors 1`
     >
       <div
         class="pulse-loader"
+        data-testid="pulse-loader"
       >
         <div
           class="pulse-loader__loading-dot-one"
diff --git a/ui/pages/settings/snaps/view-snap/view-snap.js b/ui/pages/settings/snaps/view-snap/view-snap.js
index 6ab545614671..d383974977d4 100644
--- a/ui/pages/settings/snaps/view-snap/view-snap.js
+++ b/ui/pages/settings/snaps/view-snap/view-snap.js
@@ -87,7 +87,7 @@ function ViewSnap() {
         .caveats[0].value;
     const newCaveatValue = { ...caveatValue };
     delete newCaveatValue[snapId];
-    if (Object.keys(newCaveatValue) > 0) {
+    if (Object.keys(newCaveatValue).length > 0) {
       dispatch(
         updateCaveat(
           connectedOrigin,
diff --git a/ui/selectors/institutional/selectors.js b/ui/selectors/institutional/selectors.js
index a4777714bdf6..6649b06188b7 100644
--- a/ui/selectors/institutional/selectors.js
+++ b/ui/selectors/institutional/selectors.js
@@ -44,7 +44,7 @@ export function getCustodianIconForAddress(state, address) {
     const { custodianName } =
       state.metamask.custodyAccountDetails[checksummedAddress];
     custodianIcon = state.metamask.mmiConfiguration?.custodians?.find(
-      (custodian) => custodian.name === custodianName,
+      (custodian) => custodian.envName === custodianName,
     )?.iconUrl;
   }
 
@@ -116,7 +116,7 @@ export function getIsNoteToTraderSupported(state, fromChecksumHexAddress) {
   }
 
   const foundCustodian = mmiConfiguration?.custodians?.find(
-    (custodian) => custodian.name === accountDetails.custodianName,
+    (custodian) => custodian.envName === accountDetails.custodianName,
   );
 
   return foundCustodian ? foundCustodian.isNoteToTraderSupported : false;
diff --git a/ui/selectors/institutional/selectors.test.js b/ui/selectors/institutional/selectors.test.js
index 7401df666478..20cdd9fe58fa 100644
--- a/ui/selectors/institutional/selectors.test.js
+++ b/ui/selectors/institutional/selectors.test.js
@@ -25,7 +25,7 @@ function buildState(overrides = {}) {
       },
       identities: {
         '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': {
-          name: 'Custody Account A',
+          envName: 'Custody Account A',
           address: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
         },
       },
@@ -57,7 +57,7 @@ function buildState(overrides = {}) {
         custodians: [
           {
             type: 'saturn',
-            name: 'saturn',
+            envName: 'saturn',
             apiUrl: 'https://saturn-custody.dev.metamask-institutional.io',
             iconUrl: 'images/saturn.svg',
             displayName: 'Saturn Custody',
@@ -566,7 +566,7 @@ describe('Institutional selectors', () => {
           mmiConfiguration: {
             custodians: [
               {
-                name: 'custodian1',
+                envName: 'custodian1',
                 isNoteToTraderSupported: true,
               },
             ],
@@ -590,7 +590,7 @@ describe('Institutional selectors', () => {
           mmiConfiguration: {
             custodians: [
               {
-                name: 'custodian1',
+                envName: 'custodian1',
                 isNoteToTraderSupported: false,
               },
             ],
@@ -610,7 +610,7 @@ describe('Institutional selectors', () => {
           mmiConfiguration: {
             custodians: [
               {
-                name: 'custodian1',
+                envName: 'custodian1',
                 isNoteToTraderSupported: true,
               },
             ],
@@ -632,7 +632,7 @@ describe('Institutional selectors', () => {
           mmiConfiguration: {
             custodians: [
               {
-                name: 'custodian1',
+                envName: 'custodian1',
                 isNoteToTraderSupported: true,
               },
             ],
@@ -656,7 +656,7 @@ describe('Institutional selectors', () => {
           mmiConfiguration: {
             custodians: [
               {
-                name: 'custodian1',
+                envName: 'custodian1',
                 isNoteToTraderSupported: true,
               },
             ],
diff --git a/yarn.lock b/yarn.lock
index d036e8f745c1..4d894f59bdf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -458,7 +458,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.10.1, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.21.5, @babel/parser@npm:^7.21.8, @babel/parser@npm:~7.21.2":
+"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.21.5, @babel/parser@npm:^7.21.8, @babel/parser@npm:~7.21.2":
   version: 7.21.8
   resolution: "@babel/parser@npm:7.21.8"
   bin:
@@ -1569,7 +1569,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.10.1, @babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:~7.21.2":
+"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:~7.21.2":
   version: 7.21.5
   resolution: "@babel/traverse@npm:7.21.5"
   dependencies:
@@ -1857,10 +1857,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/env-options@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "@endo/env-options@npm:0.1.3"
-  checksum: dbaa1c6edf2de712b0af76c991f2ffd29e52a27d3adca2292531dbbf42ef0541c03daa4d7f2de3efb223d0cacf303c82fe88c19d44a0f5535dce9ccbe5f66138
+"@endo/env-options@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "@endo/env-options@npm:0.1.4"
+  checksum: 0d6b82bdf07602dfc373a475234a206b61e9d0ab6ea886fdcbd111a37d9ce4e55ead5dbc1c7af52cf67a11a7185b40e7b30c3367da3928897082502d7e1274f1
   languageName: node
   linkType: hard
 
@@ -3448,14 +3448,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/aa@npm:^3.1.0, @lavamoat/aa@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "@lavamoat/aa@npm:3.1.2"
+"@lavamoat/aa@npm:^3.1.1, @lavamoat/aa@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "@lavamoat/aa@npm:3.1.5"
   dependencies:
-    resolve: "npm:^1.20.0"
+    resolve: "npm:^1.22.3"
   bin:
     lavamoat-ls: src/cli.js
-  checksum: 2441758d334d1c80bdcc8631ae79103bc6e5a0e5eb254c9d98e9320dfbd265cbe00296d03a7f9dbb0c7aec3e11e28e2267e29f4983e526968ccf1a4bd88b108f
+  checksum: 35e186fb0aaed5a2494dca4b8d353ead3123ff8a4964d502bdfe8ac369a774499a9ed2c45d04621b33f3c3fbf26ae8255fe4c3a4686f8a5dcb5a8da516be723a
   languageName: node
   linkType: hard
 
@@ -3474,19 +3474,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/lavapack@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "@lavamoat/lavapack@npm:5.2.0"
+"@lavamoat/lavapack@npm:^5.2.4, @lavamoat/lavapack@npm:^5.4.1":
+  version: 5.4.1
+  resolution: "@lavamoat/lavapack@npm:5.4.1"
   dependencies:
     JSONStream: "npm:^1.3.5"
     combine-source-map: "npm:^0.8.0"
     convert-source-map: "npm:^2.0.0"
     json-stable-stringify: "npm:^1.0.2"
-    lavamoat-core: "npm:^14.2.0"
+    lavamoat-core: "npm:^14.4.1"
     readable-stream: "npm:^3.6.0"
     through2: "npm:^4.0.2"
     umd: "npm:^3.0.3"
-  checksum: 2e71813fc5c4845ce025963bc3db21e25895f5b3b86291228f5e68ecaf95a0c301edca2f9a0d6fc6d5b0177b41c133610a9f7d699e22137b6e25e0914d72cc75
+  checksum: 63a3d947d6438149acb06349cc4160367f522040b9b87c43df8e617424634aa67f9f31058b0c6a0b02f2eac4c9dd6b16fe39f9ecf9c8fd4a4a5f3b31cfa4fb8f
   languageName: node
   linkType: hard
 
@@ -3641,9 +3641,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@metamask-institutional/custody-keyring@npm:1.0.1"
+"@metamask-institutional/custody-keyring@npm:^1.0.1, @metamask-institutional/custody-keyring@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@metamask-institutional/custody-keyring@npm:1.0.2"
   dependencies:
     "@ethereumjs/tx": "npm:^4.1.1"
     "@ethereumjs/util": "npm:^8.0.5"
@@ -3653,7 +3653,7 @@ __metadata:
     "@metamask/obs-store": "npm:^8.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: c9c763bd8416bd4434f4ae00d687f3bd33c6f4c6b7c299f0887e772e077b82291f59ecb6eebcac18cce56775887dfa8bc0a1be121d38ba35b5d5650bbb85ddf9
+  checksum: eff487de17a9d7ea889a953f9874ee0a55b568928c97bf93a90c33af52acfc8958d708d8fb4e4cd909ec0e57757409ac86476b6ab89b72b72b4f6559eab3b06b
   languageName: node
   linkType: hard
 
@@ -4020,20 +4020,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:11.0.0"
+"@metamask/eth-json-rpc-middleware@npm:^11.0.0, @metamask/eth-json-rpc-middleware@npm:^11.0.2":
+  version: 11.0.2
+  resolution: "@metamask/eth-json-rpc-middleware@npm:11.0.2"
   dependencies:
     "@metamask/eth-json-rpc-provider": "npm:^1.0.0"
-    "@metamask/eth-sig-util": "npm:^5.0.0"
-    "@metamask/utils": "npm:^3.0.3"
+    "@metamask/eth-sig-util": "npm:^6.0.0"
+    "@metamask/utils": "npm:^5.0.1"
     clone: "npm:^2.1.1"
-    eth-block-tracker: "npm:^7.0.0"
+    eth-block-tracker: "npm:^7.0.1"
     eth-rpc-errors: "npm:^4.0.3"
     json-rpc-engine: "npm:^6.1.0"
     pify: "npm:^3.0.0"
     safe-stable-stringify: "npm:^2.3.2"
-  checksum: c1bcf11d6e0fc2299e1c807c76a0a2002e18ed9a6d229cd05169d076d2292dcd38f70963676acd29c2797e1960f41effea4f105fb354119a06d3237afcc4eb32
+  checksum: 188d98dce78f85fc6364ea78b6f7e14a95cdcf0791a187177a1da8e79b8588d1b08141110b570239d92afeb021c08432d5f10948f4bba983acd1665a013b8a2c
   languageName: node
   linkType: hard
 
@@ -4111,7 +4111,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-sig-util@npm:^5.0.0, @metamask/eth-sig-util@npm:^5.0.1, @metamask/eth-sig-util@npm:^5.0.2, @metamask/eth-sig-util@npm:^5.1.0":
+"@metamask/eth-sig-util@npm:^5.0.1, @metamask/eth-sig-util@npm:^5.0.2, @metamask/eth-sig-util@npm:^5.1.0":
   version: 5.1.0
   resolution: "@metamask/eth-sig-util@npm:5.1.0"
   dependencies:
@@ -4325,6 +4325,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/logging-controller@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@metamask/logging-controller@npm:1.0.1"
+  dependencies:
+    "@metamask/base-controller": "npm:^3.2.1"
+    "@metamask/controller-utils": "npm:^4.3.2"
+    uuid: "npm:^8.3.2"
+  checksum: ce70fab9e5345e08c5a361a6ee2ca4095a4ad25939728617b762d0465045f3efb3f87d5b98f2bebe504e2b7d5072b18a2164c90604ee5a00cf5bff51ac1ae205
+  languageName: node
+  linkType: hard
+
 "@metamask/logo@npm:^3.1.1":
   version: 3.1.1
   resolution: "@metamask/logo@npm:3.1.1"
@@ -4391,14 +4402,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:^12.1.1, @metamask/network-controller@npm:^12.1.2":
-  version: 12.1.2
-  resolution: "@metamask/network-controller@npm:12.1.2"
+"@metamask/network-controller@npm:^12.1.2, @metamask/network-controller@npm:^12.2.0":
+  version: 12.2.0
+  resolution: "@metamask/network-controller@npm:12.2.0"
   dependencies:
     "@metamask/base-controller": "npm:^3.2.1"
     "@metamask/controller-utils": "npm:^4.3.2"
     "@metamask/eth-json-rpc-infura": "npm:^8.1.1"
-    "@metamask/eth-json-rpc-middleware": "npm:^11.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^11.0.2"
     "@metamask/eth-json-rpc-provider": "npm:^1.0.0"
     "@metamask/eth-query": "npm:^3.0.1"
     "@metamask/swappable-obj-proxy": "npm:^2.1.0"
@@ -4409,7 +4420,7 @@ __metadata:
     immer: "npm:^9.0.6"
     json-rpc-engine: "npm:^6.1.0"
     uuid: "npm:^8.3.2"
-  checksum: ec0cd25ac7851ed4b08cc6fb10bc66a83200b2d25efbf4de5a89fc5d9c845e403a59a5f226008460177cc7e2d26a35f38ca139b22e46083c5472bd86239638e5
+  checksum: e5497f00c8a6ed5f00a9a5dccc6ff98cc15cc83ec31493e1387f654e038e244dff6b7954422f753d07461e2d4ef9c9dde2337a6cc4c013e3fae045592278da04
   languageName: node
   linkType: hard
 
@@ -4640,20 +4651,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.38.2-flask.1, @metamask/rpc-methods@npm:^0.38.2-flask.1":
-  version: 0.38.2-flask.1
-  resolution: "@metamask/rpc-methods@npm:0.38.2-flask.1"
+"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.38.3-flask.1, @metamask/rpc-methods@npm:^0.38.3-flask.1":
+  version: 0.38.3-flask.1
+  resolution: "@metamask/rpc-methods@npm:0.38.3-flask.1"
   dependencies:
     "@metamask/key-tree": "npm:^9.0.0"
     "@metamask/permission-controller": "npm:^4.1.0"
-    "@metamask/snaps-ui": "npm:^0.37.4-flask.1"
-    "@metamask/snaps-utils": "npm:^0.38.3-flask.1"
+    "@metamask/snaps-ui": "npm:^0.37.5-flask.1"
+    "@metamask/snaps-utils": "npm:^0.38.4-flask.1"
     "@metamask/types": "npm:^1.1.0"
-    "@metamask/utils": "npm:^7.1.0"
+    "@metamask/utils": "npm:^8.1.0"
     "@noble/hashes": "npm:^1.3.1"
     eth-rpc-errors: "npm:^4.0.3"
     superstruct: "npm:^1.0.3"
-  checksum: a9b49d49df69708cd8805909e25b67b0ff75ec8299035e2cedd1295ae17a68c3cb53cf87788da729c54135e8872e93cc901f27be6ad429db6efd66dd50488a0d
+  checksum: 859b279a9b89a66daeffbf7be67d83582d58b71ac4afec54c61059a5c0cd994e176cc9b4df51ea98f645981c526353ab2f0f93bc3c1e699b445a35ecb0f7d65f
   languageName: node
   linkType: hard
 
@@ -4793,20 +4804,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.38.3-flask.1":
-  version: 0.38.3-flask.1
-  resolution: "@metamask/snaps-controllers@npm:0.38.3-flask.1"
+"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.39.0-flask.1":
+  version: 0.39.0-flask.1
+  resolution: "@metamask/snaps-controllers@npm:0.39.0-flask.1"
   dependencies:
     "@metamask/approval-controller": "npm:^3.5.0"
     "@metamask/base-controller": "npm:^3.2.0"
     "@metamask/object-multiplex": "npm:^1.2.0"
     "@metamask/permission-controller": "npm:^4.1.0"
     "@metamask/post-message-stream": "npm:^7.0.0"
-    "@metamask/rpc-methods": "npm:^0.38.2-flask.1"
-    "@metamask/snaps-execution-environments": "npm:^0.38.3-flask.1"
-    "@metamask/snaps-registry": "npm:^1.2.2"
-    "@metamask/snaps-utils": "npm:^0.38.3-flask.1"
-    "@metamask/utils": "npm:^7.1.0"
+    "@metamask/rpc-methods": "npm:^0.38.3-flask.1"
+    "@metamask/snaps-execution-environments": "npm:^0.39.0-flask.1"
+    "@metamask/snaps-registry": "npm:^2.0.0"
+    "@metamask/snaps-utils": "npm:^0.38.4-flask.1"
+    "@metamask/utils": "npm:^8.1.0"
     "@xstate/fsm": "npm:^2.0.0"
     concat-stream: "npm:^2.0.0"
     eth-rpc-errors: "npm:^4.0.3"
@@ -4815,10 +4826,9 @@ __metadata:
     json-rpc-engine: "npm:^6.1.0"
     json-rpc-middleware-stream: "npm:^4.2.0"
     nanoid: "npm:^3.1.31"
-    pump: "npm:^3.0.0"
     readable-web-to-node-stream: "npm:^3.0.2"
     tar-stream: "npm:^2.2.0"
-  checksum: a6baa56d193d77d89187b461f9865517564c08f8a4b22e6c8a1373d8837816003a1dece1e69a194a022b6207a213236719d78588e925c787d948a90eeffc7a29
+  checksum: 6a4e71fafedd9cb0ef89719d2772d0511473bd6fc474534d36fd09a024a5c1914c69bc61d8db1ab990483abd2d6ebcceef26bb7f7fb73e63ef54e3e81d2aa174
   languageName: node
   linkType: hard
 
@@ -4903,22 +4913,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^0.38.3-flask.1":
-  version: 0.38.3-flask.1
-  resolution: "@metamask/snaps-execution-environments@npm:0.38.3-flask.1"
+"@metamask/snaps-execution-environments@npm:^0.39.0-flask.1":
+  version: 0.39.0-flask.1
+  resolution: "@metamask/snaps-execution-environments@npm:0.39.0-flask.1"
   dependencies:
     "@metamask/object-multiplex": "npm:^1.2.0"
     "@metamask/post-message-stream": "npm:^7.0.0"
     "@metamask/providers": "npm:^11.1.1"
-    "@metamask/rpc-methods": "npm:^0.38.2-flask.1"
-    "@metamask/snaps-utils": "npm:^0.38.3-flask.1"
-    "@metamask/utils": "npm:^7.1.0"
+    "@metamask/rpc-methods": "npm:^0.38.3-flask.1"
+    "@metamask/snaps-utils": "npm:^0.38.4-flask.1"
+    "@metamask/utils": "npm:^8.1.0"
     eth-rpc-errors: "npm:^4.0.3"
     json-rpc-engine: "npm:^6.1.0"
     nanoid: "npm:^3.1.31"
-    pump: "npm:^3.0.0"
     superstruct: "npm:^1.0.3"
-  checksum: 471133c91b04f95aaba0aa4d6357ea58df231d062d7cce4b187e6ded7d7bc9018efe6416aea342e584d6f9d0d82b31fdee4f5dd8f3f4d1cd175229ed2ef903f0
+  checksum: 80aa0fcb299337d1e1e62fcff195123e0b23096d7895818669ba0ab0eb2c816611603665d4463c44b41ae93a03bbc6fd570ffbe2b986b560f4befd50390f72cc
   languageName: node
   linkType: hard
 
@@ -4942,7 +4951,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-registry@npm:^1.2.1, @metamask/snaps-registry@npm:^1.2.2":
+"@metamask/snaps-registry@npm:^1.2.1":
   version: 1.2.2
   resolution: "@metamask/snaps-registry@npm:1.2.2"
   dependencies:
@@ -4953,13 +4962,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.37.4-flask.1, @metamask/snaps-ui@npm:^0.37.4-flask.1":
-  version: 0.37.4-flask.1
-  resolution: "@metamask/snaps-ui@npm:0.37.4-flask.1"
+"@metamask/snaps-registry@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/snaps-registry@npm:2.0.0"
   dependencies:
-    "@metamask/utils": "npm:^6.0.1"
+    "@metamask/utils": "npm:^8.1.0"
+    "@noble/secp256k1": "npm:^1.7.1"
     superstruct: "npm:^1.0.3"
-  checksum: e57ca1e375d0c7860f198143789226552cb449a654e97b639f90a0cb577f9d46387c7c65b5dacc05b7fa613ed8499021df286590b6c633b6f5be8578d4d9f6a9
+  checksum: 99f8777708b6db3b2c12b66bd3d85f44c9e20ec78f04bd814a50c414fdb936a073d590926a494623691dd552592299eb1c3e8bb66382da46ec87c55694f46534
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.37.5-flask.1, @metamask/snaps-ui@npm:^0.37.5-flask.1":
+  version: 0.37.5-flask.1
+  resolution: "@metamask/snaps-ui@npm:0.37.5-flask.1"
+  dependencies:
+    "@metamask/utils": "npm:^8.1.0"
+    superstruct: "npm:^1.0.3"
+  checksum: a0f665df2d758a6d43c556a4b921a930b9e0cbac21195829d4d187428d071b0c53b8c5b0288029074b562272383a931407d80c8a7af5f9792bec1d5354f6d4ad
   languageName: node
   linkType: hard
 
@@ -4983,18 +5003,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.38.3-flask.1, @metamask/snaps-utils@npm:^0.38.3-flask.1":
-  version: 0.38.3-flask.1
-  resolution: "@metamask/snaps-utils@npm:0.38.3-flask.1"
+"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.38.4-flask.1, @metamask/snaps-utils@npm:^0.38.4-flask.1":
+  version: 0.38.4-flask.1
+  resolution: "@metamask/snaps-utils@npm:0.38.4-flask.1"
   dependencies:
     "@babel/core": "npm:^7.20.12"
     "@babel/types": "npm:^7.18.7"
     "@metamask/base-controller": "npm:^3.2.0"
     "@metamask/key-tree": "npm:^9.0.0"
     "@metamask/permission-controller": "npm:^4.1.0"
-    "@metamask/snaps-registry": "npm:^1.2.2"
-    "@metamask/snaps-ui": "npm:^0.37.4-flask.1"
-    "@metamask/utils": "npm:^7.1.0"
+    "@metamask/snaps-registry": "npm:^2.0.0"
+    "@metamask/snaps-ui": "npm:^0.37.5-flask.1"
+    "@metamask/utils": "npm:^8.1.0"
     "@noble/hashes": "npm:^1.3.1"
     "@scure/base": "npm:^1.1.1"
     chalk: "npm:^4.1.2"
@@ -5008,7 +5028,7 @@ __metadata:
     ses: "npm:^0.18.7"
     superstruct: "npm:^1.0.3"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 002a685195b433a3c3e5bb927f9f494271526998f3c44a58cce3737d35fc76f3b5317419048b68404b88508c8435e85fa0da55787ed4a4044ef319c8f1282807
+  checksum: fb1fb14ee3766fe0e0834719ea9ff9bcd8940c538b206fdc8ca9afdbb06515ddd178a20359790781ed6fe86fc3bc5873b67adffb135baf6713ad1db8b3c65581
   languageName: node
   linkType: hard
 
@@ -5102,7 +5122,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.4.1":
+"@metamask/utils@npm:^3.4.1":
   version: 3.6.0
   resolution: "@metamask/utils@npm:3.6.0"
   dependencies:
@@ -5167,6 +5187,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/utils@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@metamask/utils@npm:8.1.0"
+  dependencies:
+    "@ethereumjs/tx": "npm:^4.1.2"
+    "@noble/hashes": "npm:^1.3.1"
+    "@types/debug": "npm:^4.1.7"
+    debug: "npm:^4.3.4"
+    semver: "npm:^7.5.4"
+    superstruct: "npm:^1.0.3"
+  checksum: 00400538ce635841ee97db6ad27ef9bb1e71a047899aa748789da9cbb21926eac37a91d366fbfaf1d3138b7a8d4bb2b5c23edf532f7896af3e377429d9ae577e
+  languageName: node
+  linkType: hard
+
 "@multiformats/base-x@npm:^4.0.1":
   version: 4.0.1
   resolution: "@multiformats/base-x@npm:4.0.1"
@@ -15911,7 +15945,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-block-tracker@npm:^7.0.0, eth-block-tracker@npm:^7.0.1":
+"eth-block-tracker@npm:^7.0.1":
   version: 7.0.1
   resolution: "eth-block-tracker@npm:7.0.1"
   dependencies:
@@ -22783,106 +22817,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-browserify@npm:^15.7.0":
-  version: 15.7.0
-  resolution: "lavamoat-browserify@npm:15.7.0"
+"lavamoat-browserify@npm:^15.7.4":
+  version: 15.9.1
+  resolution: "lavamoat-browserify@npm:15.9.1"
   dependencies:
-    "@lavamoat/aa": "npm:^3.1.0"
-    "@lavamoat/lavapack": "npm:^5.2.0"
+    "@lavamoat/aa": "npm:^3.1.5"
+    "@lavamoat/lavapack": "npm:^5.4.1"
     browser-resolve: "npm:^2.0.0"
     concat-stream: "npm:^2.0.0"
     convert-source-map: "npm:^1.9.0"
     duplexify: "npm:^4.1.1"
     json-stable-stringify: "npm:^1.0.1"
-    lavamoat-core: "npm:^14.2.0"
+    lavamoat-core: "npm:^14.4.1"
     pify: "npm:^4.0.1"
     readable-stream: "npm:^3.6.0"
     source-map: "npm:^0.7.4"
     through2: "npm:^3.0.0"
-  checksum: 74d78a95b22895e9ac094d06b4ab5b5c2bde994f1f61afddb97fe2c055882678f266b3f06248bc592f2853b04c20e5f0ed08291c6b4e68c9e4ce8e6b278b89c0
+  checksum: d462d983c433df0e77dbde7cbc122e81554fc0ffbdb4bee05afbc7e3413b4ae6fafd1985068cded5cf693dbf1a97a1de7c0a219fa181bf9086a9fefd231030a5
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:14.2.0":
-  version: 14.2.0
-  resolution: "lavamoat-core@npm:14.2.0"
+"lavamoat-core@npm:14.4.1":
+  version: 14.4.1
+  resolution: "lavamoat-core@npm:14.4.1"
   dependencies:
     json-stable-stringify: "npm:^1.0.2"
-    lavamoat-tofu: "npm:^6.0.2"
+    lavamoat-tofu: "npm:^6.2.1"
     merge-deep: "npm:^3.0.3"
-  checksum: 2222df8c1c3814897267244321e7d9768ac9524d06c0d6e7b1edc04f2a6857e5b6daf1d8ff560e767292f2956bdcc47f7127202b8caec7fc2ea0de5612bf419c
+  checksum: 3ba352e96d728f015f193a671fef28be3c221e486956e693a4ec4690c871aa4b5aa9bd0bfb1bb9b260f1bd7709eb078f839d39c7c065640800d368a55e7e5cc3
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:^10.0.1":
-  version: 10.1.2
-  resolution: "lavamoat-core@npm:10.1.2"
-  dependencies:
-    fromentries: "npm:^1.2.0"
-    json-stable-stringify: "npm:^1.0.1"
-    lavamoat-tofu: "npm:^6.0.0"
-    merge-deep: "npm:^3.0.2"
-    resolve: "npm:^1.15.1"
-  checksum: a98eb0a069fafd57af190cd06a200186719e2659359ecedad1c2813d89e248d944b021261d111dfdf6f3fdea52e05ecb3486767b95337d987636a9ceb9ab2bdf
-  languageName: node
-  linkType: hard
-
-"lavamoat-core@patch:lavamoat-core@npm%3A14.2.0#./.yarn/patches/lavamoat-core-npm-14.2.0-c453f4f755.patch::locator=metamask-crx%40workspace%3A.":
-  version: 14.2.0
-  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.2.0#./.yarn/patches/lavamoat-core-npm-14.2.0-c453f4f755.patch::version=14.2.0&hash=5307c6&locator=metamask-crx%40workspace%3A."
+"lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch":
+  version: 14.4.1
+  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch::version=14.4.1&hash=5307c6"
   dependencies:
     json-stable-stringify: "npm:^1.0.2"
-    lavamoat-tofu: "npm:^6.0.2"
+    lavamoat-tofu: "npm:^6.2.1"
     merge-deep: "npm:^3.0.3"
-  checksum: 9acf7eac2be4f368e67f61e04ad521a4e0f8915b86a9ffcd1212f3172c5140ef7d8ca6885bb482b4758a59e7f1a996bc922081a150b15e0c62c029986c055e5f
+  checksum: 47a7f3863bd7b7ddb59ea6dad15a48859538725b0ed7bc53fd78a1a3f752c86f77b83f554c6b4a27420beb07d088fbfe1fd0847048c4e53174599d526d503fe8
   languageName: node
   linkType: hard
 
-"lavamoat-tofu@npm:^6.0.0, lavamoat-tofu@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "lavamoat-tofu@npm:6.0.2"
+"lavamoat-tofu@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "lavamoat-tofu@npm:6.2.1"
   dependencies:
-    "@babel/parser": "npm:^7.10.1"
-    "@babel/traverse": "npm:^7.10.1"
-  checksum: a641d68aa64f7b7a5d19608dd1daf77a7f442f86fb4f31ae3c5085c81891e9e0377ce8cfe9b99a3cb8c77c8efa5e0232e44056d0b04b2b364c1d814cb1215d41
+    "@babel/parser": "npm:^7.21.8"
+    "@babel/traverse": "npm:^7.21.5"
+  checksum: be1fecb988a523c1bcda57e71dc4ce1d57dcb0e01e7f4a72a59e545f96e205e9332f9e24d2f7b24fd8945eff066b7c7c8e515fb870f675a00cb94d132c81ff08
   languageName: node
   linkType: hard
 
-"lavamoat-viz@npm:^6.0.9":
-  version: 6.0.9
-  resolution: "lavamoat-viz@npm:6.0.9"
+"lavamoat-viz@npm:^6.0.11":
+  version: 6.2.1
+  resolution: "lavamoat-viz@npm:6.2.1"
   dependencies:
-    lavamoat-core: "npm:^10.0.1"
+    lavamoat-core: "npm:^14.4.1"
     ncp: "npm:^2.0.0"
     open: "npm:^7.0.3"
     pify: "npm:^4.0.1"
-    serve-handler: "npm:^6.1.3"
+    serve-handler: "npm:^6.1.5"
     yargs: "npm:^16.0.0"
   bin:
     lavamoat-viz: bin/index.js
-  checksum: 8dc91c7fbccfbe723e56c6095b35dbe5f6a22533cc5ab3556a5cc64565356eb12e29a76d5db594955024b1b966746bfd9a0c6a69a58f573d79bdd3da3400dfb4
+  checksum: 26ade3b21dd49f4f742e37d2ac52174e792447ed92b470c4618f9ac7397a9bbb51d0c225efb0a6319dfa021a566668acefd5fb07e0e6838e8df7efd508e527a4
   languageName: node
   linkType: hard
 
-"lavamoat@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "lavamoat@npm:7.1.0"
+"lavamoat@npm:^7.1.2":
+  version: 7.3.1
+  resolution: "lavamoat@npm:7.3.1"
   dependencies:
     "@babel/code-frame": "npm:^7.21.4"
     "@babel/highlight": "npm:^7.18.6"
-    "@lavamoat/aa": "npm:^3.1.0"
+    "@lavamoat/aa": "npm:^3.1.5"
     bindings: "npm:^1.5.0"
     htmlescape: "npm:^1.1.1"
     json-stable-stringify: "npm:^1.0.2"
-    lavamoat-core: "npm:^14.2.0"
-    lavamoat-tofu: "npm:^6.0.2"
+    lavamoat-core: "npm:^14.4.1"
+    lavamoat-tofu: "npm:^6.2.1"
     node-gyp-build: "npm:^4.6.0"
     resolve: "npm:^1.22.3"
     yargs: "npm:^17.7.2"
   bin:
     lavamoat: src/cli.js
     lavamoat-run-command: src/run-command.js
-  checksum: 3add11f2bfb9d21068d92412f1752c12d7a5eda114467ce8fbbba36072e5cbf0940c0024f5e75d8f0583659181d00f862d404a94a799df40eb7e12e5a803baa3
+  checksum: e2a294e8c1f911f2d7c33315fbe405c2917c2be9ed77f3504a3e5fbc62cf2aaba043e3cd86e0b7164f0930b687196784f440441f3e9fe5731a9cff1c3027cc4c
   languageName: node
   linkType: hard
 
@@ -24016,7 +24037,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-deep@npm:^3.0.2, merge-deep@npm:^3.0.3":
+"merge-deep@npm:^3.0.3":
   version: 3.0.3
   resolution: "merge-deep@npm:3.0.3"
   dependencies:
@@ -24102,11 +24123,11 @@ __metadata:
     "@keystonehq/bc-ur-registry-eth": "npm:^0.19.1"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
     "@lavamoat/allow-scripts": "npm:^2.3.1"
-    "@lavamoat/lavapack": "npm:^5.2.0"
+    "@lavamoat/lavapack": "npm:^5.2.4"
     "@lavamoat/snow": "npm:^1.5.0"
     "@material-ui/core": "npm:^4.11.0"
     "@metamask-institutional/custody-controller": "npm:^0.2.12"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.1"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.2"
     "@metamask-institutional/extension": "npm:^0.3.5"
     "@metamask-institutional/institutional-features": "npm:^1.2.4"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
@@ -24141,11 +24162,12 @@ __metadata:
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/key-tree": "npm:^9.0.0"
     "@metamask/keyring-controller": "npm:^7.4.0"
+    "@metamask/logging-controller": "npm:^1.0.1"
     "@metamask/logo": "npm:^3.1.1"
     "@metamask/message-manager": "npm:^7.3.0"
     "@metamask/metamask-eth-abis": "npm:^3.0.0"
     "@metamask/name-controller": "npm:^1.0.0"
-    "@metamask/network-controller": "npm:^12.1.1"
+    "@metamask/network-controller": "npm:^12.2.0"
     "@metamask/notification-controller": "npm:^3.0.0"
     "@metamask/obs-store": "npm:^8.1.0"
     "@metamask/permission-controller": "npm:^4.0.0"
@@ -24156,7 +24178,7 @@ __metadata:
     "@metamask/providers": "npm:^11.1.0"
     "@metamask/rate-limit-controller": "npm:^3.0.0"
     "@metamask/rpc-methods": "npm:^1.0.2"
-    "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.38.2-flask.1"
+    "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.38.3-flask.1"
     "@metamask/safe-event-emitter": "npm:^2.0.0"
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "npm:^1.0.0"
@@ -24164,11 +24186,11 @@ __metadata:
     "@metamask/slip44": "npm:^3.0.0"
     "@metamask/smart-transactions-controller": "npm:^4.0.0"
     "@metamask/snaps-controllers": "npm:^1.0.2"
-    "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.38.3-flask.1"
+    "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.39.0-flask.1"
     "@metamask/snaps-ui": "npm:^1.0.2"
-    "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.37.4-flask.1"
+    "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.37.5-flask.1"
     "@metamask/snaps-utils": "npm:^1.0.2"
-    "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.38.3-flask.1"
+    "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.38.4-flask.1"
     "@metamask/subject-metadata-controller": "npm:^2.0.0"
     "@metamask/test-dapp": "npm:^7.1.0"
     "@metamask/utils": "npm:^5.0.0"
@@ -24334,9 +24356,9 @@ __metadata:
     junit-report-merger: "npm:^4.0.0"
     koa: "npm:^2.7.0"
     labeled-stream-splicer: "npm:^2.0.2"
-    lavamoat: "npm:^7.1.0"
-    lavamoat-browserify: "npm:^15.7.0"
-    lavamoat-viz: "npm:^6.0.9"
+    lavamoat: "npm:^7.1.2"
+    lavamoat-browserify: "npm:^15.7.4"
+    lavamoat-viz: "npm:^6.0.11"
     localforage: "npm:^1.9.0"
     lockfile-lint: "npm:^4.10.6"
     lodash: "npm:^4.17.21"
@@ -24396,7 +24418,7 @@ __metadata:
     selenium-webdriver: "npm:^4.9.0"
     semver: "npm:^7.5.4"
     serve-handler: "npm:^6.1.2"
-    ses: "npm:^0.18.7"
+    ses: "npm:^0.18.8"
     single-call-balance-checker-abi: "npm:^1.0.0"
     sinon: "npm:^9.0.0"
     source-map: "npm:^0.7.2"
@@ -29959,7 +29981,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.4, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.15.1, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.21.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3, resolve@npm:^1.4.0":
+"resolve@npm:^1.1.4, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.21.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3, resolve@npm:^1.4.0":
   version: 1.22.3
   resolution: "resolve@npm:1.22.3"
   dependencies:
@@ -29985,7 +30007,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-? "resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.15.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.21.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>"
+? "resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.21.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>"
 :
   version: 1.22.3
   resolution: "resolve@patch:resolve@npm%3A1.22.3#optional!builtin<compat/resolve>::version=1.22.3&hash=c3c19d"
@@ -30743,7 +30765,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-handler@npm:^6.1.2, serve-handler@npm:^6.1.3":
+"serve-handler@npm:^6.1.2, serve-handler@npm:^6.1.5":
   version: 6.1.5
   resolution: "serve-handler@npm:6.1.5"
   dependencies:
@@ -30771,12 +30793,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ses@npm:^0.18.1, ses@npm:^0.18.7":
-  version: 0.18.7
-  resolution: "ses@npm:0.18.7"
+"ses@npm:^0.18.1, ses@npm:^0.18.7, ses@npm:^0.18.8":
+  version: 0.18.8
+  resolution: "ses@npm:0.18.8"
   dependencies:
-    "@endo/env-options": "npm:^0.1.3"
-  checksum: 601b442426bb8113bb855548878771aacb62f3c4eb3c45ff32f70338320f03eeb23c0d7eb834f5539793fa8ce497f304db50cbd5da51ef3531a4e94d424bb98c
+    "@endo/env-options": "npm:^0.1.4"
+  checksum: 243b8d546ca2f0ad68cda1178689c4a4bfab8ac25fd03daccaf6c4b94ee0c10b07eb10b8d477c73ceef9ba10a2205d2bef0bd3c64b8c98130c01adfd9c873103
   languageName: node
   linkType: hard